From d33f45ae9d10048f72c4fb90a07825b485cd4b26 Mon Sep 17 00:00:00 2001 From: SkyD666 Date: Fri, 9 Feb 2024 09:33:05 +0800 Subject: [PATCH] [build] Update dependencies; Happy 2024 --- app/build.gradle | 4 ++-- app/src/main/java/com/skyd/rays/model/db/AppDatabase.kt | 3 ++- .../java/com/skyd/rays/model/db/dao/sticker/StickerDao.kt | 4 ++-- .../java/com/skyd/rays/ui/component/RaysSwipeToDismiss.kt | 4 ++-- .../com/skyd/rays/ui/screen/minitool/MiniToolScreen.kt | 2 +- .../main/java/com/skyd/rays/ui/screen/more/MoreScreen.kt | 2 +- .../ui/screen/settings/api/apigrant/ApiGrantScreen.kt | 8 ++++---- .../ml/classification/model/ClassificationModelScreen.kt | 8 ++++---- .../shareconfig/uristringshare/UriStringShareScreen.kt | 8 ++++---- build.gradle | 2 +- 10 files changed, 23 insertions(+), 22 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 85b2da2..2966a8e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.skyd.rays" minSdk 24 targetSdk 34 - versionCode 59 - versionName "2.1-rc06" + versionCode 60 + versionName "2.1-Happy 2024" flavorDimensions = ["versionName"] testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/skyd/rays/model/db/AppDatabase.kt b/app/src/main/java/com/skyd/rays/model/db/AppDatabase.kt index 21ef82c..be6bbfd 100644 --- a/app/src/main/java/com/skyd/rays/model/db/AppDatabase.kt +++ b/app/src/main/java/com/skyd/rays/model/db/AppDatabase.kt @@ -12,9 +12,9 @@ import com.skyd.rays.model.bean.TagBean import com.skyd.rays.model.bean.UriStringSharePackageBean import com.skyd.rays.model.db.dao.ApiGrantPackageDao import com.skyd.rays.model.db.dao.SearchDomainDao -import com.skyd.rays.model.db.dao.sticker.StickerDao import com.skyd.rays.model.db.dao.TagDao import com.skyd.rays.model.db.dao.UriStringSharePackageDao +import com.skyd.rays.model.db.dao.sticker.StickerDao import com.skyd.rays.model.db.migration.Migration1To2 import com.skyd.rays.model.db.migration.Migration2To3 import com.skyd.rays.model.db.migration.Migration3To4 @@ -45,6 +45,7 @@ abstract class AppDatabase : RoomDatabase() { abstract fun apiGrantPackageDao(): ApiGrantPackageDao companion object { + @Volatile private var instance: AppDatabase? = null private val migrations = arrayOf( diff --git a/app/src/main/java/com/skyd/rays/model/db/dao/sticker/StickerDao.kt b/app/src/main/java/com/skyd/rays/model/db/dao/sticker/StickerDao.kt index 3f6d63d..0274787 100644 --- a/app/src/main/java/com/skyd/rays/model/db/dao/sticker/StickerDao.kt +++ b/app/src/main/java/com/skyd/rays/model/db/dao/sticker/StickerDao.kt @@ -35,7 +35,7 @@ interface StickerDao { val tagDao: TagDao } -// @Transaction 加上后会导致Flow更新不正常（搜索页面不能及时删除没有tag的表情包） + @Transaction @RawQuery fun getStickerWithTagsList(sql: SupportSQLiteQuery): Flow> @@ -165,7 +165,7 @@ interface StickerDao { innerDeleteAllStickers() } - @Transaction + @Transaction //加上后会导致Flow更新不正常（搜索页面不能及时删除没有tag的表情包） @Query("DELETE FROM $STICKER_TABLE_NAME WHERE $UUID_COLUMN IN (:stickerUuids)") fun innerDeleteStickers(stickerUuids: List): Int diff --git a/app/src/main/java/com/skyd/rays/ui/component/RaysSwipeToDismiss.kt b/app/src/main/java/com/skyd/rays/ui/component/RaysSwipeToDismiss.kt index fb2edfc..24dd916 100644 --- a/app/src/main/java/com/skyd/rays/ui/component/RaysSwipeToDismiss.kt +++ b/app/src/main/java/com/skyd/rays/ui/component/RaysSwipeToDismiss.kt @@ -9,7 +9,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Delete import androidx.compose.material3.Icon import androidx.compose.material3.SwipeToDismissBox -import androidx.compose.material3.SwipeToDismissState +import androidx.compose.material3.SwipeToDismissBoxState import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -20,7 +20,7 @@ import com.skyd.rays.R @Composable fun RaysSwipeToDismiss( - state: SwipeToDismissState, + state: SwipeToDismissBoxState, modifier: Modifier = Modifier, background: @Composable RowScope.() -> Unit = { Box( diff --git a/app/src/main/java/com/skyd/rays/ui/screen/minitool/MiniToolScreen.kt b/app/src/main/java/com/skyd/rays/ui/screen/minitool/MiniToolScreen.kt index 52459c0..7a7250e 100644 --- a/app/src/main/java/com/skyd/rays/ui/screen/minitool/MiniToolScreen.kt +++ b/app/src/main/java/com/skyd/rays/ui/screen/minitool/MiniToolScreen.kt @@ -53,7 +53,7 @@ fun MiniToolScreen() { imageVector = Icons.Default.Extension, onClick = { snackbarHostState.showSnackbar( - message = "\uD83D\uDC31 Meow~", + message = "\ud83c\udfee Happy New Year 2024~", scope = scope, withDismissAction = true ) diff --git a/app/src/main/java/com/skyd/rays/ui/screen/more/MoreScreen.kt b/app/src/main/java/com/skyd/rays/ui/screen/more/MoreScreen.kt index f2142bb..cc36b8f 100644 --- a/app/src/main/java/com/skyd/rays/ui/screen/more/MoreScreen.kt +++ b/app/src/main/java/com/skyd/rays/ui/screen/more/MoreScreen.kt @@ -60,7 +60,7 @@ fun MoreScreen() { imageVector = Icons.Default.Widgets, onClick = { snackbarHostState.showSnackbar( - message = "\uD83D\uDC31 Nya~", + message = "\uD83C\uDFEE Happy New Year 2024~", scope = scope, withDismissAction = true ) diff --git a/app/src/main/java/com/skyd/rays/ui/screen/settings/api/apigrant/ApiGrantScreen.kt b/app/src/main/java/com/skyd/rays/ui/screen/settings/api/apigrant/ApiGrantScreen.kt index 4f93a9c..ead5928 100644 --- a/app/src/main/java/com/skyd/rays/ui/screen/settings/api/apigrant/ApiGrantScreen.kt +++ b/app/src/main/java/com/skyd/rays/ui/screen/settings/api/apigrant/ApiGrantScreen.kt @@ -11,10 +11,10 @@ import androidx.compose.material.icons.filled.VisibilityOff import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.SnackbarHostState -import androidx.compose.material3.SwipeToDismissValue +import androidx.compose.material3.SwipeToDismissBoxValue import androidx.compose.material3.Text import androidx.compose.material3.TopAppBarDefaults -import androidx.compose.material3.rememberSwipeToDismissState +import androidx.compose.material3.rememberSwipeToDismissBoxState import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.getValue @@ -119,9 +119,9 @@ fun ApiGrantScreen(viewModel: ApiGrantViewModel = hiltViewModel()) { itemsIndexed(uriStringShareResultState.data) { _, item -> CompositionLocalProvider(LocalUseColorfulIcon provides true) { RaysSwipeToDismiss( - state = rememberSwipeToDismissState( + state = rememberSwipeToDismissBoxState( confirmValueChange = { dismissValue -> - if (dismissValue == SwipeToDismissValue.EndToStart) { + if (dismissValue == SwipeToDismissBoxValue.EndToStart) { openDeleteDialog = item.apiGrantPackageBean.packageName } false diff --git a/app/src/main/java/com/skyd/rays/ui/screen/settings/ml/classification/model/ClassificationModelScreen.kt b/app/src/main/java/com/skyd/rays/ui/screen/settings/ml/classification/model/ClassificationModelScreen.kt index 18da2f1..6613b0f 100644 --- a/app/src/main/java/com/skyd/rays/ui/screen/settings/ml/classification/model/ClassificationModelScreen.kt +++ b/app/src/main/java/com/skyd/rays/ui/screen/settings/ml/classification/model/ClassificationModelScreen.kt @@ -16,10 +16,10 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.SnackbarHost import androidx.compose.material3.SnackbarHostState -import androidx.compose.material3.SwipeToDismissValue +import androidx.compose.material3.SwipeToDismissBoxValue import androidx.compose.material3.Text import androidx.compose.material3.TopAppBarDefaults -import androidx.compose.material3.rememberSwipeToDismissState +import androidx.compose.material3.rememberSwipeToDismissBoxState import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -183,9 +183,9 @@ private fun ModelList( } itemsIndexed(models) { _, item -> RaysSwipeToDismiss( - state = rememberSwipeToDismissState( + state = rememberSwipeToDismissBoxState( confirmValueChange = { dismissValue -> - if (dismissValue == SwipeToDismissValue.EndToStart) { + if (dismissValue == SwipeToDismissBoxValue.EndToStart) { onDelete(item) } false diff --git a/app/src/main/java/com/skyd/rays/ui/screen/settings/shareconfig/uristringshare/UriStringShareScreen.kt b/app/src/main/java/com/skyd/rays/ui/screen/settings/shareconfig/uristringshare/UriStringShareScreen.kt index 59498ae..20bad87 100644 --- a/app/src/main/java/com/skyd/rays/ui/screen/settings/shareconfig/uristringshare/UriStringShareScreen.kt +++ b/app/src/main/java/com/skyd/rays/ui/screen/settings/shareconfig/uristringshare/UriStringShareScreen.kt @@ -11,10 +11,10 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.SnackbarHost import androidx.compose.material3.SnackbarHostState -import androidx.compose.material3.SwipeToDismissValue +import androidx.compose.material3.SwipeToDismissBoxValue import androidx.compose.material3.Text import androidx.compose.material3.TopAppBarDefaults -import androidx.compose.material3.rememberSwipeToDismissState +import androidx.compose.material3.rememberSwipeToDismissBoxState import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.getValue @@ -120,9 +120,9 @@ fun UriStringShareScreen(viewModel: UriStringShareViewModel = hiltViewModel()) { itemsIndexed(uriStringShareResultUiState.data) { _, item -> CompositionLocalProvider(LocalUseColorfulIcon provides true) { RaysSwipeToDismiss( - state = rememberSwipeToDismissState( + state = rememberSwipeToDismissBoxState( confirmValueChange = { dismissValue -> - if (dismissValue == SwipeToDismissValue.EndToStart) { + if (dismissValue == SwipeToDismissBoxValue.EndToStart) { openDeleteDialog = item.uriStringSharePackageBean.packageName } diff --git a/build.gradle b/build.gradle index 36b854f..018c71b 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { ext { secret = "${rootDir}/secret.gradle" compose_version = '1.6.0' - md3_version = '1.2.0-beta01' + md3_version = '1.2.0' accompanist_version = '0.34.0' mlkit_recognition_version = '16.0.0' }