v1.7.1

- update targetSdk to 34 - fix Android 14
Yanndroid · Dec 22, 2023 · 4e3c505 · 4e3c505
1 parent 56ff407
commit 4e3c505
Show file tree

Hide file tree

Showing 12 changed files with 75 additions and 31 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,22 +3,31 @@ plugins {
     id 'kotlin-android'
 }
 
+def locales = file('src/main/res').listFiles(new FilenameFilter() {
+    @Override
+    boolean accept(File dir, String name) {
+        return name.matches('values-.*') && new File(dir, name).list().contains('strings.xml')
+    }
+}).collect { it.name.substring(7) }
+
+print("Locales: " + locales.join(', '))
+
 android {
-    compileSdk 30
+    compileSdk 34
 
     defaultConfig {
         applicationId "de.dlyt.yanndroid.notinotes"
         minSdk 26
-        targetSdk 30
-        versionCode 11
-        versionName "1.7.0"
+        targetSdk 34
+        versionCode 12
+        versionName "1.7.1"
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        resConfigs locales
     }
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
@@ -29,16 +38,16 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'de.dlyt.yanndroid.notinotes'
 }
 
 configurations.all {
     exclude group: 'androidx.core', module: 'core'
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.6.0'
-    implementation 'io.github.oneuiproject.sesl:appcompat:1.3.0'
-    implementation 'io.github.oneuiproject.sesl:picker-color:1.0.1'
-    implementation 'com.google.code.gson:gson:2.9.0'
-    implementation("androidx.annotation:annotation-experimental") { version { strictly("1.1.0") } }
+    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'io.github.oneuiproject.sesl:appcompat:1.4.0'
+    implementation 'io.github.oneuiproject.sesl:picker-color:1.1.0'
+    implementation 'com.google.code.gson:gson:2.10.1'
 }
diff --git a/app/release/app-release.aab b/app/release/app-release.aab
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 11,
-      "versionName": "1.7.0",
+      "versionCode": 12,
+      "versionName": "1.7.1",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.dlyt.yanndroid.notinotes">
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-permission
+        android:name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS"
+        tools:ignore="ProtectedPermissions" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -13,6 +18,7 @@
             android:name=".DialogActivity"
             android:excludeFromRecents="true"
             android:exported="false"
+            android:noHistory="true"
             android:theme="@style/Transparent"
             android:windowSoftInputMode="adjustResize" />
 
@@ -34,6 +40,7 @@
             <intent-filter>
                 <action android:name="de.dlyt.yanndroid.notinotes.EDIT" />
                 <action android:name="de.dlyt.yanndroid.notinotes.DELETE" />
+                <action android:name="de.dlyt.yanndroid.notinotes.DISMISS" />
                 <action android:name="de.dlyt.yanndroid.notinotes.SHOW" />
             </intent-filter>
             <intent-filter>

