Merge branch 'develop' into feat/myGroupList

soopeach · web-flow · commit b06b9ee316e8 · 2022-11-22T11:07:35.000+09:00
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -23,6 +23,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name="com.whyranoid.presentation.running.RunningActivity" />
     </application>
 
 </manifest>
diff --git a/data/src/main/java/com/whyranoid/data/di/RunningModule.kt b/data/src/main/java/com/whyranoid/data/di/RunningModule.kt
@@ -1,6 +1,8 @@
-package com.whyranoid.data.di.running
+package com.whyranoid.data.di
 
 import com.google.firebase.firestore.FirebaseFirestore
+import com.whyranoid.data.running.RunningDataSource
+import com.whyranoid.data.running.RunningDataSourceImpl
 import com.whyranoid.data.running.RunningRepositoryImpl
 import com.whyranoid.domain.repository.RunningRepository
 import dagger.Module
diff --git a/data/src/main/java/com/whyranoid/data/group/GroupRepositoryImpl.kt b/data/src/main/java/com/whyranoid/data/group/GroupRepositoryImpl.kt
@@ -41,4 +41,8 @@ class GroupRepositoryImpl @Inject constructor(
     override fun getGroupNotifications(groupId: String): Flow<List<GroupNotification>> {
         return groupNotificationDataSource.getGroupNotifications(groupId)
     }
+
+    override suspend fun notifyRunningStart(uid: String, groupIdList: List<String>) {
+        groupNotificationDataSource.notifyRunningStart(uid, groupIdList)
+    }
 }
diff --git a/data/src/main/java/com/whyranoid/data/groupnotification/GroupNotificationDataSource.kt b/data/src/main/java/com/whyranoid/data/groupnotification/GroupNotificationDataSource.kt
@@ -9,12 +9,16 @@ import com.whyranoid.data.model.StartNotificationResponse
 import com.whyranoid.data.model.toFinishNotification
 import com.whyranoid.data.model.toStartNotification
 import com.whyranoid.domain.model.GroupNotification
+import com.whyranoid.domain.model.StartNotification
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.flattenMerge
 import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.withContext
