Merge branch 'main' into android-15

pcolby · Sep 7, 2024 · 53d6b90 · 53d6b90
2 parents 8280790 + 7136dde
commit 53d6b90
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 48 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.NFCQuickSettingsTile"
-        tools:targetApi="31">
+        tools:targetApi="34">
 
         <activity
             android:name=".NfcTilePreferencesActivity"

diff --git a/app/src/main/java/au/id/colby/nfcquicksettings/NfcTileService.kt b/app/src/main/java/au/id/colby/nfcquicksettings/NfcTileService.kt
@@ -214,7 +214,7 @@ class NfcTileService : TileService() {
      */
     private fun updateTile(adapter: NfcAdapter? = NfcAdapter.getDefaultAdapter(this)) {
         adapter?.apply { updateTile(isEnabled) } ?: updateTile(
-            Tile.STATE_INACTIVE,
+            Tile.STATE_UNAVAILABLE,
             string.tile_subtitle_unavailable
         )
     }

diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.5.2' apply false
-    id 'com.android.library' version '8.5.2' apply false
+    id 'com.android.application' version '8.6.0' apply false
+    id 'com.android.library' version '8.6.0' apply false
     id 'org.jetbrains.dokka' version '1.9.20' apply false
-    id 'org.jetbrains.kotlin.android' version '2.0.10' apply false
+    id 'org.jetbrains.kotlin.android' version '2.0.20' apply false
 }