diff --git a/app/src/main/java/de/dlyt/yanndroid/notinotes/ActionReceiver.kt b/app/src/main/java/de/dlyt/yanndroid/notinotes/ActionReceiver.kt
@@ -10,6 +10,7 @@ class ActionReceiver : BroadcastReceiver() {
     companion object {
         val ACTION_EDIT = "de.dlyt.yanndroid.notinotes.EDIT"
         val ACTION_DELETE = "de.dlyt.yanndroid.notinotes.DELETE"
+        val ACTION_DISMISS = "de.dlyt.yanndroid.notinotes.DISMISS"
         val ACTION_SHOW = "de.dlyt.yanndroid.notinotes.SHOW"
         val EXTRA_NOTE = "intent_note"
 
@@ -32,11 +33,22 @@ class ActionReceiver : BroadcastReceiver() {
                 Notification.createNotificationChannel(context)
                 Notification.showAll(context)
             }
+
+            ACTION_DISMISS -> {
+                val note = (intent.getSerializableExtra(EXTRA_NOTE) ?: return) as Notes.Note
+                if (note.locked) { //A14 don't delete locked notes when dismissed
+                    Notification.show(context, note)
+                } else {
+                    Notes.deleteNote(context, note)
+                }
+            }
+
             ACTION_DELETE -> {
                 val note = (intent.getSerializableExtra(EXTRA_NOTE) ?: return) as Notes.Note
                 Notes.deleteNote(context, note)
                 //todo notify TileService Detail View
             }
+
             ACTION_EDIT, ACTION_SHOW -> {
                 val note = (intent.getSerializableExtra(EXTRA_NOTE) ?: return) as Notes.Note
                 val dialogIntent = Intent(context, DialogActivity::class.java)

diff --git a/app/src/main/java/de/dlyt/yanndroid/notinotes/DialogActivity.kt b/app/src/main/java/de/dlyt/yanndroid/notinotes/DialogActivity.kt
@@ -3,7 +3,9 @@ package de.dlyt.yanndroid.notinotes
 import android.app.KeyguardManager
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.content.res.Resources
+import android.os.Build
 import android.os.Bundle
 import android.util.TypedValue
 import android.view.Gravity
@@ -47,7 +49,15 @@ class DialogActivity : AppCompatActivity() {
         setContentView(R.layout.activity_dialog)
         window.setGravity(Gravity.BOTTOM)
 
-        sendBroadcast(Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS))
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            if (checkSelfPermission(android.Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_DENIED) {
+                requestPermissions(arrayOf(android.Manifest.permission.POST_NOTIFICATIONS), 0)
+            }
+        }
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
+            sendBroadcast(Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS))
+        }
         mKeyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
         mKeyguardManager.requestDismissKeyguard(this, null)
 

diff --git a/app/src/main/java/de/dlyt/yanndroid/notinotes/Notification.kt b/app/src/main/java/de/dlyt/yanndroid/notinotes/Notification.kt
@@ -58,18 +58,10 @@ class Notification {
                     ActionReceiver.getPendingIntent(context, note, ActionReceiver.ACTION_DELETE)
                 )
                 .setContentIntent(
-                    ActionReceiver.getPendingIntent(
-                        context,
-                        note,
-                        ActionReceiver.ACTION_SHOW
-                    )
+                    ActionReceiver.getPendingIntent(context, note, ActionReceiver.ACTION_SHOW)
                 )
                 .setDeleteIntent(
-                    ActionReceiver.getPendingIntent(
-                        context,
-                        note,
-                        ActionReceiver.ACTION_DELETE
-                    )
+                    ActionReceiver.getPendingIntent(context, note, ActionReceiver.ACTION_DISMISS)
                 )
                 .setColor(note.color)
 

diff --git a/app/src/main/java/de/dlyt/yanndroid/notinotes/QSTile.kt b/app/src/main/java/de/dlyt/yanndroid/notinotes/QSTile.kt
@@ -1,5 +1,6 @@
 package de.dlyt.yanndroid.notinotes
 
+import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -31,7 +32,18 @@ class QSTile : TileService() {
         dialogIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
         dialogIntent.action = ActionReceiver.ACTION_EDIT
         dialogIntent.putExtra(ActionReceiver.EXTRA_NOTE, Notes.defaultSettingNote(context))
-        startActivityAndCollapse(dialogIntent)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            val pendingDialogIntent = PendingIntent.getActivity(
+                context,
+                0,
+                dialogIntent,
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+            )
+            startActivityAndCollapse(pendingDialogIntent)
+        } else {
+            startActivityAndCollapse(dialogIntent)
+        }
     }
 
     /** #### Detail view (samsung only) #### **/

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.0.4"
+        classpath 'com.android.tools.build:gradle:8.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/gradle.properties b/gradle.properties
@@ -18,4 +18,7 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
+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
@@ -1,6 +1,5 @@
-#Wed Jan 19 12:18:26 CET 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-rc-2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists