[FEATURE] #7 설정화면 구현 (#33)

* [base] settings 모듈 추가

* [base] string resource 추가

* [chore] 컴포즈 의존성 추가

* [chore] settings 모듈 의존성 추가

* [chore] compose 옵션 추가

* [ui] 설정화면 UI 구현

* [ui] 바텀시트 추가

* [ui] 닉네임 수정 화면 구현

* [feature] 닉네임 수정 구현

* [chore] 코딩 컨벤션 반영

* [chore] 코딩 컨벤션 반영

* [chore] 코딩 컨벤션 반영

* [chore] 코드리뷰 반영

* [chore] 코딩 컨벤션 반영

app/build.gradle.kts

@@ -77,6 +77,7 @@ dependencies {
  implementation(project(":feature:login"))
  implementation(project(":feature:pokitdetail"))
  implementation(project(":feature:search"))
+ implementation(project(":feature:settings"))
 
  // hilt
  implementation(libs.hilt)

app/src/main/java/pokitmons/pokit/navigation/RootDestination.kt

@@ -45,3 +45,11 @@ object PokitDetail {
 object Search {
  val route: String = "search"
 }
+
+object Setting {
+ val route: String = "setting"
+}
+
+object EditNickname {
+ val route: String = "editNickname"
+}

app/src/main/java/pokitmons/pokit/navigation/RootNavHost.kt

@@ -18,6 +18,9 @@ import pokitmons.pokit.LoginViewModel
 import pokitmons.pokit.login.LoginScreen
 import pokitmons.pokit.search.SearchScreenContainer
 import pokitmons.pokit.search.SearchViewModel
+import pokitmons.pokit.settings.SettingViewModel
+import pokitmons.pokit.settings.nickname.EditNicknameScreen
+import pokitmons.pokit.settings.setting.SettingsScreen
 
 @Composable
 fun RootNavHost(
@@ -92,5 +95,21 @@ fun RootNavHost(
  }
  )
  }
+
+ composable(route = Setting.route) {
+ val viewModel: SettingViewModel = hiltViewModel()
+ SettingsScreen(
+ settingViewModel = viewModel,
+ onNavigateToEditNickname = { navHostController.navigate(EditNickname.route) }
+ )
+ }
+
+ composable(route = EditNickname.route) {
+ val viewModel: SettingViewModel = hiltViewModel()
+ EditNicknameScreen(
+ settingViewModel = viewModel,
+ onBackPressed = navHostController::popBackStack
+ )
+ }
  }
 }

data/src/main/java/pokitmons/pokit/data/api/SettingApi.kt

@@ -0,0 +1,13 @@
+package pokitmons.pokit.data.api
+
+import pokitmons.pokit.data.model.setting.reqeust.EditNicknameRequest
+import pokitmons.pokit.data.model.setting.response.EditNicknameResponse
+import retrofit2.http.Body
+import retrofit2.http.PUT
+
+interface SettingApi {
+ @PUT("user/nickname")
+ suspend fun editNickname(
+ @Body editNicknameRequest: EditNicknameRequest,
+ ): EditNicknameResponse
+}

data/src/main/java/pokitmons/pokit/data/datasource/remote/setting/RemoteSettingDataSourceImpl.kt

@@ -0,0 +1,12 @@
+package pokitmons.pokit.data.datasource.remote.setting
+
+import pokitmons.pokit.data.api.SettingApi
+import pokitmons.pokit.data.model.setting.reqeust.EditNicknameRequest
+import pokitmons.pokit.data.model.setting.response.EditNicknameResponse
+import javax.inject.Inject
+
+class RemoteSettingDataSourceImpl @Inject constructor(private val settingApi: SettingApi) : SettingDataSource {
+ override suspend fun editNickname(editNicknameRequest: EditNicknameRequest): EditNicknameResponse {
+ return settingApi.editNickname(editNicknameRequest)
+ }
+}

data/src/main/java/pokitmons/pokit/data/datasource/remote/setting/SettingDataSource.kt

@@ -0,0 +1,8 @@
+package pokitmons.pokit.data.datasource.remote.setting
+
+import pokitmons.pokit.data.model.setting.reqeust.EditNicknameRequest
+import pokitmons.pokit.data.model.setting.response.EditNicknameResponse
+
+interface SettingDataSource {
+ suspend fun editNickname(editNicknameRequest: EditNicknameRequest): EditNicknameResponse
+}

