Skip to content

Commit 797258e

Browse files
authored
πŸ”€ #38 from boostcampwm-2022/feat/running_tab
λŸ¬λ‹ ν™”λ©΄ κ΅¬ν˜„
2 parents f44317a + e6228d2 commit 797258e

33 files changed

+845
-48
lines changed

β€Ž.github/workflows/mogakrunci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ jobs:
4646
path: app/build/outputs/apk/debug/app-debug.apk
4747

4848
- uses: MeilCli/slack-upload-file@v1
49+
continue-on-error: true
4950
with:
5051
slack_token: ${{ secrets.SLACK_READ_WRITE_TOKEN }}
5152
channels: ${{ secrets.SLACK_CHANNEL_DEPLOY }}
@@ -55,6 +56,7 @@ jobs:
5556
initial_comment: '🎁 release 버전 ν…ŒμŠ€νŠΈ μ•±!'
5657

5758
- uses: MeilCli/slack-upload-file@v1
59+
continue-on-error: true
5860
with:
5961
slack_token: ${{ secrets.SLACK_READ_WRITE_TOKEN }}
6062
channels: ${{ secrets.SLACK_CHANNEL_DEPLOY }}

β€Žapp/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,8 @@ dependencies {
6161
// Hilt
6262
implementation "com.google.dagger:hilt-android:$hiltVersion"
6363
kapt "com.google.dagger:hilt-android-compiler:$hiltVersion"
64+
65+
// Hilt Worker with Kotlin
66+
implementation "androidx.hilt:hilt-work:$hiltWorkerVersion"
67+
kapt "androidx.hilt:hilt-compiler:$hiltCompilerVersion"
6468
}

β€Žapp/src/main/AndroidManifest.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@
1313
android:theme="@style/Theme.MoGakRun"
1414
android:name=".MogakrunApplication"
1515
tools:targetApi="31">
16+
<provider
17+
android:name="androidx.startup.InitializationProvider"
18+
android:authorities="${applicationId}.androidx-startup"
19+
tools:node="remove">
20+
<meta-data android:name="com.whyranoid.presentation.running.WorkManagerInitializer"
21+
android:value="androidx.startup" />
22+
</provider>
1623
<activity
1724
android:name="com.whyranoid.signin.SignInActivity"
1825
android:theme="@style/Theme.MoGakRun.Splash"
@@ -23,7 +30,6 @@
2330
<category android:name="android.intent.category.LAUNCHER" />
2431
</intent-filter>
2532
</activity>
26-
<activity android:name="com.whyranoid.presentation.running.RunningActivity" />
2733
</application>
2834

2935
</manifest>
Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,30 @@
11
package com.whyranoid.mogakrun
22

33
import android.app.Application
4+
import androidx.hilt.work.HiltWorkerFactory
5+
import androidx.work.Configuration
46
import com.whyranoid.mogakrun.util.TimberDebugTree
57
import dagger.hilt.android.HiltAndroidApp
68
import timber.log.Timber
9+
import javax.inject.Inject
710

