Refactoring

app/build.gradle

@@ -1,11 +1,51 @@
 plugins {
     id 'com.android.application'
 }
-
+apply plugin: 'androidx.navigation.safeargs'
 android {
+
     compileSdkVersion 30
     buildToolsVersion "30.0.3"
 
+    sourceSets {
+        main {
+            res.srcDirs = [
+                    'src/main/res',
+                    'src/main/res/old',
+                    'src/main/res/nnew',
+
+
+                    'src/main/res/nnew/edit_name',
+                    'src/main/res/nnew/edit_password',
+                    'src/main/res/nnew/find_id',
+                    'src/main/res/nnew/find_passward',
+                    'src/main/res/nnew/food_detail',
+
+                    'src/main/res/nnew/login',
+                    'src/main/res/nnew/main',
+                    'src/main/res/nnew/main/layout/favorite',
+                    'src/main/res/nnew/main/layout/home',
+                    'src/main/res/nnew/main/layout/home/layout/advertisement',
+
+                    'src/main/res/nnew/main/layout/my_kati',
+                    'src/main/res/nnew/main/layout/my_kati/layout/allergy',
+                    'src/main/res/nnew/main/layout/my_kati/layout/my_info_edit',
+                    'src/main/res/nnew/main/layout/my_kati/layout/review',
+                    'src/main/res/nnew/main/layout/search',
+                    'src/main/res/nnew/main/layout/category',
+
+                    'src/main/res/nnew/map',
+                    'src/main/res/nnew/review',
+                    'src/main/res/nnew/set_restore_email',
+                    'src/main/res/nnew/sign_out',
+                    'src/main/res/nnew/sign_up',
+                    'src/main/res/nnew/sign_up/layout/sign_up',
+
+                    'src/main/res/nnew/sign_up/layout/welcome',
+            ]
+        }
+    }
+
     defaultConfig {
         applicationId "com.plim.kati_app"
         minSdkVersion 28
@@ -38,56 +78,66 @@ android {
 }
 
 dependencies {
+
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+
+    // heart button
+        compile 'com.github.varunest:sparkbutton:1.0.6'
+        // https://github.com/varunest/SparkButton
+
     // Google map
     implementation 'com.google.android.gms:play-services-maps:17.0.0'
     implementation 'com.google.android.gms:play-services-location:17.0.0'
     implementation 'noman.placesapi:placesAPI:1.1.3'
 
+
+
+    // Glide
     annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
     implementation 'com.github.bumptech.glide:glide:4.9.0'
-
-    implementation ("com.github.bumptech.glide:glide:4.9.0@aar") {
+    implementation("com.github.bumptech.glide:glide:4.9.0@aar") {
         transitive = true
     }
 
+    // Lombok
     implementation 'org.projectlombok:lombok'
     implementation 'org.projectlombok:lombok:1.18.16'
     annotationProcessor 'org.projectlombok:lombok:1.18.16'
     testCompileOnly 'org.projectlombok:lombok:1.18.16'
     testAnnotationProcessor 'org.projectlombok:lombok:1.18.16'
 
+    // Room
     def room_version = "2.2.6"
     implementation "androidx.room:room-runtime:$room_version"
     annotationProcessor "androidx.room:room-compiler:$room_version"
-
     implementation "android.arch.lifecycle:extensions:1.1.1"
 
-    //Retrofit - default
+    // Zxing
+    implementation 'com.journeyapps:zxing-android-embedded:4.0.0'
+    implementation 'com.google.zxing:core:3.3.0'
+
+    // Retrofit
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    //Retrofit - gson
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
-
     implementation 'com.android.volley:volley:1.1.0'
     implementation 'com.squareup.retrofit2:converter-scalars:2.4.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.squareup.okhttp3:okhttp:4.8.1'
-
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
+    // Navigation
     def nav_version = "2.3.3"
     // Java language implementation
     implementation "androidx.navigation:navigation-fragment:$nav_version"
     implementation "androidx.navigation:navigation-ui:$nav_version"
-
     // Feature module Support
     implementation "androidx.navigation:navigation-dynamic-features-fragment:$nav_version"
-
     // Testing Navigation
     androidTestImplementation "androidx.navigation:navigation-testing:$nav_version"
-
     // Jetpack Compose Integration
     implementation "androidx.navigation:navigation-compose:1.0.0-alpha07"
 
+    // default
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'

app/src/main/AndroidManifest.xml

@@ -1,52 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.plim.kati_app">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.plim.kati_app" >
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.CAMERA" />
 
     <application
-        android:allowBackup="false"
+        android:allowBackup="true"
+        android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.KATI_app"
-        android:usesCleartextTraffic="true">
-        <activity android:name=".domain.view.search.food.review.WriteReviewActivity"></activity>
-        <activity android:name=".domain.view.search.food.detail.NewDetailActivity" />
+        android:theme="@style/Theme.KatiUI"
+        android:usesCleartextTraffic="true"
+        tools:replace="android:allowBackup" >
+        <activity android:name=".kati.domain.nnew.categoryFilter.CategorySettingActivity" >
+        </activity>
+        <activity android:name=".kati.domain.foodDetail.FoodDetailActivity" />
+        <activity android:name=".kati.domain.review.ReviewActivity" />
+        <activity android:name=".kati.domain.setRestoreEmail.SetRestoreEmailActivity" />
+        <activity android:name=".kati.domain.findId.FindIdActivity" />
+        <activity android:name=".kati.domain.editSingleData.EditSingleActivity" />
+        <activity android:name=".kati.domain.findPassword.FindPasswordActivity" />
+        <activity android:name=".kati.domain.login.LoginActivity" />
+        <activity android:name=".kati.domain.map.MapServiceActivity" />
+        <activity android:name=".kati.domain.signOut.SignOutActivity" />
+        <activity android:name=".kati.domain.editSingleData.EditNameActivity" />
+        <activity android:name=".kati.domain.editSingleData.EditBirthActivity" />
+        <activity android:name=".kati.domain.editSingleData.EditAddressActivity" />
+        <activity android:name=".kati.domain.main.search.barcode.view.BarcodeActivity" />
+        <activity
+            android:name="com.journeyapps.barcodescanner.CaptureActivity"
+            android:screenOrientation="portrait"
+            android:stateNotNeeded="true"
+            tools:replace="android:screenOrientation" />
 
         <meta-data
             android:name="com.google.android.geo.API_KEY"
             android:value="AIzaSyAH63IC9w2B6lP4RYw05b7qAyNja8gOyjU" />
 
-
-        <activity android:name=".domain.view.search.map.MapServiceActivity" />
-        <activity android:name=".domain.view.user.findPW.FindPasswordActivity" />
         <activity
-            android:name=".domain.view.MainActivity"
-            android:label="@string/title_activity_main">
+            android:name=".kati.domain.editPassword.view.EditPasswordActivity"
+            android:label="@string/title_activity_password_edit"
+            android:theme="@style/Theme.KatiUI.NoActionBar" />
+        <activity
+            android:name=".kati.domain.signUp.SignUpActivity"
+            android:label="@string/title_activity_sign_up"
+            android:theme="@style/Theme.KatiUI.NoActionBar" />
+        <activity android:name=".kati.domain.main.MainActivity" />
+        <activity android:name=".kati.domain.splash.SplashActivity" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".domain.view.search.food.list.FoodSearchActivity" />
-        <activity android:name=".domain.view.user.signOut.NewWithdrawalActivity" />
-        <activity android:name=".domain.view.user.signOut.TempActivity" />
-        <activity android:name=".domain.view.user.register.RegisterActivity" />
-        <activity android:name=".domain.view.user.logOut.LogOutActivity" />
-        <activity android:name=".domain.view.user.login.LoginActivity" />
-        <activity android:name=".domain.view.user.login.GoogleLoginActivity" />
-        <activity android:name=".domain.view.search.food.detail.DetailActivity" />
-        <activity android:name=".domain.view.user.changePW.ChangePasswordActivity" />
-
-        <service
-            android:name=".domain.service.AutoLoginService"
-            android:stopWithTask="false" />
     </application>
 
 </manifest>