rename BaseScreen to AppScaffold
This commit is contained in:
+2
-2
@@ -15,7 +15,7 @@ import androidx.compose.ui.res.stringResource
|
||||
import ru.shadowsparky.callblocker.R
|
||||
import ru.shadowsparky.callblocker.domain.RejectPolicyManager
|
||||
import ru.shadowsparky.koin
|
||||
import ru.shadowsparky.ui.BaseScreen
|
||||
import ru.shadowsparky.ui.AppScaffold
|
||||
|
||||
class MainActivity : ComponentActivity() {
|
||||
private val rejectPolicyManager by koin.inject<RejectPolicyManager>()
|
||||
@@ -26,7 +26,7 @@ class MainActivity : ComponentActivity() {
|
||||
enableEdgeToEdge()
|
||||
val permissionRequest = newPermissionRequest()
|
||||
setContent {
|
||||
BaseScreen(
|
||||
AppScaffold(
|
||||
appBar = {
|
||||
TopAppBar(title = { Text(stringResource(R.string.app_name)) })
|
||||
}
|
||||
|
||||
+1
-1
@@ -110,7 +110,7 @@ fun BaseScreen(
|
||||
content: @Composable (padding: PaddingValues) -> Unit,
|
||||
appBar: @Composable () -> Unit
|
||||
) {
|
||||
ru.shadowsparky.ui.BaseScreen(
|
||||
ru.shadowsparky.ui.AppScaffold(
|
||||
modifier,
|
||||
scrollBehavior,
|
||||
snackbarState,
|
||||
|
||||
+2
-2
@@ -9,7 +9,7 @@ import androidx.compose.material3.TopAppBarScrollBehavior
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.CompositionLocalProvider
|
||||
import androidx.compose.ui.Modifier
|
||||
import ru.shadowsparky.ui.BaseScreen
|
||||
import ru.shadowsparky.ui.AppScaffold
|
||||
import ru.shadowsparky.ui.LocalBlurState
|
||||
import ru.shadowsparky.ui.applyBlurEffect
|
||||
import ru.shadowsparky.ui.rememberBlurState
|
||||
@@ -41,7 +41,7 @@ fun BaseMainScreen(
|
||||
) {
|
||||
val blurState = rememberBlurState()
|
||||
CompositionLocalProvider(LocalBlurState provides blurState) {
|
||||
BaseScreen(
|
||||
AppScaffold(
|
||||
appBar = { appBar() },
|
||||
currentRoute = route,
|
||||
onSelectNavigation = { onNavigate(it) },
|
||||
|
||||
+2
-2
@@ -41,7 +41,7 @@ import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.unit.dp
|
||||
import org.jetbrains.compose.resources.painterResource
|
||||
import org.jetbrains.compose.resources.stringResource
|
||||
import ru.shadowsparky.ui.BaseScreen
|
||||
import ru.shadowsparky.ui.AppScaffold
|
||||
import ru.shadowsparky.ui.components.ExpressiveLazyColumn
|
||||
import ru.shadowsparky.ui.components.Loading
|
||||
import ru.shadowsparky.vbox.shared.domain.EpisodeOfflineVideo
|
||||
@@ -54,7 +54,7 @@ import ru.shadowsparky.vbox.shared.presentation.SimpleAppBar
|
||||
@Composable
|
||||
fun OfflineVideoScreen(component: OfflineVideoComponent) {
|
||||
val info by component.info.collectAsState(null)
|
||||
BaseScreen(
|
||||
AppScaffold(
|
||||
appBar = {
|
||||
SimpleAppBar(
|
||||
title = stringResource(Res.string.offline_video),
|
||||
|
||||
+2
-2
@@ -27,7 +27,7 @@ import androidx.compose.ui.draw.alpha
|
||||
import androidx.compose.ui.text.style.TextOverflow
|
||||
import androidx.compose.ui.unit.dp
|
||||
import org.jetbrains.compose.resources.stringResource
|
||||
import ru.shadowsparky.ui.BaseScreen
|
||||
import ru.shadowsparky.ui.AppScaffold
|
||||
import ru.shadowsparky.ui.components.Loading
|
||||
import ru.shadowsparky.vbox.shared.presentation.list.ErrorAndRetry
|
||||
import ru.shadowsparky.videoplayer.PlayerEvent
|
||||
@@ -41,7 +41,7 @@ fun PlayerScreen(component: PlayerComponent) {
|
||||
LaunchedEffect(event) {
|
||||
if (event is PlayerComponentState.Ended) component.onBack()
|
||||
}
|
||||
BaseScreen(appBar = {}) {
|
||||
AppScaffold(appBar = {}) {
|
||||
when (val e = event) {
|
||||
is PlayerComponentState.Event -> {
|
||||
when (val state = e.state) {
|
||||
|
||||
+2
-2
@@ -38,7 +38,7 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||
import org.jetbrains.compose.resources.stringResource
|
||||
import ru.shadowsparky.ui.BaseScreen
|
||||
import ru.shadowsparky.ui.AppScaffold
|
||||
import ru.shadowsparky.ui.components.ExpressiveLazyColumn
|
||||
import ru.shadowsparky.ui.components.TextPreference
|
||||
import ru.shadowsparky.vbox.shared.domain.tag.TagInfo
|
||||
@@ -50,7 +50,7 @@ fun TagScreen(component: TagComponent) {
|
||||
val userTags by component.userTags.collectAsStateWithLifecycle(emptyList())
|
||||
var isAddSheetVisible by rememberSaveable { mutableStateOf(false) }
|
||||
var activeTag by remember { mutableStateOf<TagInfo?>(null) }
|
||||
BaseScreen(
|
||||
AppScaffold(
|
||||
appBar = {
|
||||
SimpleAppBar(
|
||||
stringResource(Res.string.user_tags),
|
||||
|
||||
Reference in New Issue
Block a user