[Feat] 바텀 네비게이션 도입 및 기존 캘린더 및 마이페이지 화면 fragment 로 전환

app/build.gradle.kts

@@ -107,6 +107,7 @@ dependencies {
     implementation(libs.transport.runtime)
     implementation(libs.activity)
     implementation(libs.fragment)
+    implementation(libs.androidx.activity)
 
     // Testing libraries
     testImplementation(libs.junit)
@@ -178,6 +179,9 @@ dependencies {
     androidTestImplementation(libs.compose.bom)
     debugImplementation(libs.androidx.ui.test.manifest)
 
+    // navigation
+    implementation ("androidx.navigation:navigation-fragment:2.8.9")
+    implementation ("androidx.navigation:navigation-ui:2.8.9")
 }
 
 kapt {

app/src/main/java/com/eatssu/android/alarm/NotificationReceiver.kt

@@ -10,7 +10,7 @@ import android.os.Build
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
 import com.eatssu.android.R
-import com.eatssu.android.presentation.main.MainActivity
+import com.eatssu.android.presentation.main.cafeteria.CafeteriaFragment
 import java.time.DayOfWeek
 import java.time.LocalDateTime
 
@@ -44,7 +44,7 @@ class NotificationReceiver : BroadcastReceiver() {
         }
 
 
-        val intent = Intent(context, MainActivity::class.java).apply {
+        val intent = Intent(context, CafeteriaFragment::class.java).apply {
             flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
         }
 

app/src/main/java/com/eatssu/android/di/NetworkModule.kt

@@ -3,11 +3,7 @@ package com.eatssu.android.di
 
 import com.eatssu.android.BuildConfig
 import com.eatssu.android.BuildConfig.BASE_URL
-import com.eatssu.android.data.service.MealService
 import com.eatssu.android.data.service.OauthService
-import com.eatssu.android.data.service.ReportService
-import com.eatssu.android.data.service.ReviewService
-import com.eatssu.android.data.service.UserService
 import com.eatssu.android.di.network.TokenInterceptor
 import dagger.Module
 import dagger.Provides
@@ -72,29 +68,4 @@ object NetworkModule {
     fun provideOauthService(retrofit: Retrofit): OauthService {
         return retrofit.create(OauthService::class.java)
     }
-
-    @Provides
-    @Singleton
-    fun provideUserService(retrofit: Retrofit): UserService {
-        return retrofit.create(UserService::class.java)
-    }
-
-    @Provides
-    @Singleton
-    fun provideReportService(retrofit: Retrofit): ReportService {
-        return retrofit.create(ReportService::class.java)
-    }
-
-    @Provides
-    @Singleton
-    fun provideReviewService(retrofit: Retrofit): ReviewService {
-        return retrofit.create(ReviewService::class.java)
-    }
-
-    @Provides
-    @Singleton
-    fun provideMealService(retrofit: Retrofit): MealService {
-        return retrofit.create(MealService::class.java)
-    }
-
 }

app/src/main/java/com/eatssu/android/di/ServiceModule.kt

@@ -0,0 +1,48 @@
+package com.eatssu.android.di
+
+import com.eatssu.android.data.service.MealService
+import com.eatssu.android.data.service.MenuService
+import com.eatssu.android.data.service.ReportService
+import com.eatssu.android.data.service.ReviewService
+import com.eatssu.android.data.service.UserService
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import retrofit2.Retrofit
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object ServiceModule {
+
+    @Provides
+    @Singleton
+    fun provideUserService(retrofit: Retrofit): UserService {
+        return retrofit.create(UserService::class.java)
+    }
+
+    @Provides
+    @Singleton
+    fun provideReportService(retrofit: Retrofit): ReportService {
+        return retrofit.create(ReportService::class.java)
+    }
+
+    @Provides
+    @Singleton
+    fun provideReviewService(retrofit: Retrofit): ReviewService {
+        return retrofit.create(ReviewService::class.java)
+    }
+
+    @Provides
+    @Singleton
+    fun provideMealService(retrofit: Retrofit): MealService {
+        return retrofit.create(MealService::class.java)
+    }
+
+    @Provides
+    @Singleton
+    fun provideMenuService(retrofit: Retrofit): MenuService {
+        return retrofit.create(MenuService::class.java)
+    }
+}