Merge branch 'refs/heads/feature/hmh_usage_library' into develop

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/com/hmh/hamyeonham/HMHApplication.kt
#	data/usagestats/build.gradle.kts
#	data/usagestats/src/main/java/com/hmh/hamyeonham/usagestats/di/UsageStatsModule.kt
#	data/usagestats/src/main/java/com/hmh/hamyeonham/usagestats/repository/DefaultUsageStatsRepository.kt
#	gradle/libs.versions.toml

app/build.gradle.kts

@@ -106,4 +106,7 @@ dependencies {
 
     // Hilt Worker
     implementation(libs.androidx.hilt.common)
+
+    // HMH - Usage Stats
+    implementation(libs.hmh.hus)
 }

app/src/main/java/com/hmh/hamyeonham/HMHApplication.kt

@@ -5,6 +5,7 @@ import androidx.hilt.work.HiltWorkerFactory
 import androidx.work.Configuration
 import com.amplitude.api.Amplitude
 import com.hmh.hamyeonham.core.notification.AppNotificationManager
+import com.hmh.hamyeonham.hus.usagestats.HMHUsageStatsManager
 import com.kakao.sdk.common.KakaoSdk
 import dagger.hilt.EntryPoint
 import dagger.hilt.EntryPoints
@@ -35,6 +36,7 @@ class HMHApplication : Application(), Configuration.Provider {
         setAmplitude()
 
         KakaoSdk.init(this, BuildConfig.KAKAO_API_KEY)
+        HMHUsageStatsManager.init(this)
         notificationManager.setupNotificationChannel()
     }
 

build.gradle.kts

@@ -7,7 +7,7 @@ buildscript {
 
     dependencies {
         classpath(libs.kotlin.gradleplugin)
-        classpath(libs.hilt.plugin)
+
         classpath(libs.agp)
         classpath(libs.ktlint)
         classpath(libs.oss.plugin)

data/usagestats/build.gradle.kts

@@ -15,4 +15,6 @@ dependencies {
     implementation(projects.core.network)
     implementation(projects.core.domain)
     implementation(projects.core.common)
+
+    implementation(libs.hmh.hus)
 }

data/usagestats/src/main/java/com/hmh/hamyeonham/usagestats/di/UsageStatsModule.kt

@@ -5,8 +5,6 @@ import android.content.Context
 import com.hmh.hamyeonham.core.domain.usagegoal.repository.UsageGoalsRepository
 import com.hmh.hamyeonham.usagestats.datasource.local.DeletedAppUsageLocalDataSource
 import com.hmh.hamyeonham.usagestats.datasource.local.DeletedAppUsageLocalDataSourceImpl
-import com.hmh.hamyeonham.usagestats.datasource.local.UsageStatusLocalDataSource
-import com.hmh.hamyeonham.usagestats.datasource.local.UsageStatusLocalDataSourceImpl
 import com.hmh.hamyeonham.usagestats.repository.DefaultDeleteGoalRepository
 import com.hmh.hamyeonham.usagestats.repository.DefaultUsageGoalsRepository
 import com.hmh.hamyeonham.usagestats.repository.DefaultUsageStatsRepository
@@ -33,9 +31,6 @@ object UsageStatsModule {
     @Module
     @InstallIn(SingletonComponent::class)
     interface Binder {
-        @Binds
-        @Singleton
-        fun provideUsageStatusDataSource(usageStatsDataSource: UsageStatusLocalDataSourceImpl): UsageStatusLocalDataSource
 
         @Binds
         @Singleton

data/usagestats/src/main/java/com/hmh/hamyeonham/usagestats/repository/DefaultUsageStatsRepository.kt

@@ -2,29 +2,27 @@ package com.hmh.hamyeonham.usagestats.repository
 
 import com.hmh.hamyeonham.common.time.getCurrentDayStartEndEpochMillis
 import com.hmh.hamyeonham.common.time.getTargetDayStartEndEpochMillis
-import com.hmh.hamyeonham.usagestats.datasource.local.UsageStatusLocalDataSource
+import com.hmh.hamyeonham.hus.usagestats.HMHUsageStatsManager
 import com.hmh.hamyeonham.usagestats.model.UsageStatus
 import kotlinx.datetime.toLocalDate
 import javax.inject.Inject
 
-class DefaultUsageStatsRepository @Inject constructor(
-    private val usageStatusLocalDataSource: UsageStatusLocalDataSource,
-) : UsageStatsRepository {
+class DefaultUsageStatsRepository @Inject constructor() : UsageStatsRepository {
     override suspend fun getUsageStats(targetDate: String): List<UsageStatus> {
         val (startTime, endTime) = getTargetDayStartEndEpochMillis(targetDate.toLocalDate())
-        val usageStatsList = usageStatusLocalDataSource.getUsageStats(startTime, endTime)
+        val usageStatsList = HMHUsageStatsManager.getUsageStats(startTime, endTime)
         return usageStatsList.map { usageStatModel ->
-            UsageStatus(usageStatModel.packageName, usageStatModel.totalTimeInForeground)
+            UsageStatus(usageStatModel.packageName, usageStatModel.timeInForeground)
         }
     }
 
     override suspend fun getUsageStats(
         startTime: Long,
         endTime: Long,
     ): List<UsageStatus> {
-        val usageStatsList = usageStatusLocalDataSource.getUsageStats(startTime, endTime)
+        val usageStatsList = HMHUsageStatsManager.getUsageStats(startTime, endTime)
         return usageStatsList.map { usageStatModel ->
-            UsageStatus(usageStatModel.packageName, usageStatModel.totalTimeInForeground)
+            UsageStatus(usageStatModel.packageName, usageStatModel.timeInForeground)
         }
     }
 
@@ -76,6 +74,6 @@ class DefaultUsageStatsRepository @Inject constructor(
     }
 
     override fun getForegroundAppPackageName(): String? {
-        return usageStatusLocalDataSource.getForegroundAppPackageName()
+        return HMHUsageStatsManager.getForegroundAppPackageName()
     }
 }

gradle/libs.versions.toml

@@ -84,6 +84,7 @@ androidx-hilt = "1.2.0"
 work-runtime-ktx = "2.9.0"
 timber = "5.0.1"
 amplitude = "2.+"
+hus = "0.0.5"
 
 
 [libraries]
@@ -216,6 +217,9 @@ androidx-work-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx"
 #amplitude
 amplitude = { module = "com.amplitude:android-sdk", version.ref = "amplitude" }
 
+#HMH-UsageStats
+hmh-hus = { group = "xyz.hmh-api", name = "hmh-hus", version.ref = "hus" }
+
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }