[fix/#118] interest 수정 오류

depromeet · Jan 31, 2024 · 9bcfc8c · 9bcfc8c
1 parent 4622123
commit 9bcfc8c
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 8 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -12,5 +12,6 @@ dependencies {
     implementation(libs.androidx.appCompat)
     implementation(libs.materialDesign)
     implementation(libs.androidx.constraintLayout)
+    implementation(libs.google.oss.plugin)
     implementation(libs.play.services.location)
 }
diff --git a/...c/main/java/com/teumteum/teumteum/presentation/mypage/setting/fragment/SettingFragment.kt b/...c/main/java/com/teumteum/teumteum/presentation/mypage/setting/fragment/SettingFragment.kt
@@ -69,6 +69,9 @@ class SettingFragment: BindingFragment<FragmentSettingBinding>(R.layout.fragment
             }
             SettingStatus.ERROR -> {
                 requireActivity().defaultToast("서버 통신 에러")
+            }
+            SettingStatus.OPENSOURCE -> {
+
             }
             else -> {}
         }

diff --git a/...main/java/com/teumteum/teumteum/presentation/mypage/setting/viewModel/SettingViewModel.kt b/...main/java/com/teumteum/teumteum/presentation/mypage/setting/viewModel/SettingViewModel.kt
@@ -265,7 +265,8 @@ fun getMemberSetting(viewModel: SettingViewModel, navController: NavController):
     return listOf(
         SettingUiItem(title = "약관 및 개인정보 처리 동의", onClick = { navController.navigate(R.id.fragment_service) }),
         SettingUiItem(title = "탈퇴하기", onClick = { navController.navigate(R.id.fragment_signout) }),
-        SettingUiItem(title = "로그아웃", onClick = { viewModel.updateSettingStatus(SettingStatus.LOGOUT) })
+        SettingUiItem(title = "로그아웃", onClick = { viewModel.updateSettingStatus(SettingStatus.LOGOUT) }),
+        SettingUiItem(title = "오픈소스", onClick = {viewModel.updateSettingStatus(SettingStatus.OPENSOURCE)})
     )
 }
 
@@ -279,8 +280,7 @@ fun getServiceGuide(): List<SettingUiItem> {
 
 enum class SettingStatus {
     LOGOUT, LOGOUT_CONFIRM, SIGNOUT,
-    DEFAULT, NOTION, ERROR, SETTING,
-    CANCEL, RECOMMEND, RECOMMEND_DETAIL
+    DEFAULT, NOTION, ERROR, OPENSOURCE
 }
 
 

diff --git a/app/src/main/java/com/teumteum/teumteum/presentation/signup/interests/GetInterestFragment.kt b/app/src/main/java/com/teumteum/teumteum/presentation/signup/interests/GetInterestFragment.kt
@@ -48,11 +48,6 @@ class GetInterestFragment:
         checkValidInput()
     }
 
-    val callback = object : OnBackPressedCallback(true) {
-        override fun handleOnBackPressed() {
-            handleBackPress()
-        }
-    }
     private fun makeChip(interest: String): Chip {
         val chipDrawable = ChipDrawable.createFromAttributes(
             requireContext(),

diff --git a/...gic/convention/build/classes/kotlin/main/plugins/AndroidApplicationPlugin$apply$1$3.class b/...gic/convention/build/classes/kotlin/main/plugins/AndroidApplicationPlugin$apply$1$3.class
diff --git a/build-logic/convention/build/classes/kotlin/main/plugins/AndroidApplicationPlugin.class b/build-logic/convention/build/classes/kotlin/main/plugins/AndroidApplicationPlugin.class
diff --git a/build-logic/convention/build/kotlin/compileKotlin/cacheable/last-build.bin b/build-logic/convention/build/kotlin/compileKotlin/cacheable/last-build.bin
diff --git a/build-logic/convention/build/kotlin/compileKotlin/local-state/build-history.bin b/build-logic/convention/build/kotlin/compileKotlin/local-state/build-history.bin
diff --git a/build-logic/convention/build/libs/convention.jar b/build-logic/convention/build/libs/convention.jar
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -91,6 +91,8 @@ google-services-plugin = { group = "com.google.gms", name = "google-services", v
 #google-crashlytics-gradle = { group = "com.google.firebase", name = "firebase-crashlytics-gradle", version.ref = "googleCrashlyticsPlguin" }
 play-services-location = { group = "com.google.android.gms", name = "play-services-location", version = "21.0.1" }
 
+
+
 navigation-plugin = { group = "androidx.navigation", name = "navigation-safe-args-gradle-plugin", version.ref = "navigationVersion" }
 
 # Kotlin