[MERGE] : #132 -> main

[FIX/#132] 2차 mvp 배포 전 수정사항 반영
depromeet · Feb 12, 2024 · 2780c9c · 2780c9c
2 parents c8021de + ddbf356
commit 2780c9c
Show file tree

Hide file tree

Showing 11 changed files with 76 additions and 78 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -99,9 +99,6 @@
         <activity
             android:name=".presentation.signin.SocialWebViewActivity"
             android:exported="false" />
-        <activity
-            android:name=".presentation.onboarding.AccessLocationActivity"
-            android:exported="false" />
         <activity
             android:name=".presentation.signup.terms.TermsWebViewActivity"
             android:exported="false" />

diff --git a/app/src/main/java/com/teumteum/teumteum/presentation/onboarding/AccessLocationActivity.kt b/app/src/main/java/com/teumteum/teumteum/presentation/onboarding/AccessLocationActivity.kt
diff --git a/app/src/main/java/com/teumteum/teumteum/presentation/onboarding/OnBoardingActivity.kt b/app/src/main/java/com/teumteum/teumteum/presentation/onboarding/OnBoardingActivity.kt
@@ -2,6 +2,7 @@ package com.teumteum.teumteum.presentation.onboarding
 
 import android.content.Intent
 import android.os.Bundle
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.tabs.TabLayoutMediator
 import com.teumteum.base.BindingActivity
@@ -12,6 +13,10 @@ import com.teumteum.domain.entity.CommonViewPagerEntity
 import com.teumteum.teumteum.R
 import com.teumteum.teumteum.databinding.ActivityOnboardingBinding
 import com.teumteum.teumteum.presentation.onboarding.adapter.OnBoardingViewPagerAdapter
+import com.teumteum.teumteum.presentation.signin.SignInActivity
+import com.teumteum.teumteum.util.PermissionUtils
+import com.teumteum.teumteum.util.custom.dialog.CommonDialogConfig
+import com.teumteum.teumteum.util.custom.dialog.CommonDialogFragment
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
@@ -38,13 +43,42 @@ class OnBoardingActivity
         setAppBarHeight(48)
     }
 
+    private val locationPermissionRequest = registerForActivityResult(
+        ActivityResultContracts.RequestMultiplePermissions()
+    ) {
+        startActivity(Intent(this@OnBoardingActivity, SignInActivity::class.java))
+        openActivitySlideAnimation()
+        finish()
+    }
+
+    private fun checkLocationPermission() {
+        locationPermissionRequest.launch(
+            arrayOf(
+                PermissionUtils.ACCESS_FINE_LOCATION, PermissionUtils.ACCESS_COARSE_LOCATION
+            )
+        )
+    }
+
     private fun setUpListener() {
         binding.btnStart.setOnSingleClickListener {
-            startActivity(Intent(this, AccessLocationActivity::class.java))
-            openActivitySlideAnimation()
+            initDialog()
         }
     }
 
