feat(android_sidebar): adding the profil page and password edit

Theo-lbg · Theo-lbg · commit 6da09afc28e0 · 2025-01-22T17:33:08.000+01:00
diff --git a/xpeapp_android/app/build.gradle b/xpeapp_android/app/build.gradle
@@ -215,5 +215,5 @@ dependencies {
     implementation("com.google.accompanist:accompanist-permissions:0.31.1-alpha")
 
     //XpehoUI
-    implementation "com.xpeho.packages:xpeho_ui_android:1.5.0"
+    implementation "com.xpeho.packages:xpeho_ui_android:1.6.0"
 }
diff --git a/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/data/Constants.kt b/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/data/Constants.kt
@@ -10,4 +10,5 @@ enum class FeatureFlippingEnum(val value: String) {
     EXPENSE_REPORT("expenseReport"),
     COLLEAGUES("colleagues"),
     QVST("campaign"),
+    PROFILE("profile")
 }
diff --git a/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/data/entity/user/UserEditPassword.kt b/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/data/entity/user/UserEditPassword.kt
@@ -0,0 +1,7 @@
+package com.xpeho.xpeapp.data.entity.user
+
+data class UserEditPassword(
+    val initialPassword: String,
+    val password: String,
+    val passwordRepeat: String,
+)
diff --git a/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/data/model/user/UserInfos.kt b/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/data/model/user/UserInfos.kt
@@ -1,4 +1,4 @@
-package com.xpeho.xpeapp.data.model
+package com.xpeho.xpeapp.data.model.user
 
 data class UserInfos(
     val id: String,
diff --git a/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/data/service/WordpressRepository.kt b/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/data/service/WordpressRepository.kt
@@ -5,8 +5,9 @@ import androidx.annotation.VisibleForTesting
 import com.xpeho.xpeapp.data.entity.AuthentificationBody
 import com.xpeho.xpeapp.data.entity.QvstAnswerBody
 import com.xpeho.xpeapp.data.entity.QvstCampaignEntity
+import com.xpeho.xpeapp.data.entity.user.UserEditPassword
 import com.xpeho.xpeapp.data.model.AuthResult
-import com.xpeho.xpeapp.data.model.UserInfos
+import com.xpeho.xpeapp.data.model.user.UserInfos
 import com.xpeho.xpeapp.data.model.WordpressToken
 import com.xpeho.xpeapp.data.model.qvst.QvstCampaign
 import com.xpeho.xpeapp.data.model.qvst.QvstProgress
@@ -199,6 +200,20 @@ class WordpressRepository(
         )
     }
 
+    /*suspend fun updatePassword(
+        editPassword: UserEditPassword
+    ): Boolean {
+        handleServiceExceptions(
+            tryBody = {
+                return api.updatePassword(editPassword)
+            },
+            catchBody = { e ->
+                Log.e("WordpressRepository: updatePassword", "Network error: ${e.message}")
+                return false
+            }
+        )
+    }*/
+
     // Exceptions handling
 
     @Suppress("ReturnCount")
diff --git a/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/data/service/WordpressService.kt b/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/data/service/WordpressService.kt
@@ -2,7 +2,8 @@ package com.xpeho.xpeapp.data.service
 
 import com.xpeho.xpeapp.data.entity.AuthentificationBody
 import com.xpeho.xpeapp.data.entity.QvstAnswerBody
-import com.xpeho.xpeapp.data.model.UserInfos
+import com.xpeho.xpeapp.data.entity.user.UserEditPassword
+import com.xpeho.xpeapp.data.model.user.UserInfos
 import com.xpeho.xpeapp.data.model.WordpressToken
 import com.xpeho.xpeapp.data.model.qvst.QvstCampaign
 import com.xpeho.xpeapp.data.model.qvst.QvstProgress
@@ -61,8 +62,16 @@ interface WordpressService {
         @Body answers: List<QvstAnswerBody>,
     ): Boolean
 
+    // Fetch the user infos
     @Headers("Content-Type: application/json")
     @GET("xpeho/v1/user-infos")
     suspend fun fetchUserInfos(): UserInfos
+
+    /*// Update the user infos
+    @Headers("Content-Type: application/json")
+    @POST("xpeho/v1/update-password")
+    suspend fun updatePassword(
+        @Body editPassword: UserEditPassword,
+    ): Boolean*/
 }
 
diff --git a/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/domain/AuthenticationManager.kt b/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/domain/AuthenticationManager.kt
@@ -4,6 +4,7 @@ import android.util.Log
 import androidx.annotation.VisibleForTesting
 import com.xpeho.xpeapp.data.DatastorePref
 import com.xpeho.xpeapp.data.entity.AuthentificationBody
