[refactor] : #113 멀티모듈 빌드 에러 수정

MYONGSIK · Jun 12, 2023 · 5f637e2 · 5f637e2
1 parent 8580533
commit 5f637e2
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 5 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -20,6 +20,18 @@
         android:theme="@style/Theme.Myongsik_android"
         android:usesCleartextTraffic="true">
 
+        <activity
+            android:name=".presentation.MainActivity"
+            android:exported="true"
+            tools:ignore="MissingClass">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="com.myongsik.myongsikandroid.androidx-startup"

diff --git a/app/src/main/res/font/notosans_regular.otf b/app/src/main/res/font/notosans_regular.otf
diff --git a/app/src/main/res/font/notoserifkr_regular.otf b/app/src/main/res/font/notoserifkr_regular.otf
diff --git a/app/src/main/res/menu/bottom_navigation_menu.xml b/app/src/main/res/menu/bottom_navigation_menu.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/fragment_search"
+        android:title="명지맛집"
+        android:icon="@drawable/ic_search1"
+        />
+
+    <item
+        android:id="@+id/fragment_map"
+        android:title="맛집지도"
+        android:icon="@drawable/ic_map"/>
+
+    <item
+        android:id="@+id/fragment_home"
+        android:title="오늘의학식"
+        android:icon="@drawable/ic_home"/>
+
+    <item
+        android:id="@+id/fragment_love"
+        android:title="찜꽁리스트"
+        android:icon="@drawable/ic_food_love"/>
+</menu>
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
     //Secrets Plugin
     id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' version '2.0.1' apply false
-    id 'androidx.navigation.safeargs.kotlin' version '2.4.1' apply false
+    id 'androidx.navigation.safeargs.kotlin' version '2.4.2' apply false
     id 'com.google.dagger.hilt.android' version '2.41' apply false
     id 'com.google.gms.google-services' version '4.3.15' apply false
     id 'com.google.firebase.crashlytics' version '2.9.4' apply false

diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
@@ -1,13 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.myongsik.myongsikandroid">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+
+    <queries>
+        <package android:name="com.nhn.android.nmap" />
+    </queries>
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/ic_main"
         android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_main_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Myongsik_android">
+        android:theme="@style/Theme.Myongsik_android"
+        android:usesCleartextTraffic="true">
+
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="com.myongsik.myongsikandroid.androidx-startup"
+            tools:node="remove" />
 
+        <meta-data
+            android:name="com.kakao.sdk.AppKey"
+            android:value="${kakaoMapApiKey}" />
+        <meta-data
+            android:name="com.google.android.gms.ads.APPLICATION_ID"
+            android:value="${admobApplicationId}" />
     </application>
 
 </manifest>
diff --git a/presentation/src/main/res/navigation/myongsik_nav_graph.xml b/presentation/src/main/res/navigation/myongsik_nav_graph.xml
@@ -115,7 +115,7 @@
         <argument
             android:name="restaurant"
             app:argType="com.myongsik.data.model.kakao.Restaurant"
-            app:parcelable = "true"/>
+            app:parcelable="true"/>
     </fragment>
 
     <fragment