From 6b7e3f9ddec3444acc037ca3e0574dde45217215 Mon Sep 17 00:00:00 2001
From: Finn M Glas <finn@finnmglas.com>
Date: Thu, 31 Dec 2020 00:09:01 +0100
Subject: [PATCH] Improve tutorial end and Make settings scrollable

---
 .../launcher/tutorial/tabs/TutorialFragmentFinish.kt  |  1 +
 app/src/main/res/layout/settings_launcher.xml         |  9 +++++++--
 app/src/main/res/layout/tutorial_finish.xml           | 11 +++++------
 app/src/main/res/values-de/strings.xml                |  4 ++--
 app/src/main/res/values-es/strings.xml                |  2 +-
 app/src/main/res/values-fr/strings.xml                |  2 +-
 app/src/main/res/values/strings.xml                   |  4 ++--
 7 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/finnmglas/launcher/tutorial/tabs/TutorialFragmentFinish.kt b/app/src/main/java/com/finnmglas/launcher/tutorial/tabs/TutorialFragmentFinish.kt
index 6d55aad..74485b9 100644
--- a/app/src/main/java/com/finnmglas/launcher/tutorial/tabs/TutorialFragmentFinish.kt
+++ b/app/src/main/java/com/finnmglas/launcher/tutorial/tabs/TutorialFragmentFinish.kt
@@ -31,6 +31,7 @@ class TutorialFragmentFinish(): Fragment(), UIObject {
     override fun applyTheme() {
         tutorial_finish_container.setBackgroundColor(dominantColor)
         setButtonColor(tutorial_finish_button_start, vibrantColor)
+        tutorial_finish_button_start.blink()
     }
 
     override fun setOnClicks() {
diff --git a/app/src/main/res/layout/settings_launcher.xml b/app/src/main/res/layout/settings_launcher.xml
index f56d6d2..d690387 100644
--- a/app/src/main/res/layout/settings_launcher.xml
+++ b/app/src/main/res/layout/settings_launcher.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+<LinearLayout
     android:id="@+id/settings_launcher_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -304,4 +308,5 @@
 
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tutorial_finish.xml b/app/src/main/res/layout/tutorial_finish.xml
index b983cb4..eb78119 100644
--- a/app/src/main/res/layout/tutorial_finish.xml
+++ b/app/src/main/res/layout/tutorial_finish.xml
@@ -27,26 +27,25 @@
         android:id="@+id/tutorial_finish_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center"
         android:text="@string/tutorial_finish_text"
         android:textSize="18sp"
         app:layout_constraintBottom_toTopOf="@id/tutorial_finish_button_start"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.8" />
+        app:layout_constraintVertical_bias="0.7" />
 
     <Button
         android:id="@+id/tutorial_finish_button_start"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:padding="32sp"
+        android:layout_marginBottom="80dp"
+        android:padding="48sp"
         android:text="@string/tutorial_finish_button"
         android:textAllCaps="false"
+        android:textSize="20sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.7" />
+        app:layout_constraintStart_toStartOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6b2f701..75b38e7 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -158,7 +158,7 @@
     <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>
+    <string name="tutorial_finish_text">Du bist bereit loszulegen!\n\nIch hoffe diese App ist sehr wertvoll für dich!\n\n- Finn (der Entwickler)</string>
+    <string name="tutorial_finish_button">Starten</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 96b3f00..d827169 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -183,6 +183,6 @@
 
     <string name="tutorial_finish_title">Vamos!</string>
     <string name="tutorial_finish_text">Estás listo para iniciar!\n\n Esperamos que esto te sea de gran ayuda!\n\n- Finn M Glas\n(el desarrollador)</string>
-    <string name="tutorial_finish_button">Iniciar Launcher</string>
+    <string name="tutorial_finish_button">Iniciar</string>
 
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index da636fc..219d1b8 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -159,6 +159,6 @@
 
     <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>
+    <string name="tutorial_finish_button">Ouvrir</string>
 
 </resources>
\ 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 f4aa166..d470421 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -182,7 +182,7 @@
     <string name="tutorial_setup_text_2">You can also change your selection later.</string>
 
     <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>
+    <string name="tutorial_finish_text">You are ready to get started!\n\nI hope this is of great value to you!\n\n- Finn (who made Launcher)</string>
+    <string name="tutorial_finish_button">Start</string>
 
 </resources>