chore: resolved conflict

EAT-SSU · Sep 28, 2024 · 06211ed · 06211ed
1 parent 88f9cf0
commit 06211ed
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 35 deletions.
diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/MyPageActivity.kt b/app/src/main/java/com/eatssu/android/ui/mypage/MyPageActivity.kt
@@ -20,12 +20,8 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.eatssu.android.R
 import com.eatssu.android.base.BaseActivity
-import com.eatssu.android.data.repository.FirebaseRemoteConfigRepository
 import com.eatssu.android.databinding.ActivityMyPageBinding
-import com.eatssu.android.ui.common.VersionViewModel
-import com.eatssu.android.ui.common.VersionViewModelFactory
 import com.eatssu.android.ui.login.LoginActivity
-import com.eatssu.android.ui.mypage.inquire.InquireActivity
 import com.eatssu.android.ui.mypage.myreview.MyReviewListActivity
 import com.eatssu.android.ui.mypage.terms.WebViewActivity
 import com.eatssu.android.ui.mypage.usernamechange.UserNameChangeActivity
@@ -35,7 +31,6 @@ import com.eatssu.android.util.startActivity
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
-import timber.log.Timber
 
 @AndroidEntryPoint
 class MyPageActivity : BaseActivity<ActivityMyPageBinding>(ActivityMyPageBinding::inflate) {
@@ -184,34 +179,6 @@ class MyPageActivity : BaseActivity<ActivityMyPageBinding>(ActivityMyPageBinding
                 }
             }
         }
-    }
-
-
-    private fun showSignoutDialog() {
-        DialogUtil.createDialogWithCancelButton(
-            "탈퇴하기",
-            this@MyPageActivity,
-            "탈퇴 하시겠습니까?",
-            "취소",
-            "탈퇴하기"
-        ) { _, _ ->
-//            ActivityCompat.finishAffinity(this)
-//            exitProcess(0)
-            myPageViewModel.signOut()
-
-            lifecycleScope.launch {
-                myPageViewModel.uiState.collectLatest {
-                    if (it.isSignOuted) {
-                        showToast(it.toastMessage)
-                        startActivity<LoginActivity>()
-                        finishAffinity()
-                    }
-
-                    }
-                }
-            }
-            }
-
 
     private fun moveToPlayStore() {
         val appPackageName = packageName

diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/SignOutActivity.kt b/app/src/main/java/com/eatssu/android/ui/mypage/SignOutActivity.kt
@@ -7,7 +7,7 @@ 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 com.eatssu.android.util.showToast
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch

diff --git a/app/src/main/java/com/eatssu/android/ui/review/report/ReportActivity.kt b/app/src/main/java/com/eatssu/android/ui/review/report/ReportActivity.kt
@@ -8,7 +8,7 @@ import androidx.lifecycle.lifecycleScope
 import com.eatssu.android.base.BaseActivity
 import com.eatssu.android.data.enums.ReportType
 import com.eatssu.android.databinding.ActivityReportBinding
-import com.eatssu.android.util.extension.showToast
+import com.eatssu.android.util.showToast
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch