From d9f0de2dd4f34784c8a1902df072bce69acc70c7 Mon Sep 17 00:00:00 2001 From: Zane Schepke Date: Sat, 19 Oct 2024 23:07:38 -0400 Subject: [PATCH] add top nav for lgos --- .../ui/common/navigation/TopNavBar.kt | 4 ++-- .../ui/screens/config/ConfigScreen.kt | 2 -- .../ui/screens/options/OptionsScreen.kt | 13 ++++++------- .../ui/screens/support/logs/LogsScreen.kt | 10 +++++++--- app/src/main/res/values/strings.xml | 1 + 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/navigation/TopNavBar.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/navigation/TopNavBar.kt index 122eefd..05f479e 100644 --- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/navigation/TopNavBar.kt +++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/navigation/TopNavBar.kt @@ -22,12 +22,12 @@ fun TopNavBar(title: String, trailing: @Composable () -> Unit = {}) { val icon = Icons.AutoMirrored.Outlined.ArrowBack Icon( imageVector = icon, - contentDescription = icon.name + contentDescription = icon.name, ) } }, actions = { trailing() - } + }, ) } diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/config/ConfigScreen.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/config/ConfigScreen.kt index 96b66bf..efc3f93 100644 --- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/config/ConfigScreen.kt +++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/config/ConfigScreen.kt @@ -1,6 +1,5 @@ package com.zaneschepke.wireguardautotunnel.ui.screens.config -import android.annotation.SuppressLint import androidx.compose.foundation.clickable import androidx.compose.foundation.focusGroup import androidx.compose.foundation.layout.Arrangement @@ -18,7 +17,6 @@ import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Edit import androidx.compose.material.icons.rounded.ContentCopy import androidx.compose.material.icons.rounded.Delete import androidx.compose.material.icons.rounded.Refresh diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/options/OptionsScreen.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/options/OptionsScreen.kt index 2132348..81a179e 100644 --- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/options/OptionsScreen.kt +++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/options/OptionsScreen.kt @@ -17,9 +17,7 @@ import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.ArrowBack import androidx.compose.material.icons.filled.Close -import androidx.compose.material.icons.filled.Edit import androidx.compose.material.icons.outlined.Add import androidx.compose.material.icons.outlined.Edit import androidx.compose.material3.Icon @@ -57,7 +55,6 @@ import com.zaneschepke.wireguardautotunnel.ui.common.config.SubmitConfigurationT import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar import com.zaneschepke.wireguardautotunnel.ui.common.text.SectionTitle -import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.ScrollDismissFab import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.WildcardSupportingLabel import com.zaneschepke.wireguardautotunnel.util.Constants import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv @@ -102,13 +99,15 @@ fun OptionsScreen(optionsViewModel: OptionsViewModel = hiltViewModel(), focusReq Scaffold( topBar = { TopNavBar(config.name, trailing = { - IconButton(onClick = { navController.navigate( - Route.Config(config.id), - ) }) { + IconButton(onClick = { + navController.navigate( + Route.Config(config.id), + ) + }) { val icon = Icons.Outlined.Edit Icon( imageVector = icon, - contentDescription = icon.name + contentDescription = icon.name, ) } }) diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/support/logs/LogsScreen.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/support/logs/LogsScreen.kt index e2a62bf..918826a 100644 --- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/support/logs/LogsScreen.kt +++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/support/logs/LogsScreen.kt @@ -1,6 +1,5 @@ package com.zaneschepke.wireguardautotunnel.ui.screens.support.logs -import android.annotation.SuppressLint import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Arrangement @@ -32,15 +31,17 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.ClipboardManager import androidx.compose.ui.platform.LocalClipboardManager import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel import com.zaneschepke.logcatter.model.LogMessage +import com.zaneschepke.wireguardautotunnel.R +import com.zaneschepke.wireguardautotunnel.ui.common.navigation.TopNavBar import com.zaneschepke.wireguardautotunnel.ui.common.text.LogTypeLabel -@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter") @Composable fun LogsScreen(viewModel: LogsViewModel = hiltViewModel()) { val logs = viewModel.logs @@ -83,6 +84,9 @@ fun LogsScreen(viewModel: LogsViewModel = hiltViewModel()) { } Scaffold( + topBar = { + TopNavBar(stringResource(R.string.logs)) + }, floatingActionButton = { FloatingActionButton( onClick = { @@ -107,7 +111,7 @@ fun LogsScreen(viewModel: LogsViewModel = hiltViewModel()) { modifier = Modifier .fillMaxSize() - .padding(horizontal = 24.dp), + .padding(horizontal = 24.dp).padding(it), ) { itemsIndexed( logs, diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7ae0931..acad34c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -199,4 +199,5 @@ never sec handshake + Logs