Release 2.1.4

README.md

@@ -28,26 +28,25 @@
 ## 📄 Package
 ```
 📦com.eatssu.android
-├── 📂base
+├── 📂alarm
 ├── 📂data
-│   ├── 📂db
 │   ├── 📂dto
 │   │   ├── 📂request
 │   │   └── 📂response
 │   ├── 📂enums
-│   └── 📂repository(impl)
+│   ├── 📂servicerepository(impl)
+│   └── 📂service
 ├── 📂di
 ├── 📂domain
 │   ├── 📂model
 │   ├── 📂repository
-│   ├── 📂service
 │   └── 📂usecase
 ├── 📂presentation
+│   ├── 📂base
 │   ├── 📂common
-│   └── 📂feature
-│       ├── 📂viewModel
-│       └── 📂view
-├── 📂util
+│   ├── 📂feature
+│   │   └── 📂...
+│   └── 📂util
 └── 📄App
 ```
 

app/build.gradle.kts

@@ -1,14 +1,15 @@
 import java.util.Properties
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.google.services)
+    alias(libs.plugins.firebase.crashlytics)
+    alias(libs.plugins.hilt.android)
     id("kotlin-parcelize")
-    id("com.google.gms.google-services")
-    id("com.google.firebase.crashlytics")
     id("kotlin-android")
     id("kotlin-kapt")