+import java.util.UUID
 import javax.inject.Inject
 
 class GroupNotificationDataSource @Inject constructor(
@@ -50,6 +54,23 @@ class GroupNotificationDataSource @Inject constructor(
             awaitClose()
         }
 
+    suspend fun notifyRunningStart(uid: String, groupIdList: List<String>) {
+        withContext(Dispatchers.IO) {
+            groupIdList.forEach { groupId ->
+                db.collection(GROUP_NOTIFICATIONS_COLLECTION)
+                    .document(groupId)
+                    .collection(START_NOTIFICATION)
+                    .document(UUID.randomUUID().toString())
+                    .set(
+                        StartNotification(
+                            startedAt = System.currentTimeMillis(),
+                            uid = uid
+                        )
+                    )
+            }
+        }
+    }
+
     private fun getGroupFinishNotifications(groupId: String): Flow<List<GroupNotification>> =
         callbackFlow {
             db.collection(GROUP_NOTIFICATIONS_COLLECTION)
diff --git a/data/src/main/java/com/whyranoid/data/running/RunningDataSource.kt b/data/src/main/java/com/whyranoid/data/running/RunningDataSource.kt
@@ -1,4 +1,4 @@
-package com.whyranoid.data.di.running
+package com.whyranoid.data.running
 
 import kotlinx.coroutines.flow.Flow
 
diff --git a/data/src/main/java/com/whyranoid/data/running/RunningDataSourceImpl.kt b/data/src/main/java/com/whyranoid/data/running/RunningDataSourceImpl.kt
@@ -1,4 +1,4 @@
-package com.whyranoid.data.di.running
+package com.whyranoid.data.running
 
 import com.google.firebase.firestore.FieldValue
 import com.google.firebase.firestore.FirebaseFirestore
@@ -38,6 +38,7 @@ class RunningDataSourceImpl(private val db: FirebaseFirestore) : RunningDataSour
     }
 
     override suspend fun finishRunning(uid: String): Boolean {
+        // TODO 구현
         return suspendCoroutine { continuation ->
             db.collection("Runners")
                 .document("runnersId")
diff --git a/data/src/main/java/com/whyranoid/data/running/RunningRepositoryImpl.kt b/data/src/main/java/com/whyranoid/data/running/RunningRepositoryImpl.kt
@@ -1,6 +1,5 @@
 package com.whyranoid.data.running
 
-import com.whyranoid.data.di.running.RunningDataSource
 import com.whyranoid.domain.repository.RunningRepository
 import kotlinx.coroutines.flow.Flow
 
@@ -10,7 +9,7 @@ class RunningRepositoryImpl(private val runningDataSource: RunningDataSource) :
     }
 
     override suspend fun startRunning(uid: String): Boolean {
-        return true
+        return runningDataSource.startRunning(uid)
     }
 
     override suspend fun finishRunning(uid: String): Boolean {
diff --git a/domain/src/main/java/com/whyranoid/domain/repository/GroupRepository.kt b/domain/src/main/java/com/whyranoid/domain/repository/GroupRepository.kt
@@ -27,4 +27,6 @@ interface GroupRepository {
 
     // 혹은 그룹 채팅을 가져오기 + 글 작성하기
     fun getGroupNotifications(groupId: String): Flow<List<GroupNotification>>
+
+    suspend fun notifyRunningStart(uid: String, groupIdList: List<String>)
 }
diff --git a/domain/src/main/java/com/whyranoid/domain/usecase/StartRunningUseCase.kt b/domain/src/main/java/com/whyranoid/domain/usecase/StartRunningUseCase.kt
@@ -1,18 +1,26 @@
 package com.whyranoid.domain.usecase
 
 import com.whyranoid.domain.repository.AccountRepository
+import com.whyranoid.domain.repository.GroupRepository
 import com.whyranoid.domain.repository.RunningRepository
 import javax.inject.Inject
 
 class StartRunningUseCase @Inject constructor(
     private val runningRepository: RunningRepository,
-    private val accountRepository: AccountRepository
+    private val accountRepository: AccountRepository,
+    private val groupRepository: GroupRepository
 ) {
     suspend operator fun invoke(): Boolean {
         accountRepository.getUid().onSuccess { uid ->
-            return runningRepository.startRunning(uid)
+            runningRepository.startRunning(uid)
+            groupRepository.getMyGroupList(uid).onSuccess { groupInfos ->
+                groupRepository.notifyRunningStart(uid, groupInfos.map { it.groupId })
+                return true
+            }.onFailure {
+                return false
+            }
         }.onFailure {
-            println("UID 또 이상해")
+            return false
         }
         return false
     }
diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <application>
         <activity
             android:name=".MainActivity"
diff --git a/presentation/src/main/java/com/whyranoid/presentation/di/NetworkConnectionModule.kt b/presentation/src/main/java/com/whyranoid/presentation/di/NetworkConnectionModule.kt
@@ -0,0 +1,21 @@
+package com.whyranoid.presentation.di
+
+import android.content.Context
+import com.whyranoid.presentation.util.networkconnection.NetworkConnectionStateHolder
+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)
+class NetworkConnectionModule {
+
+    @Provides
+    @Singleton
+    fun provideNetworkConnectionStateHolder(@ApplicationContext context: Context): NetworkConnectionStateHolder {
+        return NetworkConnectionStateHolder(context)
+    }
+}
diff --git a/presentation/src/main/java/com/whyranoid/presentation/running/RunningActivity.kt b/presentation/src/main/java/com/whyranoid/presentation/running/RunningActivity.kt
@@ -0,0 +1,12 @@
+package com.whyranoid.presentation.running
+
+import com.whyranoid.presentation.R
+import com.whyranoid.presentation.base.BaseActivity
+import com.whyranoid.presentation.databinding.ActivityRunningBinding
+
+internal class RunningActivity : BaseActivity<ActivityRunningBinding>(R.layout.activity_running) {
+
+    // TODO 1. api 연동
+    // TODO 2. ui 만들기
+    // TODO 3. workmanager 사용하기
+}
diff --git a/presentation/src/main/java/com/whyranoid/presentation/runningstart/Event.kt b/presentation/src/main/java/com/whyranoid/presentation/runningstart/Event.kt
@@ -0,0 +1,5 @@
+package com.whyranoid.presentation.runningstart
+
+sealed class Event {
+    object RunningStartButtonClick : Event()
+}
diff --git a/presentation/src/main/java/com/whyranoid/presentation/runningstart/RunningStartFragment.kt b/presentation/src/main/java/com/whyranoid/presentation/runningstart/RunningStartFragment.kt
@@ -1,16 +1,15 @@
 package com.whyranoid.presentation.runningstart
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import com.whyranoid.presentation.R
 import com.whyranoid.presentation.base.BaseFragment
 import com.whyranoid.presentation.databinding.FragmentRunningStartBinding
+import com.whyranoid.presentation.running.RunningActivity
+import com.whyranoid.presentation.util.repeatWhenUiStarted
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
 
 @AndroidEntryPoint
 internal class RunningStartFragment :
@@ -22,11 +21,23 @@ internal class RunningStartFragment :
         super.onViewCreated(view, savedInstanceState)
         binding.vm = viewModel
 
-        lifecycleScope.launch {
-            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
-                viewModel.runnerCount.collect { runnerCount ->
-                    binding.tvRunnerCountNumber.text = runnerCount.toString()
-                }
+        repeatWhenUiStarted {
+            viewModel.runnerCount.collect { runnerCount ->
+                binding.tvRunnerCountNumber.text = runnerCount.toString()
+            }
+        }
+
+        repeatWhenUiStarted {
+            viewModel.eventFlow.collect { event ->
+                handleEvent(event)
+            }
+        }
+    }
+
+    private fun handleEvent(event: Event) {
+        when (event) {
+            is Event.RunningStartButtonClick -> {
+                startActivity(Intent(requireActivity(), RunningActivity::class.java))
             }
         }
     }
diff --git a/presentation/src/main/java/com/whyranoid/presentation/runningstart/RunningStartViewModel.kt b/presentation/src/main/java/com/whyranoid/presentation/runningstart/RunningStartViewModel.kt
@@ -1,14 +1,43 @@
 package com.whyranoid.presentation.runningstart
 
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.whyranoid.domain.usecase.GetRunnerCountUseCase
+import com.whyranoid.domain.usecase.StartRunningUseCase
+import com.whyranoid.presentation.util.networkconnection.NetworkConnectionStateHolder
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
 class RunningStartViewModel @Inject constructor(
-    getRunnerCountUseCase: GetRunnerCountUseCase
+    private val startRunningUseCase: StartRunningUseCase,
+    getRunnerCountUseCase: GetRunnerCountUseCase,
+    networkConnectionStateHolder: NetworkConnectionStateHolder
 ) : ViewModel() {
 
+    val networkState = networkConnectionStateHolder.networkState
+
     val runnerCount = getRunnerCountUseCase()
+
+    private val _eventFlow = MutableSharedFlow<Event>()
+    val eventFlow = _eventFlow.asSharedFlow()
+
+    fun onStartButtonClicked() {
+        viewModelScope.launch {
+            if (startRunningUseCase()) {
+                emitEvent(Event.RunningStartButtonClick)
+            } else {
+                // TODO: 러닝 시작 실패 피드백 주기
+            }
+        }
+    }
+
+    private fun emitEvent(event: Event) {
+        viewModelScope.launch {
+            _eventFlow.emit(event)
+        }
+    }
 }
diff --git a/presentation/src/main/java/com/whyranoid/presentation/util/BindingAdapters.kt b/presentation/src/main/java/com/whyranoid/presentation/util/BindingAdapters.kt
@@ -0,0 +1,23 @@
+package com.whyranoid.presentation.util
+
+import android.view.View
+import androidx.databinding.BindingAdapter
+import com.whyranoid.presentation.util.networkconnection.NetworkState
+
+@BindingAdapter("networkConnectionVisibility")
+fun View.networkConnectionVisibility(networkState: NetworkState) {
+    visibility = when (networkState) {
+        is NetworkState.UnInitialized -> View.GONE
+        is NetworkState.Connection -> View.GONE
+        is NetworkState.DisConnection -> View.VISIBLE
+    }
+}
+
+@BindingAdapter("enableWithNetworkState")
+fun View.enableWithNetworkState(networkState: NetworkState) {
+    isEnabled = when (networkState) {
+        is NetworkState.UnInitialized -> true
+        is NetworkState.Connection -> false
+        is NetworkState.DisConnection -> true
+    }
+}
diff --git a/presentation/src/main/java/com/whyranoid/presentation/util/networkconnection/NetworkConnectionState.kt b/presentation/src/main/java/com/whyranoid/presentation/util/networkconnection/NetworkConnectionState.kt
@@ -0,0 +1,33 @@
+package com.whyranoid.presentation.util.networkconnection
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.net.ConnectivityManager
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+class NetworkConnectionStateHolder(context: Context) {
+
+    private val _networkState = MutableStateFlow<NetworkState>(NetworkState.UnInitialized)
+    val networkState: StateFlow<NetworkState> get() = _networkState.asStateFlow()
+
+    private val networkReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context, intent: Intent) {
+            _networkState.value =
+                if (context.isConnected) NetworkState.Connection else NetworkState.DisConnection
+        }
+    }
+
+    init {
+        context.registerReceiver(
+            networkReceiver,
+            IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION)
+        )
+    }
+}
+
+val Context.isConnected: Boolean
+    get() = (getSystemService(Context.CONNECTIVITY_SERVICE) as? ConnectivityManager)?.activeNetworkInfo?.isConnected == true
diff --git a/presentation/src/main/java/com/whyranoid/presentation/util/networkconnection/NetworkState.kt b/presentation/src/main/java/com/whyranoid/presentation/util/networkconnection/NetworkState.kt
@@ -0,0 +1,9 @@
+package com.whyranoid.presentation.util.networkconnection
+
+sealed class NetworkState {
+    object UnInitialized : NetworkState()
+
+    object Connection : NetworkState()
+
+    object DisConnection : NetworkState()
+}
diff --git a/presentation/src/main/res/layout/activity_running.xml b/presentation/src/main/res/layout/activity_running.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
diff --git a/presentation/src/main/res/layout/fragment_running_start.xml b/presentation/src/main/res/layout/fragment_running_start.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:bind="http://schemas.android.com/tools">
 
     <data>
 