+    private fun initDialog() {
+        CommonDialogFragment.newInstance(
+            commonDialogConfig = CommonDialogConfig(
+                title = getString(R.string.onboarding_tv_access_location_title),
+                description = getString(R.string.onboarding_tv_access_location_subtitle),
+                positiveButtonText = getString(R.string.onboarding_tv_access_location_allow),
+                negativeButtonText = getString(R.string.onboarding_tv_access_location_decline)
+            ),
+            onPositiveButtonClicked = { checkLocationPermission() },
+            onNegativeButtonClicked = { startActivity(Intent(this@OnBoardingActivity, SignInActivity::class.java))
+             }
+        ).show(supportFragmentManager, "CommonDialogFragmentTag")
+    }
+
     private fun initViewPagerItem() {
         with(viewpagerList) {
             add(

diff --git a/app/src/main/java/com/teumteum/teumteum/presentation/signin/SignInViewModel.kt b/app/src/main/java/com/teumteum/teumteum/presentation/signin/SignInViewModel.kt
@@ -6,6 +6,7 @@ import com.teumteum.domain.repository.AuthRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import timber.log.Timber
 import javax.inject.Inject
 
 @HiltViewModel
@@ -19,23 +20,27 @@ class SignInViewModel @Inject constructor(
     var oauthId = ""
 
     fun updateMemberState(socialLoginResult: SocialLoginResult) {
-        if (socialLoginResult.messages == null) {
-            if (socialLoginResult.oauthId.isNullOrEmpty()) {
+        Timber.tag("teum-login").d("${socialLoginResult}")
+        if (socialLoginResult.message == null) {
+            if (!socialLoginResult.accessToken.isNullOrEmpty() && !socialLoginResult.refreshToken.isNullOrEmpty()) {
                 // 기존 회원일 때
                 repository.setAutoLogin(
                     socialLoginResult.accessToken!!,
                     socialLoginResult.refreshToken!!)
                 _memberState.value = SignInUiState.Success
             }
-            else {
+            else if (!socialLoginResult.oauthId.isNullOrEmpty()){
                 // 새로 가입해야 할 때
                 oauthId = socialLoginResult.oauthId!!
                 _memberState.value = SignInUiState.UserNotRegistered
             }
+            else {
+                _memberState.value = SignInUiState.Failure("소셜로그인 실패")
+            }
         }
         else {
             // 통신 실패
-            _memberState.value = SignInUiState.Failure(socialLoginResult.messages!!)
+            _memberState.value = SignInUiState.Failure(socialLoginResult.message!!)
         }
     }
 

diff --git a/app/src/main/java/com/teumteum/teumteum/presentation/signin/SocialWebViewActivity.kt b/app/src/main/java/com/teumteum/teumteum/presentation/signin/SocialWebViewActivity.kt
@@ -18,6 +18,7 @@ import com.teumteum.base.component.appbar.AppBarLayout
 import com.teumteum.base.component.appbar.AppBarMenu
 import com.teumteum.base.databinding.LayoutCommonAppbarBinding
 import com.teumteum.base.util.extension.defaultSnackBar
+import com.teumteum.base.util.extension.defaultToast
 import com.teumteum.data.BuildConfig
 import com.teumteum.domain.entity.SocialLoginResult
 import com.teumteum.teumteum.R
@@ -50,7 +51,7 @@ class SocialWebViewActivity
 
         provider = intent.getStringExtra(EXTRA_KEY_PROVIDER).toString()
         initProvider(provider)
-        initCookieManager()
+//        initCookieManager()
         initAppBarLayout()
         initWebView()
         observer()
@@ -175,7 +176,7 @@ class SocialWebViewActivity
                         goToTermsActivity()
                     }
                     is SignInUiState.Failure -> {
-                        defaultSnackBar(binding.root, it.msg)
+                        defaultToast(it.msg)
                         finish()
                     }
 
@@ -192,7 +193,7 @@ class SocialWebViewActivity
                         goToHomeScreen()
                     }
                     is MyInfoUiState.Failure -> {
-                        defaultSnackBar(binding.root, state.msg)
+                        defaultToast(state.msg)
                         goToTermsActivity()
                     }
                     else -> {}

diff --git a/app/src/main/java/com/teumteum/teumteum/presentation/signup/SignUpViewModel.kt b/app/src/main/java/com/teumteum/teumteum/presentation/signup/SignUpViewModel.kt
@@ -204,6 +204,15 @@ class SignUpViewModel @Inject constructor(
         _interestSelf.value = ArrayList(interests)
     }
 
+    fun setAllInterests(interests: List<String>, selfResource: Array<String>, fieldResource: Array<String>) {
+        interestSelf.value.clear()
+        interestField.value.clear()
+        for (i in interests) {
+            if (i in selfResource) addInterestSelf(i)
+            else if (i in fieldResource) addInterestField(i)
+        }
+    }
+
     private var _goalText = MutableStateFlow<String>("")
     val goalText: StateFlow<String> = _goalText.asStateFlow()
 

diff --git a/app/src/main/java/com/teumteum/teumteum/presentation/signup/complete/CardCompleteFragment.kt b/app/src/main/java/com/teumteum/teumteum/presentation/signup/complete/CardCompleteFragment.kt
@@ -55,16 +55,17 @@ class CardCompleteFragment
 
             val interests = mutableListOf<Interest>()
             for (i in interestField.value) {
-                interests.add(Interest("#$i"))
+                interests.add(Interest(i))
             }
             for (i in interestSelf.value) {
-                interests.add(Interest("#$i"))
+                interests.add(Interest(i))
             }
             binding.cardviewBack.apply {
                 tvGoalContent.text = goalText.value
                 CHARACTER_CARD_LIST_BACK[characterId.value]?.let { ivCharacter.setImageResource(it) }
                 submitInterestList(interests)
                 isModify = false
+                setIsModifyDetail(false)
 //                isModifyDetail = false
             }
         }

diff --git a/app/src/main/java/com/teumteum/teumteum/presentation/signup/fix/CardFixFragment.kt b/app/src/main/java/com/teumteum/teumteum/presentation/signup/fix/CardFixFragment.kt
@@ -65,12 +65,13 @@ class CardFixFragment
 
             val interests = mutableListOf<Interest>()
             for (i in interestField.value) {
-                interests.add(Interest("#$i"))
+                interests.add(Interest(i))
             }
             for (i in interestSelf.value) {
-                interests.add(Interest("#$i"))
+                interests.add(Interest(i))
             }
             binding.cardviewBack.apply {
+                setIsModifyDetail(true)
                 tvGoalContent.text = goalText.value
                 SignupUtils.CHARACTER_CARD_LIST_BACK[characterId.value]?.let { ivCharacter.setImageResource(it) }
                 submitInterestList(interests)
@@ -182,12 +183,17 @@ class CardFixFragment
                     navigateTo<GetGoalFragment>()
                 }
             }
-            rvInterests.setOnSingleClickListener {
+            interestAdapter.onAddItemClick = {
                 (activity as SignUpActivity).apply {
                     showNextButtonOnFixingField()
                     navigateTo<GetInterestFragment>()
                 }
             }
+            currentList.observe(viewLifecycleOwner) { interests ->
+                val selfArray = resources.getStringArray(R.array.interest_1)
+                val fieldArray = resources.getStringArray(R.array.interest_2)
+                viewModel.setAllInterests(interests.map { it.toString() }, selfArray, fieldArray)
+            }
         }
     }
 

diff --git a/app/src/main/java/com/teumteum/teumteum/presentation/signup/intro/CardIntroActivity.kt b/app/src/main/java/com/teumteum/teumteum/presentation/signup/intro/CardIntroActivity.kt
@@ -76,6 +76,7 @@ class CardIntroActivity
             )
             binding.cardviewBack.submitInterestList(interests)
             binding.cardviewBack.isModify = false
+            binding.cardviewBack.setIsModifyDetail(false)
 //            binding.cardviewBack.isModifyDetail = false
         }
     }