data/src/main/java/pokitmons/pokit/data/di/network/NetworkModule.kt

@@ -10,6 +10,7 @@ import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import pokitmons.pokit.data.api.AuthApi
+import pokitmons.pokit.data.api.SettingApi
 import retrofit2.Retrofit
 import java.util.concurrent.TimeUnit
 import javax.inject.Singleton
@@ -67,4 +68,9 @@ object NetworkModule {
  fun provideAuthService(retrofit: Retrofit): AuthApi {
  return retrofit.create(AuthApi::class.java)
  }
+
+ @Provides
+ fun provideSettingService(retrofit: Retrofit): SettingApi {
+ return retrofit.create(SettingApi::class.java)
+ }
 }

data/src/main/java/pokitmons/pokit/data/di/setting/SettingModule.kt

@@ -0,0 +1,23 @@
+package pokitmons.pokit.data.di.setting
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import pokitmons.pokit.data.datasource.remote.setting.RemoteSettingDataSourceImpl
+import pokitmons.pokit.data.datasource.remote.setting.SettingDataSource
+import pokitmons.pokit.data.repository.setting.SettingRepositoryImpl
+import pokitmons.pokit.domain.repository.setting.SettingRepository
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class SettingModule {
+ @Binds
+ @Singleton
+ abstract fun bindSettingRepository(settingRepositoryImpl: SettingRepositoryImpl): SettingRepository
+
+ @Binds
+ @Singleton
+ abstract fun bindSettingDataSource(settingDataSourceImpl: RemoteSettingDataSourceImpl): SettingDataSource
+}

data/src/main/java/pokitmons/pokit/data/mapper/setting/SettingMapper.kt

@@ -0,0 +1,14 @@
+package pokitmons.pokit.data.mapper.setting
+
+import pokitmons.pokit.data.model.setting.response.EditNicknameResponse
+import pokitmons.pokit.domain.model.setting.EditNicknameResult
+
+object SettingMapper {
+ fun mapperToEditNickname(editNicknameResponse: EditNicknameResponse): EditNicknameResult {
+ return EditNicknameResult(
+ id = editNicknameResponse.id,
+ nickname = editNicknameResponse.nickname,
+ email = editNicknameResponse.email
+ )
+ }
+}

data/src/main/java/pokitmons/pokit/data/model/setting/reqeust/EditNicknameRequest.kt

@@ -0,0 +1,8 @@
+package pokitmons.pokit.data.model.setting.reqeust
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class EditNicknameRequest(
+ val nickname: String,
+)

data/src/main/java/pokitmons/pokit/data/model/setting/response/EditNicknameResponse.kt

@@ -0,0 +1,10 @@
+package pokitmons.pokit.data.model.setting.response
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class EditNicknameResponse(
+ val email: String,
+ val id: Int,
+ val nickname: String,
+)

data/src/main/java/pokitmons/pokit/data/repository/setting/SettingRepositoryImpl.kt

@@ -0,0 +1,25 @@
+package pokitmons.pokit.data.repository.setting
+
+import pokitmons.pokit.data.datasource.remote.setting.SettingDataSource
+import pokitmons.pokit.data.mapper.setting.SettingMapper
+import pokitmons.pokit.data.model.common.parseErrorResult
+import pokitmons.pokit.data.model.setting.reqeust.EditNicknameRequest
+import pokitmons.pokit.data.model.setting.response.EditNicknameResponse
+import pokitmons.pokit.domain.commom.PokitResult
+import pokitmons.pokit.domain.model.setting.EditNicknameResult
+import pokitmons.pokit.domain.repository.setting.SettingRepository
+import javax.inject.Inject
+
+class SettingRepositoryImpl @Inject constructor(
+ private val remoteSettingDataSource: SettingDataSource,
+) : SettingRepository {
+ override suspend fun editNickname(nickname: String): PokitResult<EditNicknameResult> {
+ return runCatching {
+ val editNicknameResponse: EditNicknameResponse = remoteSettingDataSource.editNickname(EditNicknameRequest(nickname))
+ val editNicknameMapper = SettingMapper.mapperToEditNickname(editNicknameResponse)
+ PokitResult.Success(editNicknameMapper)
+ }.getOrElse { throwable ->
+ parseErrorResult(throwable)
+ }
+ }
+}

domain/src/main/java/pokitmons/pokit/domain/model/setting/EditNicknameResult.kt

