Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package edu.rpi.shuttletracker.ui.settings

import android.content.Intent
import android.net.Uri
import android.provider.Settings
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
Expand All @@ -11,6 +14,7 @@ import androidx.compose.material.icons.outlined.Code
import androidx.compose.material.icons.outlined.Contrast
import androidx.compose.material.icons.outlined.Info
import androidx.compose.material.icons.outlined.RestartAlt
import androidx.compose.material.icons.outlined.Settings
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
Expand All @@ -29,6 +33,7 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Modifier
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
Expand All @@ -50,6 +55,16 @@ fun SettingsScreen(
navigator: DestinationsNavigator,
viewModel: SettingsViewModel = hiltViewModel(),
) {
val context = LocalContext.current

val openAppSettings: () -> Unit = {
val intent =
Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
data = Uri.fromParts("package", context.packageName, null)
}
context.startActivity(intent)
}

val scrollBehavior =
TopAppBarDefaults.exitUntilCollapsedScrollBehavior(
rememberTopAppBarState(),
Expand Down Expand Up @@ -79,28 +94,12 @@ fun SettingsScreen(
LazyColumn(
modifier = Modifier.padding(padding),
) {
// item {
// ColorBlindSettingItem(
// colorBlindMode = settingsUiState.colorBlindMode,
// updateColorBlindMode = viewModel::updateColorBlindMode,
// )
// }

item {
ThemeModeSettingItem(
themeMode = settingsUiState.themeMode,
updateThemeMode = viewModel::updateThemeMode,
)
}
if (settingsUiState.devOptionState) {
item {
SettingsItem(
Icons.Outlined.Code,
stringResource(R.string.dev_options),
onClick = { navigator.navigate(DevMenuScreenDestination()) },
)
}
}

item {
SettingsItem(
Expand All @@ -122,6 +121,24 @@ fun SettingsScreen(
onClick = { navigator.navigate(AboutScreenDestination()) },
)
}

item {
SettingsItem(
icon = Icons.Outlined.Settings,
title = stringResource(R.string.open_app_settings),
onClick = openAppSettings,
)
}

if (settingsUiState.devOptionState) {
item {
SettingsItem(
Icons.Outlined.Code,
stringResource(R.string.dev_options),
onClick = { navigator.navigate(DevMenuScreenDestination()) },
)
}
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ fun AnalyticsPage(
@Composable
@Preview
fun PermissionsPage() {
val context = LocalContext.current
LocalContext.current

Column(horizontalAlignment = Alignment.CenterHorizontally) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package edu.rpi.shuttletracker.util.services

import android.app.NotificationManager
import android.content.Context
import androidx.core.app.NotificationCompat
import com.google.firebase.messaging.FirebaseMessaging
import com.google.firebase.messaging.FirebaseMessagingService
Expand Down Expand Up @@ -41,7 +40,7 @@ class FirebaseService : FirebaseMessagingService() {
private fun sendNotification(body: String) {
val notificationManager: NotificationManager =
getSystemService(
Context.NOTIFICATION_SERVICE,
NOTIFICATION_SERVICE,
) as NotificationManager

val notificationBody =
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@
<string name="dev_options">Developer Options</string>
<string name="app_theme">App Theme</string>
<string name="redo_setup">Redo Setup</string>
<string name="open_app_settings">Open app settings</string>

<!-- Analytics -->
<string name="analytics">Analytics</string>
Expand Down
Loading