Feature/#94 my account

core/ui/src/main/java/com/suwiki/core/ui/util/LaunchedEffectWithLifecycle.kt

@@ -11,11 +11,12 @@ import kotlinx.coroutines.CoroutineScope
 @Composable
 fun LaunchedEffectWithLifecycle(
   key1: Any? = Unit,
+  key2: Any? = Unit,
   lifecycleOwner: LifecycleOwner = LocalLifecycleOwner.current,
   minActiveState: Lifecycle.State = Lifecycle.State.STARTED,
   action: suspend CoroutineScope.() -> Unit = {},
 ) {
-  LaunchedEffect(key1 = key1) {
+  LaunchedEffect(key1 = key1, key2 = key2) {
     lifecycleOwner.lifecycle.repeatOnLifecycle(minActiveState) {
       action()
     }

data/user/src/main/java/com/suwiki/data/user/repository/UserRepositoryImpl.kt

@@ -33,6 +33,7 @@ class UserRepositoryImpl @Inject constructor(
       id = id,
       password = password,
     )
+    logout()
   }
 
   override suspend fun getUserInfo(): Flow<User> = flow {

feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/examevaluation/MyExamEvaluationEditViewModel.kt

@@ -18,6 +18,8 @@ import kotlinx.collections.immutable.toPersistentList
 import kotlinx.serialization.json.Json
 import org.orbitmvi.orbit.Container
 import org.orbitmvi.orbit.ContainerHost
+import org.orbitmvi.orbit.annotation.OrbitExperimental
+import org.orbitmvi.orbit.syntax.simple.blockingIntent
 import org.orbitmvi.orbit.syntax.simple.intent
 import org.orbitmvi.orbit.syntax.simple.postSideEffect
 import org.orbitmvi.orbit.syntax.simple.reduce
@@ -128,7 +130,8 @@ class MyExamEvaluationEditViewModel @Inject constructor(
     reduce { state.copy(examInfo = examInfoList.toPersistentList()) }
   }
 
-  fun updateMyExamEvaluationValue(examEvaluationValue: String) = intent {
+  @OptIn(OrbitExperimental::class)
+  fun updateMyExamEvaluationValue(examEvaluationValue: String) = blockingIntent {
     reduce { state.copy(examEvaluation = examEvaluationValue) }
   }
 

feature/lectureevaluation/editor/src/main/java/com/suwiki/feature/lectureevaluation/editor/lectureevaluation/MyLectureEvaluationEditViewModel.kt

@@ -17,6 +17,8 @@ import kotlinx.collections.immutable.toPersistentList
 import kotlinx.serialization.json.Json
 import org.orbitmvi.orbit.Container
 import org.orbitmvi.orbit.ContainerHost
+import org.orbitmvi.orbit.annotation.OrbitExperimental
+import org.orbitmvi.orbit.syntax.simple.blockingIntent
 import org.orbitmvi.orbit.syntax.simple.intent
 import org.orbitmvi.orbit.syntax.simple.postSideEffect
 import org.orbitmvi.orbit.syntax.simple.reduce
@@ -129,7 +131,8 @@ class MyLectureEvaluationEditViewModel @Inject constructor(
     reduce { state.copy(satisfactionRating = if (satisfactionRating < 0.5) 0.5F else satisfactionRating) }
   }
 
-  fun updateMyLectureEvaluationValue(lectureEvaluationValue: String) = intent {
+  @OptIn(OrbitExperimental::class)
+  fun updateMyLectureEvaluationValue(lectureEvaluationValue: String) = blockingIntent {
     reduce { state.copy(lectureEvaluation = lectureEvaluationValue) }
   }
 

feature/login/build.gradle.kts

@@ -9,4 +9,5 @@ android {
 
 dependencies {
   implementation(projects.domain.login)
+  implementation(projects.domain.user)
 }

feature/login/src/main/java/com/suwiki/feature/login/navigation/LoginNavigation.kt

@@ -2,13 +2,17 @@ package com.suwiki.feature.login.navigation
 
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavOptions
 import androidx.navigation.compose.composable
 import com.suwiki.feature.login.findid.FindIdRoute
 import com.suwiki.feature.login.findpassword.FindPasswordRoute
 import com.suwiki.feature.login.login.LoginRoute
 
-fun NavController.navigateLogin() {
-  navigate(LoginRoute.route)
+fun NavController.navigateLogin(navOptions: NavOptions? = null) {
+  navigate(
+    route = LoginRoute.route,
+    navOptions = navOptions,
+  )
 }
 
 fun NavController.navigateFindId() {

feature/myinfo/src/main/java/com/suwiki/feature/myinfo/MyInfoContract.kt

@@ -10,4 +10,6 @@ data class MyInfoState(
 sealed interface MyInfoSideEffect {
   data object NavigateNotice : MyInfoSideEffect
   data object NavigateMyEvaluation : MyInfoSideEffect
+  data object NavigateMyAccount : MyInfoSideEffect
+  data object ShowNeedLoginToast : MyInfoSideEffect
 }

feature/myinfo/src/main/java/com/suwiki/feature/myinfo/MyInfoScreen.kt

@@ -23,6 +23,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -48,13 +49,18 @@ fun MyInfoRoute(
   viewModel: MyInfoViewModel = hiltViewModel(),
   navigateNotice: () -> Unit,
   navigateMyEvaluation: () -> Unit,
+  navigateMyAccount: () -> Unit,
+  onShowToast: (String) -> Unit = {},
 ) {
   val scrollState = rememberScrollState()
   val uiState = viewModel.collectAsState().value
+  val context = LocalContext.current
   viewModel.collectSideEffect { sideEffect ->
     when (sideEffect) {
-      MyInfoSideEffect.NavigateNotice -> navigateNotice()
+      is MyInfoSideEffect.NavigateNotice -> navigateNotice()
       is MyInfoSideEffect.NavigateMyEvaluation -> navigateMyEvaluation()
+      is MyInfoSideEffect.NavigateMyAccount -> navigateMyAccount()
+      MyInfoSideEffect.ShowNeedLoginToast -> onShowToast(context.getString(R.string.my_info_screen_need_login_toast))
     }
   }
 
@@ -68,6 +74,7 @@ fun MyInfoRoute(
     scrollState = scrollState,
     onClickNoticeButton = viewModel::navigateNotice,
     onClickMyEvaluationButton = viewModel::navigateMyEvaluation,
+    onClickMyAccountButton = viewModel::navigateMyAccount,
   )
 }
 
@@ -78,6 +85,7 @@ fun MyInfoScreen(
   scrollState: ScrollState,
   onClickNoticeButton: () -> Unit,
   onClickMyEvaluationButton: () -> Unit,
+  onClickMyAccountButton: () -> Unit,
 ) {
   val myList = immutableListOf(
     R.string.my_info_point,
@@ -142,6 +150,7 @@ fun MyInfoScreen(
           MyInfoMenuItem(
             title = stringResource(R.string.my_info_account_manage),
             iconId = R.drawable.ic_my_info_setting,
+            onClickItem = onClickMyAccountButton,
           )
         }
       }
@@ -327,6 +336,7 @@ fun MyInfoScreenScreenPreview() {
       scrollState = scrollState,
       onClickNoticeButton = {},
       onClickMyEvaluationButton = {},
+      onClickMyAccountButton = {},
     )
   }
 }

feature/myinfo/src/main/java/com/suwiki/feature/myinfo/MyInfoViewModel.kt

@@ -18,6 +18,8 @@ class MyInfoViewModel @Inject constructor(
 ) : ContainerHost<MyInfoState, MyInfoSideEffect>, ViewModel() {
   override val container: Container<MyInfoState, MyInfoSideEffect> = container(MyInfoState())
 
+  private var isLoggedIn: Boolean = false
+
   suspend fun checkLoggedIn() {
     showLoadingScreen()
     /* TODO 에러 처리 */
@@ -27,6 +29,7 @@ class MyInfoViewModel @Inject constructor(
 
   private fun reduceUser(user: User) = intent {
     reduce {
+      isLoggedIn = user.isLoggedIn
       state.copy(
         showMyInfoCard = user.isLoggedIn,
         loginId = user.userId,
@@ -40,4 +43,13 @@ class MyInfoViewModel @Inject constructor(
 
   fun navigateNotice() = intent { postSideEffect(MyInfoSideEffect.NavigateNotice) }
   fun navigateMyEvaluation() = intent { postSideEffect(MyInfoSideEffect.NavigateMyEvaluation) }
+  fun navigateMyAccount() = intent {
+    postSideEffect(
+      if (isLoggedIn) {
+        MyInfoSideEffect.NavigateMyAccount
+      } else {
+        MyInfoSideEffect.ShowNeedLoginToast
+      },
+    )
+  }
 }

feature/myinfo/src/main/java/com/suwiki/feature/myinfo/myaccount/MyAccountContract.kt

@@ -0,0 +1,14 @@
+package com.suwiki.feature.myinfo.myaccount
+
+data class MyAccountState(
+  val isLoading: Boolean = false,
+  val userId: String = "",
+  val userEmail: String = "",
+)
+
+sealed interface MyAccountSideEffect {
+  data object PopBackStack : MyAccountSideEffect
+  data object NavigateResetPassword : MyAccountSideEffect
+  data object NavigateQuit : MyAccountSideEffect
+  data class HandleException(val throwable: Throwable) : MyAccountSideEffect
+}

feature/myinfo/src/main/java/com/suwiki/feature/myinfo/myaccount/MyAccountScreen.kt

@@ -0,0 +1,164 @@
+package com.suwiki.feature.myinfo.myaccount
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import com.suwiki.core.designsystem.component.appbar.SuwikiAppBarWithTitle
+import com.suwiki.core.designsystem.theme.Gray95
+import com.suwiki.core.designsystem.theme.GrayF6
+import com.suwiki.core.designsystem.theme.SuwikiTheme
+import com.suwiki.core.designsystem.theme.White
+import com.suwiki.core.ui.extension.suwikiClickable
+import com.suwiki.feature.myinfo.R
+import org.orbitmvi.orbit.compose.collectAsState
+import org.orbitmvi.orbit.compose.collectSideEffect
+
+@Composable
+fun MyAccountRoute(
+  viewModel: MyAccountViewModel = hiltViewModel(),
+  popBackStack: () -> Unit,
+  navigateResetPassword: () -> Unit = {},
+  navigateQuit: () -> Unit = {},
+  handleException: (Throwable) -> Unit,
+) {
+  val uiState = viewModel.collectAsState().value
+  viewModel.collectSideEffect { sideEffect ->
+    when (sideEffect) {
+      MyAccountSideEffect.PopBackStack -> popBackStack()
+      is MyAccountSideEffect.NavigateResetPassword -> navigateResetPassword()
+      is MyAccountSideEffect.NavigateQuit -> navigateQuit()
+      is MyAccountSideEffect.HandleException -> handleException(sideEffect.throwable)
+    }
+  }
+
+  LaunchedEffect(key1 = Unit) {
+    viewModel.initData()
+  }
+
+  MyAccountScreen(
+    uiState = uiState,
+    popBackStack = viewModel::popBackStack,
+    onClickResetPassword = viewModel::navigateResetPassword,
+    onClickLogout = { /*TODO(LOGOUT)*/ },
+    onClickQuit = viewModel::navigateQuit,
+  )
+}
+
+@Composable
+fun MyAccountScreen(
+  uiState: MyAccountState = MyAccountState(),
+  popBackStack: () -> Unit = {},
+  onClickResetPassword: () -> Unit = {},
+  onClickLogout: () -> Unit = {},
+  onClickQuit: () -> Unit = {},
+) {
+  Column(
+    modifier = Modifier
+      .fillMaxSize()
+      .background(White),
+  ) {
+    SuwikiAppBarWithTitle(
+      showBackIcon = true,
+      showCloseIcon = false,
+      onClickBack = popBackStack,
+    )
+    Text(
+      modifier = Modifier
+        .fillMaxWidth()
+        .padding(horizontal = 24.dp, vertical = 14.dp),
+      text = stringResource(R.string.word_my_account),
+      style = SuwikiTheme.typography.body2,
+    )
+    UserInfoRowContainer(
+      userInfo = stringResource(R.string.word_login_id),
+      userInfoValue = uiState.userId,
+    )
+    UserInfoRowContainer(
+      userInfo = stringResource(R.string.word__authentication_email),
+      userInfoValue = uiState.userEmail,
+    )
+    Spacer(modifier = Modifier.height(24.dp))
+    AlignContainer(
+      title = stringResource(R.string.word_reset_password),
+      onClick = onClickResetPassword,
+    )
+    AlignContainer(
+      title = stringResource(R.string.word_logout),
+      onClick = onClickLogout,
+    )
+    AlignContainer(
+      title = stringResource(R.string.word_quit),
+      onClick = onClickQuit,
+    )
+  }
+}
+
+@Composable
+fun AlignContainer(
+  modifier: Modifier = Modifier,
+  title: String,
+  onClick: () -> Unit = {},
+) {
+  Box(
+    modifier = modifier
+      .fillMaxWidth()
+      .suwikiClickable(onClick = onClick)
+      .padding(horizontal = 24.dp, vertical = 14.dp),
+  ) {
+    Text(
+      text = title,
+      style = SuwikiTheme.typography.body2,
+    )
+  }
+}
+
+@Composable
+fun UserInfoRowContainer(
+  modifier: Modifier = Modifier,
+  userInfo: String,
+  userInfoValue: String,
+) {
+  Column {
+    Row(
+      modifier = modifier
+        .fillMaxWidth()
+        .padding(horizontal = 24.dp, vertical = 14.dp),
+      horizontalArrangement = Arrangement.SpaceBetween,
+    ) {
+      Text(
+        text = userInfo,
+        style = SuwikiTheme.typography.caption2,
+        color = Gray95,
+      )
+      Text(
+        text = userInfoValue,
+        style = SuwikiTheme.typography.body5,
+      )
+    }
+    HorizontalDivider(color = GrayF6)
+  }
+}
+
+@Preview
+@Composable
+fun MyAccountScreenPreview() {
+  SuwikiTheme {
+    MyAccountScreen()
+  }
+}