Merge pull request #1065 from toastkidjp/release/2_0_81

Release/2 0 81
toastkidjp · Dec 17, 2024 · 2fe53a4 · 2fe53a4
2 parents 0b11967 + 23d0017
commit 2fe53a4
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 104 deletions.
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -40,7 +40,7 @@ android {
 
 dependencies {
     implementation("androidx.core:core-ktx:${LibraryVersion.ktx}")
-    implementation("com.squareup.okhttp3:okhttp:${LibraryVersion.okhttp}")
+    implementation("com.squareup.okhttp3:okhttp:4.12.0")
     implementation("com.jakewharton.timber:timber:${LibraryVersion.timber}")
     implementation("com.squareup.retrofit2:retrofit:2.11.0")
     implementation(libraries.jsoup)

diff --git a/barcode/ui/build.gradle.kts b/barcode/ui/build.gradle.kts
@@ -57,8 +57,8 @@ dependencies {
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:${LibraryVersion.lifecycle}")
     implementation(libraries.activityCompose)
 
-    implementation("androidx.camera:camera-camera2:${LibraryVersion.cameraX}")
-    implementation("androidx.camera:camera-lifecycle:${LibraryVersion.cameraX}")
+    implementation("androidx.camera:camera-camera2:1.0.2")
+    implementation("androidx.camera:camera-lifecycle:1.0.2")
     implementation("androidx.camera:camera-view:1.3.4")
 
     implementation("com.jakewharton.timber:timber:${LibraryVersion.timber}")

diff --git a/buildSrc/src/main/java/property/LibraryVersion.kt b/buildSrc/src/main/java/property/LibraryVersion.kt
@@ -5,7 +5,6 @@ object LibraryVersion {
     val ktx = "1.1.0"
     val lifecycle = "2.8.5"
     val timber = "4.6.0"
-    val okhttp = "4.12.0"
     val exifinterface = "1.3.3"
     val composeCompiler = "1.4.6"
     val composeMaterial3 = "1.3.0"
@@ -14,5 +13,4 @@ object LibraryVersion {
     val robolectric = "4.8.1"
     val mockk = "1.10.6"
     val coroutinesTest = "1.5.1"
-    val cameraX = "1.0.2"
 }
diff --git a/buildSrc/src/main/java/property/Version.kt b/buildSrc/src/main/java/property/Version.kt
@@ -3,7 +3,7 @@ package property
 object Version {
     private const val MAJOR  = 2
     private const val MIDDLE = 0
-    private const val MINOR  = 80
+    private const val MINOR  = 81
 
     init {
         if (MIDDLE >= 100 || MINOR >= 10_000) {

diff --git a/image/src/main/java/jp/toastkid/image/factory/GifImageLoaderFactory.kt b/image/src/main/java/jp/toastkid/image/factory/GifImageLoaderFactory.kt
diff --git a/image/src/test/java/jp/toastkid/image/factory/GifImageLoaderFactoryTest.kt b/image/src/test/java/jp/toastkid/image/factory/GifImageLoaderFactoryTest.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -9,7 +9,7 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libraries") {
             version("kotlin", "2.0.20")
-            version("room", "2.5.0")
+            version("room", "2.6.1")
             plugin("composeCompiler", "org.jetbrains.kotlin.plugin.compose").version("2.0.21")
             library("activityCompose", "androidx.activity", "activity-compose").version("1.9.0")
             library("kotlinSerialization", "org.jetbrains.kotlinx", "kotlinx-serialization-json").version("1.6.0")

diff --git a/web/src/main/java/jp/toastkid/web/bookmark/view/BookmarkListUi.kt b/web/src/main/java/jp/toastkid/web/bookmark/view/BookmarkListUi.kt
@@ -160,7 +160,7 @@ fun BookmarkListUi() {
 
     val importRequestPermissionLauncher =
         rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) {
-            if (!it && Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+            if (!it) {
                 contentViewModel.snackShort(jp.toastkid.lib.R.string.message_requires_permission_storage)
                 return@rememberLauncherForActivityResult
             }
@@ -183,7 +183,7 @@ fun BookmarkListUi() {
 
     val exportRequestPermissionLauncher =
         rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) {
-            if (!it && Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+            if (!it) {
                 contentViewModel.snackShort(jp.toastkid.lib.R.string.message_requires_permission_storage)
                 return@rememberLauncherForActivityResult
             }
@@ -261,10 +261,20 @@ fun BookmarkListUi() {
                 openAddFolderDialogState.value = true
             }),
             OptionMenu(titleId = R.string.title_import_bookmark, action = {
-                importRequestPermissionLauncher.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+                    importRequestPermissionLauncher.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
+                    return@OptionMenu
+                }
+
+                getContentLauncher.launch(GetContentIntentFactory()("text/html"))
             }),
             OptionMenu(titleId = R.string.title_export_bookmark, action = {
-                exportRequestPermissionLauncher.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+                    exportRequestPermissionLauncher.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                    return@OptionMenu
+                }
+
+                exportLauncher.launch(CreateDocumentIntentFactory()("text/html", EXPORT_FILE_NAME))
             }),
             OptionMenu(titleId = R.string.title_add_default_bookmark, action = {
                 BookmarkInitializer.from(activityContext)() { viewModel.query(bookmarkRepository) }