From a3c02dd817b25f9c82edd691ea963e542b24b13a Mon Sep 17 00:00:00 2001
From: Sven Jacobs <github@svenjacobs.com>
Date: Thu, 14 Sep 2023 08:46:07 +0200
Subject: [PATCH] chore: Raise targetSdk to 34 (Android 14) (#247)

* chore: Raise targetSdk to 34 (Android 14)

* chore: Fix some warnings

* feat: Enable predictive back gesture
---
 app/src/main/AndroidManifest.xml                            | 6 ++++--
 .../app/leon/ui/screens/main/model/MainScreenViewModel.kt   | 4 ++--
 .../com/svenjacobs/app/leon/ui/screens/main/model/Screen.kt | 6 +++---
 .../main/kotlin/com/svenjacobs/app/leon/ui/theme/Colors.kt  | 4 +++-
 app/src/main/res/values-de/a11y.xml                         | 3 +--
 app/src/main/res/values-pl/a11y.xml                         | 1 -
 app/src/main/res/values-ru/a11y.xml                         | 3 +--
 app/src/main/res/values/a11y.xml                            | 3 +--
 buildSrc/src/main/kotlin/Android.kt                         | 2 +-
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 640838e6..2b8f0d5d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   ~ Léon - The URL Cleaner
-  ~ Copyright (C) 2022 Sven Jacobs
+  ~ Copyright (C) 2023 Sven Jacobs
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -21,12 +21,14 @@
 
     <application
         android:allowBackup="true"
+        android:enableOnBackInvokedCallback="true"
         android:fullBackupOnly="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="false"
-        android:theme="@style/Theme.App">
+        android:theme="@style/Theme.App"
+        tools:targetApi="tiramisu">
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/app/src/main/kotlin/com/svenjacobs/app/leon/ui/screens/main/model/MainScreenViewModel.kt b/app/src/main/kotlin/com/svenjacobs/app/leon/ui/screens/main/model/MainScreenViewModel.kt
index 1988a15f..776899fa 100644
--- a/app/src/main/kotlin/com/svenjacobs/app/leon/ui/screens/main/model/MainScreenViewModel.kt
+++ b/app/src/main/kotlin/com/svenjacobs/app/leon/ui/screens/main/model/MainScreenViewModel.kt
@@ -45,7 +45,7 @@ class MainScreenViewModel(
 	) {
 		sealed interface Result {
 
-			object Empty : Result
+			data object Empty : Result
 
 			data class Success(
 				val originalText: String,
@@ -53,7 +53,7 @@ class MainScreenViewModel(
 				val urls: ImmutableList<String>,
 			) : Result
 
-			object Error : Result
+			data object Error : Result
 		}
 	}
 
diff --git a/app/src/main/kotlin/com/svenjacobs/app/leon/ui/screens/main/model/Screen.kt b/app/src/main/kotlin/com/svenjacobs/app/leon/ui/screens/main/model/Screen.kt
index f109ef08..7f633747 100644
--- a/app/src/main/kotlin/com/svenjacobs/app/leon/ui/screens/main/model/Screen.kt
+++ b/app/src/main/kotlin/com/svenjacobs/app/leon/ui/screens/main/model/Screen.kt
@@ -1,6 +1,6 @@
 /*
  * Léon - The URL Cleaner
- * Copyright (C) 2022 Sven Jacobs
+ * Copyright (C) 2023 Sven Jacobs
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,14 +31,14 @@ sealed class Screen(
 	@StringRes val label: Int,
 	@StringRes val iconContentDescription: Int,
 ) {
-	object Main : Screen(
+	data object Main : Screen(
 		route = "main",
 		icon = Icons.Filled.Home,
 		label = R.string.screen_main,
 		iconContentDescription = R.string.screen_main,
 	)
 
-	object Settings : Screen(
+	data object Settings : Screen(
 		route = "settings",
 		icon = Icons.Filled.Settings,
 		label = R.string.screen_settings,
diff --git a/app/src/main/kotlin/com/svenjacobs/app/leon/ui/theme/Colors.kt b/app/src/main/kotlin/com/svenjacobs/app/leon/ui/theme/Colors.kt
index 0e312029..81920a23 100755
--- a/app/src/main/kotlin/com/svenjacobs/app/leon/ui/theme/Colors.kt
+++ b/app/src/main/kotlin/com/svenjacobs/app/leon/ui/theme/Colors.kt
@@ -1,6 +1,6 @@
 /*
  * Léon - The URL Cleaner
- * Copyright (C) 2022 Sven Jacobs
+ * Copyright (C) 2023 Sven Jacobs
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,6 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+@file:Suppress("unused")
+
 package com.svenjacobs.app.leon.ui.theme
 
 import androidx.compose.ui.graphics.Color
diff --git a/app/src/main/res/values-de/a11y.xml b/app/src/main/res/values-de/a11y.xml
index 99455008..762a00c9 100644
--- a/app/src/main/res/values-de/a11y.xml
+++ b/app/src/main/res/values-de/a11y.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   ~ Léon - The URL Cleaner
-  ~ Copyright (C) 2021 Sven Jacobs
+  ~ Copyright (C) 2023 Sven Jacobs
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -17,7 +17,6 @@
   -->
 
 <resources>
-    <string name="a11y_broom_icon">Darstellung eines Besens</string>
     <string name="a11y_howto">Darstellung eines Smartphones, welche die Anwendung erläutert</string>
     <string name="a11y_back_navigation">Icon um zurück zu navigieren</string>
 </resources>
diff --git a/app/src/main/res/values-pl/a11y.xml b/app/src/main/res/values-pl/a11y.xml
index d661cf6b..0702eb19 100644
--- a/app/src/main/res/values-pl/a11y.xml
+++ b/app/src/main/res/values-pl/a11y.xml
@@ -17,7 +17,6 @@
   -->
 
 <resources>
-    <string name="a11y_broom_icon">Rysunek miotły</string>
     <string name="a11y_howto">Obraz aplikacji wyjaśniającej na smartfonie</string>
     <string name="a11y_back_navigation">Ikona do nawigacji wstecz</string>
 </resources>
diff --git a/app/src/main/res/values-ru/a11y.xml b/app/src/main/res/values-ru/a11y.xml
index 11c190d4..0ee74e8b 100644
--- a/app/src/main/res/values-ru/a11y.xml
+++ b/app/src/main/res/values-ru/a11y.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   ~ Léon - The URL Cleaner
-  ~ Copyright (C) 2022 Sven Jacobs
+  ~ Copyright (C) 2023 Sven Jacobs
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -17,7 +17,6 @@
   -->
 
 <resources>
-    <string name="a11y_broom_icon">Изображение метлы</string>
     <string name="a11y_howto">Изображение приложения, объясняющего работу на смартфоне</string>
     <string name="a11y_back_navigation">Значок, который перемещает назад</string>
 </resources>
diff --git a/app/src/main/res/values/a11y.xml b/app/src/main/res/values/a11y.xml
index b26fea7e..9dfb1d6f 100644
--- a/app/src/main/res/values/a11y.xml
+++ b/app/src/main/res/values/a11y.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   ~ Léon - The URL Cleaner
-  ~ Copyright (C) 2021 Sven Jacobs
+  ~ Copyright (C) 2023 Sven Jacobs
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -17,7 +17,6 @@
   -->
 
 <resources>
-    <string name="a11y_broom_icon">Depiction of a broom</string>
     <string name="a11y_howto">Depiction of a smartphone explaining application</string>
     <string name="a11y_back_navigation">Icon which navigates back</string>
 </resources>
diff --git a/buildSrc/src/main/kotlin/Android.kt b/buildSrc/src/main/kotlin/Android.kt
index 89032434..d2c3417a 100644
--- a/buildSrc/src/main/kotlin/Android.kt
+++ b/buildSrc/src/main/kotlin/Android.kt
@@ -18,6 +18,6 @@
 
 object Android {
 	const val minSdk = 21
-	const val targetSdk = 33
+	const val targetSdk = 34
 	const val compileSdk = 34
 }