Add translations for the improved tutorial

app/src/main/res/layout/tutorial_concept.xml

@@ -16,7 +16,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:text="Concept"
+        android:text="@string/tutorial_concept_title"
         android:textSize="30sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -27,7 +27,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:text="Launcher is designed to be minimal, efficient and free of distraction.\n\nIt is free of payments, ads and tracking services."
+        android:text="@string/tutorial_concept_text"
         android:textSize="18sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -41,7 +41,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
         android:gravity="center"
-        android:text="The app is open-source (MIT license) and available on GitHub!\n\nMake sure to check out the repository!"
+        android:text="@string/tutorial_concept_text_2"
         android:textSize="18sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -59,6 +59,7 @@
         app:layout_constraintBottom_toTopOf="@+id/tutorial_concept_text_2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tutorial_concept_text" />
+        app:layout_constraintTop_toBottomOf="@+id/tutorial_concept_text"
+        tools:ignore="ContentDescription" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/tutorial_finish.xml

@@ -17,7 +17,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:text="Let's go!"
+        android:text="@string/tutorial_finish_title"
         android:textSize="30sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -28,7 +28,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:text="You are ready to get started!\n\n I hope this provides great value to you!\n\n- Finn M Glas\n(the developer)"
+        android:text="@string/tutorial_finish_text"
         android:textSize="18sp"
         app:layout_constraintBottom_toTopOf="@id/tutorial_finish_button_start"
         app:layout_constraintEnd_toEndOf="parent"
@@ -41,7 +41,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="32sp"
-        android:text="Start Launcher"
+        android:text="@string/tutorial_finish_button"
         android:textAllCaps="false"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout/tutorial_setup.xml

@@ -16,7 +16,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:text="Setup"
+        android:text="@string/tutorial_setup_title"
         android:textSize="30sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -28,7 +28,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:gravity="center"
-        android:text="We chose some default apps for you, if you want to, you can change them now."
+        android:text="@string/tutorial_setup_text"
         android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -52,8 +52,8 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
         android:gravity="center"
-        android:text="You can also change your selection later."
+        android:text="@string/tutorial_setup_text_2"
-        android:textSize="18sp"
+        android:textSize="14sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />

app/src/main/res/layout/tutorial_start.xml

@@ -27,7 +27,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:text="Take a few seconds to learn how to use this Launcher!"
+        android:text="@string/tutorial_start_text"
         android:textSize="18sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout/tutorial_usage.xml

@@ -15,7 +15,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:text="Usage"
+        android:text="@string/tutorial_usage_title"
         android:textSize="30sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -28,7 +28,7 @@
         android:layout_marginTop="16dp"
         android:layout_marginBottom="32dp"
         android:gravity="center"
-        android:text="Your home screen contains the local date and time. No distraction."
+        android:text="@string/tutorial_usage_text"
         android:textSize="18sp"
         app:layout_constraintBottom_toTopOf="@+id/tutorial_usage_screen"
         app:layout_constraintEnd_toEndOf="parent"
@@ -45,7 +45,8 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/tutorial_usage_text"
         app:layout_constraintTop_toBottomOf="@id/tutorial_usage_text"
-        app:srcCompat="@drawable/home_round_screen" />
+        app:srcCompat="@drawable/home_round_screen"
+        tools:ignore="ContentDescription" />
 
     <TextView
         android:id="@+id/tutorial_usage_text_2"
@@ -54,7 +55,7 @@
         android:layout_marginTop="32dp"
         android:layout_marginBottom="16dp"
         android:gravity="center"
-        android:text="You can launch your apps with a single swipe or button press. Choose some in the next slide."
+        android:text="@string/tutorial_usage_text_2"
         android:textSize="18sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/values-de/strings.xml

@@ -48,7 +48,7 @@
     <string name="settings_meta_contact_url">https://www.finnmglas.com/de/kontakt/</string>
     <string name="settings_meta_donate">Finanziell unterstützen</string>
 
-    <!-- Choose Activity -->
+    <!-- List Activity -->
     <string name="choose_title">App wählen</string>
     <string name="choose_title_view">Alle Apps</string>
 
