[feat] 마이페이지 화면 compose로 마이그레이션

android/app/src/main/AndroidManifest.xml

@@ -18,7 +18,7 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
-            android:name=".ui.setting.SettingActivity"
+            android:name=".ui.mypage.MyPageActivity"
             android:exported="false" />
         <activity
             android:name=".ui.login.LoginActivity"

android/app/src/main/java/com/on/turip/data/accounts/AccountMapper.kt

@@ -0,0 +1,12 @@
+package com.on.turip.data.accounts
+
+import com.on.turip.data.accounts.dto.MyProfileResponse
+import com.on.turip.domain.accounts.Account
+import com.on.turip.domain.accounts.Role
+
+fun MyProfileResponse.toDomain(): Account =
+    Account(
+        id = id,
+        nickname = nickname,
+        role = Role.from(role),
+    )

android/app/src/main/java/com/on/turip/data/accounts/datasource/AccountRemoteDataSource.kt

@@ -0,0 +1,8 @@
+package com.on.turip.data.accounts.datasource
+
+import com.on.turip.core.result.TuripResult
+import com.on.turip.data.accounts.dto.MyProfileResponse
+
+interface AccountRemoteDataSource {
+    suspend fun getMyProfile(): TuripResult<MyProfileResponse>
+}

android/app/src/main/java/com/on/turip/data/accounts/datasource/DefaultAccountRemoteDataSource.kt

@@ -0,0 +1,13 @@
+package com.on.turip.data.accounts.datasource
+
+import com.on.turip.core.result.TuripResult
+import com.on.turip.data.accounts.dto.MyProfileResponse
+import com.on.turip.data.accounts.service.AccountService
+import com.on.turip.data.result.safeApiCall
+import javax.inject.Inject
+
+class DefaultAccountRemoteDataSource @Inject constructor(
+    private val accountService: AccountService,
+) : AccountRemoteDataSource {
+    override suspend fun getMyProfile(): TuripResult<MyProfileResponse> = safeApiCall { accountService.getMyProfile() }
+}

android/app/src/main/java/com/on/turip/data/accounts/dto/MyProfileResponse.kt

@@ -0,0 +1,14 @@
+package com.on.turip.data.accounts.dto
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class MyProfileResponse(
+    @SerialName("id")
+    val id: Long,
+    @SerialName("nickname")
+    val nickname: String,
+    @SerialName("role")
+    val role: String,
+)

android/app/src/main/java/com/on/turip/data/accounts/repository/DefaultAccountRepository.kt

@@ -0,0 +1,15 @@
+package com.on.turip.data.accounts.repository
+
+import com.on.turip.core.result.TuripResult
+import com.on.turip.core.result.mapCatching
+import com.on.turip.data.accounts.datasource.AccountRemoteDataSource
+import com.on.turip.data.accounts.toDomain
+import com.on.turip.domain.accounts.Account
+import com.on.turip.domain.accounts.AccountRepository
+import javax.inject.Inject
+
+class DefaultAccountRepository @Inject constructor(
+    private val accountRemoteDataSource: AccountRemoteDataSource,
+) : AccountRepository {
+    override suspend fun loadMyProfile(): TuripResult<Account> = accountRemoteDataSource.getMyProfile().mapCatching { it.toDomain() }
+}

android/app/src/main/java/com/on/turip/data/accounts/service/AccountService.kt

@@ -0,0 +1,9 @@
+package com.on.turip.data.accounts.service
+
+import com.on.turip.data.accounts.dto.MyProfileResponse
+import de.jensklingenberg.ktorfit.http.GET
+
+interface AccountService {
+    @GET("accounts/me")
+    suspend fun getMyProfile(): MyProfileResponse
+}

android/app/src/main/java/com/on/turip/di/DataSourceModule.kt

@@ -1,5 +1,7 @@
 package com.on.turip.di
 
+import com.on.turip.data.accounts.datasource.AccountRemoteDataSource
+import com.on.turip.data.accounts.datasource.DefaultAccountRemoteDataSource
 import com.on.turip.data.bookmarks.datasource.BookmarkRemoteDataSource
 import com.on.turip.data.bookmarks.datasource.DefaultBookmarkRemoteDataSource
 import com.on.turip.data.content.datasource.ContentRemoteDataSource
