From 417fdec870b04fb235126c7cb6aa9b15da30d933 Mon Sep 17 00:00:00 2001
From: map-per <map-per@gmx.de>
Date: Wed, 23 Oct 2024 10:40:11 +0200
Subject: [PATCH] Better OSM explanation and new layout of login screen

Signed-off-by: map-per <map-per@gmx.de>
---
 .../organicmaps/editor/OsmLoginFragment.java  |   2 -
 .../res/layout-land/fragment_osm_login.xml    | 272 ++++++++----------
 .../main/res/layout/fragment_osm_login.xml    |  28 +-
 data/strings/strings.txt                      |   9 +-
 4 files changed, 147 insertions(+), 164 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java b/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java
index ec56c2c842..3a6f48b1fd 100644
--- a/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java
@@ -57,8 +57,6 @@ public class OsmLoginFragment extends BaseMwmToolbarFragment
     registerButton.setOnClickListener((v) -> Utils.openUrl(requireActivity(), Constants.Url.OSM_REGISTER));
     mProgress = view.findViewById(R.id.osm_login_progress);
     final String dataVersion = DateUtils.getShortDateFormatter().format(Framework.getDataVersion());
-    ((TextView) view.findViewById(R.id.osm_presentation))
-        .setText(getString(R.string.osm_presentation, dataVersion));
 
     if (BuildConfig.FLAVOR.equals("google"))
     {
diff --git a/android/app/src/main/res/layout-land/fragment_osm_login.xml b/android/app/src/main/res/layout-land/fragment_osm_login.xml
index f95650d7dc..b764563d97 100644
--- a/android/app/src/main/res/layout-land/fragment_osm_login.xml
+++ b/android/app/src/main/res/layout-land/fragment_osm_login.xml
@@ -24,161 +24,141 @@
       android:clipChildren="false"
       android:clipToPadding="false"
       android:orientation="vertical"
-      android:padding="@dimen/margin_base"
       tools:ignore="ScrollViewSize">
-      <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <ImageView
-          android:id="@+id/imageView"
-          android:layout_width="@dimen/osm_logo"
-          android:layout_height="@dimen/osm_logo"
-          android:layout_gravity="center"
-          app:srcCompat="@drawable/ic_openstreetmap_color"
-          app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toTopOf="parent" />
-        <TextView
-          android:id="@+id/osm_presentation"
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:layout_marginStart="@dimen/margin_base"
-          android:fontFamily="@string/robotoRegular"
-          android:text="@string/osm_presentation"
-          android:textAppearance="@style/MwmTextAppearance.Body2"
-          android:textColor="?android:textColorPrimary"
-          app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintStart_toEndOf="@+id/imageView"
-          app:layout_constraintTop_toTopOf="parent" />
-      </androidx.constraintlayout.widget.ConstraintLayout>
-      <TextView
-        android:id="@+id/textView2"
+      <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_half"
-        android:autoLink="web"
-        android:fontFamily="@string/robotoMedium"
-        android:text="@string/login_to_make_edits_visible"
-        android:textAppearance="@style/MwmTextAppearance.Body2"
-        android:textColor="?android:textColorPrimary" />
-      <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_half">
-        <com.google.android.material.textfield.TextInputLayout
-          android:id="@+id/osm_username_container"
-          style="@style/MwmWidget.Editor.CustomTextInput"
+        android:orientation="horizontal">
+        <LinearLayout
           android:layout_width="0dp"
-          android:layout_marginEnd="@dimen/margin_half"
-          android:textColorHint="?android:textColorSecondary"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintEnd_toStartOf="@id/osm_password_container"
-          app:layout_constraintTop_toTopOf="parent"
-          app:endIconMode="custom">
-          <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/osm_username"
-            style="@style/MwmWidget.Editor.FieldLayout.EditText"
-            android:autofillHints="emailAddress"
-            android:hint="@string/email_or_username" />
-        </com.google.android.material.textfield.TextInputLayout>
-        <com.google.android.material.textfield.TextInputLayout
-          android:id="@+id/osm_password_container"
-          style="@style/MwmWidget.Editor.CustomTextInput"
+          android:layout_height="match_parent"
+          android:layout_weight="1"
+          android:orientation="vertical"
+          android:padding="@dimen/margin_base">
+          <TextView
+            android:id="@+id/textView2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/margin_half"
+            android:fontFamily="@string/robotoMedium"
+            android:text="@string/login_to_make_edits_visible"
+            android:textAppearance="@style/MwmTextAppearance.Body2"
+            android:textColor="?android:textColorPrimary" />
+          <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <ImageView
+              android:id="@+id/imageView"
+              android:layout_width="@dimen/osm_logo"
+              android:layout_height="@dimen/osm_logo"
+              android:layout_gravity="center"
+              app:srcCompat="@drawable/ic_openstreetmap_color"
+              app:layout_constraintBottom_toBottomOf="parent"
+              app:layout_constraintStart_toStartOf="parent"
+              app:layout_constraintTop_toTopOf="parent" />
+            <TextView
+              android:id="@+id/osm_presentation"
+              android:layout_width="0dp"
+              android:layout_height="wrap_content"
+              android:layout_marginStart="@dimen/margin_base"
+              android:autoLink="web"
+              android:fontFamily="@string/robotoRegular"
+              android:text="@string/login_osm_presentation"
+              android:textAppearance="@style/MwmTextAppearance.Body3"
+              android:textColor="?android:textColorPrimary"
+              app:layout_constraintBottom_toBottomOf="parent"
+              app:layout_constraintEnd_toEndOf="parent"
+              app:layout_constraintStart_toEndOf="@+id/imageView"
+              app:layout_constraintTop_toTopOf="parent" />
+          </androidx.constraintlayout.widget.ConstraintLayout>
+        </LinearLayout>
+        <LinearLayout
           android:layout_width="0dp"
-          android:textColorHint="?android:textColorSecondary"
-          app:layout_constraintStart_toEndOf="@id/osm_username_container"
-          app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintTop_toTopOf="parent"
-          app:endIconMode="password_toggle"
-          app:endIconTint="?android:textColorSecondary">
-          <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/osm_password"
-            style="@style/MwmWidget.Editor.FieldLayout.EditText"
-            android:autofillHints="password"
-            android:hint="@string/password"
-            android:inputType="textPassword" />
-        </com.google.android.material.textfield.TextInputLayout>
-      </androidx.constraintlayout.widget.ConstraintLayout>
-      <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/margin_base">
-        <FrameLayout
-          android:id="@+id/login_container"
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintStart_toEndOf="@id/lost_password"
-          app:layout_constraintTop_toTopOf="parent">
+          android:layout_height="match_parent"
+          android:layout_weight="1"
+          android:orientation="vertical"
+          android:padding="@dimen/margin_base">
+          <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/osm_username_container"
+            style="@style/MwmWidget.Editor.CustomTextInput"
+            android:layout_marginEnd="@dimen/margin_half"
+            android:textColorHint="?android:textColorSecondary"
+            app:endIconMode="custom">
+            <com.google.android.material.textfield.TextInputEditText
+              android:id="@+id/osm_username"
+              style="@style/MwmWidget.Editor.FieldLayout.EditText"
+              android:autofillHints="emailAddress"
+              android:hint="@string/email_or_username" />
+          </com.google.android.material.textfield.TextInputLayout>
+          <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/osm_password_container"
+            style="@style/MwmWidget.Editor.CustomTextInput"
+            android:textColorHint="?android:textColorSecondary"
+            app:endIconMode="password_toggle"
+            app:endIconTint="?android:textColorSecondary">
+            <com.google.android.material.textfield.TextInputEditText
+              android:id="@+id/osm_password"
+              style="@style/MwmWidget.Editor.FieldLayout.EditText"
+              android:layout_marginTop="@dimen/margin_base"
+              android:autofillHints="password"
+              android:hint="@string/password"
+              android:inputType="textPassword" />
+          </com.google.android.material.textfield.TextInputLayout>
+          <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/margin_base">
+            <Button
+              android:id="@+id/login"
+              style="@style/MwmWidget.Button.Accent"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:text="@string/login_osm"
+              android:textAppearance="@style/MwmTextAppearance.Body2.Light" />
+            <ProgressBar
+              android:id="@+id/osm_login_progress"
+              android:layout_width="@dimen/editor_auth_btn_height"
+              android:layout_height="@dimen/editor_auth_btn_height"
+              android:layout_gravity="center"
+              android:elevation="@dimen/design_fab_elevation"
+              android:visibility="gone" />
+          </FrameLayout>
           <Button
-            android:id="@+id/login"
+            android:id="@+id/lost_password"
+            style="@style/MwmWidget.Button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="end"
+            android:background="?clickableBackground"
+            android:padding="@dimen/margin_half"
+            android:text="@string/forgot_password"
+            android:textAppearance="@style/MwmTextAppearance.Body3" />
+          <com.google.android.material.divider.MaterialDivider
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_base"
+            android:layout_marginBottom="@dimen/margin_base" />
+          <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@string/robotoRegular"
+            android:text="@string/no_osm_account"
+            android:textAppearance="@style/MwmTextAppearance.Body2"
+            android:textColor="?android:textColorPrimary" />
+          <Button
+            android:id="@+id/register"
             style="@style/MwmWidget.Button.Accent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/login_osm"
-            android:textAppearance="@style/MwmTextAppearance.Body2.Light" />
-          <ProgressBar
-            android:id="@+id/osm_login_progress"
-            android:layout_width="@dimen/editor_auth_btn_height"
-            android:layout_height="@dimen/editor_auth_btn_height"
-            android:layout_gravity="center"
-            android:elevation="@dimen/design_fab_elevation"
-            android:visibility="gone" />
-        </FrameLayout>
-        <Button
-          android:id="@+id/lost_password"
-          style="@style/MwmWidget.Button"
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:background="?clickableBackground"
-          android:gravity="start|center_vertical"
-          android:padding="@dimen/margin_half"
-          android:text="@string/forgot_password"
-          android:textAppearance="@style/MwmTextAppearance.Body3"
-          app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintEnd_toStartOf="@id/login_container"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toTopOf="parent" />
-      </androidx.constraintlayout.widget.ConstraintLayout>
-      <com.google.android.material.divider.MaterialDivider
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_base"
-        android:layout_marginBottom="@dimen/margin_base" />
-      <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <TextView
-          android:id="@+id/register_text"
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:fontFamily="@string/robotoRegular"
-          android:gravity="start|center_vertical"
-          android:text="@string/no_osm_account"
-          android:textAppearance="@style/MwmTextAppearance.Body2"
-          android:textColor="?android:textColorPrimary"
-          app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintEnd_toStartOf="@id/register"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toTopOf="parent" />
-        <Button
-          android:id="@+id/register"
-          style="@style/MwmWidget.Button.Accent"
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:background="@drawable/button_editor_light"
-          android:fontFamily="@string/robotoMedium"
-          android:padding="@dimen/margin_quarter"
-          android:text="@string/register_at_openstreetmap"
-          android:textAppearance="@style/MwmTextAppearance.Body2"
-          android:textColor="@color/text_dark"
-          app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintStart_toEndOf="@id/register_text"
-          app:layout_constraintTop_toTopOf="parent" />
-      </androidx.constraintlayout.widget.ConstraintLayout>
+            android:layout_marginTop="@dimen/margin_base"
+            android:background="@drawable/button_editor_light"
+            android:fontFamily="@string/robotoMedium"
+            android:padding="@dimen/margin_quarter"
+            android:text="@string/register_at_openstreetmap"
+            android:textAppearance="@style/MwmTextAppearance.Body2"
+            android:textColor="@color/text_dark" />
+        </LinearLayout>
+      </LinearLayout>
     </LinearLayout>
   </ScrollView>
 </LinearLayout>
diff --git a/android/app/src/main/res/layout/fragment_osm_login.xml b/android/app/src/main/res/layout/fragment_osm_login.xml
index b9292c987f..abb5400e8a 100644
--- a/android/app/src/main/res/layout/fragment_osm_login.xml
+++ b/android/app/src/main/res/layout/fragment_osm_login.xml
@@ -26,9 +26,19 @@
       android:orientation="vertical"
       android:padding="@dimen/margin_base"
       tools:ignore="ScrollViewSize">
+      <TextView
+          android:id="@+id/textView2"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginBottom="@dimen/margin_half"
+          android:fontFamily="@string/robotoMedium"
+          android:text="@string/login_to_make_edits_visible"
+          android:textAppearance="@style/MwmTextAppearance.Body2"
+          android:textColor="?android:textColorPrimary" />
       <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/margin_base">
         <ImageView
           android:id="@+id/osm_logo"
           android:layout_width="@dimen/osm_logo"
@@ -43,29 +53,19 @@
           android:layout_width="0dp"
           android:layout_height="wrap_content"
           android:layout_marginStart="@dimen/margin_base"
+          android:autoLink="web"
           android:fontFamily="@string/robotoRegular"
-          android:text="@string/osm_presentation"
-          android:textAppearance="@style/MwmTextAppearance.Body2"
+          android:text="@string/login_osm_presentation"
+          android:textAppearance="@style/MwmTextAppearance.Body3"
           android:textColor="?android:textColorPrimary"
           app:layout_constraintBottom_toBottomOf="parent"
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintStart_toEndOf="@+id/osm_logo"
           app:layout_constraintTop_toTopOf="parent" />
       </androidx.constraintlayout.widget.ConstraintLayout>
-      <TextView
-        android:id="@+id/textView2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_half"
-        android:autoLink="web"
-        android:fontFamily="@string/robotoMedium"
-        android:text="@string/login_to_make_edits_visible"
-        android:textAppearance="@style/MwmTextAppearance.Body2"
-        android:textColor="?android:textColorPrimary" />
       <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/osm_username_container"
         style="@style/MwmWidget.Editor.CustomTextInput"
-        android:layout_marginTop="@dimen/margin_half"
         android:textColorHint="?android:textColorSecondary"
         app:endIconMode="custom">
         <com.google.android.material.textfield.TextInputEditText
diff --git a/data/strings/strings.txt b/data/strings/strings.txt
index 6b5b62bf72..de21ae94f8 100644
--- a/data/strings/strings.txt
+++ b/data/strings/strings.txt
@@ -13716,7 +13716,7 @@
     bg = Влезте в OpenStreetMap
     cs = Přihlaste se do OpenStreetMap
     da = Log ind på OpenStreetMap
-    de = Melden Sie sich bei OpenStreetMap an
+    de = Bei OpenStreetMap anmelden
     el = Συνδεθείτε στο OpenStreetMap
     es = Iniciar sesión en OpenStreetMap
     et = Logi sisse OpenStreetMap-i
@@ -15968,9 +15968,14 @@
     zh-Hans = 截至 %@ 的社区创建的 OpenStreetMap 数据。请访问 OpenStreetMap.org 以了解有关如何编辑和更新地图的信息。
     zh-Hant = 截至 %@ 的社群創建的 OpenStreetMap 資料。請訪問 OpenStreetMap.org 以了解有關如何編輯和更新地圖的更多資訊。
 
+  [login_osm_presentation]
+    comment = OSM explanation on Android login screen
+    tags = android
+    en = OpenStreetMap.org (OSM) is a community project to build a free and open map. It's the source of all map data in Organic Maps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!
+
   [login_to_make_edits_visible]
     tags = android,ios
-    en = Log in to openstreetmap.org to publish your changes to the world.
+    en = Create an OpenStreetMap account or log in to publish your map edits to the world.
     af = Teken by openstreetpam.org aan om u verandering aan die wêreld te publiseer.
     ar = قم بتسجيل الدخول حتى يتمكن باقي المستخدمين من رؤية التغييرات التي قمت بها.
     az = OpenStreetMap.org saytına daxil olun ki, digər istifadəçilər sizin etdiyiniz dəyişiklikləri görə bilsinlər.