From b407a3fc042dca6fa91ace26cb99af52e55d6f85 Mon Sep 17 00:00:00 2001
From: emanuele-f <black.silver@hotmail.it>
Date: Wed, 28 Dec 2022 11:20:13 +0100
Subject: [PATCH] Fix AlertDialog inputs colors

Closes #287
---
 .../emanuelef/remote_capture/CaptureHelper.java   |  2 +-
 .../fragments/ConnectionsFragment.java            |  2 +-
 .../remote_capture/fragments/PortMapFragment.java |  2 +-
 .../remote_capture/views/RuleAddDialog.java       |  6 +++---
 .../main/res/layout/add_port_mapping_dialog.xml   | 12 ++++++++----
 app/src/main/res/layout/add_rule_dialog.xml       |  8 +++++---
 app/src/main/res/values/styles.xml                | 15 +++++++++++++++
 7 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/emanuelef/remote_capture/CaptureHelper.java b/app/src/main/java/com/emanuelef/remote_capture/CaptureHelper.java
index dfa8f850..c7ca62b3 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/CaptureHelper.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/CaptureHelper.java
@@ -20,7 +20,6 @@
 package com.emanuelef.remote_capture;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.net.VpnService;
@@ -32,6 +31,7 @@ import androidx.activity.ComponentActivity;
 import androidx.activity.result.ActivityResult;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
 
 public class CaptureHelper {
diff --git a/app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionsFragment.java b/app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionsFragment.java
index ef0cfb47..306a0d82 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionsFragment.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionsFragment.java
@@ -20,7 +20,6 @@
 package com.emanuelef.remote_capture.fragments;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
@@ -44,6 +43,7 @@ import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.SearchView;
 import androidx.core.view.MenuProvider;
 import androidx.fragment.app.Fragment;
diff --git a/app/src/main/java/com/emanuelef/remote_capture/fragments/PortMapFragment.java b/app/src/main/java/com/emanuelef/remote_capture/fragments/PortMapFragment.java
index 1801c917..691a4ff7 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/fragments/PortMapFragment.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/fragments/PortMapFragment.java
@@ -19,7 +19,6 @@
 
 package com.emanuelef.remote_capture.fragments;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
@@ -38,6 +37,7 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.SwitchCompat;
 import androidx.core.view.MenuProvider;
 import androidx.fragment.app.Fragment;
diff --git a/app/src/main/java/com/emanuelef/remote_capture/views/RuleAddDialog.java b/app/src/main/java/com/emanuelef/remote_capture/views/RuleAddDialog.java
index 48d0e76b..4c2cc264 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/views/RuleAddDialog.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/views/RuleAddDialog.java
@@ -19,7 +19,6 @@
 
 package com.emanuelef.remote_capture.views;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -27,8 +26,9 @@ import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AlertDialog;
+
 import com.emanuelef.remote_capture.R;
-import com.emanuelef.remote_capture.model.MatchList;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
 
@@ -74,7 +74,7 @@ public class RuleAddDialog implements View.OnClickListener {
                 .setNegativeButton(R.string.cancel_action, (dialogInterface, i) -> {})
                 .show();
         mDialog.setCanceledOnTouchOutside(false);
-        mDialog.getButton(android.app.AlertDialog.BUTTON_POSITIVE)
+        mDialog.getButton(AlertDialog.BUTTON_POSITIVE)
                 .setOnClickListener(this);
     }
 
diff --git a/app/src/main/res/layout/add_port_mapping_dialog.xml b/app/src/main/res/layout/add_port_mapping_dialog.xml
index 138e1d78..1d6f0605 100644
--- a/app/src/main/res/layout/add_port_mapping_dialog.xml
+++ b/app/src/main/res/layout/add_port_mapping_dialog.xml
@@ -14,7 +14,8 @@
         <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
+            android:theme="@style/Theme.TextInputLayoutOutlined"
+            style="@style/TextInputLayoutOutlinedDropdown">
 
             <AutoCompleteTextView
                 android:id="@+id/proto"
@@ -28,7 +29,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/original_port"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox" >
+            android:theme="@style/Theme.TextInputLayoutOutlined"
+            style="@style/TextInputLayoutOutlined" >
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/orig_port"
@@ -43,7 +45,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="30dp"
             android:hint="@string/destination_ip"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox" >
+            android:theme="@style/Theme.TextInputLayoutOutlined"
+            style="@style/TextInputLayoutOutlined" >
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/redirect_ip"
@@ -57,7 +60,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/destination_port"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox" >
+            android:theme="@style/Theme.TextInputLayoutOutlined"
+            style="@style/TextInputLayoutOutlined" >
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/redirect_port"
diff --git a/app/src/main/res/layout/add_rule_dialog.xml b/app/src/main/res/layout/add_rule_dialog.xml
index 110225c9..300eef7e 100644
--- a/app/src/main/res/layout/add_rule_dialog.xml
+++ b/app/src/main/res/layout/add_rule_dialog.xml
@@ -18,7 +18,8 @@
             android:layout_height="wrap_content"
             android:visibility="gone"
             tools:visibility="visible"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
+            android:theme="@style/Theme.TextInputLayoutOutlined"
+            style="@style/TextInputLayoutOutlinedDropdown">
 
             <androidx.appcompat.widget.AppCompatAutoCompleteTextView
                 android:id="@+id/combo_text"
@@ -36,7 +37,8 @@
             android:visibility="gone"
             tools:visibility="visible"
             tools:hint="Text"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox" >
+            android:theme="@style/Theme.TextInputLayoutOutlined"
+            style="@style/TextInputLayoutOutlined" >
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/text_value"
@@ -46,4 +48,4 @@
                 android:layout_height="wrap_content" />
         </com.google.android.material.textfield.TextInputLayout>
     </LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 48065e67..6bb4cd71 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -15,6 +15,21 @@
     <!-- Make the Widget.MaterialComponents.Button.TextButton of AlertDialog use the accent color -->
     <style name="AppAlertDialogTheme" parent="Theme.MaterialComponents.DayNight.Dialog">
         <item name="colorPrimary">@color/colorAccent</item>
+        <item name="windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
+        <item name="windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
+    </style>
+
+    <!-- Make the TextInputLayout of AlertDialog use the accent color -->
+    <style name="TextInputLayoutOutlined" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+        <item name="boxStrokeColor">@color/colorAccent</item>
+        <item name="hintTextColor">@color/colorAccent</item>
+    </style>
+    <style name="TextInputLayoutOutlinedDropdown" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
+        <item name="boxStrokeColor">@color/colorAccent</item>
+        <item name="hintTextColor">@color/colorAccent</item>
+    </style>
+    <style name="Theme.TextInputLayoutOutlined" parent="">
+        <item name="colorPrimary">@color/colorAccent</item>
     </style>
 
     <!-- White app theme. See values-night-v8 for the dark customizations -->