From cf1a19c4e117439cc2d474c85da51c483ce95b46 Mon Sep 17 00:00:00 2001 From: Sculas Date: Wed, 24 Aug 2022 00:17:51 +0200 Subject: [PATCH] refactor: cleanup code --- app/build.gradle.kts | 2 +- app/src/main/java/app/revanced/manager/MainActivity.kt | 5 ++--- .../app/revanced/manager/ui/component/HeadlineWithCard.kt | 8 +------- .../app/revanced/manager/ui/navigation/AppDestination.kt | 3 ++- .../screen/{MainRootScreen.kt => MainDashboardScreen.kt} | 7 ++++--- 5 files changed, 10 insertions(+), 15 deletions(-) rename app/src/main/java/app/revanced/manager/ui/screen/{MainRootScreen.kt => MainDashboardScreen.kt} (93%) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1292d98..9fa1e88 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -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" diff --git a/app/src/main/java/app/revanced/manager/MainActivity.kt b/app/src/main/java/app/revanced/manager/MainActivity.kt index 6097c61..b002462 100644 --- a/app/src/main/java/app/revanced/manager/MainActivity.kt +++ b/app/src/main/java/app/revanced/manager/MainActivity.kt @@ -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) } } } diff --git a/app/src/main/java/app/revanced/manager/ui/component/HeadlineWithCard.kt b/app/src/main/java/app/revanced/manager/ui/component/HeadlineWithCard.kt index 2595d82..966a1a5 100644 --- a/app/src/main/java/app/revanced/manager/ui/component/HeadlineWithCard.kt +++ b/app/src/main/java/app/revanced/manager/ui/component/HeadlineWithCard.kt @@ -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) diff --git a/app/src/main/java/app/revanced/manager/ui/navigation/AppDestination.kt b/app/src/main/java/app/revanced/manager/ui/navigation/AppDestination.kt index 76568b1..28e4e0b 100644 --- a/app/src/main/java/app/revanced/manager/ui/navigation/AppDestination.kt +++ b/app/src/main/java/app/revanced/manager/ui/navigation/AppDestination.kt @@ -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) } \ No newline at end of file diff --git a/app/src/main/java/app/revanced/manager/ui/screen/MainRootScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/MainDashboardScreen.kt similarity index 93% rename from app/src/main/java/app/revanced/manager/ui/screen/MainRootScreen.kt rename to app/src/main/java/app/revanced/manager/ui/screen/MainDashboardScreen.kt index bcd1292..9c4b206 100644 --- a/app/src/main/java/app/revanced/manager/ui/screen/MainRootScreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/MainDashboardScreen.kt @@ -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) { +fun MainDashboardScreen(navigator: BackstackNavigator) { 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) { .fillMaxSize() .nestedScroll(scrollBehavior.nestedScrollConnection), topBar = { - LargeTopAppBar( + MediumTopAppBar( title = { Text( text = stringResource(mainRootNavigator.currentDestination.label), @@ -65,6 +65,7 @@ fun MainRootScreen(navigator: BackstackNavigator) { when (destination) { DashboardDestination.DASHBOARD -> DashboardScreen() DashboardDestination.PATCHER -> PatcherScreen() + DashboardDestination.SETTINGS -> SettingsScreen() } } }