Merge pull request #375 from mash-up-kr/release/v1.2.0

Release/v1.2.0

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @Ahn-seokjoo @jaeryo2357 @Sookhee

.github/workflows/android.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [ "develop" ]
   pull_request:
-    branches: [ "develop" ]
+    branches: [ "develop", "refactor*", "fix*", "feat*", "feature*", "chore*", "test*" ]
 
 jobs:
   build:

.gitignore

@@ -123,6 +123,7 @@ obj/
 .idea/gradle.xml
 .idea/jarRepositories.xml
 .idea/navEditor.xml
+.idea/codeStyles/Project.xml
 
 # OS-specific files
 .DS_Store

app/build.gradle

@@ -26,8 +26,8 @@ android {
         applicationId "com.mashup"
         minSdkVersion minVersion
         targetSdkVersion targetVersion
-        versionCode 20
-        versionName "1.1.4"
+        versionCode 21
+        versionName "1.2.0"
 
         testInstrumentationRunner "com.mashup.core.testing.MashUpTestRunner"
         vectorDrawables {
@@ -98,6 +98,7 @@ dependencies {
     implementation project(":core:datastore")
     implementation project(":core:firebase")
     implementation project(":feature:setting")
+    implementation project(":feature:danggn")
 
     // ml Kit
     implementation "com.google.mlkit:barcode-scanning:$barcodeSacnnerVersion"
@@ -140,4 +141,9 @@ dependencies {
 
     // coroutine test
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutineVersion"
+
+    // flipper
+    implementation "com.facebook.flipper:flipper:$flipperVersion"
+    implementation "com.facebook.soloader:soloader:$soLoaderVersion"
+    implementation "com.facebook.flipper:flipper-network-plugin:$flipperVersion"
 }

app/src/main/AndroidManifest.xml

@@ -28,6 +28,18 @@
 
         <meta-data android:name="google_analytics_automatic_screen_reporting_enabled" android:value="false" />
 
+        <activity
+            android:name=".ui.danggn.DanggnInfoActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity" />
+
+        <activity
+            android:name=".ui.danggn.ShakeDanggnActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity" />
+
         <activity
             android:name=".ui.signup.SignUpActivity"
             android:exported="false"
@@ -92,7 +104,12 @@
             android:name=".ui.setting.SettingActivity"
             android:exported="false"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustNothing"
+            tools:ignore="LockedOrientationActivity"/>
+
+        <activity
+            android:name=".ui.setting.PushActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
             tools:ignore="LockedOrientationActivity"/>
 
         <activity
@@ -103,7 +120,7 @@
             tools:ignore="LockedOrientationActivity" />
 
         <service
-            android:name=".util.MashUpFirebaseMessagingService"
+            android:name=".service.MashUpFirebaseMessagingService"
             android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />

app/src/main/java/com/mashup/MashUpApplication.kt

@@ -1,7 +1,25 @@
 package com.mashup
 
 import android.app.Application
+import com.facebook.flipper.android.AndroidFlipperClient
+import com.facebook.flipper.android.utils.FlipperUtils
+import com.facebook.flipper.plugins.inspector.DescriptorMapping
+import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin
+import com.facebook.soloader.SoLoader
+import com.mashup.di.NetworkModule
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
-class MashUpApplication : Application()
+class MashUpApplication : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        SoLoader.init(this, false)
+
+        if (BuildConfig.DEBUG && FlipperUtils.shouldEnableFlipper(this)) {
+            val client = AndroidFlipperClient.getInstance(this)
+            client.addPlugin(InspectorFlipperPlugin(this, DescriptorMapping.withDefaults()))
+            client.addPlugin(NetworkModule.flipperNetwork)
+            client.start()
+        }
+    }
+}

app/src/main/java/com/mashup/base/BaseActivity.kt

@@ -4,6 +4,7 @@ import android.app.Dialog
 import android.os.Bundle
 import android.view.LayoutInflater
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.os.bundleOf
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
@@ -12,20 +13,22 @@ import androidx.databinding.ViewDataBinding
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
+import com.mashup.constant.EXTRA_ACTIVITY_ENTER_TYPE
 import com.mashup.constant.EXTRA_ANIMATION
+import com.mashup.core.common.constant.BAD_REQUEST
+import com.mashup.core.common.constant.DISCONNECT_NETWORK
+import com.mashup.core.common.constant.INTERNAL_SERVER_ERROR
+import com.mashup.core.common.constant.UNAUTHORIZED
 import com.mashup.core.common.model.NavigationAnimationType
 import com.mashup.core.common.utils.ProgressbarUtil
 import com.mashup.core.common.utils.ToastUtil
 import com.mashup.core.common.utils.keyboard.RootViewDeferringInsetsCallback
 import com.mashup.core.common.widget.CommonDialog
 import com.mashup.network.NetworkStatusState
 import com.mashup.network.data.NetworkStatusDetector
-import com.mashup.network.errorcode.BAD_REQUEST
-import com.mashup.network.errorcode.DISCONNECT_NETWORK
-import com.mashup.network.errorcode.INTERNAL_SERVER_ERROR
-import com.mashup.network.errorcode.UNAUTHORIZED
 import com.mashup.ui.error.NetworkDisconnectActivity
 import com.mashup.ui.login.LoginActivity
+import com.mashup.util.AnalyticsManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
@@ -179,4 +182,9 @@ abstract class BaseActivity<V : ViewDataBinding> : AppCompatActivity() {
             )
         }
     }