@@ -57,22 +57,23 @@
     <string name="choose_removed_toast">Die App wurde entfernt</string>
     <string name="choose_not_removed_toast">Die App konnte nicht entfernt werden</string>
 
-    <!-- FirstStartup Activity -->
+    <!-- Tutorial Activity -->
     <string name="tutorial_title">Tutorial</string>
-    <string-array name="intro">
+    <string name="tutorial_start_text">Nimm dir kurz Zeit und lerne, wie du diesen Launcher verwendest!</string>
-        <!--item> heading | infoText | hintText | size | format </item-->
-        <item>|Nimm dir kurz Zeit und lerne, wie du diesen Launcher verwendest!\n\n|— Tippe um weiterzukommen —|36F|0</item>
-        <item>Konzept|Er bietet dir eine minimalistische, effiziente und ablenkungsfreie digitale Umgebung.|— Tippe um weiterzukommen —|36F|0</item>
-        <item>Konzept|Er kostet dich nichts, enthält keine Werbung, sammelt keine persönlichen Daten.|— Tippe um weiterzukommen —|36F|0</item>
-        <item>Benutzung|Auf deinem Homescreen siehst du nur das Datum und die Uhrzeit. Keine Ablenkung.|— Tippe um weiterzukommen —|36F|0</item>
-        <item>Benutzung|Du öffnest Apps indem du über den Bildschirm wischt oder die Lautstärketasten drückst.|— Tippe um weiterzukommen —|36F|0</item>
-        <item>Einrichtung|Wir haben dir ein paar Standardaktionen eingerichtet…|— Zurück = Lautstärke Runter —|36F|0</item>
-        <item>Einrichtung|Hochwischen: Browser öffnen (%1$s)\n\nRunterwischen: Interne Such-app öffnen (%2$s)\n\n
-            Rechtswischen: Mails öffnen (%3$s)\n\nLinkswischen: Kalendar öffnen (%4$s)\n\n
-            Lautstärke Hoch: Messenger öffnen (%5$s)\n\nLautstärke Runter: Tools öffnen (%6$s)|— Zurück = Lautstärke Runter —|18F|1
-        </item>
-        <item>Einrichtung|Du kannst auch eigene Apps auswählen:\n\nÖffne die Einstellungen durch langes tippen auf den Startbildschirm.|— Zurück = Lautstärke Runter —|36F|0</item>
-        <item>|Du bist bereit loszulegen!\n\nIch hoffe diese App ist sehr wertvoll für dich!\n\n- Finn M Glas\n\n|— Launcher von Finn M Glas —|36F|0</item>
-    </string-array>
 
+    <string name="tutorial_concept_title">Konzept</string>
+    <string name="tutorial_concept_text">Launcher bietet dir eine minimalistische, effiziente und ablenkungsfreie digitale Umgebung.\n\nDie App kostet dich nichts, enthält keine Werbung, sammelt keine persönlichen Daten.</string>
+    <string name="tutorial_concept_text_2">Launcher ist open-source (MIT license) und auf GitHub!\n\nSchau gerne mal dort vorbei!</string>
+
+    <string name="tutorial_usage_title">Benutzung</string>
+    <string name="tutorial_usage_text">Auf deinem Homescreen siehst du nur das Datum und die Uhrzeit. Keine Ablenkung.</string>
+    <string name="tutorial_usage_text_2">Du öffnest Apps indem du über den Bildschirm wischt oder die Lautstärketasten drückst. Gleich wählst du deine Apps.</string>
+
+    <string name="tutorial_setup_title">Einrichtung</string>
+    <string name="tutorial_setup_text">Wir haben dir ein paar Standardapps ausgewählt, du kannst sie gerne ändern.</string>
+    <string name="tutorial_setup_text_2">Du kannst deine Einstellungen auch später noch ändern.</string>
+
+    <string name="tutorial_finish_title">Los gehts!</string>
+    <string name="tutorial_finish_text">Du bist bereit loszulegen!\n\nIch hoffe diese App ist sehr wertvoll für dich!\n\n- Finn M Glas\n(der Entwickler)</string>
+    <string name="tutorial_finish_button">Launcher starten</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -48,7 +48,7 @@
     <string name="settings_meta_contact_url">https://www.finnmglas.com/fr/contact/</string>
     <string name="settings_meta_donate">Faire un don</string>
 
