diff --git a/core/common/src/main/kotlin/dev/meloda/fast/common/extensions/Extensions.kt b/core/common/src/main/kotlin/dev/meloda/fast/common/extensions/Extensions.kt index d7cb5cdc..bb8353e3 100644 --- a/core/common/src/main/kotlin/dev/meloda/fast/common/extensions/Extensions.kt +++ b/core/common/src/main/kotlin/dev/meloda/fast/common/extensions/Extensions.kt @@ -125,6 +125,7 @@ fun Bundle.getParcelableCompat(key: String, clazz: Class): T? { return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { getParcelable(key, clazz) } else { + @Suppress("DEPRECATION") getParcelable(key) } } @@ -133,6 +134,7 @@ fun Bundle.getParcelableCompat(key: String, clazz: KClass): T? { return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { getParcelable(key, clazz.java) } else { + @Suppress("DEPRECATION") getParcelable(key) } } diff --git a/core/database/src/main/kotlin/dev/meloda/fast/database/di/DatabaseModule.kt b/core/database/src/main/kotlin/dev/meloda/fast/database/di/DatabaseModule.kt index 251e807c..35f5b279 100644 --- a/core/database/src/main/kotlin/dev/meloda/fast/database/di/DatabaseModule.kt +++ b/core/database/src/main/kotlin/dev/meloda/fast/database/di/DatabaseModule.kt @@ -17,7 +17,7 @@ val databaseModule = module { single { Room.databaseBuilder(get(), CacheDatabase::class.java, "cache") - .fallbackToDestructiveMigration() + .fallbackToDestructiveMigration(true) .build() } single { cacheDB().userDao() } diff --git a/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/ChatMaterialsScreen.kt b/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/ChatMaterialsScreen.kt index ca267eca..a37cace4 100644 --- a/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/ChatMaterialsScreen.kt +++ b/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/ChatMaterialsScreen.kt @@ -17,11 +17,9 @@ import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.PrimaryScrollableTabRow import androidx.compose.material3.Scaffold -import androidx.compose.material3.ScrollableTabRow import androidx.compose.material3.Tab -import androidx.compose.material3.TabRowDefaults -import androidx.compose.material3.TabRowDefaults.tabIndicatorOffset import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar import androidx.compose.material3.TopAppBarDefaults @@ -52,13 +50,13 @@ import dev.meloda.fast.chatmaterials.presentation.materials.FileMaterialsScreen import dev.meloda.fast.chatmaterials.presentation.materials.LinkMaterialsScreen import dev.meloda.fast.chatmaterials.presentation.materials.PhotoMaterialsScreen import dev.meloda.fast.chatmaterials.presentation.materials.VideoMaterialsScreen +import dev.meloda.fast.ui.R import dev.meloda.fast.ui.model.TabItem import dev.meloda.fast.ui.theme.LocalHazeState import dev.meloda.fast.ui.theme.LocalThemeConfig import kotlinx.coroutines.launch import org.koin.androidx.compose.koinViewModel import org.koin.core.qualifier.named -import dev.meloda.fast.ui.R @Composable fun ChatMaterialsRoute( @@ -176,17 +174,11 @@ fun ChatMaterialsScreen( } } ) - ScrollableTabRow( + PrimaryScrollableTabRow( modifier = Modifier.fillMaxWidth(), selectedTabIndex = selectedTabIndex, containerColor = Color.Transparent, - edgePadding = 0.dp, - indicator = { tabPositions -> - TabRowDefaults.PrimaryIndicator( - modifier = Modifier.tabIndicatorOffset(tabPositions[selectedTabIndex]), - color = MaterialTheme.colorScheme.primary - ) - } + edgePadding = 0.dp ) { tabItems.forEachIndexed { index, item -> Tab(