[PR] 1.4.2

app/build.gradle.kts

@@ -7,18 +7,23 @@ plugins {
 
     // Dagger-Hilt for Dependency Injection
     id("kotlin-kapt")
-    id("com.google.dagger.hilt.android")
+
+    // Keep this plugin in app module, since app module handles all related app information
+    // such as App ID , etc. for using firebase services.
     alias(libs.plugins.google.gms.google.services)
 
     alias(libs.plugins.kotlinSerialization)
 
+    // Required from Kotlin 2.0.0 (Every module using Compose)
+    alias(libs.plugins.compose.compiler)
+
     // KSP Plugin for Room Database
 //    id("com.google.devtools.ksp")
 }
 
 android {
     namespace = "com.doyoonkim.knutice"
-    compileSdk = 34
+    compileSdk = 35
 
     val properties = Properties().apply {
         load(FileInputStream("${rootDir}/local.properties"))
@@ -29,8 +34,8 @@ android {
         applicationId = "com.doyoonkim.knutice"
         minSdk = 31
         targetSdk = 34
-        versionCode = 16
-        versionName = "1.4.1"
+        versionCode = 17
+        versionName = "1.4.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -77,6 +82,14 @@ android {
 }
 
 dependencies {
+    implementation(projects.core.model)
+    implementation(projects.core.domain)
+    implementation(projects.core.data)
+    implementation(projects.core.network)
+    implementation(projects.core.notification)
+    implementation(projects.feature.main)
+    implementation(projects.feature.bookmark)
+    implementation(projects.common)
 
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
@@ -100,39 +113,23 @@ dependencies {
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
 
+    // Dagger
+    implementation(libs.dagger)
+    implementation(libs.dagger.android)
+    implementation(libs.dagger.android.support)
+    kapt(libs.dagger.compiler)
+    kapt(libs.dagger.android.processor)
+
     implementation(libs.kotlin.serialization)
 
     // Coroutine for Android
     implementation(libs.kotlinx.coroutines.android)
     // Navigation for Compose
     implementation(libs.androidx.navigation.compose)
-    // Coil
-    implementation(libs.coil.compose)
-
-    // Dagger Hilt for Dependency Injection
-    implementation(libs.hilt.android)
-    implementation(libs.androidx.hilt.navigation.compose)       // With Compose Navigation
-    kapt(libs.hilt.android.compiler)
-
-    // Retrofit 2
-    implementation(libs.retrofit)
-    implementation(libs.converter.gson)
-
-    // Jsoup HTML Parser Library
-    implementation(libs.jsoup)
 
     // DataStore
     implementation (libs.androidx.datastore.preferences)
 
-    // Room Database
-    implementation(libs.androidx.room.runtime)
-    kapt(libs.androidx.room.compiler)
-    // Room Database - Kotlin Extensions and Coroutine Support
-    implementation(libs.androidx.room.ktx)
-
-    // Translation
-    implementation(libs.translate)
-
 }
 
 // Allow references to generated code

app/src/main/AndroidManifest.xml

@@ -25,23 +25,33 @@
             android:value="@string/default_notification_channel_id"/>
 
         <activity
-            android:name="com.doyoonkim.knutice.presentation.MainActivity"
+            android:name="com.doyoonkim.knutice.MainActivity"
             android:exported="true"
             android:label="@string/app_name"
             android:theme="@style/Theme.KNUTICE">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
+            <!-- Intent filter for handling Deeplink -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:scheme="knutice"
+                    android:host="service" />
+            </intent-filter>
         </activity>
-        <service android:name="com.doyoonkim.knutice.fcm.PushNotificationHandler"
+        <service android:name="com.doyoonkim.notification.fcm.PushNotificationService"
             android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>
-        <receiver android:name=".alarm.AlarmReceiver" />
+        <receiver android:name="com.doyoonkim.notification.local.AlarmReceiver" />
     </application>
 
 </manifest>

app/src/main/java/com/doyoonkim/knutice/AppNavHost.kt

@@ -0,0 +1,53 @@
+package com.doyoonkim.knutice
+
+import android.net.Uri
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.lifecycle.ViewModelProvider
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.NavHost
+import com.doyoonkim.bookmark.bookmarkServiceGraph
+import com.doyoonkim.common.navigation.NavRoutes
+import com.doyoonkim.main.mainServiceNavGraph
+
+@Composable
+fun AppNavHost(
+    modifier: Modifier = Modifier,
+    contentPadding: PaddingValues,
+    navController: NavHostController,
+    viewModelFactory: ViewModelProvider.Factory
+) {
+    NavHost(
+        modifier = modifier.padding(
+            PaddingValues(
+                top = contentPadding.calculateTopPadding(),
+//                bottom = contentPadding.calculateBottomPadding()
+            )
+        ),
+        navController = navController,
+        startDestination = NavRoutes.Home.route
+    ) {
+        mainServiceNavGraph(
+            navController = navController,
+            viewModelFactory = viewModelFactory,
+            contentPadding = contentPadding,
+            onNoticeDetailRequested = { target ->
+                navController.navigate("noticeDetail/${target.nttId}/${Uri.encode(target.contentUrl)}/${target.isFabVisible}")
+            },
+            onBookmarkServiceRequested = {
+                navController.navigate("bookmark/${it.noticeId}/${it.noticeTitle}/${it.noticeInfo}")
+            }
+        )
+
+        bookmarkServiceGraph(
+            navController = navController,
+            viewModelFactory = viewModelFactory,
+            contentPadding = contentPadding,
+            onNoticeDetailRequested = { target ->
+                navController.navigate("noticeDetail/${target.nttId}/${Uri.encode(target.contentUrl)}/${target.isFabVisible}")
+            }
+        )
+    }
+}