chore: update targetSdkVersion to 33

- Add MANAGE_EXTERNAL_STORAGE permission

Author: WhiredPlanck

app/build.gradle.kts

@@ -52,11 +52,11 @@ fun buildInfo(): String {
         timeZone = TimeZone.getTimeZone("UTC")
     }.format(Date(System.currentTimeMillis()))
     writer.append("Builder: ${gitUserOrCIName}\\n")
-    writer.append("Build Time: ${time} UTC\\n")
+    writer.append("Build Time: $time UTC\\n")
     writer.append("Build Version Name: ${gitVersionName}\\n")
     writer.append("Git Hash: ${gitHashShort}\\n")
     writer.append("Git Branch: ${gitWorkingOrCIBranch}\\n")
-    writer.append("Git Repo: ${gitRemoteUrl}")
+    writer.append("Git Repo: $gitRemoteUrl")
     val info = writer.toString()
     println(info)
     return info
@@ -69,7 +69,7 @@ android {
     defaultConfig {
         applicationId  = "com.osfans.trime"
         minSdk = 21
-        targetSdk =  29
+        targetSdk = 33
         versionCode = 20230301
         versionName = "3.2.11"
 

app/src/main/AndroidManifest.xml

@@ -26,6 +26,7 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <application

app/src/main/java/com/osfans/trime/ui/components/FolderPickerPreference.kt

@@ -7,11 +7,10 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import androidx.activity.result.ActivityResultLauncher
 import androidx.appcompat.app.AlertDialog
-import androidx.core.net.toUri
 import androidx.preference.Preference
+import com.blankj.utilcode.util.UriUtils
 import com.osfans.trime.R
 import com.osfans.trime.databinding.FolderPickerDialogBinding
-import com.osfans.trime.util.UriUtils.toUri
 import java.io.File
 
 class FolderPickerPreference : Preference {
@@ -53,7 +52,7 @@ class FolderPickerPreference : Preference {
         dialogView = FolderPickerDialogBinding.inflate(LayoutInflater.from(context))
         dialogView.editText.setText(initValue)
         dialogView.button.setOnClickListener {
-            documentTreeLauncher.launch(File(initValue).toUri())
+            documentTreeLauncher.launch(UriUtils.file2Uri(File(initValue)))
         }
         AlertDialog.Builder(context)
             .setTitle(this@FolderPickerPreference.title)

app/src/main/java/com/osfans/trime/ui/fragments/ProfileFragment.kt

@@ -11,14 +11,14 @@ import androidx.preference.SwitchPreferenceCompat
 import androidx.preference.get
 import com.blankj.utilcode.util.ResourceUtils
 import com.blankj.utilcode.util.ToastUtils
+import com.blankj.utilcode.util.UriUtils
 import com.osfans.trime.R
 import com.osfans.trime.core.Rime
 import com.osfans.trime.data.AppPrefs
 import com.osfans.trime.data.DataManager
 import com.osfans.trime.ui.components.FolderPickerPreference
 import com.osfans.trime.ui.components.PaddingPreferenceFragment
 import com.osfans.trime.ui.main.MainViewModel
-import com.osfans.trime.util.UriUtils.toFile
 import com.osfans.trime.util.appContext
 import com.osfans.trime.util.formatDateTime
 import com.osfans.trime.util.withLoadingDialog
@@ -37,8 +37,7 @@ class ProfileFragment : PaddingPreferenceFragment() {
                 it,
                 DocumentsContract.getTreeDocumentId(it)
             )
-            val file = uri.toFile()
-            dialogView.editText.setText(file?.toURI()?.normalize()?.path)
+            dialogView.editText.setText(UriUtils.uri2File(uri).absolutePath)
         }
     }
 

app/src/main/java/com/osfans/trime/ui/main/PrefMainActivity.kt

@@ -142,16 +142,16 @@ class PrefMainActivity : AppCompatActivity() {
 
     private fun requestExternalStoragePermission() {
         XXPermissions.with(this)
-            .permission(Permission.Group.STORAGE)
+            .permission(Permission.MANAGE_EXTERNAL_STORAGE)
             .request(object : OnPermissionCallback {
-                override fun onGranted(permissions: MutableList<String>?, all: Boolean) {
+                override fun onGranted(permissions: List<String>, all: Boolean) {
                     if (all) {
                         ToastUtils.showShort(R.string.external_storage_permission_granted)
                         SoundThemeManager.init()
                     }
                 }
 
-                override fun onDenied(permissions: MutableList<String>?, never: Boolean) {
+                override fun onDenied(permissions: List<String>, never: Boolean) {
                     if (never) {
                         ToastUtils.showShort(R.string.external_storage_permission_denied)
                         XXPermissions.startPermissionActivity(

app/src/main/java/com/osfans/trime/util/UriUtils.kt

@@ -9,7 +9,7 @@
 plugins {
     id("com.android.application") version "7.4.0" apply false
     id("com.android.library") version "7.4.0" apply false
-    kotlin("android") version "${Extra.kotlinVersion}" apply false
+    kotlin("android") version Extra.kotlinVersion apply false
     id("com.diffplug.spotless") version "6.3.0"
 }