✨ 환경설정 화면에서 연결된 계정 정보 보여주기 구현

peter-j0y · peter-j0y · commit 24db28c5bb70 · 2022-11-26T22:57:15.000+09:00
diff --git a/data/src/main/java/com/whyranoid/data/account/AccountDataSource.kt b/data/src/main/java/com/whyranoid/data/account/AccountDataSource.kt
@@ -6,5 +6,6 @@ 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>
 }
diff --git a/data/src/main/java/com/whyranoid/data/account/AccountDataSourceImpl.kt b/data/src/main/java/com/whyranoid/data/account/AccountDataSourceImpl.kt
@@ -5,9 +5,11 @@ import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
 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
 
@@ -38,6 +40,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 ->
diff --git a/data/src/main/java/com/whyranoid/data/account/AccountRepositoryImpl.kt b/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)
     }
diff --git a/domain/src/main/java/com/whyranoid/domain/repository/AccountRepository.kt b/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>
diff --git a/domain/src/main/java/com/whyranoid/domain/usecase/GetEmailUseCase.kt b/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()
+}
diff --git a/domain/src/main/java/com/whyranoid/domain/usecase/GetNicknameUseCase.kt b/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()
     }
 }
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,12 +6,19 @@ 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
+import java.time.YearMonth
+import java.time.temporal.WeekFields
+import java.util.Locale
 
 @AndroidEntryPoint
 internal class MyRunFragment : BaseFragment<FragmentMyRunBinding>(R.layout.fragment_my_run) {
@@ -47,6 +54,28 @@ 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 {
+            setup(firstMonth, lastMonth, firstDayOfWeek)
+            scrollToMonth(currentMonth)
+        }
     }
 
     private fun observeInfo() {
@@ -92,4 +121,9 @@ internal class MyRunFragment : BaseFragment<FragmentMyRunBinding>(R.layout.fragm
                 }.show()
         }
     }
+
+    class DayViewContainer(view: View) : ViewContainer(view) {
+        lateinit var day: CalendarDay
+        val binding = ItemCalendarDayBinding.bind(view)
+    }
 }
diff --git a/presentation/src/main/java/com/whyranoid/presentation/myrun/SettingFragment.kt b/presentation/src/main/java/com/whyranoid/presentation/myrun/SettingFragment.kt
@@ -1,7 +1,46 @@
 package com.whyranoid.presentation.myrun
 
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.viewModels
 import com.whyranoid.presentation.R
 import com.whyranoid.presentation.base.BaseFragment
 import com.whyranoid.presentation.databinding.FragmentSettingBinding
+import com.whyranoid.presentation.model.UiState
+import com.whyranoid.presentation.util.repeatWhenUiStarted
+import dagger.hilt.android.AndroidEntryPoint
 
-internal class SettingFragment : BaseFragment<FragmentSettingBinding>(R.layout.fragment_setting)
+@AndroidEntryPoint
+internal class SettingFragment : BaseFragment<FragmentSettingBinding>(R.layout.fragment_setting) {
+
+    private val viewModel by viewModels<SettingViewModel>()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        observeState()
+    }
+
+    private fun observeState() {
+        viewLifecycleOwner.repeatWhenUiStarted {
+            viewModel.emailState.collect { emailState ->
+                when (emailState) {
+                    is UiState.UnInitialized -> {
+                        // 초기화 안됨
+                    }
+                    is UiState.Loading -> {
+                        // 로딩 중
+                    }
+                    is UiState.Success<String> -> initEmailView(emailState.value)
+                    is UiState.Failure -> {
+                        // 실패
+                    }
+                }
+            }
+        }
+    }
+
+    private fun initEmailView(email: String) {
+        binding.tvConnectedAccount.text = email
+    }
+}
diff --git a/presentation/src/main/java/com/whyranoid/presentation/myrun/SettingViewModel.kt b/presentation/src/main/java/com/whyranoid/presentation/myrun/SettingViewModel.kt
@@ -0,0 +1,40 @@
+package com.whyranoid.presentation.myrun
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.whyranoid.domain.usecase.GetEmailUseCase
+import com.whyranoid.presentation.model.UiState
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class SettingViewModel @Inject constructor(
+    private val getEmailUseCase: GetEmailUseCase
+) : ViewModel() {
+
+    init {
+        getEmail()
+    }
+
+    private val _emailState = MutableStateFlow<UiState<String>>(UiState.UnInitialized)
+    val emailState: StateFlow<UiState<String>>
+        get() = _emailState.asStateFlow()
+
+    private fun getEmail() {
+        viewModelScope.launch {
+            _emailState.value = UiState.Loading
+
+            getEmailUseCase().collect { emailResult ->
+                emailResult.onSuccess { email ->
+                    _emailState.value = UiState.Success(email)
+                }.onFailure { throwable ->
+                    _emailState.value = UiState.Failure(throwable)
+                }
+            }
+        }
+    }
+}
diff --git a/presentation/src/main/res/layout/fragment_my_run.xml b/presentation/src/main/res/layout/fragment_my_run.xml
@@ -86,9 +86,10 @@
                     <com.kizitonwose.calendarview.CalendarView
                         android:id="@+id/calendar_view"
                         android:layout_width="0dp"
-                        android:layout_height="wrap_content"
+                        android:layout_height="400dp"
                         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_scrollMode="paged"
diff --git a/presentation/src/main/res/layout/fragment_setting.xml b/presentation/src/main/res/layout/fragment_setting.xml
@@ -39,6 +39,7 @@
             android:layout_marginStart="16dp"/>
 
         <TextView
+            android:id="@+id/tv_connected_account"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             tools:text="mogakrun@gmail.com"
diff --git a/presentation/src/main/res/layout/item_calendar_day.xml b/presentation/src/main/res/layout/item_calendar_day.xml
@@ -15,6 +15,7 @@
             android:id="@+id/tv_calendar_day"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:textAppearance="@style/MoGakRunText.Bold.Small"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,6 @@ interface AccountDataSource {`
`6`	`6`	`fun getUserNickName(): Flow<String>`
`7`	`7`	`fun getUserProfileImgUri(): Flow<String>`
`8`	`8`	`fun getUserUid(): Flow<String>`
	`9`	`+ fun getEmail(): Flow<Result<String>>`
`9`	`10`	`suspend fun updateUserNickName(uid: String, newNickName: String): Result<String>`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,10 @@ class AccountRepositoryImpl @Inject constructor(`
`25`	`25`	`return accountDataSource.getUserNickName()`
`26`	`26`	`}`
`27`	`27`
	`28`	`+ override fun getEmail(): Flow<Result<String>> {`
	`29`	`+ return accountDataSource.getEmail()`
	`30`	`+ }`
	`31`	`+`
`28`	`32`	`override suspend fun updateNickname(uid: String, newNickName: String): Result<String> {`
`29`	`33`	`return accountDataSource.updateUserNickName(uid, newNickName)`
`30`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import kotlinx.coroutines.flow.Flow`
`5`	`5`	`import javax.inject.Inject`
`6`	`6`
`7`	`7`	`class GetNicknameUseCase @Inject constructor(private val accountRepository: AccountRepository) {`
`8`		`- suspend operator fun invoke(): Flow<String> {`
	`8`	`+ operator fun invoke(): Flow<String> {`
`9`	`9`	`return accountRepository.getNickname()`
`10`	`10`	`}`
`11`	`11`	`}`