✨ 로그아웃, 회원탈퇴 로직 구현 및 캘린더 수정 및 달린 날짜에 아이콘 뜨도록 구현

peter-j0y · peter-j0y · commit 4abe7b03fd47 · 2022-11-28T01:09:37.000+09:00
diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
         kotlinxCoroutinesVersion = "1.6.4"
         paging3Version = "3.1.1"
         navVersion = "2.5.3"
-        playServicesAuthVersion = "20.3.0"
+        playServicesAuthVersion = "20.4.0"
         hiltVersion = "2.44"
         lottieVersion = "5.2.0"
         activityKtxVersion = "1.6.1"
diff --git a/data/build.gradle b/data/build.gradle
@@ -44,6 +44,8 @@ dependencies {
     implementation platform("com.google.firebase:firebase-bom:$firebaseVersion")
     implementation "com.google.firebase:firebase-analytics-ktx"
     implementation "com.google.firebase:firebase-firestore-ktx"
+    implementation "com.google.firebase:firebase-auth-ktx"
+    implementation "com.google.android.gms:play-services-auth:$playServicesAuthVersion"
 
     // Hilt
     implementation "com.google.dagger:hilt-android:$hiltVersion"
diff --git a/data/src/main/java/com/whyranoid/data/account/AccountDataSource.kt b/data/src/main/java/com/whyranoid/data/account/AccountDataSource.kt
@@ -8,4 +8,6 @@ interface AccountDataSource {
     fun getUserUid(): Flow<String>
     fun getEmail(): Flow<Result<String>>
     suspend fun updateUserNickName(uid: String, newNickName: String): Result<String>
+    suspend fun signOut(): Result<Boolean>
+    suspend fun withDrawal(): Result<Boolean>
 }
diff --git a/data/src/main/java/com/whyranoid/data/account/AccountDataSourceImpl.kt b/data/src/main/java/com/whyranoid/data/account/AccountDataSourceImpl.kt
@@ -4,6 +4,7 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
+import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.firestore.FirebaseFirestore
 import com.whyranoid.data.account.AccountDataSourceImpl.PreferenceKeys.email
 import com.whyranoid.data.account.AccountDataSourceImpl.PreferenceKeys.nickName
@@ -18,6 +19,9 @@ class AccountDataSourceImpl @Inject constructor(
     private val fireBaseDb: FirebaseFirestore
 ) : AccountDataSource {
 
+    private val auth = FirebaseAuth.getInstance()
+    private val currentUser = auth.currentUser
+
     private object PreferenceKeys {
         val uid = stringPreferencesKey(UID_KEY)
         val email = stringPreferencesKey(EMAIL_KEY)
@@ -62,6 +66,15 @@ class AccountDataSourceImpl @Inject constructor(
         newNickName
     }
 
+    override suspend fun signOut(): Result<Boolean> = runCatching {
+        signOut()
+        true
+    }
+
+    override suspend fun withDrawal(): Result<Boolean> {
+        TODO("Not yet implemented")
+    }
+
     companion object {
         private const val UID_KEY = "uid"
         private const val EMAIL_KEY = "email"
diff --git a/data/src/main/java/com/whyranoid/data/account/AccountRepositoryImpl.kt b/data/src/main/java/com/whyranoid/data/account/AccountRepositoryImpl.kt
@@ -40,4 +40,12 @@ class AccountRepositoryImpl @Inject constructor(
     override suspend fun updateProfileUrl(newProfileUrl: String): Boolean {
         return true
     }
+
+    override suspend fun signOut(): Result<Boolean> {
+        TODO("Not yet implemented")
+    }
+
+    override suspend fun withDrawal(): Result<Boolean> {
+        TODO("Not yet implemented")
+    }
 }
diff --git a/domain/src/main/java/com/whyranoid/domain/repository/AccountRepository.kt b/domain/src/main/java/com/whyranoid/domain/repository/AccountRepository.kt
@@ -29,4 +29,10 @@ interface AccountRepository {
 
     // 프로필 사진 서버에 업데이트
     suspend fun updateProfileUrl(newProfileUrl: String): Boolean
+
+    // 로그아웃
+    suspend fun signOut(): Result<Boolean>
+
+    // 회원탈퇴
+    suspend fun withDrawal(): Result<Boolean>
 }
diff --git a/domain/src/main/java/com/whyranoid/domain/usecase/SignOutUseCase.kt b/domain/src/main/java/com/whyranoid/domain/usecase/SignOutUseCase.kt
@@ -0,0 +1,10 @@
+package com.whyranoid.domain.usecase
+
+import com.whyranoid.domain.repository.AccountRepository
+import javax.inject.Inject
+
+class SignOutUseCase @Inject constructor(private val accountRepository: AccountRepository) {
+    suspend operator fun invoke(): Result<Boolean> {
+        return accountRepository.signOut()
+    }
+}
diff --git a/domain/src/main/java/com/whyranoid/domain/usecase/WithDrawalUseCase.kt b/domain/src/main/java/com/whyranoid/domain/usecase/WithDrawalUseCase.kt
@@ -0,0 +1,10 @@
+package com.whyranoid.domain.usecase
+
+import com.whyranoid.domain.repository.AccountRepository
+import javax.inject.Inject
+
+class WithDrawalUseCase @Inject constructor(private val accountRepository: AccountRepository) {
+    suspend operator fun invoke(): Result<Boolean> {
+        return accountRepository.withDrawal()
+    }
+}
diff --git a/presentation/src/main/java/com/whyranoid/presentation/myrun/CalendarDayBinder.kt b/presentation/src/main/java/com/whyranoid/presentation/myrun/CalendarDayBinder.kt
@@ -0,0 +1,85 @@
+package com.whyranoid.presentation.myrun
+
+import android.view.View
+import androidx.core.content.ContextCompat
+import com.kizitonwose.calendarview.CalendarView
+import com.kizitonwose.calendarview.model.CalendarDay
+import com.kizitonwose.calendarview.model.DayOwner
+import com.kizitonwose.calendarview.ui.DayBinder
+import com.kizitonwose.calendarview.ui.ViewContainer
+import com.whyranoid.presentation.R
+import com.whyranoid.presentation.databinding.ItemCalendarDayBinding
+import java.time.LocalDate
+
+class CalendarDayBinder(
+    private val calendarView: CalendarView
+) : DayBinder<CalendarDayBinder.DayContainer> {
+    private var calendar: Pair<LocalDate?, LocalDate?> = null to null
+
+    class DayContainer(
+        val binding: ItemCalendarDayBinding
+    ) : ViewContainer(binding.root)
+
+    override fun create(view: View): DayContainer =
+        DayContainer(ItemCalendarDayBinding.bind(view))
+
+    override fun bind(container: DayContainer, day: CalendarDay) {
+        val (startDate, endDate) = this.calendar
+
+        container.binding.tvCalendarDay.text = day.date.dayOfMonth.toString()
+
+        if (day.owner != DayOwner.THIS_MONTH) {
+            container.binding.tvCalendarDay.setTextColor(
+                ContextCompat.getColor(
+                    calendarView.context,
+                    R.color.gray
+                )
+            )
+            // day.day와 day.date.monthValue를 지정해서 특정 월, 일에 달렸다는 콩 표시 가능
+        } else if (day.day == 10 && day.date.monthValue == 11) {
+            container.binding.root.background = (
+                ContextCompat.getDrawable(
+                    calendarView.context,
+                    R.drawable.calendar_kong
+                )
+                )
+        } else {
+            container.binding.tvCalendarDay.setTextColor(
+                ContextCompat.getColor(
+                    calendarView.context,
+                    R.color.black
+                )
+            )
+        }
+
+        if (isInRange(day.date)) {
+            container.binding.root.setBackgroundColor(
+                ContextCompat.getColor(
+                    calendarView.context,
+                    R.color.gray
+                )
+            )
+        }
+
+        if (startDate == day.date) {
+            container.binding.root.background = (
+                ContextCompat.getDrawable(
+                    calendarView.context,
+                    R.drawable.thumbnail_src_small
+                )
+                )
+        } else if (endDate == day.date) {
+            container.binding.root.background = (
+                ContextCompat.getDrawable(
+                    calendarView.context,
+                    R.drawable.thumbnail_src_small
+                )
+                )
+        }
+    }
+
+    private fun isInRange(date: LocalDate): Boolean {
+        val (startDate, endDate) = this.calendar
+        return startDate == date || endDate == date || (startDate != null && endDate != null && startDate < date && date < endDate)
+    }
+}
diff --git a/presentation/src/main/java/com/whyranoid/presentation/myrun/MyRunFragment.kt b/presentation/src/main/java/com/whyranoid/presentation/myrun/MyRunFragment.kt
@@ -6,13 +6,9 @@ import android.widget.EditText
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
-import com.kizitonwose.calendarview.model.CalendarDay
-import com.kizitonwose.calendarview.ui.DayBinder
-import com.kizitonwose.calendarview.ui.ViewContainer
 import com.whyranoid.presentation.R
 import com.whyranoid.presentation.base.BaseFragment
 import com.whyranoid.presentation.databinding.FragmentMyRunBinding
-import com.whyranoid.presentation.databinding.ItemCalendarDayBinding
 import com.whyranoid.presentation.util.loadImage
 import com.whyranoid.presentation.util.repeatWhenUiStarted
 import dagger.hilt.android.AndroidEntryPoint
@@ -31,6 +27,11 @@ internal class MyRunFragment : BaseFragment<FragmentMyRunBinding>(R.layout.fragm
 
     private val runningHistoryAdapter = MyRunningHistoryAdapter()
 
+    private val currentMonth = YearMonth.now()
+    private val firstMonth = currentMonth.minusMonths(5)
+    private val lastMonth = currentMonth.plusMonths(5)
+    private val firstDayOfWeek = WeekFields.of(Locale.getDefault()).firstDayOfWeek
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -55,43 +56,33 @@ internal class MyRunFragment : BaseFragment<FragmentMyRunBinding>(R.layout.fragm
             true
         }
 
-        calendarView.dayBinder = object : DayBinder<DayViewContainer> {
-
-            override fun create(view: View) = DayViewContainer(view)
-
-            override fun bind(container: DayViewContainer, day: CalendarDay) {
-                container.day = day
-                val textView = container.binding.tvCalendarDay
-
-                textView.text = day.date.dayOfMonth.toString()
-            }
-        }
-
-        val currentMonth = YearMonth.now()
-        val firstMonth = currentMonth.minusMonths(240)
-        val lastMonth = currentMonth.plusMonths(240)
-        val firstDayOfWeek = WeekFields.of(Locale.getDefault()).firstDayOfWeek
-
         calendarView.apply {
+            itemAnimator = null
+            dayBinder = CalendarDayBinder(this)
+            monthScrollListener = { calendarMonth ->
+                onMonthScrolled(calendarMonth.yearMonth)
+            }
+            // 모든 달력 범위 설정
             setup(firstMonth, lastMonth, firstDayOfWeek)
+            // 첫 화면에서 보일 달 설정
             scrollToMonth(currentMonth)
         }
     }
 
     private fun observeInfo() {
-        repeatWhenUiStarted {
+        viewLifecycleOwner.repeatWhenUiStarted {
             viewModel.nickName.collect { nickName ->
                 binding.tvNickName.text = nickName
             }
         }
 
-        repeatWhenUiStarted {
+        viewLifecycleOwner.repeatWhenUiStarted {
             viewModel.profileImgUri.collect { profileImgUri ->
                 binding.ivProfileImage.loadImage(profileImgUri)
             }
         }
 
-        repeatWhenUiStarted {
+        viewLifecycleOwner.repeatWhenUiStarted {
             viewModel.runningHistoryList.collect { runningHistoryList ->
                 runningHistoryAdapter.submitList(runningHistoryList)
             }
@@ -122,8 +113,11 @@ internal class MyRunFragment : BaseFragment<FragmentMyRunBinding>(R.layout.fragm
         }
     }
 
-    class DayViewContainer(view: View) : ViewContainer(view) {
-        lateinit var day: CalendarDay
-        val binding = ItemCalendarDayBinding.bind(view)
+    private fun onMonthScrolled(currentMonth: YearMonth) {
+        val visibleMonth = binding.calendarView.findFirstVisibleMonth() ?: return
+        binding.tvMonthIndicator.text = visibleMonth.yearMonth.month.toString()
+        if (currentMonth != visibleMonth.yearMonth) {
+            binding.calendarView.smoothScrollToMonth(currentMonth)
+        }
     }
 }
diff --git a/presentation/src/main/java/com/whyranoid/presentation/myrun/SettingFragment.kt b/presentation/src/main/java/com/whyranoid/presentation/myrun/SettingFragment.kt
@@ -18,9 +18,18 @@ internal class SettingFragment : BaseFragment<FragmentSettingBinding>(R.layout.f
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        initViews()
         observeState()
     }
 
+    private fun initViews() {
+//        binding.tvLogOut.setOnClickListener {
+//            viewModel.signOut()
+//            val intent = Intent(requireActivity(), SignInActivity::class.java)
+//            startActivity(intent)
+//        }
+    }
+
     private fun observeState() {
         viewLifecycleOwner.repeatWhenUiStarted {
             viewModel.emailState.collect { emailState ->
diff --git a/presentation/src/main/java/com/whyranoid/presentation/myrun/SettingViewModel.kt b/presentation/src/main/java/com/whyranoid/presentation/myrun/SettingViewModel.kt
@@ -3,6 +3,7 @@ package com.whyranoid.presentation.myrun
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.whyranoid.domain.usecase.GetEmailUseCase
+import com.whyranoid.domain.usecase.SignOutUseCase
 import com.whyranoid.presentation.model.UiState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -13,7 +14,8 @@ import javax.inject.Inject
 
 @HiltViewModel
 class SettingViewModel @Inject constructor(
-    private val getEmailUseCase: GetEmailUseCase
+    private val getEmailUseCase: GetEmailUseCase,
+    private val signOutUseCase: SignOutUseCase
 ) : ViewModel() {
 
     init {
@@ -37,4 +39,10 @@ class SettingViewModel @Inject constructor(
             }
         }
     }
+
+    fun signOut() {
+        viewModelScope.launch {
+            signOutUseCase.invoke()
+        }
+    }
 }
diff --git a/presentation/src/main/res/drawable/calendar_kong.png b/presentation/src/main/res/drawable/calendar_kong.png
diff --git a/presentation/src/main/res/layout/fragment_my_run.xml b/presentation/src/main/res/layout/fragment_my_run.xml
@@ -83,19 +83,31 @@
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="@id/tv_nick_name" />
 
+                    <TextView
+                        android:id="@+id/tv_month_indicator"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintTop_toBottomOf="@id/iv_profile_image"
+                        app:layout_constraintStart_toStartOf="parent"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginTop="16dp"
+                        android:textAppearance="@style/MoGakRunText.Bold.Medium"
+                        tools:text="11월"/>
+
                     <com.kizitonwose.calendarview.CalendarView
                         android:id="@+id/calendar_view"
                         android:layout_width="0dp"
-                        android:layout_height="400dp"
+                        android:layout_height="wrap_content"
                         android:layout_marginHorizontal="16dp"
                         android:layout_marginTop="20dp"
                         app:cv_orientation="horizontal"
                         app:cv_dayViewResource="@layout/item_calendar_day"
-                        app:cv_hasBoundaries="false"
+                        app:cv_hasBoundaries="true"
                         app:cv_scrollMode="paged"
+                        app:cv_outDateStyle="endOfGrid"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/iv_profile_image" />
+                        app:layout_constraintTop_toBottomOf="@id/tv_month_indicator" />
 
                     <TextView
                         android:id="@+id/tv_label_my_running_history"

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,6 @@ interface AccountDataSource {`
`8`	`8`	`fun getUserUid(): Flow<String>`
`9`	`9`	`fun getEmail(): Flow<Result<String>>`
`10`	`10`	`suspend fun updateUserNickName(uid: String, newNickName: String): Result<String>`
	`11`	`+ suspend fun signOut(): Result<Boolean>`
	`12`	`+ suspend fun withDrawal(): Result<Boolean>`
`11`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,4 +40,12 @@ class AccountRepositoryImpl @Inject constructor(`
`40`	`40`	`override suspend fun updateProfileUrl(newProfileUrl: String): Boolean {`
`41`	`41`	`return true`
`42`	`42`	`}`
	`43`	`+`
	`44`	`+ override suspend fun signOut(): Result<Boolean> {`
	`45`	`+ TODO("Not yet implemented")`
	`46`	`+ }`
	`47`	`+`
	`48`	`+ override suspend fun withDrawal(): Result<Boolean> {`
	`49`	`+ TODO("Not yet implemented")`
	`50`	`+ }`
`43`	`51`	`}`