MainActivity: Add telemetry snackbar

This commit is contained in:
Davide Depau committed 2024-10-30 23:17:32 +01:00
1 parent 42987f476d
commit 87b3923e8e
4 files changed
+53 -24

No files matched your search

@@ -28,4 +28,5 @@ class AppSettings(context: Context, val tileId: Int? = null) : SettingsChangeNot
var themeMode: ThemeMode by settings.delegate("theme_mode", ThemeMode.SYSTEM)
var dynamicColors: Boolean by settings.delegate("dynamic_colors", false)
var showNotificationsBanner: Boolean by settings.delegate("show_notifications_banner", true)
var showTelemetryBanner: Boolean by settings.delegate("show_telemetry_banner", true)
}
@@ -58,6 +58,10 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.ModalBottomSheet
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.RadioButton
import androidx.compose.material3.SnackbarDuration
import androidx.compose.material3.SnackbarHost
import androidx.compose.material3.SnackbarHostState
import androidx.compose.material3.SnackbarResult
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
@@ -75,9 +79,7 @@ import androidx.compose.ui.draw.drawBehind
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.layout.onSizeChanged
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.semantics.Role
@@ -257,7 +259,16 @@ class MainActivity : ComponentActivity() {
}
setContent {
MainView(mViewModel) {
val snackbarHostState = remember { SnackbarHostState() }
var telemetryDialogOpen by remember { mutableStateOf(false) }
fun setTelemetry(enabled: Boolean) {
Telemetry.enabled = enabled
mViewModel.setTelemetry(enabled)
}
MainView(mViewModel, snackbarHost = { SnackbarHost(snackbarHostState) }) {
StartView(
mViewModel,
setThemeMode = { mSettings.themeMode = it },
@@ -273,9 +284,12 @@ class MainActivity : ComponentActivity() {
openAboutView = {
startActivity(Intent(this, AboutActivity::class.java))
},
setTelemetry = { enabled ->
Telemetry.enabled = enabled
mViewModel.setTelemetry(enabled)
toggleTelemetry = {
if (Telemetry.enabled) {
telemetryDialogOpen = true
} else {
setTelemetry(true)
}
}
)
val uiState by mViewModel.state.collectAsState()
@@ -308,6 +322,29 @@ class MainActivity : ComponentActivity() {
availableDevices = { uiState.massStorageDevices }
)
}
if (telemetryDialogOpen) {
TelemetryAlertDialog(
onDismissRequest = { telemetryDialogOpen = false },
onOptOut = { setTelemetry(false) },
onCancel = { setTelemetry(true) }
)
}
if (!Telemetry.isStub && mSettings.showTelemetryBanner) {
mSettings.showTelemetryBanner = false
LaunchedEffect(null) {
val result = snackbarHostState.showSnackbar(
getString(R.string.etchdroid_uses_telemetry),
actionLabel = getString(R.string.learn_more),
withDismissAction = true,
duration = SnackbarDuration.Short,
)
if (result == SnackbarResult.ActionPerformed) {
telemetryDialogOpen = true
}
}
}
}
}
}
@@ -440,12 +477,11 @@ fun StartView(
setDynamicTheme: (Boolean) -> Unit = {},
onCTAClick: () -> Unit = {},
openAboutView: () -> Unit = {},
setTelemetry: (Boolean) -> Unit = {},
toggleTelemetry: () -> Unit = {},
) {
val uiState by viewModel.state.collectAsState()
var menuOpen by remember { mutableStateOf(false) }
var whatCanIWriteOpen by remember { mutableStateOf(false) }
var telemetryDialogOpen by remember { mutableStateOf(false) }
val iconBackgroundColor = MaterialTheme.colorScheme.onSurfaceVariant
val systemInDarkMode = isSystemInDarkTheme()
@@ -575,15 +611,6 @@ fun StartView(
modifier = Modifier.padding(12.dp, 0.dp)
)
fun toggleTelemetry() {
val checked = uiState.telemetry
if (checked) {
telemetryDialogOpen = true
} else {
setTelemetry(true)
}
}
DropdownMenuItem(
onClick = { toggleTelemetry() },
text = { Text("Send anonymous data") },
@@ -634,13 +661,6 @@ fun StartView(
}, darkTheme = darkMode
)
}
if (telemetryDialogOpen) {
TelemetryAlertDialog(
onDismissRequest = { telemetryDialogOpen = false },
onOptOut = { setTelemetry(false) },
onCancel = { setTelemetry(true) }
)
}
}
}
+2
View File
@@ -132,4 +132,6 @@
<string name="telemetry_icon">Icona per la telemetria</string>
<string name="telemetry_opt_out">Disattiva telemetria</string>
<string name="telemetry_keep_enabled">Mantieni attiva</string>
<string name="etchdroid_uses_telemetry">EtchDroid invia della telemetria.</string>
<string name="learn_more">Maggiori info</string>
</resources>
+6
View File
@@ -257,4 +257,10 @@
<string name="telemetry_opt_out">Opt-out</string>
<!-- Button to opt-in to telemetry; it can be translated as "Enable telemetry" if it fits better in the target language -->
<string name="telemetry_keep_enabled">Keep enabled</string>
<!-- Displayed in the main app screen on first launch in a toast/snackbar. It should be short and concise. -->
<string name="etchdroid_uses_telemetry">EtchDroid sends telemetry info.</string>
<!-- Displayed in the main app screen on first launch as a snackbar action button. It should be short and concise. -->
<string name="learn_more">Learn more</string>
</resources>