From 39ce99fa0535264e1511badf6f84273508eec6ad Mon Sep 17 00:00:00 2001
From: Julian Mutter <julian.mutter@comumail.de>
Date: Fri, 1 Mar 2024 16:28:03 +0100
Subject: [PATCH] Follow analyzer suggestions, remove deprecations

---
 app/build.gradle                            | 2 +-
 app/src/main/res/layout/confirm_dialog.xml  | 6 ++++--
 app/src/main/res/layout/shape_inspector.xml | 3 ++-
 app/src/main/res/layout/tool_inspector.xml  | 3 ++-
 app/src/main/res/layout/tutorial.xml        | 3 ++-
 app/src/main/res/values-de/strings.xml      | 4 ++--
 app/src/main/res/values/strings.xml         | 4 ++--
 build.gradle                                | 6 +++---
 8 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2be98a1..fd96122 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,7 +24,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    flavorDimensions 'releaseTargetGroup'
+    flavorDimensions = ['releaseTargetGroup']
     productFlavors {
         flavorStoreRelease {
             dimension 'releaseTargetGroup'
diff --git a/app/src/main/res/layout/confirm_dialog.xml b/app/src/main/res/layout/confirm_dialog.xml
index 5d621c5..0490ab7 100644
--- a/app/src/main/res/layout/confirm_dialog.xml
+++ b/app/src/main/res/layout/confirm_dialog.xml
@@ -35,7 +35,8 @@
             android:layout_marginRight="1dp"
             android:layout_marginEnd="1dp"
             style="@style/DialogButton"
-            android:text="@string/confirm_dialog_button_yes"/>
+            android:text="@string/confirm_dialog_button_yes"
+            android:gravity="center_horizontal" />
         <Button
             android:id="@+id/confirm_dialog_no_button"
             android:layout_width="wrap_content"
@@ -43,7 +44,8 @@
             android:textAlignment="center"
             style="@style/DialogButton"
             android:layout_height="wrap_content"
-            android:text="@string/confirm_dialog_button_no"/>
+            android:text="@string/confirm_dialog_button_no"
+            android:gravity="center_horizontal" />
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/shape_inspector.xml b/app/src/main/res/layout/shape_inspector.xml
index 22bb492..109b786 100644
--- a/app/src/main/res/layout/shape_inspector.xml
+++ b/app/src/main/res/layout/shape_inspector.xml
@@ -53,7 +53,8 @@
             android:layout_centerInParent="true"
             android:text="@string/placeholder_textview"
             android:textAlignment="center"
-            android:textSize="20sp"/>
+            android:textSize="20sp"
+            android:gravity="center_horizontal" />
     </RelativeLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tool_inspector.xml b/app/src/main/res/layout/tool_inspector.xml
index 994e7fd..255c703 100644
--- a/app/src/main/res/layout/tool_inspector.xml
+++ b/app/src/main/res/layout/tool_inspector.xml
@@ -66,7 +66,8 @@
             android:layout_centerInParent="true"
             android:text="@string/placeholder_textview"
             android:textAlignment="center"
-            android:textSize="20sp"/>
+            android:textSize="20sp"
+            android:gravity="center_horizontal" />
     </RelativeLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tutorial.xml b/app/src/main/res/layout/tutorial.xml
index 97d1d30..625d83c 100644
--- a/app/src/main/res/layout/tutorial.xml
+++ b/app/src/main/res/layout/tutorial.xml
@@ -24,7 +24,8 @@
             android:layout_alignParentTop="true"
             android:layout_centerHorizontal="true"
             android:text="@string/tutorial_placeholder"
-            android:textAlignment="center"/>
+            android:textAlignment="center"
+            android:gravity="center_horizontal" />
 
         <ImageView
             android:id="@+id/tutorial_image_view"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 03f3d9f..ece0324 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -17,7 +17,7 @@
     <string name="goal_message_restart_format_d">Neustart: Level %d</string>
     <string name="goal_message_next_level_format_d">Nächstes Level: %d</string>
     <string name="goal_message_next_world_format_s">Nächste Welt:\n%s</string>
-    <string name="pre_start_screen_loading">LÄDT...</string>
+    <string name="pre_start_screen_loading">LÄDT…</string>
     <string name="short_menu_continue">Weiter</string>
     <string name="short_menu_exit">Beenden</string>
     <string name="start_screen_play">Spielen</string>
@@ -39,7 +39,7 @@
     <string name="playershape_name_sun">Sonne</string>
     <string name="level_button_format_d">Level: %d</string>
     <string name="playershape_description_hypno_spiral">Lass dich hypnotisieren!</string>
-    <string name="playershape_description_wheel">Ein krasses Auto ohne ... Auto</string>
+    <string name="playershape_description_wheel">Ein krasses Auto ohne … Auto</string>
     <string name="playershape_description_sun">Lass dir die Sonne ins Gesicht scheinen</string>
     <string name="task_collect_stars_progress_format_ddd">Sammle %d Sterne (%d/%d)</string>
     <string name="task_collect_energy_progress_format_ddd">Sammle %d Energie (%d/%d)</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dbfc55d..860eda9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,7 +26,7 @@
     <string name="goal_message_restart_format_d">Restart level %d</string>
     <string name="goal_message_next_level_format_d">Next level: %d</string>
     <string name="goal_message_next_world_format_s">Next world:\n%s</string>
-    <string name="pre_start_screen_loading">LOADING...</string>
+    <string name="pre_start_screen_loading">LOADING…</string>
     <string name="short_menu_continue">Continue</string>
     <string name="short_menu_exit">Exit</string>
     <string name="start_screen_play">Play</string>
@@ -64,7 +64,7 @@
     <string name="playershape_description_soccer">Let\'s roll to the goal!</string>
     <string name="playershape_description_pacman" translatable="false">PACMAN!</string>
     <string name="playershape_description_smiley" translatable="false">Don\'t worry, roll happy!</string>
-    <string name="playershape_description_wheel">A nice car without the... car</string>
+    <string name="playershape_description_wheel">A nice car without the… car</string>
     <string name="playershape_description_sun">Shine bright like the sun</string>
     <string name="playershape_description_blue">Why am I blue?</string>
     <string name="playershape_description_rainbow">So colorful!!!</string>
diff --git a/build.gradle b/build.gradle
index cdfb5e9..c673ad8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@
 
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
     dependencies {
@@ -22,11 +22,11 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }