ReVanced/revanced-manager-compose-old
1
0
Fork 0
mirror of https://github.com/revanced/revanced-manager-compose-old.git synced 2025-04-29 22:14:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: cleanup code

Browse Source
This commit is contained in:
Sculas 2022-08-24 00:17:51 +02:00
parent 4daacf0e91
commit cf1a19c4e1
No known key found for this signature in database
GPG Key ID: 1530BFF96D1EEB89
5 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle.kts
View File

@ -72,7 +72,7 @@ dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3")
// Taxi (navigation)
implementation("com.github.X1nto:Taxi:1.0.0")
implementation("com.github.X1nto:Taxi:1.2.0")
// Ktor
val ktorVersion = "2.0.3"

5
app/src/main/java/app/revanced/manager/MainActivity.kt
View File

@ -12,8 +12,7 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.ui.Modifier
import app.revanced.manager.preferences.PreferencesManager
import app.revanced.manager.ui.navigation.AppDestination
import app.revanced.manager.ui.screen.MainRootScreen
import app.revanced.manager.ui.screen.SettingsScreen
import app.revanced.manager.ui.screen.MainDashboardScreen
import app.revanced.manager.ui.theme.ReVancedManagerTheme
import com.xinto.taxi.Taxi
import com.xinto.taxi.rememberBackstackNavigator
@ -39,7 +38,7 @@ class MainActivity : ComponentActivity() {
transitionSpec = { fadeIn() with fadeOut() }
) { destination ->
when (destination) {
is AppDestination.Dashboard -> MainRootScreen(navigator = navigator)
is AppDestination.Dashboard -> MainDashboardScreen(navigator = navigator)
}
}
}

8
app/src/main/java/app/revanced/manager/ui/component/HeadlineWithCard.kt
View File

@ -5,25 +5,19 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.ElevatedCard
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun HeadlineWithCard(
@StringRes headline: Int,
content: @Composable () -> Unit
) {
Column {
Text(
text = stringResource(headline),
style = MaterialTheme.typography.headlineSmall
)
Text(stringResource(headline))
ElevatedCard(
modifier = Modifier
.padding(top = 12.dp)

3
app/src/main/java/app/revanced/manager/ui/navigation/AppDestination.kt
View File

@ -23,5 +23,6 @@ enum class DashboardDestination(
@StringRes val label: Int
) : Destination {
DASHBOARD(Icons.Default.Dashboard, R.string.dashboard),
PATCHER(Icons.Default.Build, R.string.patcher)
PATCHER(Icons.Default.Build, R.string.patcher),
SETTINGS(Icons.Default.Settings, R.string.settings)
}

7
app/src/main/java/app/revanced/manager/ui/screen/MainRootScreen.kt → app/src/main/java/app/revanced/manager/ui/screen/MainDashboardScreen.kt
View File

@ -9,7 +9,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import app.revanced.manager.ui.navigation.AppDestination
import app.revanced.manager.ui.navigation.DashboardDestination
import com.xinto.taxi.BackstackNavigator
@ -18,11 +17,12 @@ import com.xinto.taxi.rememberNavigator
@OptIn(ExperimentalMaterial3Api::class, ExperimentalAnimationApi::class)
@Composable
fun MainRootScreen(navigator: BackstackNavigator<AppDestination>) {
fun MainDashboardScreen(navigator: BackstackNavigator<AppDestination>) {
val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(
decayAnimationSpec = rememberSplineBasedDecay(),
state = rememberTopAppBarState()
)
val mainRootNavigator = rememberNavigator(DashboardDestination.DASHBOARD)
val currentDestination = mainRootNavigator.currentDestination
@ -31,7 +31,7 @@ fun MainRootScreen(navigator: BackstackNavigator<AppDestination>) {
.fillMaxSize()
.nestedScroll(scrollBehavior.nestedScrollConnection),
topBar = {
LargeTopAppBar(
MediumTopAppBar(
title = {
Text(
text = stringResource(mainRootNavigator.currentDestination.label),
@ -65,6 +65,7 @@ fun MainRootScreen(navigator: BackstackNavigator<AppDestination>) {
when (destination) {
DashboardDestination.DASHBOARD -> DashboardScreen()
DashboardDestination.PATCHER -> PatcherScreen()
DashboardDestination.SETTINGS -> SettingsScreen()
}
}
}