diff options
author | RaindropsSys <contact@minteck.org> | 2023-05-12 17:08:26 +0200 |
---|---|---|
committer | RaindropsSys <contact@minteck.org> | 2023-05-12 17:08:26 +0200 |
commit | b8c032b2d1e597c4cbea09b78178080c1a76a9a6 (patch) | |
tree | df2516dafa029dae64d4416d3cf2c8337199cbac | |
parent | cc3adfdfa405879573e35a8f6c5569246c43bb7c (diff) | |
download | ponypush-b8c032b2d1e597c4cbea09b78178080c1a76a9a6.tar.gz ponypush-b8c032b2d1e597c4cbea09b78178080c1a76a9a6.tar.bz2 ponypush-b8c032b2d1e597c4cbea09b78178080c1a76a9a6.zip |
Updated 7 files and added 5 files (automated)
-rw-r--r-- | app/build.gradle | 6 | ||||
-rw-r--r-- | app/src/main/java/io/heckel/ntfy/msg/NotificationService.kt | 2 | ||||
-rw-r--r-- | app/src/main/java/io/heckel/ntfy/ui/DetailAdapter.kt | 1 | ||||
-rw-r--r-- | app/src/main/res/drawable-anydpi/ic_category_reminder.xml | 15 | ||||
-rw-r--r-- | app/src/main/res/drawable-hdpi/ic_category_reminder.png | bin | 0 -> 448 bytes | |||
-rw-r--r-- | app/src/main/res/drawable-mdpi/ic_category_reminder.png | bin | 0 -> 329 bytes | |||
-rw-r--r-- | app/src/main/res/drawable-xhdpi/ic_category_reminder.png | bin | 0 -> 613 bytes | |||
-rw-r--r-- | app/src/main/res/drawable-xxhdpi/ic_category_reminder.png | bin | 0 -> 958 bytes | |||
-rw-r--r-- | app/src/main/res/values/strings.xml | 1 | ||||
-rw-r--r-- | build.gradle | 2 | ||||
-rw-r--r-- | gradle.properties | 3 | ||||
-rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 |
12 files changed, 27 insertions, 5 deletions
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 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24" + android:tint="#FFFFFF"> + <group android:scaleX="0.92" + android:scaleY="0.92" + android:translateX="0.96" + android:translateY="0.96"> + <path + android:fillColor="@android:color/white" + android:pathData="M7.58,4.08L6.15,2.65C3.75,4.48 2.17,7.3 2.03,10.5h2c0.15,-2.65 1.51,-4.97 3.55,-6.42zM19.97,10.5h2c-0.15,-3.2 -1.73,-6.02 -4.12,-7.85l-1.42,1.43c2.02,1.45 3.39,3.77 3.54,6.42zM18,11c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2v-5zM12,22c0.14,0 0.27,-0.01 0.4,-0.04 0.65,-0.14 1.18,-0.58 1.44,-1.18 0.1,-0.24 0.15,-0.5 0.15,-0.78h-4c0.01,1.1 0.9,2 2.01,2z"/> + </group> +</vector> diff --git a/app/src/main/res/drawable-hdpi/ic_category_reminder.png b/app/src/main/res/drawable-hdpi/ic_category_reminder.png Binary files differnew file mode 100644 index 0000000..76a8df6 --- /dev/null +++ b/app/src/main/res/drawable-hdpi/ic_category_reminder.png diff --git a/app/src/main/res/drawable-mdpi/ic_category_reminder.png b/app/src/main/res/drawable-mdpi/ic_category_reminder.png Binary files differnew file mode 100644 index 0000000..ac637b1 --- /dev/null +++ b/app/src/main/res/drawable-mdpi/ic_category_reminder.png diff --git a/app/src/main/res/drawable-xhdpi/ic_category_reminder.png b/app/src/main/res/drawable-xhdpi/ic_category_reminder.png Binary files differnew file mode 100644 index 0000000..0cdb48b --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/ic_category_reminder.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_category_reminder.png b/app/src/main/res/drawable-xxhdpi/ic_category_reminder.png Binary files differnew file mode 100644 index 0000000..979d5f4 --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/ic_category_reminder.png 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 @@ <string name="category_pleasure">Pleasure alerts</string> <string name="category_emergency">Emergency alerts</string> <string name="category_delta">Delta Kiosk requests</string> + <string name="category_reminder">Activity reminders</string> <string name="category_travelling">System travelling updates</string> <string name="category_alarm">Automated alarms</string> <string name="category_status">Server status updates</string> 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 |