From 7c995f14bb8885a1e1e2e666a27b99704d8b11f5 Mon Sep 17 00:00:00 2001
From: Jarne Demeulemeester
 <32322857+jarnedemeulemeester@users.noreply.github.com>
Date: Sun, 11 Sep 2022 12:49:46 +0200
Subject: [PATCH] Target API level 33 (#123)

* Target API level 33

compileSdk 32 -> 33
buildToolsVersion 32.0.0 -> 33.0.0
targetSdk 32 -> 33

* Add monochrome icon

* Upgrade agp to 7.3.0-rc01

agp 7.2.2 -> 7.3.0-rc01

* Move namespace to build.gradle
---
 app/build.gradle.kts                                 | 12 ++++++++----
 app/src/main/AndroidManifest.xml                     |  4 +---
 app/src/main/res/mipmap-anydpi/ic_launcher.xml       |  1 +
 app/src/main/res/mipmap-anydpi/ic_launcher_round.xml |  5 -----
 build.gradle.kts                                     |  2 +-
 5 files changed, 11 insertions(+), 13 deletions(-)
 delete mode 100644 app/src/main/res/mipmap-anydpi/ic_launcher_round.xml

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d7884237..7de4e155 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -9,13 +9,14 @@ plugins {
 }
 
 android {
-    compileSdk = 32
-    buildToolsVersion = "32.0.0"
+    namespace = "dev.jdtech.jellyfin"
+    compileSdk = 33
+    buildToolsVersion = "33.0.0"
 
     defaultConfig {
         applicationId = "dev.jdtech.jellyfin"
         minSdk = 26
-        targetSdk = 32
+        targetSdk = 33
         versionCode = 12
         versionName = "0.6.1"
     }
@@ -27,7 +28,10 @@ android {
         getByName("release") {
             isMinifyEnabled = true
             isShrinkResources = true
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
         create("staging") {
             initWith(getByName("release"))
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 33b0570f..3370d373 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.jdtech.jellyfin">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
@@ -17,7 +16,6 @@
         android:label="@string/app_name"
         android:banner="@mipmap/ic_banner"
         android:networkSecurityConfig="@xml/network_security_config"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Findroid">
 
diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml
index 7353dbd1..ef49c991 100644
--- a/app/src/main/res/mipmap-anydpi/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi/ic_launcher.xml
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
deleted file mode 100644
index 7353dbd1..00000000
--- a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 0ba3f28f..87598b36 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.2.2")
+        classpath("com.android.tools.build:gradle:7.3.0-rc01")
 
         val kotlinVersion = "1.7.10"
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")