From 616aeb9da6c680fce81aa9bf441892d1725e222b Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 7 Sep 2020 17:45:46 -0700
Subject: [PATCH] reorganize About dialog

Changed enough that I needed to replace an already-localized string with
one that'll need localization. Sorry.
---
 xwords4/android/app/build.gradle              |  3 +-
 .../org/eehouse/android/xw4/AboutAlert.java   | 16 ++++---
 .../android/xw4/XWDevIDPreference.java        | 42 -------------------
 .../app/src/main/res/layout/about_dlg.xml     | 14 ++++---
 .../app/src/main/res/values/strings.xml       | 28 ++++++++-----
 .../android/app/src/main/res/xml/xwprefs.xml  |  9 ----
 xwords4/android/res_src/values-ca/strings.xml |  1 -
 xwords4/android/res_src/values-de/strings.xml |  1 -
 xwords4/android/res_src/values-fr/strings.xml |  6 +--
 xwords4/android/res_src/values-ja/strings.xml |  1 -
 .../android/res_src/values-nb-rNO/strings.xml |  1 -
 xwords4/android/res_src/values-nl/strings.xml |  1 -
 xwords4/android/res_src/values-pl/strings.xml |  1 -
 xwords4/android/res_src/values-pt/strings.xml |  3 --
 14 files changed, 39 insertions(+), 88 deletions(-)
 delete mode 100644 xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWDevIDPreference.java

diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle
index 50f9f0072..76d32a6a4 100644
--- a/xwords4/android/app/build.gradle
+++ b/xwords4/android/app/build.gradle
@@ -22,6 +22,7 @@ if (! forFDroid) {
     GITREV += " --dirty"
 }
 GITREV = GITREV.execute().text.trim()
+def GITREV_SHORT = "git rev-parse --short HEAD".execute().text.trim()
 
 // Make CURTAG non-empty IFF we're at a tag (release build)
 def CURTAG = "git describe --exact-match".execute().text.trim()
