refactor: cleanup code

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"

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.MainDashboardScreen
-import app.revanced.manager.ui.screen.SettingsScreen
 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)
                     }
                 }
             }

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))
-            text = stringResource(headline),
-            style = MaterialTheme.typography.headlineSmall
-        )
         ElevatedCard(
             modifier = Modifier
                 .padding(top = 12.dp)

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)
 }

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<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()
                 }
             }
         }