Merge pull request #1066 from toastkidjp/release/2_0_82

Release/2 0 82
toastkidjp · Dec 25, 2024 · 53ce181 · 53ce181
2 parents 2fe53a4 + 10449a1
commit 53ce181
Show file tree

Hide file tree

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

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -131,12 +131,12 @@ dependencies {
     // Compose dependencies.
     implementation("androidx.compose.material3:material3:${LibraryVersion.composeMaterial3}")
     implementation(libraries.activityCompose)
-    implementation("androidx.navigation:navigation-compose:${LibraryVersion.navigationCompose}")
-    implementation("androidx.navigation:navigation-runtime-ktx:${LibraryVersion.navigationCompose}")
+    implementation("androidx.navigation:navigation-compose:2.7.7")
+    implementation("androidx.navigation:navigation-runtime-ktx:2.7.7")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:${LibraryVersion.lifecycle}")
     implementation("androidx.core:core-ktx:${LibraryVersion.ktx}")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:${LibraryVersion.coroutines}")
-    implementation("com.jakewharton.timber:timber:${LibraryVersion.timber}")
+    implementation(libraries.timber)
     implementation(libraries.kotlinSerialization)
 
     implementation("org.burnoutcrew.composereorderable:reorderable:0.9.2")

diff --git a/article/build.gradle.kts b/article/build.gradle.kts
@@ -70,7 +70,7 @@ dependencies {
 
     implementation("androidx.core:core-ktx:${LibraryVersion.ktx}")
 
-    implementation("com.jakewharton.timber:timber:${LibraryVersion.timber}")
+    implementation(libraries.timber)
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:${LibraryVersion.coroutines}")
 
     implementation("androidx.compose.material3:material3:${LibraryVersion.composeMaterial3}")

diff --git a/barcode/library/build.gradle.kts b/barcode/library/build.gradle.kts
@@ -43,7 +43,7 @@ dependencies {
 
     implementation("com.google.zxing:core:3.4.1")
 
-    implementation("com.jakewharton.timber:timber:${LibraryVersion.timber}")
+    implementation(libraries.timber)
 
     testImplementation("junit:junit:${LibraryVersion.junit}")
     testImplementation("io.mockk:mockk:${LibraryVersion.mockk}")

diff --git a/barcode/ui/build.gradle.kts b/barcode/ui/build.gradle.kts
@@ -53,15 +53,14 @@ dependencies {
 
     // Compose dependencies.
     implementation("androidx.compose.material3:material3:${LibraryVersion.composeMaterial3}")
-    implementation(libraries.coilCompose)
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:${LibraryVersion.lifecycle}")
     implementation(libraries.activityCompose)
 
     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}")
+    implementation(libraries.timber)
 
     testImplementation("junit:junit:${LibraryVersion.junit}")
     testImplementation("io.mockk:mockk:${LibraryVersion.mockk}")

diff --git a/buildSrc/src/main/java/property/LibraryVersion.kt b/buildSrc/src/main/java/property/LibraryVersion.kt
@@ -4,7 +4,6 @@ object LibraryVersion {
     val coroutines = "1.5.1"
     val ktx = "1.1.0"
     val lifecycle = "2.8.5"
-    val timber = "4.6.0"
     val exifinterface = "1.3.3"
     val composeCompiler = "1.4.6"
     val composeMaterial3 = "1.3.0"

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  = 81
+    private const val MINOR  = 82
 
     init {
         if (MIDDLE >= 100 || MINOR >= 10_000) {

diff --git a/calendar/build.gradle.kts b/calendar/build.gradle.kts
@@ -52,7 +52,7 @@ dependencies {
     implementation("androidx.core:core-ktx:${LibraryVersion.ktx}")
     implementation(libraries.activityCompose)
     implementation("androidx.lifecycle:lifecycle-viewmodel-compose:${LibraryVersion.lifecycle}")
-    implementation("com.jakewharton.timber:timber:${LibraryVersion.timber}")
+    implementation(libraries.timber)
 
     testImplementation("junit:junit:${LibraryVersion.junit}")
     testImplementation("io.mockk:mockk:${LibraryVersion.mockk}")

diff --git a/editor/build.gradle.kts b/editor/build.gradle.kts
@@ -59,7 +59,7 @@ dependencies {
     implementation(libraries.activityCompose)
     implementation("androidx.lifecycle:lifecycle-viewmodel-compose:${LibraryVersion.lifecycle}")
 
-    implementation("com.jakewharton.timber:timber:${LibraryVersion.timber}")
+    implementation(libraries.timber)
     implementation(libraries.jsoup)
 
     testImplementation("junit:junit:${LibraryVersion.junit}")

diff --git a/image/build.gradle.kts b/image/build.gradle.kts
@@ -55,14 +55,13 @@ dependencies {
     // Compose dependencies.
     implementation("androidx.compose.material3:material3:${LibraryVersion.composeMaterial3}")
     implementation(libraries.coilCompose)
-    implementation(libraries.coilGif)
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:${LibraryVersion.lifecycle}")
     implementation(libraries.activityCompose)
 
     implementation("androidx.core:core-ktx:${LibraryVersion.ktx}")
-    implementation("androidx.exifinterface:exifinterface:${LibraryVersion.exifinterface}")
+    implementation(libraries.exifinterface)
 
-    implementation("com.jakewharton.timber:timber:${LibraryVersion.timber}")
+    implementation(libraries.timber)
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:${LibraryVersion.coroutines}")
 
     testImplementation("junit:junit:${LibraryVersion.junit}")

diff --git a/image/src/main/java/jp/toastkid/image/preview/ImagePreviewUi.kt b/image/src/main/java/jp/toastkid/image/preview/ImagePreviewUi.kt
@@ -53,19 +53,15 @@ import androidx.core.net.toUri
 import androidx.exifinterface.media.ExifInterface
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelStoreOwner
-import coil3.SingletonImageLoader
-import coil3.compose.AsyncImage
-import coil3.request.ImageRequest
-import coil3.request.crossfade
 import jp.toastkid.image.Image
 import jp.toastkid.image.R
-import jp.toastkid.image.factory.GifImageLoaderFactory
 import jp.toastkid.image.preview.attach.AttachToAnyAppUseCase
 import jp.toastkid.image.preview.attach.AttachToThisAppBackgroundUseCase
 import jp.toastkid.image.preview.detail.ExifInformationExtractorUseCase
 import jp.toastkid.image.preview.viewmodel.ImagePreviewViewModel
 import jp.toastkid.lib.ContentViewModel
 import jp.toastkid.ui.dialog.ConfirmDialog
+import jp.toastkid.ui.image.EfficientImage
 import kotlinx.coroutines.launch
 import java.io.BufferedInputStream
 import java.io.File
@@ -96,23 +92,15 @@ internal fun ImagePreviewUi(
 
     val pagerState = rememberPagerState(initialIndex) { viewModel.pageCount() }
 
-    val gifImageLoader = remember { GifImageLoaderFactory().invoke(context) }
-    val imageLoader = remember { SingletonImageLoader.get(context) }
-
     Box {
         HorizontalPager(
             pageSize = PageSize.Fill,
             pageSpacing = 100.dp,
             state = pagerState
         ) {
             with(sharedTransitionScope) {
-                AsyncImage(
-                    model = ImageRequest.Builder(LocalContext.current)
-                        .data(viewModel.getCurrentImage(pagerState.currentPage).path)
-                        .memoryCacheKey(viewModel.getCurrentImage(pagerState.currentPage).path)
-                        .crossfade(true)
-                        .build(),
-                    imageLoader = if (viewModel.getCurrentImage(pagerState.currentPage).path.endsWith(".gif")) gifImageLoader else imageLoader,
+                EfficientImage(
+                    model = viewModel.getCurrentImage(pagerState.currentPage).path,
                     contentDescription = viewModel.getCurrentImage(pagerState.currentPage).name,
                     colorFilter = viewModel.colorFilterState.value,
                     modifier = Modifier

diff --git a/image/src/main/java/jp/toastkid/image/view/ImageListUi.kt b/image/src/main/java/jp/toastkid/image/view/ImageListUi.kt
@@ -45,10 +45,6 @@ import androidx.compose.ui.unit.sp
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelStoreOwner
 import androidx.lifecycle.compose.LocalLifecycleOwner
-import coil3.compose.AsyncImage
-import coil3.request.ImageRequest
-import coil3.request.crossfade
-import coil3.request.placeholder
 import jp.toastkid.image.Image
 import jp.toastkid.image.R
 import jp.toastkid.image.list.BucketLoader
@@ -60,6 +56,7 @@ import jp.toastkid.lib.ContentViewModel
 import jp.toastkid.lib.preference.PreferenceApplier
 import jp.toastkid.lib.view.scroll.StateScrollerFactory
 import jp.toastkid.lib.viewmodel.event.finder.FindInPageEvent
+import jp.toastkid.ui.image.EfficientImage
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -229,12 +226,8 @@ internal fun ImageListUi(
                         .padding(4.dp)
                 ) {
                     with(sharedTransitionScope) {
-                        AsyncImage(
-                            model = ImageRequest.Builder(context)
-                                .data(image.path)
-                                .crossfade(true)
-                                .placeholder(R.drawable.ic_image)
-                                .build(),
+                        EfficientImage(
+                            model = image.path,
                             contentDescription = image.name,
                             contentScale = ContentScale.Crop,
                             modifier = Modifier

diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
@@ -71,7 +71,7 @@ dependencies {
     implementation(libraries.composeUi)
     implementation("androidx.compose.material3:material3:${LibraryVersion.composeMaterial3}")
 
-    implementation("com.jakewharton.timber:timber:${LibraryVersion.timber}")
+    implementation(libraries.timber)
 
     testImplementation("junit:junit:${LibraryVersion.junit}")
     testImplementation("org.robolectric:robolectric:${LibraryVersion.robolectric}")

diff --git a/markdown/build.gradle.kts b/markdown/build.gradle.kts
@@ -35,7 +35,6 @@ dependencies {
     implementation(project(":ui"))
     implementation("androidx.compose.material3:material3:${property.LibraryVersion.composeMaterial3}")
     implementation("androidx.core:core-ktx:1.7.0")
-    implementation(libraries.coilCompose)
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:${property.LibraryVersion.lifecycle}")
     implementation(libraries.activityCompose)
 

diff --git a/music/build.gradle.kts b/music/build.gradle.kts
@@ -48,18 +48,18 @@ tasks.withType<GenerateBuildConfig> {
 
 dependencies {
     implementation(project(path = ":lib"))
+    implementation(project(path = ":ui"))
 
     implementation("androidx.core:core-ktx:${LibraryVersion.ktx}")
 
     // Compose dependencies.
     implementation("androidx.compose.material3:material3:${LibraryVersion.composeMaterial3}")
-    implementation(libraries.coilCompose)
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:${LibraryVersion.lifecycle}")
     implementation(libraries.activityCompose)
 
     implementation("androidx.media:media:1.3.0")
 
-    implementation("com.jakewharton.timber:timber:${LibraryVersion.timber}")
+    implementation(libraries.timber)
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:${LibraryVersion.coroutines}")
 
     testImplementation("junit:junit:${LibraryVersion.junit}")

diff --git a/music/src/main/java/jp/toastkid/media/music/view/MusicListUi.kt b/music/src/main/java/jp/toastkid/media/music/view/MusicListUi.kt
@@ -59,12 +59,12 @@ import androidx.compose.ui.unit.sp
 import androidx.core.net.toUri
 import androidx.core.os.bundleOf
 import androidx.lifecycle.ViewModelProvider
-import coil3.compose.AsyncImage
 import jp.toastkid.lib.ContentViewModel
 import jp.toastkid.media.R
 import jp.toastkid.media.music.MediaPlayerService
 import jp.toastkid.media.music.popup.MediaPlayerPopupViewModel
 import jp.toastkid.media.music.popup.playback.speed.PlayingSpeed
+import jp.toastkid.ui.image.EfficientImage
 import kotlinx.coroutines.launch
 import java.util.concurrent.atomic.AtomicReference
 
@@ -327,7 +327,7 @@ internal fun MusicList(
                             .clickable { onClickItem(music) }
                             .padding(4.dp)
                     ) {
-                        AsyncImage(
+                        EfficientImage(
                             music.description.iconUri,
                             contentDescription = "TODO",
                             contentScale = ContentScale.FillBounds,

diff --git a/pdf/build.gradle.kts b/pdf/build.gradle.kts
@@ -46,11 +46,11 @@ tasks.withType<GenerateBuildConfig> {
 
 dependencies {
     implementation(project(path = ":lib"))
+    implementation(project(path = ":ui"))
 
     implementation("androidx.core:core-ktx:${LibraryVersion.ktx}")
 
     implementation("androidx.compose.material3:material3:${LibraryVersion.composeMaterial3}")
-    implementation(libraries.coilCompose)
     implementation(libraries.activityCompose)
 
     testImplementation("junit:junit:${LibraryVersion.junit}")

diff --git a/pdf/src/main/java/jp/toastkid/pdf/view/PdfViewerUi.kt b/pdf/src/main/java/jp/toastkid/pdf/view/PdfViewerUi.kt
@@ -44,10 +44,10 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.compose.LocalLifecycleOwner
-import coil3.compose.AsyncImage
 import jp.toastkid.lib.ContentViewModel
 import jp.toastkid.lib.view.scroll.StateScrollerFactory
 import jp.toastkid.pdf.PdfImageFactory
+import jp.toastkid.ui.image.EfficientImage
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -134,7 +134,7 @@ private fun PdfPageList(uri: Uri, listState: LazyListState, modifier: Modifier)
                         }
                 ) {
                     val max = images.size
-                    AsyncImage(
+                    EfficientImage(
                         model = bitmap,
                         contentDescription = "${index + 1} / $max",
                         modifier = Modifier.graphicsLayer(

diff --git a/rss/build.gradle.kts b/rss/build.gradle.kts
@@ -54,7 +54,6 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:${LibraryVersion.coroutines}")
 
     implementation("androidx.compose.material3:material3:${LibraryVersion.composeMaterial3}")
-    implementation(libraries.coilCompose)
     implementation(libraries.activityCompose)
 
     testImplementation("junit:junit:${LibraryVersion.junit}")

diff --git a/search/build.gradle.kts b/search/build.gradle.kts
@@ -71,9 +71,9 @@ dependencies {
     implementation("androidx.compose.material3:material3:${LibraryVersion.composeMaterial3}")
     implementation(libraries.activityCompose)
     implementation(libraries.coilCompose)
-    implementation("io.coil-kt.coil3:coil-network-okhttp:${LibraryVersion.coilCompose}")
+    implementation(libraries.coilNetwork)
     implementation("androidx.lifecycle:lifecycle-viewmodel-compose:${LibraryVersion.lifecycle}")
-    implementation("com.jakewharton.timber:timber:${LibraryVersion.timber}")
+    implementation(libraries.timber)
 
     implementation("androidx.core:core-ktx:${LibraryVersion.ktx}")
     testImplementation("junit:junit:${LibraryVersion.junit}")

diff --git a/search/src/main/java/jp/toastkid/search/view/SearchAssistComponents.kt b/search/src/main/java/jp/toastkid/search/view/SearchAssistComponents.kt
@@ -28,10 +28,10 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import coil3.compose.AsyncImage
 import jp.toastkid.lib.R
-import jp.toastkid.ui.parts.SwipeToDismissItem
 import jp.toastkid.search.SearchCategory
+import jp.toastkid.ui.image.EfficientImage
+import jp.toastkid.ui.parts.SwipeToDismissItem
 import jp.toastkid.yobidashi.browser.UrlItem
 import jp.toastkid.yobidashi.browser.bookmark.model.Bookmark
 import jp.toastkid.yobidashi.browser.history.ViewHistory
@@ -74,7 +74,7 @@ internal fun SearchItemContent(
                 )
                     .heightIn(min = 44.dp)
             ) {
-                AsyncImage(
+                EfficientImage(
                     SearchCategory.findByCategory(category).iconId,
                     contentDescription = category,
                     placeholder = painterResource(id = R.drawable.ic_history_black),
@@ -136,7 +136,7 @@ fun BindItemContent(
                     onLongClick = onLongClick
                 )
             ) {
-                AsyncImage(
+                EfficientImage(
                     when (urlItem) {
                         is Bookmark -> File(urlItem.favicon)
                         is ViewHistory -> File(urlItem.favicon)

diff --git a/search/src/main/java/jp/toastkid/search/view/SearchCategorySpinner.kt b/search/src/main/java/jp/toastkid/search/view/SearchCategorySpinner.kt
@@ -36,6 +36,7 @@ import androidx.compose.ui.unit.sp
 import coil3.compose.AsyncImage
 import jp.toastkid.lib.preference.PreferenceApplier
 import jp.toastkid.search.SearchCategory
+import jp.toastkid.ui.image.EfficientImage
 
 @Composable
 internal fun SearchCategorySpinner(
@@ -57,7 +58,7 @@ internal fun SearchCategorySpinner(
     ) {
         val category = SearchCategory.findByCategory(currentCategory)
 
-        AsyncImage(
+        EfficientImage(
             category.iconId,
             contentDescription = stringResource(id = category.id),
             contentScale = ContentScale.Fit,
@@ -82,7 +83,7 @@ internal fun SearchCategorySpinner(
                     DropdownMenuItem(
                         text = {
                             Row(verticalAlignment = Alignment.CenterVertically) {
-                                AsyncImage(
+                                EfficientImage(
                                     model = searchCategory.iconId,
                                     contentDescription = stringResource(id = searchCategory.id),
                                     modifier = Modifier.width(40.dp)

diff --git a/search/src/main/java/jp/toastkid/search/view/SearchContentsUi.kt b/search/src/main/java/jp/toastkid/search/view/SearchContentsUi.kt
@@ -46,14 +46,14 @@ import androidx.compose.ui.unit.sp
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelStoreOwner
 import androidx.lifecycle.viewmodel.compose.viewModel
-import coil3.compose.AsyncImage
 import jp.toastkid.data.repository.factory.RepositoryFactory
 import jp.toastkid.lib.ContentViewModel
 import jp.toastkid.lib.clip.Clipboard
 import jp.toastkid.lib.intent.ShareIntentFactory
 import jp.toastkid.search.R
 import jp.toastkid.search.url_suggestion.ItemDeletionUseCase
 import jp.toastkid.search.viewmodel.SearchUiViewModel
+import jp.toastkid.ui.image.EfficientImage
 
 @OptIn(
     ExperimentalFoundationApi::class,
@@ -241,7 +241,7 @@ internal fun SearchContentsUi(
                                 }
                             )
                         ) {
-                            AsyncImage(
+                            EfficientImage(
                                 model = it.image,
                                 contentDescription = it.title,
                                 modifier = Modifier.width(40.dp)