-    <!-- Choose Activity -->
+    <!-- List Activity -->
     <string name="choose_title">Choisir App</string>
     <string name="choose_title_view">Applications</string>
 
@@ -57,21 +57,24 @@
     <string name="choose_removed_toast">Application supprimée</string>
     <string name="choose_not_removed_toast">Impossible de supprimer l\'application</string>
 
-    <!-- FirstStartup Activity -->
+    <!-- Tutorial Activity -->
     <string name="tutorial_title">Le Tutoriel</string>
-    <string-array name="intro">
+    <string name="tutorial_start_text">Prenez un moment et apprenez à utiliser ce lanceur!</string>
-        <!--item> heading | infoText | hintText | size | format </item-->
+
-        <item>|Prenez un moment et apprenez à utiliser ce lanceur!\n\n|— Appuyez pour continuer —|36F|0</item>
+    <string name="tutorial_concept_title">Concept</string>
-        <item>Concept|Il vous offre un environnement minimaliste, efficace et sans distraction.|— Appuyez pour continuer —|36F|0</item>
+    <string name="tutorial_concept_text">Launcher vous offre un environnement minimaliste, efficace et sans distraction.\n\nIl ne vous coûte rien, ne contient aucune publicité, ne recueille pas de données personnelles.</string>
-        <item>Concept|Il ne vous coûte rien, ne contient aucune publicité, ne recueille pas de données personnelles.|— Appuyez pour continuer —|36F|0</item>
+    <string name="tutorial_concept_text_2">L\'application est open-source (licence MIT) et disponible sur GitHub!\n\nAssurez-vous de visiter le repo!</string>
-        <item>Utilisation|Vous ne voyez que la date et l\'heure sur votre écran d\'accueil. Aucune distraction.|— Appuyez pour continuer —|36F|0</item>
+
-        <item>Utilisation|Vous ouvrez des applications en faisant glisser l\'écran ou en appuyant sur les touches de volume.|— Appuyez pour continuer —|36F|0</item>
+    <string name="tutorial_usage_title">Utilisation</string>
-        <item>Installer|Nous avons mis en place quelques promotions standards pour vous…|— Retour = volume en baisse —|36F|0</item>
+    <string name="tutorial_usage_text">Vous ne voyez que la date et l\'heure sur votre écran d\'accueil. Aucune distraction.</string>
-        <item>Installer|Balayez haut: Ouvrir le navigateur (%1$s)\n\nBalayez bas: Ouvrir l\'application de recherche interne (%2$s)\n\n
+    <string name="tutorial_usage_text_2">Vous ouvrez des applications en faisant glisser l\'écran ou en appuyant sur les touches de volume. Choisissez-les maintenant.</string>
-            Balayez droit: Ouvrir Mail (%3$s)\n\nBalayez gauche: Ouvrir le Calendrier (%4$s)\n\n
+
-            Monter volume: Ouvrir Messenger (%5$s)\n\nBaisser volume: Ouvrir utilitaires (%6$s)|— Retour = volume en baisse —|18F|1
+    <string name="tutorial_setup_title">Installer</string>
-        </item>
+    <string name="tutorial_setup_text">Nous avons choisi quelques applications standards pour vous, vous pouvez changer-les maintenant.</string>
-        <item>Installer|Vous pouvez choisir vos applications:\n\nOuvrez les paramètres en appuyant longuement sur l\'écran d\'accueil.|— Retour = volume en baisse —|36F|0</item>
+    <string name="tutorial_setup_text_2">Vous pouvez également modifier votre sélection ultérieurement.</string>
-        <item>|Vous êtes prêt à commencer!\n\nJ\'espère que cette application vous sera très précieuse!\n\n- Finn M Glas\n\n|— Launcher par Finn M Glas —|36F|0</item>
+
-    </string-array>
+    <string name="tutorial_finish_title">Allez!</string>
+    <string name="tutorial_finish_text">Vous êtes prêt à commencer!\n\nJ\'espère que cette application vous sera très précieuse!\n\n- Finn M Glas\n(le développeur)</string>
+    <string name="tutorial_finish_button">Ouvrir Launcher</string>
+
 </resources>

