Disable after-call if not handling calls.

CDrummond · Sep 1, 2024 · e58cdbc · e58cdbc
1 parent 2eab65e
commit e58cdbc
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/lms-material/src/main/java/com/craigd/lmsmaterial/app/SettingsActivity.java b/lms-material/src/main/java/com/craigd/lmsmaterial/app/SettingsActivity.java
@@ -12,7 +12,6 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
 import android.os.Bundle;
@@ -39,6 +38,7 @@
 import androidx.preference.SwitchPreferenceCompat;
 
 import java.util.List;
+import java.util.Objects;
 
 import io.github.muddz.styleabletoast.StyleableToast;
 
@@ -395,6 +395,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             updateListSummary(NOTIFCATIONS_PREF_KEY);
             updateListSummary(ORIENTATION_PREF_KEY);
             updateListSummary(ON_CALL_PREF_KEY);
+            setAfterCallState();
             updateListSummary(PLAYER_APP_PREF_KEY);
             PreferenceManager.getDefaultSharedPreferences(getContext()).registerOnSharedPreferenceChangeListener(this);
         }
@@ -407,6 +408,7 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
 
             if (ON_CALL_PREF_KEY.equals(key)) {
                 updateListSummary(key);
+                setAfterCallState();
                 if (!PhoneStateHandler.DO_NOTHING.equals(sharedPreferences.getString(key, PhoneStateHandler.DO_NOTHING))) {
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                         activity.checkOnCallAndNotifPermission();
@@ -460,6 +462,7 @@ public void resetOnCall() {
                     pref.setValue(PhoneStateHandler.DO_NOTHING);
                 }
                 updateListSummary(ON_CALL_PREF_KEY);
+                setAfterCallState();
             }
         }
 
@@ -500,6 +503,14 @@ public void setNotifications(String val) {
                 resetOnCall();
             }
         }
+
+        private void setAfterCallState() {
+            SwitchPreferenceCompat afterCall = getPreferenceManager().findPreference(AFTER_CALL_PREF_KEY);
+            if (afterCall!=null) {
+                SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext());
+                afterCall.setEnabled(!PhoneStateHandler.DO_NOTHING.equals(sharedPreferences.getString(ON_CALL_PREF_KEY, PhoneStateHandler.DO_NOTHING)));
+            }
+        }
     }
 
     public void checkNotificationPermission() {

diff --git a/lms-material/src/main/res/color/switch_thumb_color.xml b/lms-material/src/main/res/color/switch_thumb_color.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorText" android:state_checked="true"/>
+    <item android:color="@color/colorText" android:state_checked="true" android:state_enabled="true"/>
+    <item android:color="@color/colorTextDim" android:state_enabled="false"/>
     <item android:color="@color/colorTextDim"/>
 </selector>
diff --git a/lms-material/src/main/res/color/switch_thumb_color_light.xml b/lms-material/src/main/res/color/switch_thumb_color_light.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorText" android:state_checked="true"/>
+    <item android:color="@color/colorText" android:state_checked="true"  android:state_enabled="true"/>
+    <item android:color="@color/colorTextDimLight" android:state_enabled="false"/>
     <item android:color="@color/colorTextDimLight"/>
 </selector>
diff --git a/lms-material/src/main/res/color/switch_track_color.xml b/lms-material/src/main/res/color/switch_track_color.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorAccent" android:state_checked="true"/>
+    <item android:color="@color/colorAccent" android:state_checked="true" android:state_enabled="true"/>
 </selector>
diff --git a/lms-material/src/main/res/color/switch_track_decoration_color.xml b/lms-material/src/main/res/color/switch_track_decoration_color.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorAccent" android:state_checked="true"/>
+    <item android:color="@color/colorAccent" android:state_checked="true"  android:state_enabled="true"/>
+    <item android:color="@color/colorTextDim" android:state_enabled="false"/>
     <item android:color="@color/colorTextDim"/>
 </selector>
diff --git a/lms-material/src/main/res/color/switch_track_decoration_color_light.xml b/lms-material/src/main/res/color/switch_track_decoration_color_light.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorAccent" android:state_checked="true"/>
+    <item android:color="@color/colorAccent" android:state_checked="true" android:state_enabled="true"/>
+    <item android:color="@color/colorTextDimLight" android:state_enabled="false"/>
     <item android:color="@color/colorTextDimLight"/>
 </selector>