@@ -64,4 +66,8 @@ abstract class DataSourceModule {
     @Binds
     @Singleton
     abstract fun bindGuestRemoteDataSource(guestRemoteDataSource: GuestRemoteDataSource): GuestDataSource
+
+    @Binds
+    @Singleton
+    abstract fun bindAccountRemoteDataSource(defaultAccountRemoteDataSource: DefaultAccountRemoteDataSource): AccountRemoteDataSource
 }

android/app/src/main/java/com/on/turip/di/RepositoryModule.kt

@@ -1,5 +1,6 @@
 package com.on.turip.di
 
+import com.on.turip.data.accounts.repository.DefaultAccountRepository
 import com.on.turip.data.bookmarks.repository.DefaultBookmarkRepository
 import com.on.turip.data.content.repository.DefaultContentRepository
 import com.on.turip.data.login.repository.DefaultAuthRepository
@@ -9,6 +10,7 @@ import com.on.turip.data.region.repository.DefaultRegionRepository
 import com.on.turip.data.searchhistory.repository.DefaultSearchHistoryRepository
 import com.on.turip.data.turip.repository.DefaultTuripRepository
 import com.on.turip.data.userstorage.repository.DefaultUserStorageRepository
+import com.on.turip.domain.accounts.AccountRepository
 import com.on.turip.domain.bookmark.repository.BookmarkRepository
 import com.on.turip.domain.content.repository.ContentRepository
 import com.on.turip.domain.login.AuthRepository
@@ -62,4 +64,8 @@ abstract class RepositoryModule {
     @Binds
     @Singleton
     abstract fun bindGuestRepository(defaultGuestRepository: DefaultGuestRepository): GuestRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindAccountRepository(defaultAccountRepository: DefaultAccountRepository): AccountRepository
 }

android/app/src/main/java/com/on/turip/di/ServiceModule.kt

@@ -1,5 +1,7 @@
 package com.on.turip.di
 
+import com.on.turip.data.accounts.service.AccountService
+import com.on.turip.data.accounts.service.createAccountService
 import com.on.turip.data.bookmarks.service.BookmarkService
 import com.on.turip.data.bookmarks.service.createBookmarkService
 import com.on.turip.data.content.service.ContentService
@@ -51,4 +53,8 @@ object ServiceModule {
     @Provides
     @Singleton
     fun provideGuestService(ktorfit: Ktorfit): GuestService = ktorfit.createGuestService()
+
+    @Provides
+    @Singleton
+    fun provideAccountService(ktorfit: Ktorfit): AccountService = ktorfit.createAccountService()
 }

android/app/src/main/java/com/on/turip/domain/accounts/Account.kt

@@ -0,0 +1,7 @@
+package com.on.turip.domain.accounts
+
+data class Account(
+    val id: Long,
+    val nickname: String,
+    val role: Role,
+)

android/app/src/main/java/com/on/turip/domain/accounts/AccountRepository.kt

@@ -0,0 +1,7 @@
+package com.on.turip.domain.accounts
+
+import com.on.turip.core.result.TuripResult
+
+interface AccountRepository {
+    suspend fun loadMyProfile(): TuripResult<Account>
+}

android/app/src/main/java/com/on/turip/domain/accounts/Role.kt

@@ -0,0 +1,16 @@
+package com.on.turip.domain.accounts
+
+enum class Role(
+    private val tag: String,
+) {
+    MEMBER("MEMBER"),
+    GUEST("GUEST"),
+    ;
+
+    companion object {
+        fun from(role: String): Role {
+            val tag = role.uppercase()
+            return entries.firstOrNull { it.tag == tag } ?: GUEST
+        }
+    }
+}

android/app/src/main/java/com/on/turip/ui/compose/home/HomeScreen.kt

@@ -1,5 +1,6 @@
 package com.on.turip.ui.compose.home
 
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -48,6 +49,7 @@ fun HomeScreen(
     onRegionClick: (String) -> Unit,
     onContentClick: (UsersLikeContentModel) -> Unit,
     navigateToLoginScreen: () -> Unit,
+    navigateToMyPage: () -> Unit,
     viewModel: HomeViewModel = hiltViewModel(),
 ) {
     val uiState: HomeUiState by viewModel.uiState.collectAsStateWithLifecycle()
@@ -71,6 +73,7 @@ fun HomeScreen(
             onContentClick = onContentClick,
             onRegionClick = onRegionClick,
             onDomesticClick = { viewModel.updateDomesticSelected(it) },
+            onNavigateToMyPage = navigateToMyPage,
             modifier = Modifier.padding(innerPadding),
         )
     }
