From 83b532e16e379a267af507b92c8c4a8f0def9c82 Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <a_gadgetbridge@anymore.nl>
Date: Sat, 8 Jun 2024 21:53:23 +0200
Subject: [PATCH] Reorder intro screen and use correct app_name

---
 .../res/layout/fragment_welcome_intro.xml     | 24 ++++++++++++-------
 app/src/main/res/values/strings.xml           |  2 ++
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/layout/fragment_welcome_intro.xml b/app/src/main/res/layout/fragment_welcome_intro.xml
index c99ec99dc..3808e6090 100644
--- a/app/src/main/res/layout/fragment_welcome_intro.xml
+++ b/app/src/main/res/layout/fragment_welcome_intro.xml
@@ -12,11 +12,24 @@
         android:gravity="center_horizontal"
         android:orientation="vertical">
 
+        <ImageView
+            android:layout_width="200dp"
+            android:layout_height="200dp"
+            android:background="@color/accent"
+            android:src="@drawable/ic_launcher_foreground" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="30dp"
+            android:textAlignment="center"
+            android:text="@string/first_start_intro_welcome_to"
+            android:textSize="30sp" />
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textAlignment="center"
-            android:text="Welcome to\nGadgetbridge"
+            android:text="@string/app_name"
             android:textSize="30sp" />
 
         <TextView
@@ -25,14 +38,7 @@
             android:layout_marginTop="20dp"
             android:textSize="20sp"
             android:textAlignment="center"
-            android:text="Break free from the proprietary apps and cloud services of gadget vendors." />
-
-        <ImageView
-            android:layout_width="200dp"
-            android:layout_height="200dp"
-            android:layout_marginTop="30dp"
-            android:background="@color/accent"
-            android:src="@drawable/ic_launcher_foreground" />
+            android:text="@string/first_start_intro_tag_line" />
 
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ec7377af1..6bcfbe206 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3420,4 +3420,6 @@
     <string name="music_rename_playlist">Rename playlist</string>
     <string name="music_error">Error occurred</string>
     <string name="music_huawei_device_info">Supported formats: %1$s\nWatch storage: %2$d MB</string>
+    <string name="first_start_intro_welcome_to">Welcome to</string>
+    <string name="first_start_intro_tag_line">Break free from the proprietary apps and cloud services of gadget vendors.</string>
 </resources>