From 61a78c0ad849e7c85ce2d81f0e2f6d6fbd6333b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Tue, 25 Jul 2023 23:57:12 +0100
Subject: [PATCH] Move user name to about user preferences

- Remove from Mi Band prefs
- Remove fitness goal from mi band prefs - it's also un the about user
  section
- During pairing, direct user to the about user if there is invalid data
---
 .../devices/miband/MiBandPairingActivity.java |  3 ++-
 .../miband/MiBandPreferencesActivity.java     | 19 -------------------
 app/src/main/res/xml/about_user.xml           |  7 +++++++
 app/src/main/res/xml/miband_preferences.xml   | 18 ------------------
 4 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPairingActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPairingActivity.java
index 2fad17a39..da7367004 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPairingActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPairingActivity.java
@@ -38,6 +38,7 @@ import org.slf4j.LoggerFactory;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.activities.AboutUserPreferencesActivity;
 import nodomain.freeyourgadget.gadgetbridge.activities.AbstractGBActivity;
 import nodomain.freeyourgadget.gadgetbridge.activities.ControlCenterv2;
 import nodomain.freeyourgadget.gadgetbridge.activities.DiscoveryActivity;
@@ -96,7 +97,7 @@ public class MiBandPairingActivity extends AbstractGBActivity implements Bonding
         }
 
         if (!MiBandCoordinator.hasValidUserInfo()) {
-            Intent userSettingsIntent = new Intent(this, MiBandPreferencesActivity.class);
+            Intent userSettingsIntent = new Intent(this, AboutUserPreferencesActivity.class);
             startActivityForResult(userSettingsIntent, REQ_CODE_USER_SETTINGS, null);
             return;
         }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java
index 6d6f6d9b2..3bc85282d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java
@@ -53,22 +53,6 @@ public class MiBandPreferencesActivity extends AbstractSettingsActivity {
         addPreferencesFromResource(R.xml.miband_preferences);
 
         addTryListeners();
-
-        Prefs prefs = GBApplication.getPrefs();
-
-        final Preference fitnessGoal = findPreference(ActivityUser.PREF_USER_STEPS_GOAL);
-        fitnessGoal.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newVal) {
-                invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        GBApplication.deviceService().onSendConfiguration(ActivityUser.PREF_USER_STEPS_GOAL);
-                    }
-                });
-                return true;
-            }
-        });
     }
 
     /**
@@ -121,10 +105,7 @@ public class MiBandPreferencesActivity extends AbstractSettingsActivity {
     @Override
     protected String[] getPreferenceKeysWithSummary() {
         Set<String> prefKeys = new HashSet<>();
-        prefKeys.add(PREF_USER_NAME);
         prefKeys.add(PREF_MIBAND_ADDRESS);
-        prefKeys.add(ActivityUser.PREF_USER_STEPS_GOAL);
-        prefKeys.add(PREF_INACTIVITY_THRESHOLD);
         prefKeys.add(getNotificationPrefKey(VIBRATION_COUNT, ORIGIN_ALARM_CLOCK));
         prefKeys.add(getNotificationPrefKey(VIBRATION_COUNT, ORIGIN_INCOMING_CALL));
 
diff --git a/app/src/main/res/xml/about_user.xml b/app/src/main/res/xml/about_user.xml
index f3b292cd5..452f9d07b 100644
--- a/app/src/main/res/xml/about_user.xml
+++ b/app/src/main/res/xml/about_user.xml
@@ -6,6 +6,13 @@
         android:key="pref_category_activity_personal"
         android:title="@string/activity_prefs_about_you">
 
+        <EditTextPreference
+            android:key="mi_user_alias"
+            android:maxLength="17"
+            android:title="@string/miband_prefs_alias"
+            app:iconSpaceReserved="false"
+            app:useSimpleSummaryProvider="true" />
+
         <EditTextPreference
             app:iconSpaceReserved="false"
             android:inputType="number"
diff --git a/app/src/main/res/xml/miband_preferences.xml b/app/src/main/res/xml/miband_preferences.xml
index b4e5bf91f..a0d745e10 100644
--- a/app/src/main/res/xml/miband_preferences.xml
+++ b/app/src/main/res/xml/miband_preferences.xml
@@ -1,23 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <!--TODO: this is actually "about your miband" and possibly refers to a single device (if the owner has multiple mibands, it may be that they are worn on different arms -->
-    <PreferenceCategory
-        android:key="pref_category_miband_personal"
-        android:title="@string/activity_prefs_about_you">
-        <EditTextPreference
-            android:key="mi_user_alias"
-            android:maxLength="17"
-            android:title="@string/miband_prefs_alias" />
-
-        <EditTextPreference
-            android:defaultValue="10000"
-            android:inputType="number"
-            android:key="fitness_goal"
-            android:maxLength="5"
-            android:title="@string/miband_prefs_fitness_goal" />
-
-    </PreferenceCategory>
-
     <PreferenceCategory
         android:key="pref_category_miband_notification"
         android:title="@string/pref_header_vibration_settings">