meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move "show app intro" to phone settings (#2984)

Browse source
This commit is contained in:
Phil Oliver 2025-09-05 13:24:41 -04:00 • committed by GitHub
parent f78c440c61
commit 0cb0b19128
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/com/geeksville/mesh/ui/Main.kt
View file

@ -352,7 +352,6 @@ fun MainScreen(
if (action is MainMenuAction) {
when (action) {
MainMenuAction.QUICK_CHAT -> navController.navigate(ContactsRoutes.QuickChat)
MainMenuAction.SHOW_INTRO -> uIViewModel.onMainMenuAction(action)
else -> onAction(action)
}
} else if (action is NodeMenuAction) {

1
app/src/main/java/com/geeksville/mesh/ui/common/components/MainAppBar.kt
View file

@ -206,7 +206,6 @@ private fun TopBarActions(
enum class MainMenuAction(@StringRes val stringRes: Int) {
EXPORT_RANGETEST(R.string.save_rangetest),
SHOW_INTRO(R.string.intro_show),
QUICK_CHAT(R.string.quick_chat),
}

9
app/src/main/java/com/geeksville/mesh/ui/settings/SettingsScreen.kt
View file

@ -30,6 +30,7 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.BugReport
import androidx.compose.material.icons.rounded.FormatPaint
import androidx.compose.material.icons.rounded.Language
import androidx.compose.material.icons.rounded.WavingHand
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
@ -212,6 +213,14 @@ fun SettingsScreen(
choices = themeMap.mapValues { (_, value) -> { uiViewModel.setTheme(value) } },
)
}
SettingsItem(
text = stringResource(R.string.intro_show),
leadingIcon = Icons.Rounded.WavingHand,
trailingIcon = null,
) {
uiViewModel.showAppIntro()
}
}
}
}