@@ -55,8 +56,8 @@ android {
 
         // We need both of these because xwprefs.xml can't reference
         // the BuildConfig constant
-        resValue "string", "git_rev", "$GITREV"
         variant.buildConfigField "String", "GIT_REV", "\"$GITREV\""
+        variant.buildConfigField "String", "GITREV_SHORT", "\"$GITREV_SHORT\""
 
         // def stamp = Long.valueOf('date +\'%s\''.execute().text.trim());
         def stamp = Math.round(System.currentTimeMillis() / 1000)
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/AboutAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/AboutAlert.java
index f1ee116b3..44587764f 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/AboutAlert.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/AboutAlert.java
@@ -50,16 +50,16 @@ public class AboutAlert extends XWDialogFragment {
         View view = LocUtils.inflate( context, R.layout.about_dlg );
         TextView vers = (TextView)view.findViewById( R.id.version_string );
 
-        DateFormat df = DateFormat.getDateTimeInstance( DateFormat.FULL,
-                                                        DateFormat.FULL );
+        DateFormat df = DateFormat.getDateTimeInstance( DateFormat.DEFAULT,
+                                                        DateFormat.DEFAULT );
         String dateString
             = df.format( new Date( BuildConfig.BUILD_STAMP * 1000 ) );
-        String devID = XwJNI.dvc_getMQTTDevID(null);
-        vers.setText( getString( R.string.about_vers_fmt,
+        vers.setText( getString( R.string.about_vers_fmt2,
                                  BuildConfig.VARIANT_NAME,
                                  BuildConfig.VERSION_NAME,
-                                 BuildConfig.GIT_REV,
-                                 dateString, devID ) );
+                                 BuildConfig.VERSION_CODE,
+                                 BuildConfig.GITREV_SHORT,
+                                 dateString ) );
 
         TextView xlator = (TextView)view.findViewById( R.id.about_xlator );
         String str = getString( R.string.xlator );
@@ -69,6 +69,10 @@ public class AboutAlert extends XWDialogFragment {
             xlator.setVisibility( View.GONE );
         }
 
+        str = getString( R.string.about_devid_fmt, XwJNI.dvc_getMQTTDevID(null) );
+        ((TextView)view.findViewById( R.id.about_build ))
+            .setText( str );
+
         AlertDialog.Builder builder = LocUtils.makeAlertBuilder( context )
             .setIcon( R.drawable.icon48x48 )
             .setTitle( R.string.app_name )
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWDevIDPreference.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWDevIDPreference.java
deleted file mode 100644
index 1cc12d22a..000000000
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWDevIDPreference.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- compile-command: "find-and-gradle.sh inXw4dDeb"; -*- */
-/*
- * Copyright 2010 - 2015 by Eric House (xwords@eehouse.org).  All rights
- * reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-package org.eehouse.android.xw4;
-
-import android.content.Context;
-import android.preference.EditTextPreference;
-import android.util.AttributeSet;
-
-public class XWDevIDPreference extends EditTextPreference {
-    private Context m_context;
-
-    public XWDevIDPreference( Context context, AttributeSet attrs )
-    {
-        super( context, attrs );
-        m_context = context;
-    }
-
-    protected void onAttachedToActivity()
-    {
-        super.onAttachedToActivity();
-        int devID = DevID.getRelayDevIDInt( m_context );
-        setSummary( String.format( "%d", devID ) );
-    }
-}
diff --git a/xwords4/android/app/src/main/res/layout/about_dlg.xml b/xwords4/android/app/src/main/res/layout/about_dlg.xml
index 6c53fd279..39ecd1781 100644
--- a/xwords4/android/app/src/main/res/layout/about_dlg.xml
+++ b/xwords4/android/app/src/main/res/layout/about_dlg.xml
@@ -11,12 +11,12 @@
                 android:layout_height="fill_parent"
                 >
 
-    <TextView android:id="@+id/version_string"
-              style="@style/about_items"
+    <TextView style="@style/about_items"
+    	      android:text="@string/about_copyright"
               />
 
     <TextView style="@style/about_items"
-    	      android:text="@string/about_copyright"
+              android:id="@+id/version_string"
               />
 
     <TextView style="@style/about_items"
@@ -24,13 +24,17 @@
     	      android:autoLink="all" 
               />
 
-    <TextView android:id="@+id/about_xlator"
-              style="@style/about_items"
+    <TextView style="@style/about_items"
+              android:id="@+id/about_xlator"
               />
 
     <TextView style="@style/about_items"
               android:text="@string/about_credits"
               />
 
+    <TextView style="@style/about_items"
+              android:id="@+id/about_build"
+              />
+
   </LinearLayout>
 </ScrollView>
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index a1405adbc..606e88f37 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -1468,14 +1468,21 @@
        ########################################################### 
       -->
     <!-- String giving version info, which is substituted in. -->
-    <string name="about_vers_fmt">CrossWords for Android, %1$s variant, Version %2$s,
-        rev %3$s, built on %4$s. DevID: %5$s.</string>
+    <string name="about_vers_fmt2">Build information:
+    \n\tVariant: %1$s
+    \n\tVersion name: %2$s
+    \n\tVersion code: %3$d
+    \n\tSource (git) rev: %4$s
+    \n\tBuilt: %5$s</string>
+
+    <string name="about_devid_fmt">Device ID: %1$s</string>
+
     <!-- copyright info -->
-    <string name="about_copyright">Copyright (C) 1998-2020 by Eric
-        House. This free/open source software is released under the GNU Public
-        License.</string>
+    <string name="about_copyright">CrossWords for Android \nCopyright
+    (C) 1998-2020 by Eric House. This free/open source software is
+    released under the GNU Public License.</string>
     <!-- Another paragraph in the about dialog -->
-    <string name="about_web">For a manual or sourcecode see:
+    <string name="about_web">For an (old) manual or sourcecode see:
     http://xwords.sf.net/android.php.  To report bugs, suggest
     features, offer to help, etc., please email:
     xwords@eehouse.org.</string>
@@ -1485,9 +1492,10 @@
     <string name="xlator">[empty]</string>
     <!-- Another paragraph giving credit for work done other than by
          Eric House and translators -->
-    <string name="about_credits">Toolbar icons by Sarah Chu. Navbar
-    icons from the Noun Project: “archive” by Trendy; “rematch” by
-    Becris; and “swap” by iconomania.</string>
+    <string name="about_credits">Credits: Toolbar icons by Sarah
+    Chu. Navbar icons from the Noun Project: “archive” by Trendy;
+    “rematch” by Becris; and “swap” by iconomania. Localization by
+    volunteers via weblate.org.</string>
     <!-- text of dialog showing the set of changes made since the last
          release -->
     <string name="changes_title">Recent changes</string>
@@ -2260,8 +2268,6 @@
     <string name="board_menu_game_netstats">Network stats</string>
     <string name="board_menu_game_showInvites">Show invites</string>
     <string name="netstats_title">Game network stats</string>
-    <string name="git_rev_title">Source version id</string>
-    <string name="devid_title">Device ID (on relay)</string>
     <string name="relay_port">Relay game port</string>
     <string name="mqtt_port">MQTT port</string>
     <string name="mqtt_qos">MQTT QOS</string>
diff --git a/xwords4/android/app/src/main/res/xml/xwprefs.xml b/xwords4/android/app/src/main/res/xml/xwprefs.xml
index 13b3a644e..571a2d19f 100644
--- a/xwords4/android/app/src/main/res/xml/xwprefs.xml
+++ b/xwords4/android/app/src/main/res/xml/xwprefs.xml
@@ -547,14 +547,5 @@
                         android:summary="@string/unhide_dupmode_summary"
                         android:defaultValue="false"
                         />
-
-    <EditTextPreference android:title="@string/git_rev_title"
-                        android:summary="@string/git_rev"
-                        android:enabled="false"
-                        />
-    <org.eehouse.android.xw4.XWDevIDPreference 
-        android:title="@string/devid_title"
-        android:enabled="false"
-        />
   </PreferenceScreen>
 </PreferenceScreen>
diff --git a/xwords4/android/res_src/values-ca/strings.xml b/xwords4/android/res_src/values-ca/strings.xml
index 87de617f4..1e09ccc6b 100644
--- a/xwords4/android/res_src/values-ca/strings.xml
+++ b/xwords4/android/res_src/values-ca/strings.xml
@@ -354,7 +354,6 @@ que connecti via el repetidor.</string>
 
 Introduïu el vostre nom aquí. S\'usarà en crear partides noves. (Podreu
  canviar-lo després a la secció «Partida nova predeterminada» de la configuració.)</string>
-    <string name="about_vers_fmt">CrossWords per a l\'Android, %1$s variant, versió %2$s, rev %3$s, construït en %4$s. (DevID: %5$s)</string>
     <string name="about_credits">Icones de la barra d\'eines per Sarah Chu. Icones Navbar del Noun Project: «archive» per Trendy; «rematch» per Becris i «swap» per iconomania.</string>
     <string name="changes_title">Canvis recents</string>
     <string name="changes_button">Canvis recents</string>
diff --git a/xwords4/android/res_src/values-de/strings.xml b/xwords4/android/res_src/values-de/strings.xml
index 673510536..bf803ebf0 100644
--- a/xwords4/android/res_src/values-de/strings.xml
+++ b/xwords4/android/res_src/values-de/strings.xml
@@ -801,7 +801,6 @@
 \n
 \nHalten Sie Ihren Finger auf einen Namen auf der Punktetafel, um Details über den letzten Zug dieses Spielers anzuzeigen.</string>
     <string name="not_again_newfrom">Eine neue Partie erzeugen, die bereit zum Spielen ist, mit allen Einstellungen aus dieser Partie. Das heißt, diese Partie als Vorlage verwenden.</string>
-    <string name="about_vers_fmt">CrossWords für Android, %1$s Variant, Version %2$s, Rev. %3$s, Build-Datum %4$s. (DevID: %5$s)</string>
     <string name="bt_pair_settings">Weitere paaren</string>
     <string name="invite_progress_title">Verbinde …</string>
     <string name="invite_progress_fmt">Sende Einladung an CrossWords auf %1$s</string>
diff --git a/xwords4/android/res_src/values-fr/strings.xml b/xwords4/android/res_src/values-fr/strings.xml
index 8f0620606..768731680 100644
--- a/xwords4/android/res_src/values-fr/strings.xml
+++ b/xwords4/android/res_src/values-fr/strings.xml
@@ -1783,11 +1783,7 @@ modèle.</string>
        # Dialog giving copyright and other basic info about # the app
        ########################################################### 
       -->
-    <!-- String giving version info, which is substituted in. -->
-    <!--<string name="about_vers_fmt">CrossWords for Android, Version %1$s,
-        rev %2$s, built on %3$s.</string>-->
-    <string name="about_vers_fmt">CrossWords pour Android, %1$s variant, version %2$s,
-rév. %3$s, compilé le %4$s. (DevID: %5$s)</string>
+
     <!-- copyright info -->
     <!--<string name="about_copyright">Copyright (C) 1998-2015 by Eric
         House. This free/open source software is released under the GNU Public
diff --git a/xwords4/android/res_src/values-ja/strings.xml b/xwords4/android/res_src/values-ja/strings.xml
index 33761077c..e07d5168e 100644
--- a/xwords4/android/res_src/values-ja/strings.xml
+++ b/xwords4/android/res_src/values-ja/strings.xml
@@ -328,7 +328,6 @@
     <string name="not_again_newfrom">ここからすべての設定を使用して、すぐにプレイできるゲームを新しく作成します。つまり、このゲームをテンプレートとして扱います。</string>
     <string name="default_name_title">デフォルト プレイヤー名</string>
     <string name="default_name_message">ここに名前を入力してください。これは新しいゲームを作成するときに使用されます。(後で、設定のセクション \"新しいゲームのデフォルト\" で変更できます)</string>
-    <string name="about_vers_fmt">Android 用クロスワード, %1$s バリアント, バージョン %2$s, リビジョン %3$s, ビルド %4$s. (DevID: %5$s)</string>
     <string name="about_copyright">Copyright (C) 1998-2020 by Eric House. このフリー/オープンソース ソフトウェアは the GNU Public License に基づいてリリースされています.</string>
     <string name="about_web">マニュアルまたはソースコードは: http://xwords.sf.net/android.php を参照してください。バグの報告、機能の提案、支援の提供などは、メールしてください: xwords@eehouse.org 。</string>
     <string name="xlator">[空]</string>
diff --git a/xwords4/android/res_src/values-nb-rNO/strings.xml b/xwords4/android/res_src/values-nb-rNO/strings.xml
index a90d271e9..6011cce72 100644
--- a/xwords4/android/res_src/values-nb-rNO/strings.xml
+++ b/xwords4/android/res_src/values-nb-rNO/strings.xml
@@ -567,7 +567,6 @@
     <string name="str_cant_undo_tileassign">Tildelingen kan ikke angres.</string>
     <string name="finalscores_title">Sluttpoengsummer</string>
     <string name="ids_endnow">Er du sikker på at du ønsker å gi deg?</string>
-    <string name="about_vers_fmt">CrossWords for Android, %1$s variant, versjon %2$s, rev %3$s, bygd den %4$s. (DevID: %5$s)</string>
     <string name="about_copyright">Kopirett © 1998-2020 Eric House. Denne frie programvaren er lisensiert med GNU Public-lisens.</string>
     <string name="about_web">For manual eller kildekode, se: http://xwords.sf.net/android.php For å innrapportere feil, foreslå funksjoner, tilby hjelp, osv., send e-post til: xwords@eehouse.org</string>
     <string name="xlator">[tom]</string>
diff --git a/xwords4/android/res_src/values-nl/strings.xml b/xwords4/android/res_src/values-nl/strings.xml
index c69bcb16a..4b73067bc 100644
--- a/xwords4/android/res_src/values-nl/strings.xml
+++ b/xwords4/android/res_src/values-nl/strings.xml
@@ -330,7 +330,6 @@
     <string name="not_again_newfrom">Maak een nieuw spel, klaar om te spelen, met alle instellingen van dit spel. Dat wil zeggen, gebruik dit spel als een template.</string>
     <string name="default_name_title">Welkom</string>
     <string name="default_name_message">Bedankt voor het installeren van CrossWords!\n\nVul je naam hieronder in. Het wordt gebruikt als je een nieuw spel maakt. (Je kan dit later wijzigen onder \"Standaardinstellingen nieuw spel\" in Instellingen.)</string>
-    <string name="about_vers_fmt">CrossWords voor Android, %1$s variant, Versio %2$s, revisie %3$s, gebouwd op %4$s. (DevID: %5$s)</string>
     <string name="about_copyright">Copyright (C) 1998-2020 Eric House. Dit is vrije/open source software uitgebracht onder de GNU Public License.</string>
     <string name="about_web">Voor een handleiding of de broncode kijk op http://xwords.sf.net/android.php. Om bugs te rapporteren, functies aan te vragen, hulp aan te bieden, etc., stuur een mail naar xwords@eehouse.org.</string>
     <string name="xlator">[leeg]</string>
diff --git a/xwords4/android/res_src/values-pl/strings.xml b/xwords4/android/res_src/values-pl/strings.xml
index 5e6f9c109..f3f250c2c 100644
--- a/xwords4/android/res_src/values-pl/strings.xml
+++ b/xwords4/android/res_src/values-pl/strings.xml
@@ -437,7 +437,6 @@
 \n
 \nPrzytrzymaj palec na nazwie w tablicy wyników, aby uzyskać szczegółowe informacje na temat ostatniego ruchu tego gracza.</string>
     <string name="not_again_newfrom">Stwórz nową, gotową do gry grę, wykorzystując wszystkie ustawienia z tej gry. To znaczy, traktuj tę grę jak szablon.</string>
-    <string name="about_vers_fmt">CrossWords dla systemu Android, %1$s wariant, wersja %2$s, rev %3$s, oparty na %4$s. (DevID: %5$s)</string>
     <string name="about_copyright">Copyright (C) 1998-2020 by Eric House. To darmowe/otwartoźródłowe oprogramowanie jest wydawane na licencji publicznej GNU.</string>
     <string name="about_web">Instrukcja obsługi i kod źródłowy znajduje się na stronie: http://xwords.sf.net/android.php. Aby zgłosić błędy, zasugerować funkcje, zaoferować pomoc itp., proszę o kontakt mailowy: xwords@eehouse.org.</string>
     <string name="xlator">[pusta]</string>
diff --git a/xwords4/android/res_src/values-pt/strings.xml b/xwords4/android/res_src/values-pt/strings.xml
index 2ef32eb7a..4b423d164 100644
--- a/xwords4/android/res_src/values-pt/strings.xml
+++ b/xwords4/android/res_src/values-pt/strings.xml
@@ -1398,9 +1398,6 @@
        # Dialog giving copyright and other basic info about # the app
        ########################################################### 
       -->
-    <!-- String giving version info, which is substituted in. -->
-    <string name="about_vers_fmt">CrossWords para Android, %1$s Variant, Versão %2$s,
-        rev %3$s, built on %4$s. (DevID: %5$s)</string>
     <!-- copyright info -->
     <string name="about_copyright">Copyright (C) 1998-2020 por Eric
         House. Esse software livre/aberto é liberado sob a Licença