+import com.xpeho.xpeapp.data.entity.user.UserEditPassword
 import com.xpeho.xpeapp.data.model.AuthResult
 import com.xpeho.xpeapp.data.model.WordpressToken
 import com.xpeho.xpeapp.data.service.FirebaseService
@@ -107,11 +108,6 @@ class AuthenticationManager(
         wordpressUid?.let { datastorePref.setUserId(it) }
     }
 
-     suspend fun fetchUserInfos() {
-         val userInfos = wordpressRepo.fetchUserInfos()
-         Log.d("AuthenticationManager: fetchUserInfos", userInfos.toString())
-     }
-
     suspend fun logout() {
         firebaseService.signOut()
         datastorePref.clearAuthData()
diff --git a/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/enums/Screens.kt b/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/enums/Screens.kt
@@ -7,4 +7,5 @@ enum class Screens {
     Vacation,
     Colleague,
     Qvst,
+    Profile
 }
diff --git a/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/Navigation.kt b/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/Navigation.kt
@@ -13,6 +13,7 @@ import com.xpeho.xpeapp.ui.page.LoginPage
 import com.xpeho.xpeapp.ui.page.NewsletterPage
 import com.xpeho.xpeapp.ui.page.qvst.QvstCampaignDetailPage
 import com.xpeho.xpeapp.ui.page.qvst.QvstPage
+import com.xpeho.xpeapp.ui.page.user.ProfilePage
 
 fun NavGraphBuilder.navigationBuilder(
     navigationController: NavHostController,
@@ -70,4 +71,13 @@ fun NavGraphBuilder.navigationBuilder(
             }
         }
     }
+    composable(route = Screens.Profile.name) {
+        Layout(navigationController) {
+            if (ffManager.isFeatureEnabled(FeatureFlippingEnum.PROFILE)) {
+                ProfilePage(navigationController = navigationController)
+            } else {
+                DisabledFeaturePlaceHolder()
+            }
+        }
+    }
 }