app/src/main/res/values/strings.xml

@@ -57,7 +57,7 @@
     <string name="settings_meta_donate">Make a donation</string>
     <string name="settings_meta_donate_url" translatable="false">https://sponsor.finnmglas.com</string>
 
-    <!-- Choose Activity -->
+    <!-- List Activity -->
     <string name="choose_title">Choose App</string>
     <string name="choose_title_view">All Apps</string>
 
@@ -69,23 +69,25 @@
     <string name="choose_removed_toast">Removed the selected application</string>
     <string name="choose_not_removed_toast">Unable to remove application</string>
 
-    <!-- FirstStartup Activity -->
+    <!-- Tutorial Activity -->
     <string name="tutorial_title">Tutorial</string>
-    <string-array name="intro">
+    <string name="tutorial_start_text">Take a few seconds to learn how to use this Launcher!</string>
-        <!--item> heading | infoText | hintText | size | format </item-->
+
-        <item>|Take a few seconds to learn how to use this Launcher!\n\n|— Tap anywhere to continue —|36F|0</item>
+    <string name="tutorial_concept_title">Concept</string>
-        <item>Concept|It is designed to be minimal, efficient and free of distraction.|— Tap anywhere to continue —|36F|0</item>
+    <string name="tutorial_concept_text">Launcher is designed to be minimal, efficient and free of distraction.\n\nIt is free of payments, ads and tracking services.</string>
-        <item>Concept|It is free of payments, ads and tracking services.|— Tap anywhere to continue —|36F|0</item>
+    <string name="tutorial_concept_text_2">The app is open-source (MIT license) and available on GitHub!\n\nMake sure to check out the repository!</string>
-        <item>Usage|Your home screen contains the local date and time. No distraction.|— Tap anywhere to continue —|36F|0</item>
+
-        <item>Usage|You can open your apps with a single swipe or button press.|— Tap anywhere to continue —|36F|0</item>
+    <string name="tutorial_usage_title">Usage</string>
-        <item>Setup|We have set up some default actions for you…|— Use volume keys to navigate —|36F|0</item>
+    <string name="tutorial_usage_text">Your home screen contains the local date and time. No distraction.</string>
-        <item>Setup|Swipe Up: Open a Browser (%1$s)\n\nSwipe Down: Open internal Search App (%2$s)\n\n
+    <string name="tutorial_usage_text_2">You can launch your apps with a single swipe or button press. Choose some in the next slide.</string>
-            Swipe Right: Open Mail (%3$s)\n\nSwipe Left: Open Calendar (%4$s)\n\n
+
-            Volume Up: Open a messenger (%5$s)\n\nVolume Down: Open Utilities (%6$s)|— Use volume keys to navigate —|18F|1
+    <string name="tutorial_setup_title">Setup</string>
-        </item>
+    <string name="tutorial_setup_text">We chose some default apps for you, if you want to, you can change them now.</string>
-        <item>Setup|You can choose your own apps:\n\nOpen settings by tapping and holding the home screen.|— Use volume keys to navigate —|36F|0</item>
+    <string name="tutorial_setup_text_2">You can also change your selection later.</string>
-        <item>|You are ready to get started!\n\n I hope this provides great value to you!\n\n- Finn M Glas\n\n|— Launcher by Finn M Glas —|36F|0</item>
+
-    </string-array>
+    <string name="tutorial_finish_title">Let\'s go!</string>
+    <string name="tutorial_finish_text">You are ready to get started!\n\n I hope this provides great value to you!\n\n- Finn M Glas\n(the developer)</string>
+    <string name="tutorial_finish_button">Start Launcher</string>
 
     <!-- Default Apps for different actions (button-press, swipes ...) -->
     <string-array name="default_up">