@@ -84,6 +87,7 @@ private fun HomeScreenContent(
     onContentClick: (UsersLikeContentModel) -> Unit,
     onRegionClick: (String) -> Unit,
     onDomesticClick: (Boolean) -> Unit,
+    onNavigateToMyPage: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     var keyword: String by rememberSaveable { mutableStateOf("") }
@@ -166,6 +170,14 @@ private fun HomeScreenContent(
                     regions = uiState.regionCategories,
                     onRegionClick = onRegionClick,
                 )
+
+                Text(
+                    text = "임시 마이페이지 확인용 텍스트",
+                    modifier =
+                        Modifier
+                            .padding(top = TuripTheme.spacing.large)
+                            .clickable(onClick = onNavigateToMyPage),
+                )
             }
         }
     }
@@ -184,6 +196,7 @@ private fun HomeLoadingPreview() {
                 onContentClick = { },
                 onRegionClick = { },
                 onDomesticClick = { },
+                onNavigateToMyPage = {},
                 modifier = Modifier.padding(innerPadding),
             )
         }
@@ -210,6 +223,7 @@ private fun HomeSuccessPreview() {
                 onContentClick = { },
                 onRegionClick = { },
                 onDomesticClick = { },
+                onNavigateToMyPage = {},
                 modifier = Modifier.padding(innerPadding),
             )
         }
@@ -229,6 +243,7 @@ private fun HomeServerErrorPreview() {
                 onContentClick = { },
                 onRegionClick = { },
                 onDomesticClick = { },
+                onNavigateToMyPage = {},
                 modifier = Modifier.padding(innerPadding),
             )
         }
@@ -248,6 +263,7 @@ private fun HomeNetworkErrorPreview() {
                 onContentClick = { },
                 onRegionClick = { },
                 onDomesticClick = { },
+                onNavigateToMyPage = {},
                 modifier = Modifier.padding(innerPadding),
             )
         }

android/app/src/main/java/com/on/turip/ui/compose/login/LoginScreen.kt

@@ -73,7 +73,7 @@ fun LoginScreen(
             title = stringResource(R.string.login_dialog_migration_title),
             message = stringResource(R.string.login_dialog_migration_message),
             confirmText = stringResource(R.string.login_dialog_confirm_text),
-            dismissText = stringResource(R.string.setting_logout_dialog_dismiss),
+            dismissText = stringResource(R.string.my_page_logout_dialog_dismiss),
             onConfirmation = viewmodel::migration,
             onDismissRequest = viewmodel::clearGuestData,
         )
@@ -154,12 +154,10 @@ private fun LoginScreenContent(
                             .border(
                                 border = BorderStroke(1.dp, TuripTheme.colors.gray02),
                                 shape = TuripTheme.shape.container,
-                            )
-                            .background(
+                            ).background(
                                 color = TuripTheme.colors.gray03,
                                 shape = TuripTheme.shape.container,
-                            )
-                            .fillMaxWidth()
+                            ).fillMaxWidth()
                             .padding(vertical = TuripTheme.spacing.extraLarge),
                     textAlign = TextAlign.Center,
                 )

android/app/src/main/java/com/on/turip/ui/compose/mypage/MyPageDialogState.kt

@@ -0,0 +1,7 @@
+package com.on.turip.ui.compose.mypage
+
+sealed interface MyPageDialogState {
+    data object LogoutRequired : MyPageDialogState
+
+    data object ConfirmWithdraw : MyPageDialogState
+}

android/app/src/main/java/com/on/turip/ui/compose/mypage/MyPageMapper.kt

@@ -0,0 +1,11 @@
+package com.on.turip.ui.compose.mypage
+
+import com.on.turip.domain.accounts.Account
+import com.on.turip.ui.compose.mypage.model.ProfileModel
+
+fun Account.toUiModel(): ProfileModel =
+    ProfileModel(
+        id = id,
+        nickname = nickname,
+        imageUrl = null,
+    )