From 2068d28dd574d7f236df7749889f931bc1f32793 Mon Sep 17 00:00:00 2001
From: Docile-Alligator <25734209+Docile-Alligator@users.noreply.github.com>
Date: Sat, 5 Jul 2025 23:35:59 -0400
Subject: [PATCH] Refine ime insetin CustomizeCommentFilterActivity and
 CustomizePostFilterActivity.

---
 app/src/main/AndroidManifest.xml              |  3 ++-
 .../CustomizeCommentFilterActivity.java       | 22 +++++++++++++------
 .../CustomizePostFilterActivity.java          | 22 ++++++++++++-------
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 17b10143..d75c2e09 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -66,7 +66,8 @@
             android:exported="false"
             android:label="@string/customize_comment_filter_activity_label"
             android:parentActivityName=".activities.SettingsActivity"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".activities.CommentFilterPreferenceActivity"
             android:exported="false"
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizeCommentFilterActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizeCommentFilterActivity.java
index a4dde6b8..3251bd0a 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizeCommentFilterActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizeCommentFilterActivity.java
@@ -94,24 +94,31 @@ public class CustomizeCommentFilterActivity extends BaseActivity {
                 @NonNull
                 @Override
                 public WindowInsetsCompat onApplyWindowInsets(@NonNull View v, @NonNull WindowInsetsCompat insets) {
-                    Insets allInsets = insets.getInsets(
+                    Insets windowInsets = insets.getInsets(
                             WindowInsetsCompat.Type.systemBars()
                                     | WindowInsetsCompat.Type.displayCutout()
                     );
+                    Insets imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime());
 
                     setMargins(binding.toolbarCustomizeCommentFilterActivity,
-                            allInsets.left,
-                            allInsets.top,
-                            allInsets.right,
+                            windowInsets.left,
+                            windowInsets.top,
+                            windowInsets.right,
                             BaseActivity.IGNORE_MARGIN);
 
                     binding.contentWrapperViewCustomizeCommentFilterActivity.setPadding(
-                            allInsets.left,
+                            windowInsets.left,
                             0,
-                            allInsets.right,
-                            allInsets.bottom
+                            windowInsets.right,
+                            windowInsets.bottom
                     );
 
+                    setMargins(binding.contentWrapperViewCustomizeCommentFilterActivity,
+                            BaseActivity.IGNORE_MARGIN,
+                            BaseActivity.IGNORE_MARGIN,
+                            BaseActivity.IGNORE_MARGIN,
+                            imeInsets.bottom);
+
                     return WindowInsetsCompat.CONSUMED;
                 }
             });
@@ -246,6 +253,7 @@ public class CustomizeCommentFilterActivity extends BaseActivity {
 
         binding.excludeUsersCardViewCustomizeCommentFilterActivity.setCardBackgroundColor(filledCardViewBackgroundColor);
         binding.excludeUsersExplanationTextViewCustomizeCommentFilterActivity.setTextColor(primaryTextColor);
+        binding.excludeUsersTextInputLayoutCustomizeCommentFilterActivity.setBoxStrokeColor(primaryTextColor);
         binding.excludeUsersTextInputLayoutCustomizeCommentFilterActivity.setDefaultHintTextColor(ColorStateList.valueOf(primaryTextColor));
         binding.excludeUsersTextInputEditTextCustomizeCommentFilterActivity.setTextColor(primaryTextColor);
         binding.addUsersImageViewCustomizeCommentFilterActivity.setImageDrawable(Utils.getTintedDrawable(this, R.drawable.ic_add_24dp, primaryIconColor));
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 6c8a8214..191669e4 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizePostFilterActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizePostFilterActivity.java
@@ -99,25 +99,31 @@ public class CustomizePostFilterActivity extends BaseActivity {
                 @NonNull
                 @Override
                 public WindowInsetsCompat onApplyWindowInsets(@NonNull View v, @NonNull WindowInsetsCompat insets) {
-                    Insets allInsets = insets.getInsets(
+                    Insets windowInsets = insets.getInsets(
                             WindowInsetsCompat.Type.systemBars()
                                     | WindowInsetsCompat.Type.displayCutout()
-                                    | WindowInsetsCompat.Type.ime()
                     );
+                    Insets imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime());
 
                     setMargins(binding.toolbarCustomizePostFilterActivity,
-                            allInsets.left,
-                            allInsets.top,
-                            allInsets.right,
+                            windowInsets.left,
+                            windowInsets.top,
+                            windowInsets.right,
                             BaseActivity.IGNORE_MARGIN);
 
                     binding.contentWrapperViewCustomizePostFilterActivity.setPadding(
-                            allInsets.left,
+                            windowInsets.left,
                             0,
-                            allInsets.right,
-                            allInsets.bottom
+                            windowInsets.right,
+                            windowInsets.bottom
                     );
 
+                    setMargins(binding.contentWrapperViewCustomizePostFilterActivity,
+                            BaseActivity.IGNORE_MARGIN,
+                            BaseActivity.IGNORE_MARGIN,
+                            BaseActivity.IGNORE_MARGIN,
+                            imeInsets.bottom);
+
                     return WindowInsetsCompat.CONSUMED;
                 }
             });