From 30df07451203af2be0faac2c299573b062435484 Mon Sep 17 00:00:00 2001
From: Harry Bond <me@hbond.xyz>
Date: Mon, 15 Jul 2024 19:08:55 +0100
Subject: [PATCH] [Android] show username on profile button in settings

Signed-off-by: Harry Bond <me@hbond.xyz>
---
 .../settings/SettingsPrefsFragment.java       | 14 ++++++
 android/app/src/main/res/xml/prefs_main.xml   |  4 +-
 data/strings/strings.txt                      | 45 +++++++++++++++++++
 3 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
index a3f8554dce..3018ac65e6 100644
--- a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
@@ -17,6 +17,7 @@ import app.organicmaps.Framework;
 import app.organicmaps.R;
 import app.organicmaps.downloader.MapManager;
 import app.organicmaps.downloader.OnmapDownloader;
+import app.organicmaps.editor.OsmOAuth;
 import app.organicmaps.editor.ProfileActivity;
 import app.organicmaps.help.HelpActivity;
 import app.organicmaps.location.LocationHelper;
@@ -77,11 +78,24 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
     pref.setSummary(RoutingOptions.hasAnyOptions() ? R.string.on : R.string.off);
   }
 
+  private void updateProfileSettingsPrefsSummary()
+  {
+    final Preference pref = getPreference(getString(R.string.pref_osm_profile));
+    if (OsmOAuth.isAuthorized(requireContext()))
+    {
+      final String username = OsmOAuth.getUsername(requireContext());
+      pref.setSummary(username);
+    }
+    else
+      pref.setSummary(R.string.not_signed_in);
+  }
+
   @Override
   public void onResume()
   {
     super.onResume();
 
+    updateProfileSettingsPrefsSummary();
     updateVoiceInstructionsPrefsSummary();
     updateRoutingSettingsPrefsSummary();
   }
diff --git a/android/app/src/main/res/xml/prefs_main.xml b/android/app/src/main/res/xml/prefs_main.xml
index 93bc6d01da..6192fe9937 100644
--- a/android/app/src/main/res/xml/prefs_main.xml
+++ b/android/app/src/main/res/xml/prefs_main.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen
   xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools">
 
   <Preference
     android:key="@string/pref_osm_profile"
     android:title="@string/profile"
+    tools:summary="LongLongUsernameHere"
     app:singleLineTitle="false"
     android:order="1"/>
   <androidx.preference.PreferenceCategory
diff --git a/data/strings/strings.txt b/data/strings/strings.txt
index 5af6684c38..1d4a83ca1f 100644
--- a/data/strings/strings.txt
+++ b/data/strings/strings.txt
@@ -13694,6 +13694,51 @@
     zh-Hans = 登录
     zh-Hant = 登入
 
+  [not_signed_in]
+    comment = Status message indicating that user did not login to OSM profile yet.
+    tags = android
+    en = Not signed in
+    af = Nie ingeteken nie
+    ar = لم يتم تسجيل الدخول
+    az = Giriş edilməyib
+    be = Не ўвайшлі ў сістэму
+    bg = Не е влязъл в системата
+    ca = No heu iniciat sessió
+    cs = Nejste přihlášeni
+    da = Ikke logget ind
+    de = Nicht angemeldet
+    el = Δεν έχετε συνδεθεί
+    es = No se ha iniciado sesión
+    et = Pole sisse logitud
+    eu = Ez zaude saiatuta
+    fa = وارد نشده‌اید
+    fi = Et ole kirjautunut sisään
+    fr = Non connecté•e
+    he = לא מחובר
+    hi = साइन इन नहीं किया गया है
+    hu = Nincs bejelentkezve
+    id = Belum masuk
+    it = Non sei connesso
+    ja = サインインしていません
+    ko = 로그인되지 않음
+    lt = Neprisijungta
+    mr = साइन इन केलेले नाही
+    nb = Ikke logget inn
+    nl = Niet ingelogd
+    pl = Nie zalogowano
+    pt = Sessão não iniciada
+    ro = Neautentificat
+    ru = Не выполнен вход
+    sk = Nie ste prihlásený
+    sv = Inte inloggad
+    sw = Hujasajiliwa
+    th = ยังไม่ได้ลงชื่อเข้าใช้
+    tr = Giriş yapılmadı
+    uk = Не ввійшли
+    vi = Chưa đăng nhập
+    zh-Hans = 未登录
+    zh-Hant = 未登入
+
   [login_osm]
     tags = android,ios
     en = Login to OpenStreetMap