@@ -18,8 +19,9 @@
             layout="@layout/bottom_navigation_bar" />
 
         <include
-            android:id="@+id/tool_bar"
-            layout="@layout/tool_bar" />
+            android:id="@+id/tv_network_connection"
+            layout="@layout/network_conntection_alert"
+            bind:networkState="@{vm.networkState}" />
 
         <androidx.constraintlayout.widget.Guideline
             android:id="@+id/width_start"
@@ -100,8 +102,10 @@
             app:layout_constraintTop_toBottomOf="@id/tv_runner_count_unit" />
 
         <androidx.cardview.widget.CardView
+            enableWithNetworkState="@{vm.networkState}"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:onClick="@{() -> vm.onStartButtonClicked()}"
             app:cardBackgroundColor="@color/mogakrun_primary_light"
             app:cardCornerRadius="999dp"
             app:layout_constraintBottom_toBottomOf="@id/bottom_navigation"
diff --git a/presentation/src/main/res/layout/network_conntection_alert.xml b/presentation/src/main/res/layout/network_conntection_alert.xml
diff --git a/presentation/src/main/res/values/colors.xml b/presentation/src/main/res/values/colors.xml
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -41,4 +41,8 @@ class GroupRepositoryImpl @Inject constructor(`
`41`	`41`	`override fun getGroupNotifications(groupId: String): Flow<List<GroupNotification>> {`
`42`	`42`	`return groupNotificationDataSource.getGroupNotifications(groupId)`
`43`	`43`	`}`
	`44`	`+`
	`45`	`+ override suspend fun notifyRunningStart(uid: String, groupIdList: List<String>) {`
	`46`	`+ groupNotificationDataSource.notifyRunningStart(uid, groupIdList)`
	`47`	`+ }`
`44`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.whyranoid.data.di.running`
	`1`	`+package com.whyranoid.data.running`
`2`	`2`
`3`	`3`	`import kotlinx.coroutines.flow.Flow`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`package com.whyranoid.data.running`
`2`	`2`
`3`		`-import com.whyranoid.data.di.running.RunningDataSource`
`4`	`3`	`import com.whyranoid.domain.repository.RunningRepository`
`5`	`4`	`import kotlinx.coroutines.flow.Flow`
`6`	`5`
`@@ -10,7 +9,7 @@ class RunningRepositoryImpl(private val runningDataSource: RunningDataSource) :`
`10`	`9`	`}`
`11`	`10`
`12`	`11`	`override suspend fun startRunning(uid: String): Boolean {`
`13`		`- return true`
	`12`	`+ return runningDataSource.startRunning(uid)`
`14`	`13`	`}`
`15`	`14`
`16`	`15`	`override suspend fun finishRunning(uid: String): Boolean {`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,6 @@ interface GroupRepository {`
`27`	`27`
`28`	`28`	`// 혹은 그룹 채팅을 가져오기 + 글 작성하기`
`29`	`29`	`fun getGroupNotifications(groupId: String): Flow<List<GroupNotification>>`
	`30`	`+`
	`31`	`+ suspend fun notifyRunningStart(uid: String, groupIdList: List<String>)`
`30`	`32`	`}`