forked from melod1n/fast-messenger
fix deprecations
This commit is contained in:
@@ -125,6 +125,7 @@ fun <T> Bundle.getParcelableCompat(key: String, clazz: Class<T>): T? {
|
|||||||
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||||
getParcelable(key, clazz)
|
getParcelable(key, clazz)
|
||||||
} else {
|
} else {
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
getParcelable(key)
|
getParcelable(key)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -133,6 +134,7 @@ fun <T : Any> Bundle.getParcelableCompat(key: String, clazz: KClass<T>): T? {
|
|||||||
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||||
getParcelable(key, clazz.java)
|
getParcelable(key, clazz.java)
|
||||||
} else {
|
} else {
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
getParcelable(key)
|
getParcelable(key)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ val databaseModule = module {
|
|||||||
|
|
||||||
single {
|
single {
|
||||||
Room.databaseBuilder(get(), CacheDatabase::class.java, "cache")
|
Room.databaseBuilder(get(), CacheDatabase::class.java, "cache")
|
||||||
.fallbackToDestructiveMigration()
|
.fallbackToDestructiveMigration(true)
|
||||||
.build()
|
.build()
|
||||||
}
|
}
|
||||||
single { cacheDB().userDao() }
|
single { cacheDB().userDao() }
|
||||||
|
|||||||
+4
-12
@@ -17,11 +17,9 @@ import androidx.compose.material3.ExperimentalMaterial3Api
|
|||||||
import androidx.compose.material3.Icon
|
import androidx.compose.material3.Icon
|
||||||
import androidx.compose.material3.IconButton
|
import androidx.compose.material3.IconButton
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
|
import androidx.compose.material3.PrimaryScrollableTabRow
|
||||||
import androidx.compose.material3.Scaffold
|
import androidx.compose.material3.Scaffold
|
||||||
import androidx.compose.material3.ScrollableTabRow
|
|
||||||
import androidx.compose.material3.Tab
|
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.Text
|
||||||
import androidx.compose.material3.TopAppBar
|
import androidx.compose.material3.TopAppBar
|
||||||
import androidx.compose.material3.TopAppBarDefaults
|
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.LinkMaterialsScreen
|
||||||
import dev.meloda.fast.chatmaterials.presentation.materials.PhotoMaterialsScreen
|
import dev.meloda.fast.chatmaterials.presentation.materials.PhotoMaterialsScreen
|
||||||
import dev.meloda.fast.chatmaterials.presentation.materials.VideoMaterialsScreen
|
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.model.TabItem
|
||||||
import dev.meloda.fast.ui.theme.LocalHazeState
|
import dev.meloda.fast.ui.theme.LocalHazeState
|
||||||
import dev.meloda.fast.ui.theme.LocalThemeConfig
|
import dev.meloda.fast.ui.theme.LocalThemeConfig
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import org.koin.androidx.compose.koinViewModel
|
import org.koin.androidx.compose.koinViewModel
|
||||||
import org.koin.core.qualifier.named
|
import org.koin.core.qualifier.named
|
||||||
import dev.meloda.fast.ui.R
|
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun ChatMaterialsRoute(
|
fun ChatMaterialsRoute(
|
||||||
@@ -176,17 +174,11 @@ fun ChatMaterialsScreen(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
ScrollableTabRow(
|
PrimaryScrollableTabRow(
|
||||||
modifier = Modifier.fillMaxWidth(),
|
modifier = Modifier.fillMaxWidth(),
|
||||||
selectedTabIndex = selectedTabIndex,
|
selectedTabIndex = selectedTabIndex,
|
||||||
containerColor = Color.Transparent,
|
containerColor = Color.Transparent,
|
||||||
edgePadding = 0.dp,
|
edgePadding = 0.dp
|
||||||
indicator = { tabPositions ->
|
|
||||||
TabRowDefaults.PrimaryIndicator(
|
|
||||||
modifier = Modifier.tabIndicatorOffset(tabPositions[selectedTabIndex]),
|
|
||||||
color = MaterialTheme.colorScheme.primary
|
|
||||||
)
|
|
||||||
}
|
|
||||||
) {
|
) {
|
||||||
tabItems.forEachIndexed { index, item ->
|
tabItems.forEachIndexed { index, item ->
|
||||||
Tab(
|
Tab(
|
||||||
|
|||||||
Reference in New Issue
Block a user