Merge pull request #62 from Richter3766/Fix/issue-#61

Richter3766 · web-flow · commit 8620784d6916 · 2025-03-16T15:48:22.000+09:00
Fix/issue #61 - 버그 수정
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -14,10 +14,10 @@ android {
 
     defaultConfig {
         applicationId = "com.example.notimanager"
-        minSdk = 28
+        minSdk = 26
         targetSdk = 35
         versionCode = 1
-        versionName = "1.0"
+        versionName = "1.0.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resValue("string", "admob_app_id", System.getenv("ADMOB_APP_ID") ?: "")
         resValue("string", "admob_banner_id", System.getenv("ADMOB_BANNER_ID") ?: "")
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
         tools:targetApi="35">
         <meta-data
             android:name="com.google.android.gms.ads.APPLICATION_ID"
-            android:value="@string/admob_app_id"/>
+            android:value="ca-app-pub-4472438519886520~1562656818"/>
 
         <activity
             android:name=".presentation.ui.activity.MainActivity"
diff --git a/app/src/main/java/com/example/notimanager/domain/service/ForegroundNotiService.kt b/app/src/main/java/com/example/notimanager/domain/service/ForegroundNotiService.kt
@@ -29,7 +29,7 @@ class ForegroundNotiService: Service() {
 
         val appName = intent?.extras?.getString("appName") ?: ""
         val content = intent?.extras?.getString("content") ?: ""
-        val isGroupSummary = intent?.extras?.getBoolean("isGroupSummary") ?: false
+        val isGroupSummary = intent?.extras?.getBoolean("isGroupSummary") == true
         putNotification(appName, content, isGroupSummary)
 
         return START_STICKY
@@ -48,7 +48,7 @@ class ForegroundNotiService: Service() {
         appName: String,
         content: String,
         isGroupSummary: Boolean) {
-        val appContent = if (isGroupSummary) content else getString(R.string.status_app_content, content)
+        val appContent = content
 
         val notificationIntent = Intent(this, MainActivity::class.java).apply {
             putExtra("appName", appName)
diff --git a/app/src/main/java/com/example/notimanager/domain/service/NotiListenerService.kt b/app/src/main/java/com/example/notimanager/domain/service/NotiListenerService.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import android.graphics.drawable.Icon
 import android.service.notification.NotificationListenerService
 import android.service.notification.StatusBarNotification
+import com.example.notimanager.R
 import com.example.notimanager.data.model.AppIconModel
 import com.example.notimanager.data.model.NotificationIconModel
 import com.example.notimanager.data.model.NotificationMetaModel
@@ -128,7 +129,17 @@ class NotiListenerService: NotificationListenerService() {
         if (count != 0){
             val serviceIntent = Intent(this, ForegroundNotiService::class.java).apply {
                 putExtra("appName", appName)
-                putExtra("content", count.toString())
+                putExtra("content", getString(R.string.status_app_content, count.toString()))
+            }
+            startService(serviceIntent)
+        }
+        else{
+            val basicTitle = getString(R.string.status_basic_title)
+            val notiContent = getString(R.string.status_noti_content)
+            val serviceIntent = Intent(this, ForegroundNotiService::class.java).apply {
+                putExtra("appName", basicTitle)
+                putExtra("content", notiContent)
+                putExtra("isGroupSummary", true)
             }
             startService(serviceIntent)
         }
diff --git a/app/src/main/java/com/example/notimanager/presentation/ui/ads/AdSize.kt b/app/src/main/java/com/example/notimanager/presentation/ui/ads/AdSize.kt
@@ -26,7 +26,8 @@ object AdsUtil{
     }
 
     fun getAdView(context: Context): AdView{
-        val unitId = context.getString(R.string.admob_banner_id)
+//        val unitId = context.getString(R.string.admob_banner_id)
+        val unitId = "ca-app-pub-3940256099942544/9214589741"
         val adView = AdView(context)
         adView.adUnitId = unitId
         adView.setAdSize(getAdSize(context))
diff --git a/app/src/main/java/com/example/notimanager/presentation/ui/component/list/NotificationAppListView.kt b/app/src/main/java/com/example/notimanager/presentation/ui/component/list/NotificationAppListView.kt
@@ -1,7 +1,6 @@
 package com.example.notimanager.presentation.ui.component.list
 
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -15,7 +14,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -34,7 +32,7 @@ import com.example.notimanager.presentation.ui.component.item.NotificationAppIte
 fun NotificationAppListView(
     navController: NavController,
     viewModel: NotificationAppViewModel,
-    priorityViewModel: NotificationAppPriorityViewModel
+    priorityViewModel: NotificationAppPriorityViewModel,
 ) {
     val notificationAppState by viewModel.notificationAppState.observeAsState(NotificationAppState())
     val priorityState by priorityViewModel.notificationAppPriorityState.observeAsState((NotificationAppPriorityState()))
@@ -63,31 +61,32 @@ fun NotificationAppListView(
                 .fillMaxSize()
                 .padding(bottom = 56.dp) // AndroidView의 높이만큼 패딩 추가
         ) {
-            items(currentNotiPriority) { notification ->
-                NotificationAppItemView(
-                    notification = notification,
-                    onClick = {
-                        navController.navigate("titleScreen/${notification.appName}")
-                    },
-                    viewModel = viewModel,
-                    priorityViewModel = priorityViewModel
-                )
-            }
-            if (currentNotiPriority.isNotEmpty()) {
+            if(currentNotiPriority.isNotEmpty()){
+                items(currentNotiPriority) { notification ->
+                    NotificationAppItemView(
+                        notification = notification,
+                        onClick = {
+                            navController.navigate("titleScreen/${notification.appName}")
+                        },
+                        viewModel = viewModel,
+                        priorityViewModel = priorityViewModel
+                    )
+                }
                 item {
                     HorizontalDivider()
                 }
             }
-
-            items(currentNoti) { notification ->
-                NotificationAppItemView(
-                    notification = notification,
-                    onClick = {
-                        navController.navigate("titleScreen/${notification.appName}")
-                    },
-                    viewModel = viewModel,
-                    priorityViewModel = priorityViewModel
-                )
+            if (currentNoti.isNotEmpty()){
+                items(currentNoti) { notification ->
+                    NotificationAppItemView(
+                        notification = notification,
+                        onClick = {
+                            navController.navigate("titleScreen/${notification.appName}")
+                        },
+                        viewModel = viewModel,
+                        priorityViewModel = priorityViewModel
+                    )
+                }
             }
         }
 
diff --git a/app/src/main/java/com/example/notimanager/presentation/ui/component/list/NotificationTitleListView.kt b/app/src/main/java/com/example/notimanager/presentation/ui/component/list/NotificationTitleListView.kt
@@ -33,7 +33,7 @@ import com.example.notimanager.presentation.ui.component.item.NotificationTitleI
 fun NotificationTitleListView(
     navController: NavController,
     viewModel: NotificationTitleViewModel,
-    priorityViewModel: NotificationTitlePriorityViewModel
+    priorityViewModel: NotificationTitlePriorityViewModel,
 ) {
     val notificationTitleState by viewModel.notificationTitleState.observeAsState(
         NotificationTitleState()
@@ -63,42 +63,44 @@ fun NotificationTitleListView(
         LazyColumn(
             modifier = Modifier.fillMaxSize().padding(bottom = 56.dp)
         ) {
-            items(currentNotiPriority) { notification ->
-                NotificationTitleItemView(notification = notification, onClick = {
-                    if (notification.subText == "") navController.navigate("notificationScreen/${viewModel.getAppName()}/${getEncodedString(notification.title)}/False")
-                    else navController.navigate("notificationScreen/${viewModel.getAppName()}/${getEncodedString(notification.subText)}/True")
-                }, viewModel = viewModel, priorityViewModel = priorityViewModel)
-            }
+            if(currentNotiPriority.isNotEmpty()){
+                items(currentNotiPriority) { notification ->
+                    NotificationTitleItemView(notification = notification, onClick = {
+                        if (notification.subText == "") navController.navigate("notificationScreen/${viewModel.getAppName()}/${getEncodedString(notification.title)}/False")
+                        else navController.navigate("notificationScreen/${viewModel.getAppName()}/${getEncodedString(notification.subText)}/True")
+                    }, viewModel = viewModel, priorityViewModel = priorityViewModel)
+                }
 
-            if (currentNotiPriority.isNotEmpty()){
                 item {
                     HorizontalDivider()
                 }
             }
-
-            items(currentNoti) { notification ->
-                NotificationTitleItemView(notification = notification, onClick = {
-                    if (notification.subText == "") {
-                        viewModel.updateAsRead(notification.title)
-                        navController.navigate(
-                            "notificationScreen/${viewModel.getAppName()}/${
-                                getEncodedString(
-                                    notification.title
-                                )
-                            }/False"
-                        )
-                    }
-                    else {
-                        viewModel.updateAsSubText(notification.subText)
-                        navController.navigate(
-                            "notificationScreen/${viewModel.getAppName()}/${
-                                getEncodedString(
-                                    notification.subText
-                                )
-                            }/True"
-                        )
-                    }}, viewModel = viewModel, priorityViewModel = priorityViewModel)
+            if(currentNoti.isNotEmpty()){
+                items(currentNoti) { notification ->
+                    NotificationTitleItemView(notification = notification, onClick = {
+                        if (notification.subText == "") {
+                            viewModel.updateAsRead(notification.title)
+                            navController.navigate(
+                                "notificationScreen/${viewModel.getAppName()}/${
+                                    getEncodedString(
+                                        notification.title
+                                    )
+                                }/False"
+                            )
+                        }
+                        else {
+                            viewModel.updateAsSubText(notification.subText)
+                            navController.navigate(
+                                "notificationScreen/${viewModel.getAppName()}/${
+                                    getEncodedString(
+                                        notification.subText
+                                    )
+                                }/True"
+                            )
+                        }}, viewModel = viewModel, priorityViewModel = priorityViewModel)
+                }
             }
+
         }
 
         AndroidView(
diff --git a/app/src/main/java/com/example/notimanager/presentation/ui/screen/DateFormatterScreen.kt b/app/src/main/java/com/example/notimanager/presentation/ui/screen/DateFormatterScreen.kt
@@ -30,7 +30,9 @@ fun DateFormatterScreen(
             CommonTopAppBar(title) {
                 if (!isClicked) {
                     isClicked = true
-                    navController.popBackStack()
+                    if (navController.previousBackStackEntry != null) {
+                        navController.popBackStack()
+                    }
                 }
             }
         }
diff --git a/app/src/main/java/com/example/notimanager/presentation/ui/screen/FilteredListScreen.kt b/app/src/main/java/com/example/notimanager/presentation/ui/screen/FilteredListScreen.kt
@@ -33,8 +33,9 @@ fun FilteredListScreen(
             CommonTopAppBar(title = title, onBackClick = {
                 if (!isClicked){
                     isClicked = true
-
-                    navController.popBackStack()
+                    if (navController.previousBackStackEntry != null) {
+                        navController.popBackStack()
+                    }
                 }
 
             })
diff --git a/app/src/main/java/com/example/notimanager/presentation/ui/screen/NotificationScreen.kt b/app/src/main/java/com/example/notimanager/presentation/ui/screen/NotificationScreen.kt
@@ -51,7 +51,9 @@ fun NotificationScreen(navController: NavController, appName: String = "", title
             CommonTopAppBar(title = title, onBackClick = {
                 if(!isClicked){
                     isClicked = true
-                    navController.popBackStack()
+                    if (navController.previousBackStackEntry != null) {
+                        navController.popBackStack()
+                    }
                 } }
             )
         }
diff --git a/app/src/main/java/com/example/notimanager/presentation/ui/screen/NotificationSubScreen.kt b/app/src/main/java/com/example/notimanager/presentation/ui/screen/NotificationSubScreen.kt
@@ -50,9 +50,10 @@ fun NotificationSubScreen(navController: NavController, appName: String = "", su
             CommonTopAppBar(title = subText, onBackClick = {
                 if(!isClicked){
                     isClicked = true
-                    navController.popBackStack()
+                    if (navController.previousBackStackEntry != null) {
+                        navController.popBackStack()
+                    }
                 }
-
             })
         }
     ) { innerPadding ->
diff --git a/app/src/main/java/com/example/notimanager/presentation/ui/screen/SettingScreen.kt b/app/src/main/java/com/example/notimanager/presentation/ui/screen/SettingScreen.kt
@@ -30,7 +30,9 @@ fun SettingScreen(
             CommonTopAppBar(title){
                 if (!isClicked){
                     isClicked = true
-                    navController.popBackStack()
+                    if (navController.previousBackStackEntry != null) {
+                        navController.popBackStack()
+                    }
                 }
             }
         }
diff --git a/app/src/main/java/com/example/notimanager/presentation/ui/screen/TitleScreen.kt b/app/src/main/java/com/example/notimanager/presentation/ui/screen/TitleScreen.kt
@@ -1,5 +1,6 @@
 package com.example.notimanager.presentation.ui.screen
 
+import android.util.Log
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.HorizontalDivider
@@ -35,6 +36,15 @@ fun TitleScreen(navController: NavController, appName: String = ""){
     val coroutineScope = rememberCoroutineScope()
 
     var isClicked by remember { mutableStateOf(false) }
+    val onRefresh: () -> Unit = {
+        isRefreshing = true
+        viewModel.loadNotificationTitles()
+        priorityViewModel.loadNotificationTitles()
+        coroutineScope.launch {
+            delay(500)
+            isRefreshing = false
+        }
+    }
 
     LaunchedEffect(appName) {
         viewModel.setArgs(appName)
@@ -51,9 +61,9 @@ fun TitleScreen(navController: NavController, appName: String = ""){
             CommonTopAppBar(title = appName, onBackClick = {
                 if (!isClicked) {
                     isClicked = true
-
-                    navController.popBackStack()
-
+                    if (navController.previousBackStackEntry != null) {
+                        navController.popBackStack()
+                    }
                 }
             })
         }
@@ -65,15 +75,7 @@ fun TitleScreen(navController: NavController, appName: String = ""){
 
         PullToRefreshBox(
             isRefreshing = isRefreshing,
-            onRefresh = {
-                isRefreshing = true
-                viewModel.loadNotificationTitles()
-                priorityViewModel.loadNotificationTitles()
-                coroutineScope.launch {
-                    delay(500)
-                    isRefreshing = false
-                }
-            },
+            onRefresh = onRefresh,
             modifier = Modifier.padding(innerPadding)
         ) {
             NotificationTitleListView(navController, viewModel, priorityViewModel)
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
@@ -40,6 +40,7 @@
     <string name="status_basic_title">NotiManager</string>
     <string name="status_basic_content">모든 중요 알림을 확인했어요.</string>
     <string name="status_app_content">%1$s개의 읽지 않은 알림이 있어요.</string>
+    <string name="status_noti_content">새로운 알림이 있어요.</string>
 
     <!--  시간 UI  -->
     <string name="time_now">방금</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -40,6 +40,7 @@
     <string name="status_basic_title">NotiManager</string>
     <string name="status_basic_content">You have checked all important notifications.</string>
     <string name="status_app_content">You have %1$s unread notifications.</string>
+    <string name="status_noti_content">You have a new notification.</string>
 
     <!-- 시간 UI -->
     <string name="time_now">Just now</string>

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,8 @@ object AdsUtil{`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`fun getAdView(context: Context): AdView{`
`29`		`- val unitId = context.getString(R.string.admob_banner_id)`
	`29`	`+// val unitId = context.getString(R.string.admob_banner_id)`
	`30`	`+ val unitId = "ca-app-pub-3940256099942544/9214589741"`
`30`	`31`	`val adView = AdView(context)`
`31`	`32`	`adView.adUnitId = unitId`
`32`	`33`	`adView.setAdSize(getAdSize(context))`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,9 @@ fun DateFormatterScreen(`
`30`	`30`	`CommonTopAppBar(title) {`
`31`	`31`	`if (!isClicked) {`
`32`	`32`	`isClicked = true`
`33`		`- navController.popBackStack()`
	`33`	`+ if (navController.previousBackStackEntry != null) {`
	`34`	`+ navController.popBackStack()`
	`35`	`+ }`
`34`	`36`	`}`
`35`	`37`	`}`
`36`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,9 @@ fun NotificationScreen(navController: NavController, appName: String = "", title`
`51`	`51`	`CommonTopAppBar(title = title, onBackClick = {`
`52`	`52`	`if(!isClicked){`
`53`	`53`	`isClicked = true`
`54`		`- navController.popBackStack()`
	`54`	`+ if (navController.previousBackStackEntry != null) {`
	`55`	`+ navController.popBackStack()`
	`56`	`+ }`
`55`	`57`	`} }`
`56`	`58`	`)`
`57`	`59`	`}`