diff --git a/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/components/layout/Sidebar.kt b/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/components/layout/Sidebar.kt
@@ -168,7 +168,6 @@ fun Sidebar(
                     modifier = Modifier
                         .padding(bottom = 20.dp, start = 18.dp, end = 18.dp),
                 ) {
-                    SidebarLogoutButtonSection(navigationController)
                     HorizontalDivider(
                         color = Color.White,
                         thickness = 1.dp,
@@ -186,33 +185,6 @@ fun Sidebar(
     }
 }
 
-@Composable
-fun SidebarLogoutButtonSection(
-    navigationController: NavController
-) {
-    Row(
-        modifier = Modifier
-            .fillMaxWidth(),
-        horizontalArrangement = Arrangement.Center
-    ) {
-        ClickyButton(
-            label = "Déconnexion",
-            size = 16.sp,
-            verticalPadding = 5.dp,
-            horizontalPadding = 15.dp,
-            backgroundColor = Color.White,
-            labelColor = XpehoColors.CONTENT_COLOR
-        ) {
-            CoroutineScope(Dispatchers.IO).launch {
-                XpeApp.appModule.authenticationManager.logout()
-            }
-            // Return to login page and clear the backstack
-            navigationController.navigate(route = Screens.Login.name) {
-                popUpTo(Screens.Home.name) { inclusive = true }
-            }
-        }
-    }
-}
 
 @Composable
 fun SidebarInfoSection(
diff --git a/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/components/layout/SidebarItemProfile.kt b/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/components/layout/SidebarItemProfile.kt
@@ -6,7 +6,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
@@ -22,6 +21,7 @@ import com.xpeho.xpeapp.ui.viewModel.viewModelFactory
 @Composable
 fun SidebarItemProfile(
     navigationController: NavController,
+
     userInfosViewModel: UserInfosViewModel = viewModel(
         factory = viewModelFactory {
             UserInfosViewModel(
@@ -37,7 +37,7 @@ fun SidebarItemProfile(
         modifier = Modifier
             .fillMaxWidth()
             .clickable {
-                navigationController.navigate(route = Screens.Home.name)
+                navigationController.navigate(route = Screens.Profile.name)
             }
             .padding(vertical = 16.dp, horizontal = 12.dp)
     ) {
diff --git a/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/page/LoginPage.kt b/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/page/LoginPage.kt
@@ -130,11 +130,12 @@ private fun LoginPageInputFields(
         keyboardAction = ImeAction.Next,
         onKeyboardAction = {
             passwordFocusRequester.requestFocus()
+        },
+        onInput = {
+            wordpressViewModel.usernameInput = it
+            wordpressViewModel.usernameInError = false
         }
-    ) {
-        wordpressViewModel.usernameInput = it
-        wordpressViewModel.usernameInError = false
-    }
+    )
     CheckInputField(wordpressViewModel.usernameInError, R.string.login_page_enter_email_warning)
     Spacer(modifier = Modifier.height(10.dp))
     InputText(
@@ -148,11 +149,12 @@ private fun LoginPageInputFields(
         onKeyboardAction = {
             focusManager.clearFocus()
             wordpressViewModel.onLogin()
+        },
+        onInput = {
+            wordpressViewModel.passwordInput = it
+            wordpressViewModel.passwordInError = false
         }
-    ) {
-        wordpressViewModel.passwordInput = it
-        wordpressViewModel.passwordInError = false
-    }
+    )
     CheckInputField(wordpressViewModel.passwordInError, R.string.login_page_enter_password_warning)
 }
 
diff --git a/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/page/user/ProfileEditPasswordView.kt b/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/page/user/ProfileEditPasswordView.kt
@@ -0,0 +1,111 @@
+package com.xpeho.xpeapp.ui.page.user
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.sp
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.xpeho.xpeapp.R
+import com.xpeho.xpeapp.XpeApp
+import com.xpeho.xpeapp.data.entity.user.UserEditPassword
+import com.xpeho.xpeapp.ui.components.layout.Title
+import com.xpeho.xpeapp.ui.viewModel.user.UserInfosViewModel
+import com.xpeho.xpeapp.ui.viewModel.viewModelFactory
+import com.xpeho.xpeho_ui_android.ClickyButton
+import com.xpeho.xpeho_ui_android.InputText
+import com.xpeho.xpeho_ui_android.foundations.Colors
+
+@Composable
+fun ProfileEditPasswordView(
+    userInfosViewModel: UserInfosViewModel = viewModel(
+        factory = viewModelFactory {
+            UserInfosViewModel(
+                wordpressRepo = XpeApp.appModule.wordpressRepository,
+                authManager = XpeApp.appModule.authenticationManager
+            )
+        }
+    ),
+    onChangePassword: () -> Unit
+) {
+    val passwordFocusRequester = remember { FocusRequester() }
+    var initialPassword by remember { mutableStateOf("") }
+    var newPassword by remember { mutableStateOf("") }
+    var confirmPassword by remember { mutableStateOf("") }
+
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(10.dp),
+        verticalArrangement = Arrangement.spacedBy(16.dp)
+    ) {
+        Title(label = stringResource(id = R.string.profil_page_modify_password))
+
+        InputText(
+            label = stringResource(id = R.string.profil_page_modify_password_initial),
+            labelSize = 14.sp,
+            inputSize = 18.sp,
+            password = true,
+            onKeyboardAction = { passwordFocusRequester.requestFocus() },
+            focusRequester = passwordFocusRequester,
+            keyboardAction = ImeAction.Done,
+            onInput = {initialPassword = it },
+        )
+
+        InputText(
+            label = stringResource(id = R.string.profil_page_modify_password_new),
+            labelSize = 14.sp,
+            inputSize = 18.sp,
+            password = true,
+            focusRequester = passwordFocusRequester,
+            keyboardAction = ImeAction.Done,
+            onKeyboardAction = {passwordFocusRequester.requestFocus() },
+            onInput = {newPassword = it }
+        )
+
+        InputText(
+            label = stringResource(id = R.string.profil_page_modify_password_confirm),
+            labelSize = 14.sp,
+            inputSize = 18.sp,
+            password = true,
+            focusRequester = passwordFocusRequester,
+            keyboardAction = ImeAction.Done,
+            onKeyboardAction = {passwordFocusRequester.requestFocus()},
+            onInput = { confirmPassword = it }
+        )
+
+        Spacer(modifier = Modifier.height(10.dp))
+
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.Center
+        ) {
+            ClickyButton(
+                label = stringResource(id = R.string.profil_page_modify_password_cancel),
+                onPress = {
+                    onChangePassword()
+                },
+                backgroundColor = Color.White,
+                labelColor = Colors.CONTENT_COLOR
+            )
+            Spacer(modifier = Modifier.width(8.dp))
+
+            ClickyButton(
+                label = stringResource(id = R.string.profil_page_modify_password_save),
+                onPress = {
+//                    if (newPassword == confirmPassword) {
+//                        userInfosViewModel.updatePassword(UserEditPassword(
+//                            initialPassword, newPassword, confirmPassword))
+//                        onChangePassword()
+//                    } else {
+//                        // Handle password mismatch error
+//                    }
+                }
+            )
+        }
+    }
+}
diff --git a/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/page/user/ProfilePage.kt b/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/page/user/ProfilePage.kt
@@ -0,0 +1,40 @@
+package com.xpeho.xpeapp.ui.page.user
+
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.unit.dp
+import androidx.compose.runtime.Composable
+import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.NavController
+import com.xpeho.xpeapp.XpeApp
+import com.xpeho.xpeapp.ui.viewModel.user.UserInfosViewModel
+import com.xpeho.xpeapp.ui.viewModel.viewModelFactory
+
+@Composable
+fun ProfilePage(
+    navigationController: NavController
+)  {
+    var isChangingPassword by remember { mutableStateOf(false) }
+
+    Column(
+        modifier = Modifier
+            .padding(16.dp)
+            .semantics {
+                contentDescription = if (isChangingPassword) "ChangePasswordView" else "ProfileView"
+            },
+        verticalArrangement = Arrangement.spacedBy(16.dp)
+    ) {
+        if (isChangingPassword) {
+            ProfileEditPasswordView( onChangePassword = { isChangingPassword = false }
+            )
+        } else {
+            ProfileUserInfosView(onChangePassword = { isChangingPassword = true }, navigationController = navigationController)
+        }
+    }
+}
+
+
diff --git a/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/page/user/ProfileUserInfosView.kt b/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/page/user/ProfileUserInfosView.kt
diff --git a/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/uiState/PasswordUpdateUiState.kt b/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/uiState/PasswordUpdateUiState.kt
diff --git a/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/uiState/UserInfosUiState.kt b/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/uiState/UserInfosUiState.kt
diff --git a/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/viewModel/user/UserInfosViewModel.kt b/xpeapp_android/app/src/main/java/com/xpeho/xpeapp/ui/viewModel/user/UserInfosViewModel.kt
diff --git a/xpeapp_android/app/src/main/res/values/strings.xml b/xpeapp_android/app/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -215,5 +215,5 @@ dependencies {`
`215`	`215`	`implementation("com.google.accompanist:accompanist-permissions:0.31.1-alpha")`
`216`	`216`
`217`	`217`	`//XpehoUI`
`218`		`- implementation "com.xpeho.packages:xpeho_ui_android:1.5.0"`
	`218`	`+ implementation "com.xpeho.packages:xpeho_ui_android:1.6.0"`
`219`	`219`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,5 @@ enum class FeatureFlippingEnum(val value: String) {`
`10`	`10`	`EXPENSE_REPORT("expenseReport"),`
`11`	`11`	`COLLEAGUES("colleagues"),`
`12`	`12`	`QVST("campaign"),`
	`13`	`+ PROFILE("profile")`
`13`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.xpeho.xpeapp.data.model`
	`1`	`+package com.xpeho.xpeapp.data.model.user`
`2`	`2`
`3`	`3`	`data class UserInfos(`
`4`	`4`	`val id: String,`
Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,5 @@ enum class Screens {`
`7`	`7`	`Vacation,`
`8`	`8`	`Colleague,`
`9`	`9`	`Qvst,`
	`10`	`+ Profile`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ import com.xpeho.xpeapp.ui.page.LoginPage`
`13`	`13`	`import com.xpeho.xpeapp.ui.page.NewsletterPage`
`14`	`14`	`import com.xpeho.xpeapp.ui.page.qvst.QvstCampaignDetailPage`
`15`	`15`	`import com.xpeho.xpeapp.ui.page.qvst.QvstPage`
	`16`	`+import com.xpeho.xpeapp.ui.page.user.ProfilePage`
`16`	`17`
`17`	`18`	`fun NavGraphBuilder.navigationBuilder(`
`18`	`19`	`navigationController: NavHostController,`
`@@ -70,4 +71,13 @@ fun NavGraphBuilder.navigationBuilder(`
`70`	`71`	`}`
`71`	`72`	`}`
`72`	`73`	`}`
	`74`	`+ composable(route = Screens.Profile.name) {`
	`75`	`+ Layout(navigationController) {`
	`76`	`+ if (ffManager.isFeatureEnabled(FeatureFlippingEnum.PROFILE)) {`
	`77`	`+ ProfilePage(navigationController = navigationController)`
	`78`	`+ } else {`
	`79`	`+ DisabledFeaturePlaceHolder()`
	`80`	`+ }`
	`81`	`+ }`
	`82`	`+ }`
`73`	`83`	`}`