Merge pull request #4078 from Navid200/Navid_2025_07_07

Follower Chime menu update

Author: jamorham

app/src/main/java/com/eveningoutpost/dexdrip/utils/Preferences.java

@@ -1432,6 +1432,8 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                 }
             }
 
+            final Preference xSyncFollowChime = findPreference("follower_chime");
+
 
             if (collectionType != DexCollectionType.WebFollow) {
                 try {
@@ -1863,6 +1865,14 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                 }
             }
 
+            if (collectionType != DexCollectionType.Follower) {
+                try {
+                    collectionCategory.removePreference(xSyncFollowChime);
+                } catch (Exception e) {
+                    //
+                }
+            }
+
             if (getBestCollectorHardwareName().equals("G7")) { // Remove battery options, from G5/G6/Dex1/G7 Debug Settings, if we are using G7 or One+
                 try {
                     PreferenceScreen screen = (PreferenceScreen) findPreference("xdrip_plus_g5_extra_settings");
@@ -2580,6 +2590,10 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                         collectionCategory.addPreference(nsFollowLag);
                     }
 
+                    if (collectionType == DexCollectionType.Follower) {
+                        collectionCategory.addPreference(xSyncFollowChime);
+                    }
+
 
                     String stringValue = newValue.toString();
                     if (preference instanceof ListPreference) {

app/src/main/res/xml/pref_data_source.xml

@@ -242,6 +242,14 @@
             android:summary="Your account and follower app are from the USA"
             android:title="US Servers" />
 
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="follower_chime"
+            android:summary="@string/notify_data_arrives_master"
+            android:switchTextOff="@string/short_off_text_for_switches"
+            android:switchTextOn="@string/short_on_text_for_switches"
+            android:title="@string/follower_chime_new" />
+
         <ListPreference
             android:defaultValue="gb"
             android:entries="@array/carelinkCountryEntries"

app/src/main/res/xml/pref_notifications.xml

@@ -400,17 +400,6 @@
                         android:switchTextOn="@string/short_on_text_for_switches"
                         android:title="@string/title_sens_expiry_notify" />
                 </PreferenceScreen>
-                <PreferenceScreen
-                    android:key="@string/other_xdrip_plus_alerts"
-                    android:title="@string/other_xdrip_plus_alerts">
-                    <SwitchPreference
-                        android:defaultValue="false"
-                        android:key="follower_chime"
-                        android:summary="@string/notify_data_arrives_master"
-                        android:switchTextOff="@string/short_off_text_for_switches"
-                        android:switchTextOn="@string/short_on_text_for_switches"
-                        android:title="@string/follower_chime_new" />
-                </PreferenceScreen>
             </PreferenceScreen>
         </PreferenceCategory>
     </PreferenceScreen>