@@ -0,0 +1,7 @@
+package pokitmons.pokit.domain.model.setting
+
+data class EditNicknameResult(
+ val email: String,
+ val id: Int,
+ val nickname: String,
+)

domain/src/main/java/pokitmons/pokit/domain/repository/setting/SettingRepository.kt

@@ -0,0 +1,8 @@
+package pokitmons.pokit.domain.repository.setting
+
+import pokitmons.pokit.domain.commom.PokitResult
+import pokitmons.pokit.domain.model.setting.EditNicknameResult
+
+interface SettingRepository {
+ suspend fun editNickname(nickname: String): PokitResult<EditNicknameResult>
+}

domain/src/main/java/pokitmons/pokit/domain/usecase/setting/EditNicknameUseCase.kt

@@ -0,0 +1,15 @@
+package pokitmons.pokit.domain.usecase.setting
+
+import pokitmons.pokit.domain.commom.PokitResult
+import pokitmons.pokit.domain.model.setting.EditNicknameResult
+import pokitmons.pokit.domain.repository.setting.SettingRepository
+import javax.inject.Inject
+
+class EditNicknameUseCase @Inject constructor(private val settingRepository: SettingRepository) {
+ suspend fun editNickname(nickname: String): PokitResult<EditNicknameResult> {
+ return when (val editNicknameResult = settingRepository.editNickname(nickname)) {
+ is PokitResult.Success -> PokitResult.Success(editNicknameResult.result)
+ is PokitResult.Error -> PokitResult.Error(editNicknameResult.error)
+ }
+ }
+}

feature/settings/build.gradle.kts

@@ -0,0 +1,74 @@
+plugins {
+ alias(libs.plugins.com.android.library)
+ alias(libs.plugins.org.jetbrains.kotlin.android)
+ alias(libs.plugins.hilt)
+ id("kotlin-kapt")
+}
+
+android {
+ namespace = "pokitmons.pokit.settings"
+ compileSdk = 34
+
+ defaultConfig {
+ minSdk = 24
+
+ testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+ consumerProguardFiles("consumer-rules.pro")
+ }
+
+ buildFeatures {
+ compose = true
+ }
+
+ composeOptions {
+ kotlinCompilerExtensionVersion = "1.5.1"
+ }
+
+ buildTypes {
+ release {
+ isMinifyEnabled = false
+ proguardFiles(
+ getDefaultProguardFile("proguard-android-optimize.txt"),
+ "proguard-rules.pro"
+ )
+ }
+ }
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_1_8
+ targetCompatibility = JavaVersion.VERSION_1_8
+ }
+ kotlinOptions {
+ jvmTarget = "1.8"
+ }
+}
+
+dependencies {
+ implementation(libs.androidx.core.ktx)
+ implementation(libs.androidx.lifecycle.runtime.ktx)
+ implementation(libs.androidx.activity.compose)
+ implementation(platform(libs.androidx.compose.bom))
+ implementation(libs.androidx.ui)
+ implementation(libs.androidx.ui.graphics)
+ implementation(libs.androidx.ui.tooling.preview)
+ implementation(libs.androidx.material3)
+ implementation(libs.androidx.navigation.compose)
+ testImplementation(libs.junit)
+ androidTestImplementation(libs.androidx.junit)
+ androidTestImplementation(libs.androidx.espresso.core)
+ androidTestImplementation(platform(libs.androidx.compose.bom))
+ androidTestImplementation(libs.androidx.ui.test.junit4)
+ debugImplementation(libs.androidx.ui.tooling)
+ debugImplementation(libs.androidx.ui.test.manifest)
+
+ implementation(project(":core:ui"))
+ implementation(project(":domain"))
+ implementation(project(":feature:login"))
+
+ // hilt
+ implementation(libs.hilt)
+ kapt(libs.hilt.compiler)
+
+ // navigation
+ implementation(libs.androidx.navigation.compose)
+ implementation(libs.hilt.navigation.compose)
+}

feature/settings/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

feature/settings/src/androidTest/java/pokitmons/pokit/settings/ExampleInstrumentedTest.kt

@@ -0,0 +1,22 @@
+package pokitmons.pokit.settings
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import junit.framework.TestCase.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+ @Test
+ fun useAppContext() {
+ // Context of the app under test.
+ val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+ assertEquals("pokitmons.pokit.settings.test", appContext.packageName)
+ }
+}

feature/settings/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>