[Redesign/#203] my page 리디자인 적용

app/build.gradle.kts

@@ -93,6 +93,7 @@ dependencies {
     implementation(libs.transport.runtime)
     implementation(libs.activity)
     implementation(libs.fragment)
+    implementation(libs.androidx.activity)
 
     // Testing libraries
     testImplementation(libs.junit)

app/src/main/AndroidManifest.xml

@@ -6,7 +6,7 @@
         <intent>
             <action android:name="android.media.action.IMAGE_CAPTURE" />
         </intent>
-    </queries> 
+    </queries>
 
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
     <uses-permission
@@ -25,7 +25,6 @@
     <application
         android:name=".App"
         android:allowBackup="true"
-        android:usesCleartextTraffic="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@drawable/image_logo_none"
@@ -35,8 +34,15 @@
         android:roundIcon="@drawable/image_logo_none"
         android:supportsRtl="true"
         android:theme="@style/Theme.EatSSUAndroid"
+        android:usesCleartextTraffic="true"
         tools:targetApi="31">
-
+        <activity
+            android:name=".ui.mypage.DeveloperActivity"
+            android:exported="false" />
+        <activity
+            android:name=".ui.mypage.SignOutActivity"
+            android:exported="false"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.mypage.terms.WebViewActivity"
             android:exported="false" />
@@ -48,7 +54,6 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
         </activity>
         <activity
             android:name=".ui.mypage.inquire.InquiryActivity"

app/src/main/java/com/eatssu/android/ui/mypage/DeveloperActivity.kt

@@ -0,0 +1,17 @@
+package com.eatssu.android.ui.mypage
+
+import android.os.Bundle
+import com.eatssu.android.R
+import com.eatssu.android.base.BaseActivity
+import com.eatssu.android.databinding.ActivityDeveloperBinding
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class DeveloperActivity :
+    BaseActivity<ActivityDeveloperBinding>(ActivityDeveloperBinding::inflate) {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        toolbarTitle.text = getString(R.string.developer) // 툴바 제목 설정
+    }
+}

app/src/main/java/com/eatssu/android/ui/mypage/MyPageActivity.kt

@@ -76,7 +76,14 @@ class MyPageActivity : BaseActivity<ActivityMyPageBinding>(ActivityMyPageBinding
         }
 
         binding.tvSignout.setOnClickListener {
-            showSignoutDialog()
+            val intent = Intent(this, SignOutActivity::class.java)
+            intent.putExtra("nickname", myPageViewModel.uiState.value.nickname)
+            startActivity(intent)
+//            showSignoutDialog()
+        }
+
+        binding.llDeveloper.setOnClickListener {
+            startActivity<DeveloperActivity>()
         }
 
         binding.llStoreAppVersion.setOnClickListener {

app/src/main/java/com/eatssu/android/ui/mypage/SignOutActivity.kt

@@ -0,0 +1,76 @@
+package com.eatssu.android.ui.mypage
+
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import androidx.activity.viewModels
+import androidx.lifecycle.lifecycleScope
+import com.eatssu.android.base.BaseActivity
+import com.eatssu.android.databinding.ActivitySignOutBinding
+import com.eatssu.android.util.extension.showToast
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+@AndroidEntryPoint
+class SignOutActivity :
+    BaseActivity<ActivitySignOutBinding>(ActivitySignOutBinding::inflate) {
+    //TODO 현재 dev서버 탈퇴하기 500
+
+    private val signOutViewModel: SignOutViewModel by viewModels()
+
+    private var inputNickname: String = ""
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        toolbarTitle.text = "탈퇴하기" // 툴바 제목 설정
+
+        val nickname = intent.getStringExtra("nickname")
+
+        binding.btnSignOut.isEnabled = false
+
+//        binding.etEnterNickname.hint =
+        binding.etEnterNickname.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {}
+
+            //값 변경 시 실행되는 함수
+            override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
+                if (nickname != null) {
+                    checkNickname(nickname)
+                }
+            }
+
+            override fun afterTextChanged(p0: Editable?) {}
+        })
+
+        setOnClickListener()
+    }
+
+
+    private fun setOnClickListener() {
+        binding.btnSignOut.setOnClickListener {
+            signOutViewModel.signOut()
+
+            lifecycleScope.launch {
+                signOutViewModel.uiState.collectLatest {
+                    if (it.isSignOuted) {
+                        showToast(it.toastMessage) //Todo 사용가능 토스트가 무슨 3번이나 나옴
+                    } else {
+                        showToast(it.toastMessage) //Todo 사용가능 토스트가 무슨 3번이나 나옴
+                    }
+                }
+            }
+        }
+    }
+
+    fun checkNickname(nickname: String) {
+        //입력값 담기
+        inputNickname = binding.etEnterNickname.text.trim().toString()
+        // 값 유무에 따른 활성화 여부
+        if (inputNickname == nickname) {
+            binding.btnSignOut.isEnabled = true
+        } else {
+            binding.btnSignOut.isEnabled = false
+        }
+    }
+}

app/src/main/java/com/eatssu/android/ui/mypage/SignOutViewModel.kt

@@ -0,0 +1,78 @@
+package com.eatssu.android.ui.mypage
+
+import android.util.Log
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.eatssu.android.data.usecase.GetUserInfoUseCase
+import com.eatssu.android.data.usecase.LogoutUseCase
+import com.eatssu.android.data.usecase.SetAccessTokenUseCase
+import com.eatssu.android.data.usecase.SetRefreshTokenUseCase
+import com.eatssu.android.data.usecase.SignOutUseCase
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.onCompletion
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class SignOutViewModel @Inject constructor(
+    private val logoutUseCase: LogoutUseCase,
+    private val signOutUseCase: SignOutUseCase,
+    private val getUserInfoUseCase: GetUserInfoUseCase,
+    private val setAccessTokenUseCase: SetAccessTokenUseCase,
+    private val setRefreshTokenUseCase: SetRefreshTokenUseCase,
+) : ViewModel() {
+
+    private val _uiState: MutableStateFlow<SignOutState> = MutableStateFlow(SignOutState())
+    val uiState: StateFlow<SignOutState> = _uiState.asStateFlow()
+
+    fun signOut() {
+        viewModelScope.launch {
+            signOutUseCase().onStart {
+                _uiState.update { it.copy(loading = true) }
+            }.onCompletion {
+                _uiState.update { it.copy(loading = false, error = true) }
+            }.catch { e ->
+                _uiState.update { it.copy(error = true, toastMessage = "정보를 불러올 수 없습니다.") }
+                Log.d(TAG, e.toString())
+
+            }.collectLatest { result ->
+                Log.d(TAG, result.toString())
+                if (result.result == true) {
+                    logoutUseCase()
+                    _uiState.update {
+                        it.copy(
+                            isSignOuted = true,
+                            toastMessage = "탈퇴가 완료되었습니다."
+                        )
+                    }
+                }
+            }
+        }
+    }
+
+    companion object {
+        val TAG = "SignOutViewModel"
+    }
+}
+
+
+data class SignOutState(
+    var loading: Boolean = true,
+    var error: Boolean = false,
+
+    var toastMessage: String = "",
+
+    var nickname: String = "",
+    var platform: String = "",
+
+    var isNicknameNull: Boolean = false,
+    var isLoginOuted: Boolean = false,
+    var isSignOuted: Boolean = false,
+)