현재 연결된 계정 표시 구현, 로그아웃/회원탈퇴 로직 구현, 캘린더 뷰 구현

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"

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"

data/src/main/java/com/whyranoid/data/account/AccountDataSource.kt

@@ -6,5 +6,8 @@ interface AccountDataSource {
     fun getUserNickName(): Flow<String>
     fun getUserProfileImgUri(): Flow<String>
     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>
 }

data/src/main/java/com/whyranoid/data/account/AccountDataSourceImpl.kt

@@ -4,10 +4,13 @@ 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
 import com.whyranoid.data.account.AccountDataSourceImpl.PreferenceKeys.profileImgUri
 import com.whyranoid.data.account.AccountDataSourceImpl.PreferenceKeys.uid
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
@@ -16,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)
@@ -38,6 +44,15 @@ class AccountDataSourceImpl @Inject constructor(
             preferences[uid] ?: EMPTY_STRING
         }
 
+    override fun getEmail(): Flow<Result<String>> {
+        return dataStoreDb.data
+            .map { preferences ->
+                runCatching {
+                    preferences[email] ?: EMPTY_STRING
+                }
+            }
+    }
+
     override suspend fun updateUserNickName(uid: String, newNickName: String) = runCatching {
         // 로컬에 업데이트
         dataStoreDb.edit { preferences ->
@@ -51,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"

data/src/main/java/com/whyranoid/data/account/AccountRepositoryImpl.kt

@@ -25,6 +25,10 @@ class AccountRepositoryImpl @Inject constructor(
         return accountDataSource.getUserNickName()
     }
 
+    override fun getEmail(): Flow<Result<String>> {
+        return accountDataSource.getEmail()
+    }
+
     override suspend fun updateNickname(uid: String, newNickName: String): Result<String> {
         return accountDataSource.updateUserNickName(uid, newNickName)
     }
@@ -36,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")
+    }
 }

data/src/main/java/com/whyranoid/data/account/RunningHistoryDao.kt

@@ -12,6 +12,6 @@ interface RunningHistoryDao {
     @Insert(onConflict = OnConflictStrategy.ABORT)
     suspend fun addRunningHistory(runningHistory: RunningHistoryEntity)
 
-    @Query("SELECT * FROM running_history ORDER BY startedAt ASC")
+    @Query("SELECT * FROM running_history ORDER BY started_at ASC")
     fun getRunningHistory(): Flow<List<RunningHistoryEntity>>
 }

data/src/main/java/com/whyranoid/data/account/RunningHistoryEntity.kt

@@ -1,5 +1,6 @@
 package com.whyranoid.data.account
 