811
@HiltAndroidApp
9-
class MogakrunApplication : Application() {
12+
class MogakrunApplication : Application(), Configuration.Provider {
13+
14+
@Inject
15+
lateinit var workerFactory: HiltWorkerFactory
16+
1017
override fun onCreate() {
1118
super.onCreate()
1219

1320
if (BuildConfig.DEBUG) {
1421
Timber.plant(TimberDebugTree())
1522
}
1623
}
24+
25+
override fun getWorkManagerConfiguration() =
26+
Configuration.Builder()
27+
.setWorkerFactory(workerFactory)
28+
.setMinimumLoggingLevel(android.util.Log.DEBUG)
29+
.build()
1730
}

β€Žbuild.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ buildscript {
2828
calendarVersion = "1.0.4"
2929
glideVersion = "4.14.2"
3030
roomVersion = "2.4.3"
31+
naverMapVersion = "21.0.1"
32+
naverMapVersion = "3.16.0"
33+
googleLocationVersion = "21.0.1"
34+
workManagerVersion = "2.7.1"
35+
hiltWorkerVersion = "1.0.0"
36+
hiltCompilerVersion = "1.0.0"
3137
}
3238
dependencies {
3339
classpath "com.google.gms:google-services:$googleServiceVersion"
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.whyranoid.data.di
22

33
import com.google.firebase.firestore.FirebaseFirestore
4-
import com.whyranoid.data.running.RunningDataSource
5-
import com.whyranoid.data.running.RunningDataSourceImpl
6-
import com.whyranoid.data.running.RunningRepositoryImpl
7-
import com.whyranoid.domain.repository.RunningRepository
4+
import com.whyranoid.data.running.RunnerDataSource
5+
import com.whyranoid.data.running.RunnerDataSourceImpl
6+
import com.whyranoid.data.running.RunnerRepositoryImpl
7+
import com.whyranoid.domain.repository.RunnerRepository
88
import dagger.Module
99
import dagger.Provides
1010
import dagger.hilt.InstallIn
@@ -17,13 +17,13 @@ class RunningModule {
1717

1818
@Provides
1919
@Singleton
20-
fun provideRunningDataSource(db: FirebaseFirestore): RunningDataSource {
21-
return RunningDataSourceImpl(db)
20+
fun provideRunningDataSource(db: FirebaseFirestore): RunnerDataSource {
21+
return RunnerDataSourceImpl(db)
2222
}
2323

2424
@Provides
2525
@Singleton
26-
fun provideRunningRepository(runningDataSource: RunningDataSource): RunningRepository {
27-
return RunningRepositoryImpl(runningDataSource)
26+
fun provideRunningRepository(runnerDataSource: RunnerDataSource): RunnerRepository {
27+
return RunnerRepositoryImpl(runnerDataSource)
2828
}
2929
}

β€Ždata/src/main/java/com/whyranoid/data/running/RunningDataSource.kt renamed to β€Ždata/src/main/java/com/whyranoid/data/running/RunnerDataSource.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.whyranoid.data.running
22

33
import kotlinx.coroutines.flow.Flow
44

5-
interface RunningDataSource {
5+
interface RunnerDataSource {
66

77
fun getCurrentRunnerCount(): Flow<Int>
88

β€Ždata/src/main/java/com/whyranoid/data/running/RunningDataSourceImpl.kt renamed to β€Ždata/src/main/java/com/whyranoid/data/running/RunnerDataSourceImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import kotlinx.coroutines.flow.callbackFlow
88
import kotlin.coroutines.resume
99
import kotlin.coroutines.suspendCoroutine
1010

11-
class RunningDataSourceImpl(private val db: FirebaseFirestore) : RunningDataSource {
11+
class RunnerDataSourceImpl(private val db: FirebaseFirestore) : RunnerDataSource {
1212

1313
override fun getCurrentRunnerCount(): Flow<Int> = callbackFlow {
1414
db.collection("Runners")

β€Ždata/src/main/java/com/whyranoid/data/running/RunningRepositoryImpl.kt renamed to β€Ždata/src/main/java/com/whyranoid/data/running/RunnerRepositoryImpl.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package com.whyranoid.data.running
22

3-
import com.whyranoid.domain.repository.RunningRepository
3+
import com.whyranoid.domain.repository.RunnerRepository
44
import kotlinx.coroutines.flow.Flow
55

6-
class RunningRepositoryImpl(private val runningDataSource: RunningDataSource) : RunningRepository {
6+
class RunnerRepositoryImpl(private val runnerDataSource: RunnerDataSource) : RunnerRepository {
77
override fun getCurrentRunnerCount(): Flow<Int> {
8-
return runningDataSource.getCurrentRunnerCount()
8+
return runnerDataSource.getCurrentRunnerCount()
99
}
1010

1111
override suspend fun startRunning(uid: String): Boolean {
12-
return runningDataSource.startRunning(uid)
12+
return runnerDataSource.startRunning(uid)
1313
}
1414

1515
override suspend fun finishRunning(uid: String): Boolean {

β€Ždomain/src/main/java/com/whyranoid/domain/repository/RunningRepository.kt renamed to β€Ždomain/src/main/java/com/whyranoid/domain/repository/RunnerRepository.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.whyranoid.domain.repository
22

33
import kotlinx.coroutines.flow.Flow
44

5-
interface RunningRepository {
5+
interface RunnerRepository {
66

77
// ν˜„μž¬ 달리고 μžˆλŠ” μ‚¬λžŒ 카운트 - 리λͺ¨νŠΈ
88
fun getCurrentRunnerCount(): Flow<Int>

0 commit comments

Comments
Β (0)