+
+    protected fun sendActivityEnterType(screenName: String) {
+        val type = intent.getStringExtra(EXTRA_ACTIVITY_ENTER_TYPE) ?: return
+        AnalyticsManager.addEvent(screenName, bundleOf("type" to type))
+    }
 }

app/src/main/java/com/mashup/base/BaseFragment.kt

@@ -11,15 +11,15 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
+import com.mashup.core.common.constant.BAD_REQUEST
+import com.mashup.core.common.constant.DISCONNECT_NETWORK
+import com.mashup.core.common.constant.INTERNAL_SERVER_ERROR
+import com.mashup.core.common.constant.UNAUTHORIZED
 import com.mashup.core.common.utils.ProgressbarUtil
 import com.mashup.core.common.utils.ToastUtil
 import com.mashup.core.common.widget.CommonDialog
 import com.mashup.network.NetworkStatusState
 import com.mashup.network.data.NetworkStatusDetector
-import com.mashup.network.errorcode.BAD_REQUEST
-import com.mashup.network.errorcode.DISCONNECT_NETWORK
-import com.mashup.network.errorcode.INTERNAL_SERVER_ERROR
-import com.mashup.network.errorcode.UNAUTHORIZED
 import com.mashup.ui.error.NetworkDisconnectActivity
 import com.mashup.ui.login.LoginActivity
 import kotlinx.coroutines.CoroutineScope

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

@@ -1,5 +1,6 @@
 package com.mashup.constant
 
+const val EXTRA_MAIN_TAB = "EXTRA_MAIN_TAB"
 const val EXTRA_LOGIN_TYPE = "EXTRA_MAIN_TYPE"
 
 const val EXTRA_TITLE_KEY = "EXTRA_TITLE_KEY"
@@ -10,3 +11,9 @@ const val EXTRA_LOGOUT = "EXTRA_LOGOUT"
 const val EXTRA_WITH_DRAWL = "EXTRA_WITH_DRAWL"
 
 const val EXTRA_ANIMATION = "EXTRA_ANIMATION"
+
+const val EXTRA_LINK = "link"
+
+const val EXTRA_POPUP_KEY = "EXTRA_POPUP_KEY"
+
+const val EXTRA_ACTIVITY_ENTER_TYPE = "EXTRA_ACTIVITY_ENTER_TYPE"

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

@@ -31,3 +31,9 @@ const val LOG_QR_TIME_FAIL = "qr_time_fail"
 const val LOG_QR_WRONG = "qr_wrong"
 
 const val LOG_DELETE_SUCCESS_USER = "delete_user_success"
+
+const val LOG_COMMON_POPUP_CONFIRM = "popup_new_confirm"
+const val LOG_COMMON_POPUP_CANCEL = "popup_new_cancel"
+
+const val LOG_DANGGN = "danggn"
+const val LOG_DANGGN_HELP = "danggn_help"

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

@@ -15,6 +15,8 @@ class AccessResponse(
     val platform: String,
     @field:Json(name = "token")
     val token: String,
-    @field:Json(name = "pushNotificationAgreed")
-    val pushNotificationAgreed: Boolean
+    @field:Json(name = "newsPushNotificationAgreed")
+    val pushNotificationAgreed: Boolean,
+    @field:Json(name = "danggnPushNotificationAgreed")
+    val danggnPushNotificationAgreed: Boolean
 )

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

@@ -15,6 +15,8 @@ data class MemberInfoResponse(
     val name: String,
     @field:Json(name = "platform")
     val platform: String,
-    @field:Json(name = "pushNotificationAgreed")
-    val pushNotificationAgreed: Boolean
+    @field:Json(name = "newsPushNotificationAgreed")
+    val pushNotificationAgreed: Boolean,
+    @field:Json(name = "danggnPushNotificationAgreed")
+    val danggnPushNotificationAgreed: Boolean
 )

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

@@ -5,6 +5,8 @@ import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
 class PushNotificationRequest(
-    @field:Json(name = "pushNotificationAgreed")
-    val pushNotificationAgreed: Boolean
+    @field:Json(name = "newsPushNotificationAgreed")
+    val pushNotificationAgreed: Boolean,
+    @field:Json(name = "danggnPushNotificationAgreed")
+    val danggnPushNotificationAgreed: Boolean
 )