Feat/settings-frontend

frontend/app/src/main/java/com/example/speechbuddy/compose/emailverification/EmailVerificationScreen.kt

@@ -21,11 +21,11 @@ import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import com.example.speechbuddy.R
+import com.example.speechbuddy.compose.utils.AuthTopAppBarUi
 import com.example.speechbuddy.compose.utils.ButtonLevel
 import com.example.speechbuddy.compose.utils.ButtonUi
 import com.example.speechbuddy.compose.utils.TextFieldUi
 import com.example.speechbuddy.compose.utils.TitleUi
-import com.example.speechbuddy.compose.utils.TopAppBarUi
 import com.example.speechbuddy.ui.models.EmailVerificationErrorType
 import com.example.speechbuddy.viewmodel.EmailVerificationViewModel
 
@@ -47,7 +47,9 @@ fun EmailVerificationScreen(
     Surface(
         modifier = modifier.fillMaxSize()
     ) {
-        Scaffold(topBar = { TopAppBarUi(onBackClick = onBackClick) }) {
+        Scaffold(
+            topBar = { AuthTopAppBarUi(onBackClick = onBackClick) }
+        ) {
             Column(
                 modifier = Modifier
                     .fillMaxSize()
@@ -72,7 +74,7 @@ fun EmailVerificationScreen(
                 // Email Text Field
                 TextFieldUi(value = viewModel.emailInput,
                     onValueChange = { viewModel.setEmail(it) },
-                    label = { Text(text = stringResource(id = R.string.email_field)) },
+                    label = { Text(text = stringResource(id = R.string.email)) },
                     supportingButton = {
                         ButtonUi(
                             text = stringResource(id = R.string.send_validation_code),

frontend/app/src/main/java/com/example/speechbuddy/compose/home/HomeScreen.kt

@@ -26,6 +26,7 @@ import com.example.speechbuddy.compose.settings.SettingsScreen
 import com.example.speechbuddy.compose.symbolcreation.SymbolCreationScreen
 import com.example.speechbuddy.compose.symbolselection.SymbolSelectionScreen
 import com.example.speechbuddy.compose.texttospeech.TextToSpeechScreen
+import com.example.speechbuddy.compose.utils.HomeTopAppBarUi
 import com.example.speechbuddy.ui.SpeechBuddyTheme
 
 data class BottomNavItem(
@@ -44,12 +45,12 @@ fun HomeScreen(
     val navItems = listOf(
         BottomNavItem(
             "symbol_selection",
-            R.string.symbol_selection,
+            R.string.talk_with_symbols,
             R.drawable.outline_touch_app_24
         ),
         BottomNavItem(
             "text_to_speech",
-            R.string.text_to_speech,
+            R.string.talk_with_speech,
             R.drawable.outline_volume_up_24
         ),
         BottomNavItem(
@@ -69,8 +70,6 @@ fun HomeScreen(
             BottomNavigationBar(
                 items = navItems,
                 navController = navController,
-                modifier = Modifier
-                    .height(100.dp),
                 onItemClick = {
                     navController.navigate(it.route)
                 }

frontend/app/src/main/java/com/example/speechbuddy/compose/login/LoginScreen.kt

@@ -21,11 +21,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.example.speechbuddy.R
+import com.example.speechbuddy.compose.utils.AuthTopAppBarUi
 import com.example.speechbuddy.compose.utils.ButtonLevel
 import com.example.speechbuddy.compose.utils.ButtonUi
 import com.example.speechbuddy.compose.utils.TextFieldUi
 import com.example.speechbuddy.compose.utils.TitleUi
-import com.example.speechbuddy.compose.utils.TopAppBarUi
 import com.example.speechbuddy.ui.models.LoginErrorType
 import com.example.speechbuddy.viewmodel.LoginViewModel
 
@@ -46,7 +46,7 @@ fun LoginScreen(
 
     Surface(modifier = modifier.fillMaxSize()) {
         Scaffold(
-            topBar = { TopAppBarUi(onBackClick = onBackClick) }
+            topBar = { AuthTopAppBarUi(onBackClick = onBackClick) }
         ) {
             Column(
                 modifier = Modifier
@@ -66,7 +66,7 @@ fun LoginScreen(
                 TextFieldUi(
                     value = viewModel.emailInput,
                     onValueChange = { viewModel.setEmail(it) },
-                    label = { Text(stringResource(id = R.string.email_field)) },
+                    label = { Text(stringResource(id = R.string.email)) },
                     supportingText = {
                         if (isEmailError) {
                             Text(stringResource(id = uiState.error!!.messageId))

frontend/app/src/main/java/com/example/speechbuddy/compose/resetpassword/ResetPasswordScreen.kt

@@ -25,7 +25,7 @@ import com.example.speechbuddy.compose.utils.ButtonLevel
 import com.example.speechbuddy.compose.utils.ButtonUi
 import com.example.speechbuddy.compose.utils.TextFieldUi
 import com.example.speechbuddy.compose.utils.TitleUi
-import com.example.speechbuddy.compose.utils.TopAppBarUi
+import com.example.speechbuddy.compose.utils.AuthTopAppBarUi
 import com.example.speechbuddy.ui.models.ResetPasswordErrorType
 import com.example.speechbuddy.viewmodel.ResetPasswordViewModel
 
@@ -48,7 +48,7 @@ fun ResetPasswordScreen(
     ) {
         Scaffold(
             topBar = {
-                TopAppBarUi(
+                AuthTopAppBarUi(
                     onBackClick = onBackClick
                 )
             }

frontend/app/src/main/java/com/example/speechbuddy/compose/settings/AccountSettings.kt

@@ -0,0 +1,136 @@
+package com.example.speechbuddy.compose.settings
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import com.example.speechbuddy.R
+import com.example.speechbuddy.compose.utils.AlertDialogUi
+import com.example.speechbuddy.compose.utils.ButtonLevel
+import com.example.speechbuddy.compose.utils.ButtonUi
+import com.example.speechbuddy.compose.utils.HomeTopAppBarUi
+import com.example.speechbuddy.compose.utils.TitleUi
+import com.example.speechbuddy.ui.models.AccountSettingsAlert
+import com.example.speechbuddy.viewmodel.AccountSettingsViewModel
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AccountSettings(
+    modifier: Modifier = Modifier,
+    onBackClick: () -> Unit,
+    viewModel: AccountSettingsViewModel = hiltViewModel()
+) {
+    val uiState by viewModel.uiState.collectAsState()
+
+    Surface(
+        modifier = modifier.fillMaxSize()
+    ) {
+        Scaffold(
+            topBar = {
+                HomeTopAppBarUi(
+                    title = stringResource(id = R.string.settings),
+                    onBackClick = onBackClick,
+                    isBackClickEnabled = true
+                )
+            }
+        ) { paddingValues ->
+            Column(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .padding(top = paddingValues.calculateTopPadding())
+                    .padding(24.dp),
+                verticalArrangement = Arrangement.Center
+            ) {
+                TitleUi(title = stringResource(id = R.string.account))
+
+                Spacer(modifier = Modifier.height(20.dp))
+
+                Column(
+                    verticalArrangement = Arrangement.spacedBy(10.dp)
+                ) {
+                    SettingsRow(
+                        label = stringResource(id = R.string.email),
+                        content = {
+                            SettingsRowText(text = uiState.email)
+                        }
+                    )
+
+                    SettingsRow(
+                        label = stringResource(id = R.string.nickname),
+                        content = {
+                            SettingsRowText(text = uiState.nickname)
+                        }
+                    )
+                }
+
+                Spacer(modifier = Modifier.height(80.dp))
+
+                Column(
+                    verticalArrangement = Arrangement.spacedBy(14.dp)
+                ) {
+                    ButtonUi(
+                        text = stringResource(id = R.string.logout),
+                        onClick = { viewModel.showAlert(AccountSettingsAlert.LOGOUT) }
+                    )
+
+                    ButtonUi(
+                        text = stringResource(id = R.string.withdraw),
+                        onClick = { viewModel.showAlert(AccountSettingsAlert.WITHDRAW) },
+                        level = ButtonLevel.QUATERNARY
+                    )
+                }
+            }
+        }
+    }
+
+    uiState.alert?.let { alert ->
+        when (alert) {
+            AccountSettingsAlert.LOGOUT -> {
+                AlertDialogUi(
+                    title = stringResource(id = R.string.logout),
+                    text = stringResource(id = R.string.logout_warning),
+                    dismissButtonText = stringResource(id = R.string.dismiss),
+                    confirmButtonText = stringResource(id = R.string.logout),
+                    onDismiss = { viewModel.hideAlert() },
+                    onConfirm = { viewModel.logout() }
+                )
+            }
+
+            AccountSettingsAlert.WITHDRAW -> {
+                AlertDialogUi(
+                    title = stringResource(id = R.string.withdraw),
+                    text = stringResource(id = R.string.withdraw_warning),
+                    dismissButtonText = stringResource(id = R.string.dismiss),
+                    confirmButtonText = stringResource(id = R.string.proceed),
+                    onDismiss = { viewModel.hideAlert() },
+                    onConfirm = {
+                        viewModel.showAlert(AccountSettingsAlert.WITHDRAW_PROCEED)
+                    }
+                )
+            }
+
+            AccountSettingsAlert.WITHDRAW_PROCEED -> {
+                AlertDialogUi(
+                    title = stringResource(id = R.string.withdraw),
+                    text = stringResource(id = R.string.withdraw_proceed_warning),
+                    dismissButtonText = stringResource(id = R.string.dismiss),
+                    confirmButtonText = stringResource(id = R.string.withdraw),
+                    onDismiss = { viewModel.hideAlert() },
+                    onConfirm = { viewModel.deleteAccount() }
+                )
+            }
+        }
+    }
+}

frontend/app/src/main/java/com/example/speechbuddy/compose/settings/BackupSettings.kt

@@ -0,0 +1,86 @@
+package com.example.speechbuddy.compose.settings
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Switch
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import com.example.speechbuddy.R
+import com.example.speechbuddy.compose.utils.ButtonUi
+import com.example.speechbuddy.compose.utils.HomeTopAppBarUi
+import com.example.speechbuddy.compose.utils.TitleUi
+import com.example.speechbuddy.viewmodel.BackupSettingsViewModel
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun BackupSettings(
+    modifier: Modifier = Modifier,
+    onBackClick: () -> Unit,
+    viewModel: BackupSettingsViewModel = hiltViewModel()
+) {
+    val uiState by viewModel.uiState.collectAsState()
+
+    Surface(
+        modifier = modifier.fillMaxSize()
+    ) {
+        Scaffold(topBar = {
+            HomeTopAppBarUi(
+                title = stringResource(id = R.string.settings),
+                onBackClick = onBackClick,
+                isBackClickEnabled = true
+            )
+        }) { paddingValues ->
+            Column(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .padding(top = paddingValues.calculateTopPadding())
+                    .padding(24.dp), verticalArrangement = Arrangement.Center
+            ) {
+                TitleUi(title = stringResource(id = R.string.backup_to_server))
+
+                Spacer(modifier = Modifier.height(20.dp))
+
+                Column(
+                    verticalArrangement = Arrangement.spacedBy(10.dp)
+                ) {
+                    SettingsRow(
+                        label = stringResource(id = R.string.last_backup_date),
+                        content = {
+                            SettingsRowText(text = uiState.lastBackupDate)
+                        }
+                    )
+
+                    SettingsRow(label = stringResource(id = R.string.enable_auto_backup),
+                        content = {
+                            Switch(
+                                checked = uiState.isAutoBackupEnabled,
+                                onCheckedChange = { viewModel.setAutoBackup(it) },
+                                modifier = Modifier.heightIn(max = 32.dp)
+                            )
+                        }
+                    )
+                }
+
+                Spacer(modifier = Modifier.height(80.dp))
+
+                ButtonUi(
+                    text = stringResource(id = R.string.backup_now),
+                    onClick = { viewModel.backup() }
+                )
+            }
+        }
+    }
+}