-    id("dagger.hilt.android.plugin")
+    id("com.google.android.gms.oss-licenses-plugin")
 }
 
 android {
@@ -21,8 +22,8 @@ android {
         applicationId = "com.eatssu.android"
         minSdk = 23
         targetSdk = 34
-        versionCode = 23
-        versionName = "2.1.3"
+        versionCode = 24
+        versionName = "2.1.4"
 
       testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -54,6 +55,7 @@ android {
 
         debug {
 //            applicationIdSuffix = ".debug"
+//            isDebuggable = false
 
             val p = Properties()
             p.load(project.rootProject.file("local.properties").reader())
@@ -100,7 +102,6 @@ dependencies {
     implementation(libs.transport.runtime)
     implementation(libs.activity)
     implementation(libs.fragment)
-    implementation(libs.androidx.activity)
 
     // Testing libraries
     testImplementation(libs.junit)
@@ -151,6 +152,9 @@ dependencies {
 
     // Timber for logging
     implementation(libs.timber)
+
+    // OSS
+    implementation(libs.oss.licenses)
 }
 
 kapt {

app/src/main/AndroidManifest.xml

@@ -41,9 +41,11 @@
         android:theme="@style/Theme.EatSSUAndroid"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
-
+        <meta-data
+            android:name="com.google.android.gms.oss.licenses.enabled"
+            android:value="true" />
         <receiver
-            android:name=".util.NotificationReceiver"
+            android:name=".alarm.NotificationReceiver"
             android:enabled="true"
             android:exported="false">
             <intent-filter>
@@ -52,17 +54,17 @@
         </receiver>
 
         <activity
-            android:name=".ui.mypage.DeveloperActivity"
+            android:name=".presentation.mypage.DeveloperActivity"
             android:exported="false" />
         <activity
-            android:name=".ui.mypage.SignOutActivity"
+            android:name=".presentation.mypage.SignOutActivity"
             android:exported="false"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name=".ui.mypage.terms.WebViewActivity"
+            android:name=".presentation.mypage.terms.WebViewActivity"
             android:exported="false" />
         <activity
-            android:name=".ui.login.IntroActivity"
+            android:name=".presentation.login.IntroActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -71,31 +73,31 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".ui.review.write.ReviewWriteRateActivity"
+            android:name=".presentation.review.write.ReviewWriteRateActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ui.review.write.menu.ReviewWriteMenuActivity"
+            android:name=".presentation.review.write.menu.ReviewWriteMenuActivity"
             android:exported="false" />
         <activity
-            android:name=".ui.login.LoginActivity"
+            android:name=".presentation.login.LoginActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ui.common.AndroidMessageDialogActivity"
+            android:name=".presentation.common.AndroidMessageDialogActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ui.common.ForceUpdateDialogActivity"
+            android:name=".presentation.common.ForceUpdateDialogActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
@@ -116,74 +118,74 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".base.BaseActivity"
+            android:name=".presentation.base.BaseActivity"
             android:exported="false">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ui.mypage.usernamechange.UserNameChangeActivity"
+            android:name=".presentation.mypage.usernamechange.UserNameChangeActivity"
             android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ui.mypage.myreview.MyReviewListActivity"
+            android:name=".presentation.mypage.myreview.MyReviewListActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ui.review.list.ReviewActivity"
+            android:name=".presentation.review.list.ReviewActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ui.mypage.MyPageActivity"
+            android:name=".presentation.mypage.MyPageActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
 
         <activity
-            android:name=".ui.main.MainActivity"
+            android:name=".presentation.main.MainActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ui.review.report.OthersReviewDialogActivity"
+            android:name=".presentation.review.report.OthersReviewDialogActivity"
             android:exported="true"
             android:theme="@style/Theme.MyDialog">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ui.review.delete.MyReviewDialogActivity"
+            android:name=".presentation.review.delete.MyReviewDialogActivity"
             android:exported="true"
             android:theme="@style/Theme.MyDialog">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ui.review.report.ReportActivity"
+            android:name=".presentation.review.report.ReportActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".ui.review.modify.ModifyReviewActivity"
+            android:name=".presentation.review.modify.ModifyReviewActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"

app/src/main/java/com/eatssu/android/App.kt

@@ -20,6 +20,8 @@ class App: Application() {
         appContext = this
         KakaoSdk.init(this,BuildConfig.KAKAO_NATIVE_APP_KEY)
 
-        Timber.plant(Timber.DebugTree())
+        if (BuildConfig.DEBUG) {
+            Timber.plant(Timber.DebugTree())
+        }
     }
 }

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

@@ -1,4 +1,4 @@
-package com.eatssu.android.util
+package com.eatssu.android.alarm
 
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -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.ui.main.MainActivity
+import com.eatssu.android.presentation.main.MainActivity
 import java.time.DayOfWeek
 import java.time.LocalDateTime
 

app/src/main/java/com/eatssu/android/util/MySharedPreferences.kt → app/src/main/java/com/eatssu/android/data/MySharedPreferences.kt

@@ -1,4 +1,4 @@
-package com.eatssu.android.util
+package com.eatssu.android.data
 
 
 import android.content.Context

app/src/main/java/com/eatssu/android/util/RetrofitImpl.kt → app/src/main/java/com/eatssu/android/data/RetrofitImpl.kt

@@ -1,4 +1,4 @@
-package com.eatssu.android.util
+package com.eatssu.android.data
 
 import android.content.Context
 import android.content.Intent
@@ -10,10 +10,10 @@ import android.widget.Toast
 import com.eatssu.android.App
 import com.eatssu.android.BuildConfig
 import com.eatssu.android.BuildConfig.BASE_URL
-import com.eatssu.android.base.BaseResponse
+import com.eatssu.android.data.dto.response.BaseResponse
 import com.eatssu.android.data.dto.response.TokenResponse
 import com.eatssu.android.di.network.TokenInterceptor
-import com.eatssu.android.ui.login.LoginActivity
+import com.eatssu.android.presentation.login.LoginActivity
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import kotlinx.coroutines.runBlocking

app/src/main/java/com/eatssu/android/base/BaseResponse.kt → app/src/main/java/com/eatssu/android/data/dto/response/BaseResponse.kt

@@ -1,4 +1,4 @@
-package com.eatssu.android.base
+package com.eatssu.android.data.dto.response
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/com/eatssu/android/data/dto/response/MealResponse.kt

@@ -1,14 +1,14 @@
 package com.eatssu.android.data.dto.response
 
-import com.eatssu.android.data.model.Menu
+import com.eatssu.android.domain.model.Menu
 import com.google.gson.annotations.SerializedName
 
 data class GetMealResponse(
 
     @SerializedName("mealId") var mealId: Long? = null,
     @SerializedName("price") var price: Int? = null,
-    @SerializedName("mainRating") var mainRating: Double? = null,
-    @SerializedName("menusInformationList") var menusInformationList: ArrayList<MenusInformationList> = arrayListOf(),
+    @SerializedName("rating") var rating: Double? = null,
+    @SerializedName("briefMenus") var briefMenus: ArrayList<MenusInformationList> = arrayListOf(),
 )
 
 data class MenusInformationList(
@@ -23,10 +23,10 @@ fun ArrayList<GetMealResponse>.mapTodayMenuResponseToMenu(): List<Menu> {
 
     this.forEach { mealResponse ->
         val menuNames =
-            mealResponse.menusInformationList.joinToString(separator = "+") { it.name ?: "" }
+            mealResponse.briefMenus.joinToString(separator = "+") { it.name ?: "" }
         val mealId = mealResponse.mealId ?: -1
         val price = mealResponse.price ?: 0
-        val mainRating = mealResponse.mainRating ?: 0.0
+        val mainRating = mealResponse.rating ?: 0.0
 
         val menu = Menu(mealId, menuNames, price, mainRating)
 

app/src/main/java/com/eatssu/android/data/dto/response/MealReviewInfoResponse.kt

@@ -1,6 +1,6 @@
 package com.eatssu.android.data.dto.response
 
-import com.eatssu.android.data.model.ReviewInfo
+import com.eatssu.android.domain.model.ReviewInfo
 import com.google.gson.annotations.SerializedName
 
 data class GetMealReviewInfoResponse(

app/src/main/java/com/eatssu/android/data/dto/response/MenuOfMealResponse.kt

@@ -1,10 +1,10 @@
 package com.eatssu.android.data.dto.response
 
-import com.eatssu.android.data.model.MenuMini
+import com.eatssu.android.domain.model.MenuMini
 import com.google.gson.annotations.SerializedName
 
 data class MenuOfMealResponse(
-    @SerializedName("menusInformation") var menusInformation: ArrayList<MenusInformation> = arrayListOf(),
+    @SerializedName("briefMenus") var briefMenus: ArrayList<MenusInformation> = arrayListOf(),
 )
 
 data class MenusInformation(
@@ -14,14 +14,13 @@ data class MenusInformation(
 
     )
 
-fun MenuOfMealResponse.asMenuOfMeal(): List<MenuMini> {
-    val menuList = mutableListOf<MenuMini>()
+fun MenuOfMealResponse.toMenuMiniList(): List<MenuMini> {
+    return briefMenus.map { it.toMenuMini() }
+}
 
-    this.menusInformation.forEach {
-
-        val menu = MenuMini(it.menuId, it.name)
-        menuList.add(menu)
-    }
-
-    return menuList
+fun MenusInformation.toMenuMini(): MenuMini {
+    return MenuMini(
+        id = this.menuId,
+        name = this.name
+    )
 }