Feature : 홈 리뉴얼

app/build.gradle

@@ -29,8 +29,8 @@ android {
         applicationId "com.mashup"
         minSdkVersion minVersion
         targetSdkVersion targetVersion
-        versionCode 31
-        versionName "1.6.2"
+        versionCode 34
+        versionName "1.7.2"
 
         testInstrumentationRunner "com.mashup.core.testing.MashUpTestRunner"
         vectorDrawables {
@@ -107,6 +107,8 @@ dependencies {
     implementation project(":feature:setting")
     implementation project(":feature:danggn")
     implementation project(":feature:myPage")
+    implementation project(":feature:moreMenu")
+    implementation project(':feature:moreMenu:notice')
 
     // ml Kit
     implementation "com.google.mlkit:barcode-scanning:$barcodeSacnnerVersion"
@@ -164,4 +166,7 @@ dependencies {
 
     // Naver Map
     implementation "io.github.fornewid:naver-map-compose:1.4.0"
+
+    // Date Time
+    implementation 'com.jakewharton.threetenabp:threetenabp:1.3.1'
 }

app/src/debug/java/com/mashup/data/network/NetworkConstanst.kt

@@ -1,3 +1,4 @@
 package com.mashup.data.network
 
 const val API_HOST = "https://api.dev-member.mash-up.kr/"
+const val WEB_HOST = "https://dev-app.mash-up.kr/"

app/src/main/AndroidManifest.xml

@@ -6,7 +6,8 @@
     <uses-feature
         android:name="android.hardware.camera"
         android:required="false" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
@@ -15,19 +16,21 @@
     <queries>
         <package android:name="com.android.vending" />
         <intent>
-            <action android:name="android.intent.action.VIEW"/>
-            <data android:scheme="https" android:host="play.google.com" />
+            <action android:name="android.intent.action.VIEW" />
+            <data
+                android:host="play.google.com"
+                android:scheme="https" />
         </intent>
     </queries>
 
     <application
         android:name=".MashUpApplication"
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="${appName}"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:resizeableActivity="false"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:allowBackup="false"
         android:theme="@style/Theme.MashUp"
         android:usesCleartextTraffic="true"
         tools:ignore="DataExtractionRules">
@@ -62,8 +65,9 @@
             android:name=".ui.login.LoginActivity"
             android:exported="true"
             android:screenOrientation="portrait"
-            tools:ignore="LockedOrientationActivity"/>
-        <activity android:name=".ui.splash.SplashActivity"
+            tools:ignore="LockedOrientationActivity" />
+        <activity
+            android:name=".ui.splash.SplashActivity"
             android:exported="true"
             android:screenOrientation="portrait"
             android:theme="@style/SplashTheme"
@@ -99,6 +103,7 @@
             android:name=".ui.main.MainActivity"
             android:exported="true"
             android:label="@string/title_activity_main"
+            android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.MashUp"
             android:windowSoftInputMode="stateAlwaysHidden"
@@ -125,13 +130,14 @@
             android:name=".ui.setting.SettingActivity"
             android:exported="false"
             android:screenOrientation="portrait"
-            tools:ignore="LockedOrientationActivity"/>
+            tools:ignore="LockedOrientationActivity" />
 
         <activity
             android:name=".ui.setting.PushActivity"
             android:exported="false"
             android:screenOrientation="portrait"
-            tools:ignore="LockedOrientationActivity"/>
+            tools:ignore="LockedOrientationActivity" />
+
 
         <activity
             android:name=".ui.error.NetworkDisconnectActivity"
@@ -140,6 +146,20 @@
             android:screenOrientation="portrait"
             tools:ignore="LockedOrientationActivity" />
 
+        <activity
+            android:name=".ui.moremenu.MoreMenuActivity"
+            android:exported="false"
+            android:screenOrientation="portrait" />
+
+        <activity android:name=".ui.webview.mashong.MashongActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"/>
+
+        <activity
+            android:name=".ui.webview.birthday.BirthdayActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"/>
+
         <service
             android:name=".service.MashUpFirebaseMessagingService"
             android:exported="false">

app/src/main/java/com/mashup/constant/ExtraConstant.kt

@@ -6,6 +6,7 @@ const val EXTRA_LOGIN_TYPE = "EXTRA_MAIN_TYPE"
 const val EXTRA_TITLE_KEY = "EXTRA_TITLE_KEY"
 const val EXTRA_URL_KEY = "EXTRA_URL_KEY"
 const val EXTRA_SCHEDULE_ID = "EXTRA_SCHEDULE_ID"
+const val EXTRA_SCHEDULE_TYPE = "EXTRA_SCHEDULE_TYPE"
 
 const val EXTRA_LOGOUT = "EXTRA_LOGOUT"
 const val EXTRA_WITH_DRAWL = "EXTRA_WITH_DRAWL"

app/src/main/java/com/mashup/constant/log/UserActionLogs.kt

@@ -1,42 +1,96 @@
 package com.mashup.constant.log
 
-const val LOG_BACK = "back"
-const val LOG_CLOSE = "close"
+/**
+ * Category Common
+ */
+const val LOG_COMMON_BACK = "back"
+const val LOG_COMMON_CLOSE = "close"
+const val LOG_COMMON_POPUP_CONFIRM = "popup_new_confirm"
+const val LOG_COMMON_POPUP_CANCEL = "popup_new_cancel"
 
+/**
+ * Category SignUp
+ */
 const val LOG_LOGIN = "login"
 const val LOG_SIGN_UP = "signup"
-
-const val LOG_LOGOUT = "logout"
-const val LOG_DELETE_USER = "delete_user"
-const val LOG_SNS_FACEBOOK = "facebook"
-const val LOG_SNS_INSTAGRAM = "instagram"
-const val LOG_SNS_TISTORY = "tistory"
-const val LOG_SNS_YOUTUBE = "youtube"
-const val LOG_SNS_MASHUP_HOME = "mashup_home"
-const val LOG_SNS_MASHUP_RECRUIT = "mashup_recruit"
-const val LOG_PLACE_SIGN_CODE = "signup_code"
-const val LOG_PLACE_SIGN_MEMBER_INFO = "signup_info"
-const val LOG_PLACE_SIGN_PLATFORM = "signup_platform"
 const val LOG_POPUP_SIGNUP_CONFIRM = "popup_signup_confirm"
 const val LOG_POPUP_SIGNUP_CANCEL = "popup_signup_cancel"
-
 const val LOG_PLACE_CHANGE_PASSWORD = "change_password"
-const val LOG_PLACE_ENTER_ID = "enter_id"
 
-const val LOG_SCHEDULE_LIST_REFRESH = "refresh"
-const val LOG_SCHEDULE_STATUS_CONFIRM = "status_confirm"
-const val LOG_SCHEDULE_EVENT_DETAIL = "event_detail"
+/**
+ * Category Event List
+ */
+const val LOG_EVENT_LIST_REFRESH = "refresh"
+const val LOG_EVENT_LIST_STATUS_CONFIRM = "status_confirm"
+const val LOG_EVENT_LIST_EVENT_DETAIL = "event_detail"
+const val LOG_EVENT_LIST_WEEK_MASHONG = "week_mashong"
+const val LOG_EVENT_LIST_WEEK = "week"
+const val LOG_EVENT_LIST_ALL = "all"
+const val LOG_EVENT_LIST_DETAIL_COPY = "detail_copy"
+
+/**
+ * Category More
+ */
+const val LOG_MORE_BIRTH = "more_birth"
+const val LOG_MORE_MASHONG = "more_mashong"
+const val LOG_MORE_CARROT = "more_carrot"
+const val LOG_MORE_ALARM = "more_alarm"
+const val LOG_MORE_SETTING = "more_setting"
+
+/**
+ * Category Alarm
+ */
+const val LOG_ALARM_LIST = "alarm_list"
 
+/**
+ * Category Logout
+ */
+const val LOG_POPUP_LOGOUT_CONFIRM = "popup_logout_confirm"
+const val LOG_POPUP_LOGOUT_CANCEL = "popup_logout_cancel"
+
+/**
+ * Category QR
+ */
 const val LOG_QR = "qr"
 const val LOG_QR_SUCCESS = "qr_success"
 const val LOG_QR_DONE = "qr_done"
 const val LOG_QR_TIME_FAIL = "qr_time_fail"
 const val LOG_QR_WRONG = "qr_wrong"
+const val LOG_QR_LOCATION = "qr_location"
+const val LOG_QR_DISTANCE_OUT_OF_RANGE = "qr_distance_out_of_range"
 
-const val LOG_DELETE_SUCCESS_USER = "delete_user_success"
+/**
+ * Category MyPage
+ */
+const val LOG_MYPAGE_HELP = "help"
 
-const val LOG_COMMON_POPUP_CONFIRM = "popup_new_confirm"
-const val LOG_COMMON_POPUP_CANCEL = "popup_new_cancel"
+/**
+ * Category Setting
+ */
+const val LOG_SETTING_LOGOUT = "logout"
+const val LOG_SETTING_DELETE_USER = "delete_user"
+const val LOG_SETTING_SNS_FACEBOOK = "facebook"
+const val LOG_SETTING_SNS_INSTAGRAM = "instagram"
+const val LOG_SETTING_SNS_TISTORY = "tistory"
+const val LOG_SETTING_SNS_YOUTUBE = "youtube"
+const val LOG_SETTING_SNS_MASHUP_HOME = "mashup_home"
+const val LOG_SETTING_SNS_MASHUP_RECRUIT = "mashup_recruit"
 
+/**
+ * Category Delete User
+ */
+const val LOG_DELETE_USER_SUCCESS = "delete_user_success"
+
+/**
+ * Category Danggn
+ */
 const val LOG_DANGGN = "danggn"
 const val LOG_DANGGN_HELP = "danggn_help"
+
+/**
+ * UnCategorization
+ */
+const val LOG_PLACE_SIGN_CODE = "signup_code"
+const val LOG_PLACE_SIGN_MEMBER_INFO = "signup_info"
+const val LOG_PLACE_SIGN_PLATFORM = "signup_platform"
+const val LOG_PLACE_ENTER_ID = "enter_id"

app/src/main/java/com/mashup/data/dto/ScheduleResponse.kt

@@ -9,6 +9,10 @@ import java.util.Locale
 
 @JsonClass(generateAdapter = true)
 data class ScheduleResponse(
+    @field:Json(name = "scheduleType")
+    val scheduleType: String,
+    @field:Json(name = "notice")
+    val notice: String?,
     @field:Json(name = "scheduleId")
     val scheduleId: Int,
     @field:Json(name = "dateCount")
@@ -54,9 +58,11 @@ data class ScheduleResponse(
             dateCount == 0 -> {
                 "D-Day"
             }
+
             dateCount > 0 -> {
                 "D-$dateCount"
             }
+
             else -> {
                 "D+${-dateCount}"
             }

app/src/main/java/com/mashup/di/NetworkModule.kt

@@ -5,7 +5,9 @@ import com.facebook.flipper.plugins.network.NetworkFlipperPlugin
 import com.mashup.BuildConfig.DEBUG_MODE
 import com.mashup.core.model.Platform
 import com.mashup.core.network.adapter.PlatformJsonAdapter
+import com.mashup.core.network.dao.MetaDao
 import com.mashup.core.network.dao.PopupDao
+import com.mashup.core.network.dao.PushHistoryDao
 import com.mashup.core.network.dao.StorageDao
 import com.mashup.data.network.API_HOST
 import com.mashup.network.CustomDateAdapter
@@ -145,4 +147,20 @@ class NetworkModule {
     ): MemberProfileDao {
         return retrofit.create()
     }
+
+    @Provides
+    @Singleton
+    fun provideMetaDao(
+        retrofit: Retrofit
+    ): MetaDao {
+        return retrofit.create()
+    }
+
+    @Provides
+    @Singleton
+    fun providePushHistoryDao(
+        retrofit: Retrofit
+    ): PushHistoryDao {
+        return retrofit.create()
+    }
 }

app/src/main/java/com/mashup/service/MashUpFirebaseMessagingService.kt

@@ -13,12 +13,15 @@ import android.os.Build
 import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
+import androidx.core.os.bundleOf
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import com.mashup.BuildConfig
 import com.mashup.R
 import com.mashup.constant.EXTRA_LINK
+import com.mashup.constant.log.LOG_ALARM_LIST
 import com.mashup.ui.splash.SplashActivity
+import com.mashup.util.AnalyticsManager
 import dagger.hilt.android.AndroidEntryPoint
 import java.net.URL
 
@@ -58,6 +61,13 @@ class MashUpFirebaseMessagingService : FirebaseMessagingService() {
         imageUrl: Uri?,
         data: Map<String, String>
     ) {
+        AnalyticsManager.addEvent(
+            eventName = LOG_ALARM_LIST,
+            params = bundleOf(
+                "place" to "PUSH",
+                "type" to PushLinkType.getPushLinkType(data[EXTRA_LINK].orEmpty()).name
+            )
+        )
         val splashIntent = Intent(this, SplashActivity::class.java).apply {
             flags = Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP
             putExtra(EXTRA_LINK, data[EXTRA_LINK])

app/src/main/java/com/mashup/service/PushLinkType.kt

@@ -5,6 +5,8 @@ enum class PushLinkType {
     QR, // QR 페이지
     DANGGN, // 당근 페이지
     DANGGN_REWARD,
+    BIRTHDAY, // 생일 축하
+    MASHONG, // 매숑이 키우기
     MYPAGE,
     UNKNOWN
     ;

app/src/main/java/com/mashup/ui/login/LoginActivity.kt

@@ -26,6 +26,8 @@ import com.mashup.ui.main.model.MainTab
 import com.mashup.ui.password.PasswordActivity
 import com.mashup.ui.qrscan.QRScanActivity
 import com.mashup.ui.signup.SignUpActivity
+import com.mashup.ui.webview.birthday.BirthdayActivity
+import com.mashup.ui.webview.mashong.MashongActivity
 import com.mashup.util.AnalyticsManager
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.collectLatest
@@ -160,6 +162,14 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
                 )
             }
 
+            PushLinkType.BIRTHDAY -> {
+                buildTaskStack(baseIntent, BirthdayActivity.newIntent(this))
+            }
+
+            PushLinkType.MASHONG -> {
+                buildTaskStack(baseIntent, MashongActivity.newIntent(this))
+            }
+
             PushLinkType.QR -> {
                 buildTaskStack(baseIntent, QRScanActivity.newIntent(this))
             }