From 4e2b09b0794664b518fa1de82dc17fae82844ad5 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Sat, 16 Oct 2021 15:28:35 +0800
Subject: New options in post filter: Title: contains keywords, Title: contains
 regex, Contain domains.

---
 .../res/layout/activity_customize_post_filter.xml  | 64 +++++++++++++++++++++-
 app/src/main/res/values/arrays.xml                 |  1 +
 app/src/main/res/values/strings.xml                |  4 ++
 3 files changed, 67 insertions(+), 2 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/activity_customize_post_filter.xml b/app/src/main/res/layout/activity_customize_post_filter.xml
index 572d6f94..0d2dfd49 100644
--- a/app/src/main/res/layout/activity_customize_post_filter.xml
+++ b/app/src/main/res/layout/activity_customize_post_filter.xml
@@ -323,6 +323,26 @@
 
             </com.google.android.material.textfield.TextInputLayout>
 
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/title_contains_strings_text_input_layout_customize_post_filter_activity"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
+                android:paddingStart="16dp"
+                android:paddingEnd="16dp"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/title_contains_strings_text_input_edit_text_customize_post_filter_activity"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="?attr/font_family"
+                    android:textSize="?attr/font_default"
+                    android:hint="@string/title_contains_strings_hint" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/title_excludes_regex_text_input_layout_customize_post_filter_activity"
                 android:layout_width="match_parent"
@@ -343,6 +363,26 @@
 
             </com.google.android.material.textfield.TextInputLayout>
 
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/title_contains_regex_text_input_layout_customize_post_filter_activity"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
+                android:paddingStart="16dp"
+                android:paddingEnd="16dp"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/title_contains_regex_text_input_edit_text_customize_post_filter_activity"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="?attr/font_family"
+                    android:textSize="?attr/font_default"
+                    android:hint="@string/title_contains_regex_hint" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
@@ -457,7 +497,7 @@
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/excludes_domains_text_input_layout_customize_post_filter_activity"
+                android:id="@+id/exclude_domains_text_input_layout_customize_post_filter_activity"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingTop="8dp"
@@ -467,7 +507,7 @@
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/excludes_domains_text_input_edit_text_customize_post_filter_activity"
+                    android:id="@+id/exclude_domains_text_input_edit_text_customize_post_filter_activity"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:fontFamily="?attr/font_family"
@@ -476,6 +516,26 @@
 
             </com.google.android.material.textfield.TextInputLayout>
 
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/contain_domains_text_input_layout_customize_post_filter_activity"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
+                android:paddingStart="16dp"
+                android:paddingEnd="16dp"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/contain_domains_text_input_edit_text_customize_post_filter_activity"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="?attr/font_family"
+                    android:textSize="?attr/font_default"
+                    android:hint="@string/contain_domains_hint" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/min_vote_text_input_layout_customize_post_filter_activity"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 1573c6da..fdf0911e 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -546,6 +546,7 @@
         <item>@string/exclude_flair</item>
         <item>@string/contain_flair</item>
         <item>@string/exclude_domain</item>
+        <item>@string/contain_domain</item>
     </string-array>
 
     <string-array name="settings_app_lock_timeout">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f5654e8e..18f024c0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1077,12 +1077,15 @@
     <string name="only_nsfw">Only NSFW</string>
     <string name="only_spoiler">Only Spoiler</string>
     <string name="title_excludes_strings_hint">Title: excludes keywords (key1,key2)</string>
+    <string name="title_contains_strings_hint">Title: contains keywords (key1,key2)</string>
     <string name="title_excludes_regex_hint">Title: excludes regex</string>
+    <string name="title_contains_regex_hint">Title: contains regex</string>
     <string name="exclude_subreddits_hint">Exclude subreddits (e.g. funny,AskReddit)</string>
     <string name="exclude_users_hint">Exclude users (e.g. Hostilenemy,random)</string>
     <string name="exclude_flairs_hint">Exclude flairs (e.g. flair1,flair2)</string>
     <string name="contain_flairs_hint">Contain flairs (e.g. flair1,flair2)</string>
     <string name="exclude_domains_hint">Exclude domains</string>
+    <string name="contain_domains_hint">Contain domains</string>
     <string name="min_vote_hint">Min vote (-1: no restriction)</string>
     <string name="max_vote_hint">Max vote (-1: no restriction)</string>
     <string name="min_comments_hint">Min comments (-1: no restriction)</string>
@@ -1158,6 +1161,7 @@
     <string name="exclude_flair">Exclude this flair</string>
     <string name="contain_flair">Contain this flair</string>
     <string name="exclude_domain">Exclude this domain</string>
+    <string name="contain_domain">Contain this domain</string>
 
     <string name="suggest_title">Suggest Title</string>
     <string name="suggest_title_failed">Failed to suggest a title</string>
-- 
cgit v1.2.3