diff --git a/app/src/main/java/com/greenart7c3/citrine/MainActivity.kt b/app/src/main/java/com/greenart7c3/citrine/MainActivity.kt index 5fd4570..9373704 100644 --- a/app/src/main/java/com/greenart7c3/citrine/MainActivity.kt +++ b/app/src/main/java/com/greenart7c3/citrine/MainActivity.kt @@ -22,10 +22,8 @@ import androidx.compose.foundation.lazy.items import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.AlertDialog -import androidx.compose.material3.CenterAlignedTopAppBar import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.ElevatedButton -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Surface @@ -68,6 +66,7 @@ import com.greenart7c3.citrine.ui.HomeViewModel import com.greenart7c3.citrine.ui.LogcatScreen import com.greenart7c3.citrine.ui.SettingsScreen import com.greenart7c3.citrine.ui.components.CitrineBottomBar +import com.greenart7c3.citrine.ui.components.CitrineTopAppBar import com.greenart7c3.citrine.ui.components.DatabaseInfo import com.greenart7c3.citrine.ui.components.RelayInfo import com.greenart7c3.citrine.ui.dialogs.ImportEventsDialog @@ -86,7 +85,6 @@ import kotlinx.coroutines.launch class MainActivity : ComponentActivity() { private val storageHelper = SimpleStorageHelper(this@MainActivity) - @OptIn(ExperimentalMaterial3Api::class) override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -106,21 +104,9 @@ class MainActivity : ComponentActivity() { ) }, topBar = { - if (destinationRoute.startsWith("Feed") || destinationRoute == Route.DatabaseInfo.route || destinationRoute.startsWith("Contacts")) { - CenterAlignedTopAppBar( - title = { - Text( - text = if (destinationRoute.startsWith("Feed")) { - stringResource(R.string.feed) - } else if (destinationRoute == Route.DatabaseInfo.route) { - stringResource(R.string.database) - } else { - stringResource(R.string.restore_follows) - }, - ) - }, - ) - } + CitrineTopAppBar( + destinationRoute = destinationRoute, + ) }, ) { padding -> val configuration = LocalConfiguration.current diff --git a/app/src/main/java/com/greenart7c3/citrine/ui/components/CitrineTopAppBar.kt b/app/src/main/java/com/greenart7c3/citrine/ui/components/CitrineTopAppBar.kt new file mode 100644 index 0000000..692bb65 --- /dev/null +++ b/app/src/main/java/com/greenart7c3/citrine/ui/components/CitrineTopAppBar.kt @@ -0,0 +1,31 @@ +package com.greenart7c3.citrine.ui.components + +import androidx.compose.material3.CenterAlignedTopAppBar +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.res.stringResource +import com.greenart7c3.citrine.R +import com.greenart7c3.citrine.ui.navigation.Route + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun CitrineTopAppBar( + destinationRoute: String, +) { + if (destinationRoute.startsWith("Feed") || destinationRoute == Route.DatabaseInfo.route || destinationRoute.startsWith("Contacts")) { + CenterAlignedTopAppBar( + title = { + Text( + text = if (destinationRoute.startsWith("Feed")) { + stringResource(R.string.feed) + } else if (destinationRoute == Route.DatabaseInfo.route) { + stringResource(R.string.database) + } else { + stringResource(R.string.restore_follows) + }, + ) + }, + ) + } +}