aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDocile-Alligator <25734209+Docile-Alligator@users.noreply.github.com>2023-09-20 03:03:33 +0000
committerDocile-Alligator <25734209+Docile-Alligator@users.noreply.github.com>2023-09-20 03:03:33 +0000
commit3e4068442f1e78e76770b18427ed266a392fb896 (patch)
tree24fed26993cff84ce372258206cfa02a60337298 /app
parentd597048759a9ab5c4f5cd060d864cccfe6fc8562 (diff)
downloadinfinity-for-reddit-3e4068442f1e78e76770b18427ed266a392fb896.tar
infinity-for-reddit-3e4068442f1e78e76770b18427ed266a392fb896.tar.gz
infinity-for-reddit-3e4068442f1e78e76770b18427ed266a392fb896.tar.bz2
infinity-for-reddit-3e4068442f1e78e76770b18427ed266a392fb896.tar.lz
infinity-for-reddit-3e4068442f1e78e76770b18427ed266a392fb896.tar.xz
infinity-for-reddit-3e4068442f1e78e76770b18427ed266a392fb896.tar.zst
infinity-for-reddit-3e4068442f1e78e76770b18427ed266a392fb896.zip
Change TextInputLayout style. Disable swipe right to go back in CustomizePostFilterActivity.
Diffstat (limited to 'app')
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizePostFilterActivity.java5
-rw-r--r--app/src/main/res/layout/activity_customize_post_filter.xml34
-rw-r--r--app/src/main/res/layout/activity_post_poll.xml12
-rw-r--r--app/src/main/res/layout/activity_view_post_detail.xml2
-rw-r--r--app/src/main/res/layout/dialog_edit_post_filter_name_of_usage.xml2
-rw-r--r--app/src/main/res/layout/dialog_go_to_thing_edit_text.xml2
-rw-r--r--app/src/main/res/layout/dialog_insert_link.xml4
-rw-r--r--app/src/main/res/layout/fragment_set_reddit_gallery_item_caption_and_url_bottom_sheet.xml4
8 files changed, 30 insertions, 35 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizePostFilterActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizePostFilterActivity.java
index 45097020..16f8b2d8 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizePostFilterActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizePostFilterActivity.java
@@ -46,7 +46,6 @@ import ml.docilealligator.infinityforreddit.Infinity;
import ml.docilealligator.infinityforreddit.R;
import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
-import ml.docilealligator.infinityforreddit.customviews.slidr.Slidr;
import ml.docilealligator.infinityforreddit.postfilter.PostFilter;
import ml.docilealligator.infinityforreddit.postfilter.SavePostFilter;
import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
@@ -226,10 +225,6 @@ public class CustomizePostFilterActivity extends BaseActivity {
applyCustomTheme();
- if (mSharedPreferences.getBoolean(SharedPreferencesUtils.SWIPE_RIGHT_TO_GO_BACK, true)) {
- Slidr.attach(this);
- }
-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && isChangeStatusBarIconColor()) {
addOnOffsetChangedListener(appBarLayout);
}
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 e406cf39..427e24e5 100644
--- a/app/src/main/res/layout/activity_customize_post_filter.xml
+++ b/app/src/main/res/layout/activity_customize_post_filter.xml
@@ -51,7 +51,7 @@
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/name_text_input_edit_text_customize_post_filter_activity"
@@ -312,7 +312,7 @@
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/title_excludes_strings_text_input_edit_text_customize_post_filter_activity"
@@ -333,7 +333,7 @@
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/title_contains_strings_text_input_edit_text_customize_post_filter_activity"
@@ -354,7 +354,7 @@
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/title_excludes_regex_text_input_edit_text_customize_post_filter_activity"
@@ -375,7 +375,7 @@
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/title_contains_regex_text_input_edit_text_customize_post_filter_activity"
@@ -400,7 +400,7 @@
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:layout_marginStart="16dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/excludes_subreddits_text_input_edit_text_customize_post_filter_activity"
@@ -438,7 +438,7 @@
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:layout_marginStart="16dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/excludes_users_text_input_edit_text_customize_post_filter_activity"
@@ -471,7 +471,7 @@
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/excludes_flairs_text_input_edit_text_customize_post_filter_activity"
@@ -492,7 +492,7 @@
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/contains_flairs_text_input_edit_text_customize_post_filter_activity"
@@ -513,7 +513,7 @@
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/exclude_domains_text_input_edit_text_customize_post_filter_activity"
@@ -534,7 +534,7 @@
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/contain_domains_text_input_edit_text_customize_post_filter_activity"
@@ -555,7 +555,7 @@
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/min_vote_text_input_edit_text_customize_post_filter_activity"
@@ -577,7 +577,7 @@
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/max_vote_text_input_edit_text_customize_post_filter_activity"
@@ -599,7 +599,7 @@
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/min_comments_text_input_edit_text_customize_post_filter_activity"
@@ -621,7 +621,7 @@
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/max_comments_text_input_edit_text_customize_post_filter_activity"
@@ -643,7 +643,7 @@
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/min_awards_text_input_edit_text_customize_post_filter_activity"
@@ -665,7 +665,7 @@
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/max_awards_text_input_edit_text_customize_post_filter_activity"
diff --git a/app/src/main/res/layout/activity_post_poll.xml b/app/src/main/res/layout/activity_post_poll.xml
index f3601995..f1b90454 100644
--- a/app/src/main/res/layout/activity_post_poll.xml
+++ b/app/src/main/res/layout/activity_post_poll.xml
@@ -234,7 +234,7 @@
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/option_1_text_input_layout_edit_text_post_poll_activity"
@@ -254,7 +254,7 @@
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/option_2_text_input_layout_edit_text_post_poll_activity"
@@ -274,7 +274,7 @@
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/option_3_text_input_layout_edit_text_post_poll_activity"
@@ -294,7 +294,7 @@
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/option_4_text_input_layout_edit_text_post_poll_activity"
@@ -314,7 +314,7 @@
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/option_5_text_input_layout_edit_text_post_poll_activity"
@@ -334,7 +334,7 @@
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/option_6_text_input_layout_edit_text_post_poll_activity"
diff --git a/app/src/main/res/layout/activity_view_post_detail.xml b/app/src/main/res/layout/activity_view_post_detail.xml
index 4f32b0e8..f2236a95 100644
--- a/app/src/main/res/layout/activity_view_post_detail.xml
+++ b/app/src/main/res/layout/activity_view_post_detail.xml
@@ -72,7 +72,7 @@
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/search_text_input_edit_text_view_post_detail_activity"
diff --git a/app/src/main/res/layout/dialog_edit_post_filter_name_of_usage.xml b/app/src/main/res/layout/dialog_edit_post_filter_name_of_usage.xml
index 0b6ffc3f..48ee48f1 100644
--- a/app/src/main/res/layout/dialog_edit_post_filter_name_of_usage.xml
+++ b/app/src/main/res/layout/dialog_edit_post_filter_name_of_usage.xml
@@ -24,7 +24,7 @@
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/text_input_edit_text_edit_post_filter_name_of_usage_dialog"
diff --git a/app/src/main/res/layout/dialog_go_to_thing_edit_text.xml b/app/src/main/res/layout/dialog_go_to_thing_edit_text.xml
index 707f4d55..3775b2d3 100644
--- a/app/src/main/res/layout/dialog_go_to_thing_edit_text.xml
+++ b/app/src/main/res/layout/dialog_go_to_thing_edit_text.xml
@@ -6,7 +6,7 @@
android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="16dp"
diff --git a/app/src/main/res/layout/dialog_insert_link.xml b/app/src/main/res/layout/dialog_insert_link.xml
index 8c8de9a1..c7fb1bd3 100644
--- a/app/src/main/res/layout/dialog_insert_link.xml
+++ b/app/src/main/res/layout/dialog_insert_link.xml
@@ -14,7 +14,7 @@
android:paddingBottom="8dp"
app:boxStrokeColor="?attr/primaryTextColor"
app:hintTextColor="?attr/primaryTextColor"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edit_text_insert_link_dialog"
@@ -37,7 +37,7 @@
android:paddingBottom="8dp"
app:boxStrokeColor="?attr/primaryTextColor"
app:hintTextColor="?attr/primaryTextColor"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edit_link_insert_link_dialog"
diff --git a/app/src/main/res/layout/fragment_set_reddit_gallery_item_caption_and_url_bottom_sheet.xml b/app/src/main/res/layout/fragment_set_reddit_gallery_item_caption_and_url_bottom_sheet.xml
index 9c354bef..ebaf7a86 100644
--- a/app/src/main/res/layout/fragment_set_reddit_gallery_item_caption_and_url_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_set_reddit_gallery_item_caption_and_url_bottom_sheet.xml
@@ -21,7 +21,7 @@
android:paddingEnd="16dp"
app:boxStrokeColor="?attr/primaryTextColor"
app:hintTextColor="?attr/primaryTextColor"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/caption_text_input_edit_text_set_reddit_gallery_item_caption_and_url_bottom_sheet_fragment"
@@ -45,7 +45,7 @@
android:paddingEnd="16dp"
app:boxStrokeColor="?attr/primaryTextColor"
app:hintTextColor="?attr/primaryTextColor"
- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/url_text_input_edit_text_set_reddit_gallery_item_caption_and_url_bottom_sheet_fragment"
generated by cgit (git). Responsive design from responsive-cgit-css. Dark theme color palette from Dracula theme