Skip to content

Commit 53d6b90

Browse files
committed
Merge branch 'main' into android-15
2 parents 8280790 + 7136dde commit 53d6b90

File tree

6 files changed

+5
-48
lines changed

6 files changed

+5
-48
lines changed

app/src/main/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
android:label="@string/app_name"
1515
android:roundIcon="@mipmap/ic_launcher_round"
1616
android:supportsRtl="true"
17-
android:theme="@style/Theme.NFCQuickSettingsTile"
18-
tools:targetApi="31">
17+
tools:targetApi="34">
1918

2019
<activity
2120
android:name=".NfcTilePreferencesActivity"

app/src/main/java/au/id/colby/nfcquicksettings/NfcTileService.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ class NfcTileService : TileService() {
214214
*/
215215
private fun updateTile(adapter: NfcAdapter? = NfcAdapter.getDefaultAdapter(this)) {
216216
adapter?.apply { updateTile(isEnabled) } ?: updateTile(
217-
Tile.STATE_INACTIVE,
217+
Tile.STATE_UNAVAILABLE,
218218
string.tile_subtitle_unavailable
219219
)
220220
}

app/src/main/res/values-night/themes.xml

-16
This file was deleted.

app/src/main/res/values/colors.xml

-10
This file was deleted.

app/src/main/res/values/themes.xml

-16
This file was deleted.

build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
3-
id 'com.android.application' version '8.5.2' apply false
4-
id 'com.android.library' version '8.5.2' apply false
3+
id 'com.android.application' version '8.6.0' apply false
4+
id 'com.android.library' version '8.6.0' apply false
55
id 'org.jetbrains.dokka' version '1.9.20' apply false
6-
id 'org.jetbrains.kotlin.android' version '2.0.10' apply false
6+
id 'org.jetbrains.kotlin.android' version '2.0.20' apply false
77
}

0 commit comments

Comments
 (0)