+import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.whyranoid.domain.model.RunningHistory
@@ -8,11 +9,11 @@ import com.whyranoid.domain.model.RunningHistory
 data class RunningHistoryEntity(
     @PrimaryKey
     val historyId: String,
-    val startedAt: Long,
-    val finishedAt: Long,
-    val totalRunningTime: Int,
-    val pace: Double,
-    val totalDistance: Double
+    @ColumnInfo(name = "started_at") val startedAt: Long,
+    @ColumnInfo(name = "finished_at") val finishedAt: Long,
+    @ColumnInfo(name = "total_running_time") val totalRunningTime: Int,
+    @ColumnInfo(name = "pace") val pace: Double,
+    @ColumnInfo(name = "total_distance") val totalDistance: Double
 )
 
 fun RunningHistoryEntity.toRunningHistory(): RunningHistory {

data/src/main/java/com/whyranoid/data/account/RunningHistoryLocalDataSourceImpl.kt

@@ -6,11 +6,11 @@ import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
 class RunningHistoryLocalDataSourceImpl @Inject constructor(
-    private val roomDb: RunningHistoryLocalDataBase
+    private val runningHistoryDao: RunningHistoryDao
 ) : RunningHistoryLocalDataSource {
 
     override fun getRunningHistory(): Flow<List<RunningHistory>> {
-        return roomDb.runningHistoryDao().getRunningHistory().map { runningHistoryList ->
+        return runningHistoryDao.getRunningHistory().map { runningHistoryList ->
             runningHistoryList.map { runningHistoryEntity ->
                 runningHistoryEntity.toRunningHistory()
             }

data/src/main/java/com/whyranoid/data/di/RunningHistoryDataBaseModule.kt

@@ -0,0 +1,32 @@
+package com.whyranoid.data.di
+
+import android.content.Context
+import androidx.room.Room
+import com.whyranoid.data.account.RunningHistoryDao
+import com.whyranoid.data.account.RunningHistoryLocalDataBase
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object RunningHistoryDataBaseModule {
+    @Singleton
+    @Provides
+    fun provideRoomDataBase(
+        @ApplicationContext appContext: Context
+    ): RunningHistoryLocalDataBase = Room.databaseBuilder(
+        appContext,
+        RunningHistoryLocalDataBase::class.java,
+        "mogakrun_running_history.db"
+    )
+        .build()
+
+    @Singleton
+    @Provides
+    fun provideRunningHistoryDao(runningHistoryLocalDataBase: RunningHistoryLocalDataBase): RunningHistoryDao =
+        runningHistoryLocalDataBase.runningHistoryDao()
+}

data/src/main/java/com/whyranoid/data/di/DataBaseModule.kt → data/src/main/java/com/whyranoid/data/di/UserDataBaseModule.kt

@@ -5,8 +5,6 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.PreferenceDataStoreFactory
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.preferencesDataStoreFile
-import androidx.room.Room
-import com.whyranoid.data.account.RunningHistoryLocalDataBase
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -16,22 +14,7 @@ import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
-object DataBaseModule {
-    @Singleton
-    @Provides
-    fun provideRoomDataBase(
-        @ApplicationContext appContext: Context
-    ): RunningHistoryLocalDataBase = Room.databaseBuilder(
-        appContext,
-        RunningHistoryLocalDataBase::class.java,
-        "mogakrun_running_history.db"
-    )
-        .build()
-}
-
-@Module
-@InstallIn(SingletonComponent::class)
-object DataStoreModule {
+object UserDataBaseModule {
 
     private const val USER_PREFERENCES = "user_preferences"
 

domain/src/main/java/com/whyranoid/domain/repository/AccountRepository.kt

@@ -17,6 +17,9 @@ interface AccountRepository {
     // 데이터스토어에서 닉네임 가져오기
     fun getNickname(): Flow<String>
 
+    // 데이터스토어에서 이메일 가져오기
+    fun getEmail(): Flow<Result<String>>
+
     // 닉네임 수정, 서버에 먼저 보내고 성공하면 로컬에 반영
     // 실패하면 실패 사용자에게 알리기
     suspend fun updateNickname(uid: String, newNickName: String): Result<String>
@@ -26,4 +29,10 @@ interface AccountRepository {
 
     // 프로필 사진 서버에 업데이트
     suspend fun updateProfileUrl(newProfileUrl: String): Boolean
+
+    // 로그아웃
+    suspend fun signOut(): Result<Boolean>
+
+    // 회원탈퇴
+    suspend fun withDrawal(): Result<Boolean>
 }

domain/src/main/java/com/whyranoid/domain/usecase/GetEmailUseCase.kt

@@ -0,0 +1,9 @@
+package com.whyranoid.domain.usecase
+
+import com.whyranoid.domain.repository.AccountRepository
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Inject
+
+class GetEmailUseCase @Inject constructor(private val accountRepository: AccountRepository) {
+    operator fun invoke(): Flow<Result<String>> = accountRepository.getEmail()
+}

domain/src/main/java/com/whyranoid/domain/usecase/GetNicknameUseCase.kt

@@ -5,7 +5,7 @@ import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 class GetNicknameUseCase @Inject constructor(private val accountRepository: AccountRepository) {
-    suspend operator fun invoke(): Flow<String> {
+    operator fun invoke(): Flow<String> {
         return accountRepository.getNickname()
     }
 }

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()
+    }
+}

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()
+    }
+}

presentation/src/main/java/com/whyranoid/presentation/myrun/RunningHistoryUiModel.kt → presentation/src/main/java/com/whyranoid/presentation/model/RunningHistoryUiModel.kt

@@ -1,4 +1,4 @@
-package com.whyranoid.presentation.myrun
+package com.whyranoid.presentation.model
 
 import com.whyranoid.domain.model.RunningHistory
 

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)
+    }
+}