@@ -119,8 +120,8 @@ class CardIntroActivity
     }
 
     companion object {
-        const val INTEREST_EXAMPLE_1 = "#사이드 프로젝트"
-        const val INTEREST_EXAMPLE_2 = "#네트워킹"
-        const val INTEREST_EXAMPLE_3 = "#모여서 각자 일하기"
+        const val INTEREST_EXAMPLE_1 = "사이드 프로젝트"
+        const val INTEREST_EXAMPLE_2 = "네트워킹"
+        const val INTEREST_EXAMPLE_3 = "모여서 각자 일하기"
     }
 }
diff --git a/app/src/main/res/layout/fragment_common_dialog.xml b/app/src/main/res/layout/fragment_common_dialog.xml
@@ -72,7 +72,7 @@
                 android:padding="12dp"
                 android:stateListAnimator="@null"
                 android:text="@{dialogConfig.negativeButtonText}"
-                android:textColor="@color/text_button_primary_default"
+                android:textColor="@color/text_button_alternative"
                 android:textSize="15sp"
                 app:layout_constraintBottom_toBottomOf="@id/btn_common_dialog_positive"
                 app:layout_constraintEnd_toStartOf="@id/btn_common_dialog_positive"

diff --git a/core/domain/src/main/java/com/teumteum/domain/entity/SocialLoginResult.kt b/core/domain/src/main/java/com/teumteum/domain/entity/SocialLoginResult.kt
@@ -7,5 +7,5 @@ data class SocialLoginResult (
     val accessToken: String?,
     val refreshToken: String?,
     val oauthId: String?,
-    val messages: String?
+    val message: String?
 )