From b8c032b2d1e597c4cbea09b78178080c1a76a9a6 Mon Sep 17 00:00:00 2001 From: RaindropsSys Date: Fri, 12 May 2023 17:08:26 +0200 Subject: Updated 7 files and added 5 files (automated) --- app/build.gradle | 6 +++--- .../main/java/io/heckel/ntfy/msg/NotificationService.kt | 2 ++ app/src/main/java/io/heckel/ntfy/ui/DetailAdapter.kt | 1 + .../main/res/drawable-anydpi/ic_category_reminder.xml | 15 +++++++++++++++ app/src/main/res/drawable-hdpi/ic_category_reminder.png | Bin 0 -> 448 bytes app/src/main/res/drawable-mdpi/ic_category_reminder.png | Bin 0 -> 329 bytes app/src/main/res/drawable-xhdpi/ic_category_reminder.png | Bin 0 -> 613 bytes .../main/res/drawable-xxhdpi/ic_category_reminder.png | Bin 0 -> 958 bytes app/src/main/res/values/strings.xml | 1 + build.gradle | 2 +- gradle.properties | 3 +++ gradle/wrapper/gradle-wrapper.properties | 2 +- 12 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 app/src/main/res/drawable-anydpi/ic_category_reminder.xml create mode 100644 app/src/main/res/drawable-hdpi/ic_category_reminder.png create mode 100644 app/src/main/res/drawable-mdpi/ic_category_reminder.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_category_reminder.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_category_reminder.png diff --git a/app/build.gradle b/app/build.gradle index 691747c..7e3594a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,8 +14,8 @@ android { minSdkVersion 27 targetSdkVersion 33 - versionCode 141 - versionName "3.1.4" + versionCode 142 + versionName "3.1.5" buildConfigField 'String', "NTFY_VERSION", '"1.16.0"' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -30,7 +30,7 @@ android { buildTypes { release { - minifyEnabled true + minifyEnabled false debuggable false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } diff --git a/app/src/main/java/io/heckel/ntfy/msg/NotificationService.kt b/app/src/main/java/io/heckel/ntfy/msg/NotificationService.kt index 081a7f8..7a24022 100644 --- a/app/src/main/java/io/heckel/ntfy/msg/NotificationService.kt +++ b/app/src/main/java/io/heckel/ntfy/msg/NotificationService.kt @@ -122,6 +122,8 @@ class NotificationService(val context: Context) { R.drawable.ic_category_motivation } else if (tags.contains("schedule")) { R.drawable.ic_category_schedule + } else if (tags.contains("reminder")) { + R.drawable.ic_category_reminder } else if (tags.contains("equilink")) { R.drawable.ic_category_equilink } else { diff --git a/app/src/main/java/io/heckel/ntfy/ui/DetailAdapter.kt b/app/src/main/java/io/heckel/ntfy/ui/DetailAdapter.kt index 3a3f564..e35e74b 100644 --- a/app/src/main/java/io/heckel/ntfy/ui/DetailAdapter.kt +++ b/app/src/main/java/io/heckel/ntfy/ui/DetailAdapter.kt @@ -111,6 +111,7 @@ class DetailAdapter(private val activity: Activity, private val lifecycleScope: "genitalia" -> context.getString(R.string.category_genitalia) "chdebug" -> context.getString(R.string.category_debug) "debug" -> context.getString(R.string.category_debug) + "reminder" -> context.getString(R.string.category_reminder) else -> context.getString(R.string.category_default, item) } } diff --git a/app/src/main/res/drawable-anydpi/ic_category_reminder.xml b/app/src/main/res/drawable-anydpi/ic_category_reminder.xml new file mode 100644 index 0000000..0c61a43 --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_category_reminder.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable-hdpi/ic_category_reminder.png b/app/src/main/res/drawable-hdpi/ic_category_reminder.png new file mode 100644 index 0000000..76a8df6 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_category_reminder.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_category_reminder.png b/app/src/main/res/drawable-mdpi/ic_category_reminder.png new file mode 100644 index 0000000..ac637b1 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_category_reminder.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_category_reminder.png b/app/src/main/res/drawable-xhdpi/ic_category_reminder.png new file mode 100644 index 0000000..0cdb48b Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_category_reminder.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_category_reminder.png b/app/src/main/res/drawable-xxhdpi/ic_category_reminder.png new file mode 100644 index 0000000..979d5f4 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_category_reminder.png differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1986fba..c501210 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -382,6 +382,7 @@ Pleasure alerts Emergency alerts Delta Kiosk requests + Activity reminders System travelling updates Automated alarms Server status updates diff --git a/build.gradle b/build.gradle index 7d4dd33..42235a4 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.3.14' // This is removed in the "fdroid" flavor diff --git a/gradle.properties b/gradle.properties index 3b8190d..9aff27f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,3 +14,6 @@ org.gradle.jvmargs=-Xmx1536m android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index edb3793..fdffbb3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip -- cgit