Feat/issue #26 - 새로고침 기능

app/build.gradle.kts

@@ -117,6 +117,7 @@ dependencies {
     implementation(libs.protolite.well.known.types)
     implementation(libs.androidx.navigation.compose)
     implementation(libs.coil.compose)
+    implementation(libs.androidx.lifecycle.runtime.compose)
 
     // 테스트
     testImplementation(libs.junit)

app/src/androidTest/java/com/example/notimanager/data/service/NotiListenerServiceTest.kt

@@ -13,7 +13,7 @@ import com.example.notimanager.data.model.NotificationMetaModel
 import com.example.notimanager.presentation.ui.activity.MainActivity
 import com.example.notimanager.data.model.NotificationModel
 import com.example.notimanager.data.repository.NotificationRepository
-import com.example.notimanager.data.service.NotiListenerService
+import com.example.notimanager.domain.service.NotiListenerService
 import com.example.notimanager.data.utils.NameGetter
 import com.example.notimanager.data.utils.IntentHelper
 import io.mockk.coEvery
@@ -85,7 +85,7 @@ class NotiListenerServiceTest {
 
         // Mock the PendingIntentHelper
         val intentArray = "MockedByteArray".toByteArray()
-        every { IntentHelper.saveIntent(mockPendingIntent) } returns intentArray
+        every { IntentHelper.saveIntent(realIntent) } returns intentArray
 
         val expectedNotificationModel = NotificationModel(
             appName = "Test App",
@@ -103,12 +103,12 @@ class NotiListenerServiceTest {
         coEvery { notificationRepository.insertNotificationMeta(notificationMetaModel) } returns 1L
         val notificationIconModel = NotificationIconModel(
             notificationId = 1L,
-            iconBytes = uri
+            iconBytes = "".toByteArray()
         )
         coEvery { notificationRepository.insertNotificationIcon(notificationIconModel) } returns 1L
 
         val appIconModel = AppIconModel(
-            iconBytes = "com.example.test",
+            iconBytes = "".toByteArray(),
             notiAppName = "Test App"
         )
         coEvery { notificationRepository.insertAppIcon(appIconModel) } returns 1L
@@ -123,6 +123,6 @@ class NotiListenerServiceTest {
         coVerify { notificationRepository.insertAppIcon(appIconModel) }
 
         // Verify that PendingIntentHelper was called
-        verify { IntentHelper.saveIntent(mockPendingIntent) }
+        verify { IntentHelper.saveIntent(realIntent) }
     }
 }

app/src/main/AndroidManifest.xml

@@ -12,7 +12,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.NotiManger"
-        tools:targetApi="31">
+        android:enableOnBackInvokedCallback="true"
+        tools:targetApi="35">
         <activity
             android:name=".presentation.ui.activity.MainActivity"
             android:exported="true"
@@ -25,7 +26,7 @@
         </activity>
 
         <service
-            android:name=".data.service.NotiListenerService"
+            android:name=".domain.service.NotiListenerService"
             android:exported="true"
             android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
             <intent-filter>

app/src/main/java/com/example/notimanager/data/repository/NotificationRepository.kt

@@ -8,6 +8,7 @@ import com.example.notimanager.data.source.local.dao.AppIconDao
 import com.example.notimanager.data.source.local.dao.NotificationDao
 import com.example.notimanager.data.source.local.dao.NotificationIconDao
 import com.example.notimanager.data.source.local.dao.NotificationMetaDao
+import com.example.notimanager.domain.repository.NotificationRepositoryInterface
 
 class NotificationRepository(
     private val notificationDao: NotificationDao,

app/src/main/java/com/example/notimanager/di/RepositoryModule.kt

@@ -5,7 +5,7 @@ import com.example.notimanager.data.repository.NotificationAppRepository
 import com.example.notimanager.data.repository.NotificationPermissionRepository
 import com.example.notimanager.data.repository.NotificationRepository
 import com.example.notimanager.data.repository.NotificationDomainRepository
-import com.example.notimanager.data.repository.NotificationRepositoryInterface
+import com.example.notimanager.domain.repository.NotificationRepositoryInterface
 import com.example.notimanager.data.repository.NotificationTitleRepository
 import com.example.notimanager.data.source.local.dao.AppIconDao
 import com.example.notimanager.data.source.local.dao.NotificationDao

app/src/main/java/com/example/notimanager/data/repository/NotificationRepositoryInterface.kt → app/src/main/java/com/example/notimanager/domain/repository/NotificationRepositoryInterface.kt

@@ -1,4 +1,4 @@
-package com.example.notimanager.data.repository
+package com.example.notimanager.domain.repository
 
 import com.example.notimanager.data.model.AppIconModel
 import com.example.notimanager.data.model.NotificationIconModel

app/src/main/java/com/example/notimanager/data/service/NotiListenerService.kt → app/src/main/java/com/example/notimanager/domain/service/NotiListenerService.kt

@@ -1,14 +1,13 @@
-package com.example.notimanager.data.service
+package com.example.notimanager.domain.service
 
 import android.graphics.drawable.Icon
 import android.service.notification.NotificationListenerService
 import android.service.notification.StatusBarNotification
-import android.util.Log
 import com.example.notimanager.data.model.AppIconModel
 import com.example.notimanager.data.model.NotificationIconModel
 import com.example.notimanager.data.model.NotificationMetaModel
 import com.example.notimanager.data.model.NotificationModel
-import com.example.notimanager.data.repository.NotificationRepositoryInterface
+import com.example.notimanager.domain.repository.NotificationRepositoryInterface
 import com.example.notimanager.data.utils.AppIconGetter.convertByteArray
 import com.example.notimanager.data.utils.AppIconGetter.convertByteArrayWithColor
 import com.example.notimanager.data.utils.NameGetter

app/src/main/java/com/example/notimanager/presentation/ui/component/NotificationAppListView.kt

@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
@@ -19,6 +20,7 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
@@ -43,52 +45,59 @@ import com.example.notimanager.presentation.stateholder.viewmodel.NotificationAp
 @Composable
 fun NotificationAppListView(
     navController: NavController,
-    innerPadding: PaddingValues,
-    viewModel: NotificationAppViewModel = hiltViewModel(),
-    priorityViewModel: NotificationAppPriorityViewModel = hiltViewModel()
+    viewModel: NotificationAppViewModel,
+    priorityViewModel: NotificationAppPriorityViewModel
 ) {
     val notificationAppState by viewModel.notificationAppState.observeAsState(NotificationAppState())
     val priorityState by priorityViewModel.notificationAppPriorityState.observeAsState((NotificationAppPriorityState()))
+    var currentNotiPriority by remember { mutableStateOf(priorityState.notificationAppList) }
+    var currentNoti by remember { mutableStateOf(notificationAppState.notificationAppList) }
 
-    Column(
-        Modifier.padding(innerPadding)
-    ) {
-        if (notificationAppState.isLoading || priorityState.isLoading) {
-            CircularProgressIndicator(modifier = Modifier.padding(16.dp))
-        } else if (notificationAppState.error != null) {
+    LaunchedEffect(priorityState.notificationAppList) {
+        if (!priorityState.isLoading) {
+            currentNotiPriority = priorityState.notificationAppList
+        }
+    }
 
-        } else {
-            LazyColumn {
-                items(priorityState.notificationAppList) { notification ->
-                    NotificationAppItemView(
-                        notification = notification,
-                        onClick = {
-                            navController
-                            .navigate("titleScreen/${notification.appName}/${notification.title}"
-                            )
-                        },
-                        viewModel = viewModel,
-                        priorityViewModel = priorityViewModel
-                    )
-                }
+    LaunchedEffect(notificationAppState.notificationAppList) {
+        if (!notificationAppState.isLoading) {
+            currentNoti = notificationAppState.notificationAppList
+        }
+    }
 
-                item {
-                    HorizontalDivider()
-                }
+    LazyColumn(
+        Modifier.fillMaxSize()
+    ) {
+        items(currentNotiPriority) { notification ->
+            NotificationAppItemView(
+                notification = notification,
+                onClick = {
+                    navController
+                        .navigate(
+                            "titleScreen/${notification.appName}/${notification.title}"
+                        )
+                },
+                viewModel = viewModel,
+                priorityViewModel = priorityViewModel
+            )
+        }
 
-                items(notificationAppState.notificationAppList) { notification ->
-                    NotificationAppItemView(
-                        notification = notification,
-                        onClick = {
-                            navController
-                                .navigate("titleScreen/${notification.appName}/${notification.title}"
-                                )
-                        },
-                        viewModel = viewModel,
-                        priorityViewModel = priorityViewModel
-                    )
-                }
-            }
+        item {
+            HorizontalDivider()
+        }
+
+        items(currentNoti) { notification ->
+            NotificationAppItemView(
+                notification = notification,
+                onClick = {
+                    navController
+                        .navigate(
+                            "titleScreen/${notification.appName}/${notification.title}"
+                        )
+                },
+                viewModel = viewModel,
+                priorityViewModel = priorityViewModel
+            )
         }
     }
 }
@@ -157,14 +166,15 @@ fun NotificationAppItemView(
                         priorityViewModel.removeAppPriority(notification.appName){
                             viewModel.loadNotificationApps()
                         }
-
+                        showModal = false
                     })
                 }
                 else{
                     ClickableTextView(text = "중요 알림 설정", onClick = {
                         viewModel.setAppPriority(notification.appName, priorityViewModel.getLength()){
                             priorityViewModel.loadNotificationAppPriority()
                         }
+                        showModal = false
                     })
                 }
                 ClickableTextView(text = "삭제", onClick = {})

app/src/main/java/com/example/notimanager/presentation/ui/component/NotificationTitleListView.kt

@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
@@ -19,6 +20,7 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
@@ -41,7 +43,6 @@ import com.example.notimanager.presentation.stateholder.viewmodel.NotificationTi
 @Composable
 fun NotificationTitleListView(
     navController: NavController,
-    innerPadding: PaddingValues,
     viewModel: NotificationTitleViewModel,
     priorityViewModel: NotificationTitlePriorityViewModel
 ) {
@@ -51,35 +52,42 @@ fun NotificationTitleListView(
     val priorityState by priorityViewModel.notificationTitlePriorityState.observeAsState(
         NotificationTitlePriorityState()
     )
-    Column (
-        Modifier.padding(innerPadding)
-    ){
-        if (notificationTitleState.isLoading || priorityState.isLoading) {
-            CircularProgressIndicator(modifier = Modifier.padding(16.dp))
-        } else if (notificationTitleState.error != null) {
+    var currentNotiPriority by remember { mutableStateOf(priorityState.notificationTitleList) }
+    var currentNoti by remember { mutableStateOf(notificationTitleState.notificationTitleList) }
 
-        } else {
-            LazyColumn {
-                items(priorityState.notificationTitleList) { notification ->
-                    NotificationTitleItemView(notification = notification, onClick = {
-                        navController.navigate(
-                            "notificationScreen/${viewModel.getAppName()}/${notification.title}"
-                        )
-                    }, viewModel = viewModel, priorityViewModel = priorityViewModel)
-                }
+    LaunchedEffect(priorityState.notificationTitleList) {
+        if (!priorityState.isLoading) {
+            currentNotiPriority = priorityState.notificationTitleList
+        }
+    }
 
-                item {
-                    HorizontalDivider()
-                }
+    LaunchedEffect(notificationTitleState.notificationTitleList) {
+        if (!notificationTitleState.isLoading) {
+            currentNoti = notificationTitleState.notificationTitleList
+        }
+    }
 
-                items(notificationTitleState.notificationTitleList) { notification ->
-                    NotificationTitleItemView(notification = notification, onClick = {
-                        navController.navigate(
-                            "notificationScreen/${viewModel.getAppName()}/${notification.title}"
-                        )
-                    }, viewModel = viewModel, priorityViewModel = priorityViewModel)
-                }
-            }
+    LazyColumn(
+        modifier = Modifier.fillMaxSize()
+    ) {
+        items(currentNotiPriority) { notification ->
+            NotificationTitleItemView(notification = notification, onClick = {
+                navController.navigate(
+                    "notificationScreen/${viewModel.getAppName()}/${notification.title}"
+                )
+            }, viewModel = viewModel, priorityViewModel = priorityViewModel)
+        }
+
+        item {
+            HorizontalDivider()
+        }
+
+        items(currentNoti) { notification ->
+            NotificationTitleItemView(notification = notification, onClick = {
+                navController.navigate(
+                    "notificationScreen/${viewModel.getAppName()}/${notification.title}"
+                )
+            }, viewModel = viewModel, priorityViewModel = priorityViewModel)
         }
     }
 }