PagingSource 추가 리팩터링

app/build.gradle.kts

@@ -1,4 +1,4 @@
-import java.util.Properties
+import java.util.*
 
 plugins {
     alias(libs.plugins.android.application)
@@ -21,7 +21,7 @@ android {
         applicationId = "com.hmoa.app"
         minSdk = 26
         targetSdk = 34
-        versionCode = 33
+        versionCode = 35
         versionName = "1.2.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -90,6 +90,7 @@ dependencies {
     implementation(project(":core-repository"))
     implementation(project(":core-common"))
 
+    implementation(libs.app.update.ktx)
     implementation(libs.bootpay) //부트페이
     implementation(libs.bundles.kakao.login) // kakao
     implementation(libs.bundles.hilt) // hilt

app/src/main/AndroidManifest.xml

@@ -30,7 +30,7 @@
             android:usesCleartextTraffic="true"
             tools:targetApi="31">
         <activity
-                android:name=".MainActivity"
+                android:name=".view.MainActivity"
                 android:exported="true"
                 android:theme="@style/SplashTheme"
                 android:launchMode="singleTask">
@@ -64,12 +64,12 @@
             </intent-filter>
         </activity> <!-- 서비스를 추가하고 인텐트 필터를 설정한다. -->
         <service
-                android:name=".FcmAppService"
+                android:name=".service.FcmAppService"
                 android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT"/>
             </intent-filter>
         </service>
     </application>
 
-</manifest>
+</manifest>

app/src/main/java/com/hmoa/app/FcmAppService.kt → app/src/main/java/com/hmoa/app/service/FcmAppService.kt

@@ -1,4 +1,4 @@
-package com.hmoa.app
+package com.hmoa.app.service
 
 import android.app.Notification
 import android.app.NotificationChannel
@@ -8,28 +8,36 @@ import android.content.Context
 import android.content.Intent
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
+import com.hmoa.app.view.MainActivity
 
 class FcmAppService : FirebaseMessagingService() {
     override fun onNewToken(token: String) {
         super.onNewToken(token)
     }
+
     override fun onMessageReceived(remoteMessage: RemoteMessage) {
         super.onMessageReceived(remoteMessage)
 
-        if(remoteMessage.data.isNotEmpty()){
+        if (remoteMessage.data.isNotEmpty()) {
             sendNotification(remoteMessage.data)
         }
     }
-    private fun sendNotification(fcmData : Map<String, String>){
+
+    private fun sendNotification(fcmData: Map<String, String>) {
         val CHANNEL_DEFAULT_IMPORTANCE = "channelId"
         val ONGOING_NOTIFICATION = 1
 
-        val notificationIntent = Intent(this, MainActivity::class.java).apply{
+        val notificationIntent = Intent(this, MainActivity::class.java).apply {
             addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
-            putExtra("deeplink",fcmData["deeplink"])
-            putExtra("id",fcmData["id"])
+            putExtra("deeplink", fcmData["deeplink"])
+            putExtra("id", fcmData["id"])
         }
-        val pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
+        val pendingIntent = PendingIntent.getActivity(
+            this,
+            0,
+            notificationIntent,
+            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+        )
 
         val notification = Notification.Builder(this, CHANNEL_DEFAULT_IMPORTANCE)
             .setContentTitle(fcmData["title"])
@@ -41,9 +49,10 @@ class FcmAppService : FirebaseMessagingService() {
 
         val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
-        val channel = NotificationChannel(CHANNEL_DEFAULT_IMPORTANCE, "HMOA Channel", NotificationManager.IMPORTANCE_DEFAULT)
+        val channel =
+            NotificationChannel(CHANNEL_DEFAULT_IMPORTANCE, "HMOA Channel", NotificationManager.IMPORTANCE_DEFAULT)
         notificationManager.createNotificationChannel(channel)
 
         notificationManager.notify(ONGOING_NOTIFICATION, notification)
     }
-}
+}

app/src/main/java/com/hmoa/app/MainActivity.kt → app/src/main/java/com/hmoa/app/view/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.hmoa.app
+package com.hmoa.app.view
 
 import android.Manifest
 import android.content.Intent
@@ -8,6 +8,8 @@ import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import androidx.activity.compose.setContent
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.layout.Box
@@ -32,19 +34,23 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
+import com.google.android.material.snackbar.Snackbar
+import com.google.android.play.core.appupdate.AppUpdateInfo
+import com.google.android.play.core.appupdate.AppUpdateManager
+import com.google.android.play.core.appupdate.AppUpdateManagerFactory
+import com.google.android.play.core.appupdate.AppUpdateOptions
+import com.google.android.play.core.install.model.AppUpdateType
+import com.google.android.play.core.install.model.InstallStatus
+import com.google.android.play.core.install.model.UpdateAvailability
 import com.google.firebase.messaging.FirebaseMessaging
+import com.hmoa.app.BuildConfig
 import com.hmoa.app.navigation.SetUpNavGraph
+import com.hmoa.app.viewmodel.AppViewModel
 import com.hmoa.core_common.permissions
 import com.hmoa.core_designsystem.BottomScreen
 import com.hmoa.core_designsystem.component.HomeTopBar
 import com.hmoa.core_designsystem.component.MainBottomBar
-import com.hmoa.core_domain.entity.navigation.AuthenticationRoute
-import com.hmoa.core_domain.entity.navigation.CommunityRoute
-import com.hmoa.core_domain.entity.navigation.HPediaRoute
-import com.hmoa.core_domain.entity.navigation.HomeRoute
-import com.hmoa.core_domain.entity.navigation.MagazineRoute
-import com.hmoa.core_domain.entity.navigation.PerfumeRoute
-import com.hmoa.core_domain.entity.navigation.UserInfoRoute
+import com.hmoa.core_domain.entity.navigation.*
 import com.hmoa.feature_brand.navigation.navigateToBrandSearch
 import com.hmoa.feature_fcm.navigateToAlarmScreen
 import com.hmoa.feature_home.navigation.navigateToHome
@@ -86,10 +92,94 @@ class MainActivity : AppCompatActivity() {
         BottomScreen.Magazine.name,
         BottomScreen.MyPage.name
     )
+    private lateinit var appUpdateManager: AppUpdateManager
+    private val activityResultLauncher =
+        registerForActivityResult(ActivityResultContracts.StartIntentSenderForResult()) { result: ActivityResult ->
+            handleUpdateResult(result)
+        }
+
+    // Displays the snackbar notification and call to action.
+    fun popupSnackbarForCompleteUpdate() {
+        Snackbar.make(
+            findViewById(com.hmoa.core_designsystem.R.drawable.ic_fab),
+            "새로운 업데이트 다운로드가 완료되었습니다.",
+            Snackbar.LENGTH_INDEFINITE
+        ).apply {
+            setAction("재시작") { appUpdateManager.completeUpdate() }
+            show()
+        }
+    }
+
+    private fun checkImmediateUpdateAvailability() {
+        appUpdateManager.appUpdateInfo.addOnSuccessListener { appUpdateInfo ->
+            if (shouldTriggerImmediateUpdate(appUpdateInfo)) {
+                Log.d("checkUpdateAvailability", "ImemediateUpdate")
+                startImmediateUpdate(appUpdateInfo)
+            }
+        }.addOnFailureListener { e ->
+            Log.e("UpdateFlow", "Failed to check update availability", e)
+        }
+    }
+
+    private fun checkFlexibleUpdateAvailability() {
+        appUpdateManager.appUpdateInfo.addOnSuccessListener { appUpdateInfo ->
+            if (shouldTriggerFlexibleUpdate(appUpdateInfo)) {
+                Log.d("checkUpdateAvailability", "ImemediateUpdate")
+                startFlexibleUpdate(appUpdateInfo)
+                if (appUpdateInfo.installStatus() == InstallStatus.DOWNLOADED) {
+                    popupSnackbarForCompleteUpdate()
+                }
+            }
+        }.addOnFailureListener { e ->
+            Log.e("UpdateFlow", "Failed to check update availability", e)
+        }
+    }
+
+
+    private fun shouldTriggerImmediateUpdate(appUpdateInfo: AppUpdateInfo): Boolean {
+        return appUpdateInfo.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE &&
+                appUpdateInfo.isUpdateTypeAllowed(AppUpdateType.IMMEDIATE)
+    }
+
+    private fun shouldTriggerFlexibleUpdate(appUpdateInfo: AppUpdateInfo): Boolean {
+        return appUpdateInfo.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE &&
+                appUpdateInfo.isUpdateTypeAllowed(AppUpdateType.FLEXIBLE)
+    }
+
+
+    private fun startImmediateUpdate(appUpdateInfo: AppUpdateInfo) {
+        appUpdateManager.startUpdateFlowForResult(
+            appUpdateInfo,
+            activityResultLauncher,
+            AppUpdateOptions.newBuilder(AppUpdateType.IMMEDIATE).build()
+        )
+    }
+
+    private fun startFlexibleUpdate(appUpdateInfo: AppUpdateInfo) {
+        appUpdateManager.startUpdateFlowForResult(
+            appUpdateInfo,
+            activityResultLauncher,
+            AppUpdateOptions.newBuilder(AppUpdateType.FLEXIBLE).build()
+        )
+    }
+
+    private fun handleUpdateResult(result: ActivityResult) {
+        if (result.resultCode == RESULT_OK) {
+            Log.d("UpdateFlow", "Update flow completed successfully!")
+        } else {
+            Log.e("UpdateFlow", "Update flow failed! Result code: ${result.resultCode}")
+            // 필요시 재시도 로직 추가 가능
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         installSplashScreen()
         WindowCompat.setDecorFitsSystemWindows(window, false)
+
+        appUpdateManager = AppUpdateManagerFactory.create(this)
+        checkImmediateUpdateAvailability()
+
         requestNotificationPermission()
         BootpayAnalytics.init(this, BuildConfig.BOOTPAY_APPLICATION_ID)
 
@@ -162,6 +252,11 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        checkFlexibleUpdateAvailability()
+    }
+
     //firebase 초기 토큰 처리
     private fun initializeFirebaseSetting(fcmToken: String?, onSaveFcmToken: (token: String) -> Unit) {
         FirebaseMessaging.getInstance().token.addOnSuccessListener {
@@ -273,4 +368,4 @@ class MainActivity : AppCompatActivity() {
             lifecycleScope.launch { viewModel.saveNotificationEnabled(true) }
         }
     }
-}
+}

app/src/main/java/com/hmoa/app/AppViewModel.kt → app/src/main/java/com/hmoa/app/viewmodel/AppViewModel.kt

@@ -1,4 +1,4 @@
-package com.hmoa.app
+package com.hmoa.app.viewmodel
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -7,8 +7,6 @@ import com.hmoa.core_domain.repository.LoginRepository
 import com.hmoa.core_model.request.FCMTokenSaveRequestDto
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -43,4 +41,4 @@ class AppViewModel @Inject constructor(
     suspend fun saveNotificationEnabled(isEnabled: Boolean) =
         viewModelScope.launch { fcmRepository.saveNotificationEnabled(isEnabled) }
 
-}
+}

feature-home/src/main/java/com/hmoa/feature_home/PerfumePagingSource.kt

@@ -0,0 +1,36 @@
+package com.hmoa.feature_home
+
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+
+class PerfumePagingSource<T : Any, R>(
+    private val fetcher: suspend (pageNumber: Int) -> R,
+    private val mapper: (R) -> List<T>
+) : PagingSource<Int, T>() {
+
+    override fun getRefreshKey(state: PagingState<Int, T>): Int? {
+        return state.anchorPosition?.let {
+            state.closestPageToPosition(it)?.prevKey?.plus(1)
+                ?: state.closestPageToPosition(it)?.nextKey?.minus(1)
+        }
+    }
+
+    override suspend fun load(params: LoadParams<Int>): LoadResult<Int, T> {
+        val pageNumber = params.key ?: 0
+        return try {
+            val response = fetcher(pageNumber)
+            val data = mapper(response)
+
+            val prevKey = if (pageNumber > 0) pageNumber - 1 else null
+            val nextKey = if (data.isEmpty()) null else pageNumber + 1
+
+            LoadResult.Page(
+                data = data,
+                prevKey = prevKey,
+                nextKey = nextKey
+            )
+        } catch (e: Exception) {
+            LoadResult.Error(e)
+        }
+    }
+}