Merge pull request #126 from depromeet/feat/course-itinerary-amplitude#119

[#119] 경로검색 유저데이터 트래킹

Author: hyuns66

app/.DS_Store

@@ -37,8 +37,8 @@ android {
         applicationId = "com.depromeet.team6"
         minSdk = 26
         targetSdk = 34
-        versionCode = 10
-        versionName = "1.1.0"
+        versionCode = 13
+        versionName = "1.2.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField("String", "KAKAO_NATIVE_APP_KEY", properties["kakao.native.app.key"].toString())
@@ -154,6 +154,7 @@ dependencies {
 
     // Amplitude
     implementation(libs.amplitude)
+    implementation(libs.play.services.appset)
 }
 java {
     toolchain {

app/build.gradle.kts

@@ -28,6 +28,7 @@
 -keep class com.depromeet.team6.data.datalocal.model.** { *; }
 -keep class com.depromeet.team6.domain.model.** { *; }
 -keep class com.depromeet.team6.presentation.model.** { *; }
+-keep class com.depromeet.team6.data.dataremote.** { *; }
 
 -keepattributes Signature, InnerClasses, EnclosingMethod
 -keepattributes RuntimeVisibleAnnotations, RuntimeVisibleParameterAnnotations
@@ -63,4 +64,4 @@
 # Optional: if you're using Retrofit + Gson
 -keep class retrofit2.** { *; }
 -keep class com.google.gson.** { *; }
--keep class okhttp3.** { *; }
+-keep class okhttp3.** { *; }

app/proguard-rules.pro

@@ -6,6 +6,7 @@ import androidx.core.content.edit
 import androidx.security.crypto.EncryptedSharedPreferences
 import androidx.security.crypto.MasterKey
 import com.depromeet.team6.BuildConfig
+import com.depromeet.team6.presentation.util.amplitude.AmplitudeUtils
 import com.google.android.gms.maps.model.LatLng
 import com.kakao.sdk.auth.Constants.ACCESS_TOKEN
 import com.kakao.sdk.auth.Constants.REFRESH_TOKEN
@@ -75,6 +76,7 @@ class UserInfoLocalDataSource @Inject constructor(
         setValue(ACCESS_TOKEN, "")
         setValue(FCM_TOKEN, "")
         setIntValue(USER_ID, INITIAL_INT)
+        AmplitudeUtils.resetUserId()
     }
 
     private fun getValue(key: String): String =

app/src/main/ic_launcher-playstore.png

@@ -8,13 +8,17 @@ import android.content.Context
 import android.content.Intent
 import android.os.PowerManager
 import android.util.Log
+import androidx.annotation.Keep
+import androidx.compose.ui.graphics.toArgb
 import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
 import com.depromeet.team6.R
+import com.depromeet.team6.ui.theme.defaultTeam6Colors
 import com.google.firebase.messaging.Constants
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 
+@Keep
 class FcmService : FirebaseMessagingService() {
 
     private lateinit var body: String
@@ -104,6 +108,8 @@ class FcmService : FirebaseMessagingService() {
             .setContentTitle(title ?: getString(R.string.notification_title_text))
             .setContentText(body ?: getString(R.string.notification_body_text))
             .setSmallIcon(R.drawable.ic_app_logo_foreground)
+            .setColor(defaultTeam6Colors.black.toArgb())
+            .setColorized(true)
             .setAutoCancel(true)
             .build()
 
@@ -136,6 +142,8 @@ class FcmService : FirebaseMessagingService() {
             .setContentTitle(title ?: getString(R.string.notification_title_text))
             .setContentText(body ?: getString(R.string.notification_body_text))
             .setSmallIcon(R.drawable.ic_app_logo_foreground)
+            .setColor(defaultTeam6Colors.black.toArgb())
+            .setColorized(true)
             .setAutoCancel(true)
             .setContentIntent(pendingIntent)
             .setCategory(Notification.CATEGORY_MESSAGE)
@@ -159,6 +167,8 @@ class FcmService : FirebaseMessagingService() {
             .setContentTitle(title)
             .setContentText(body)
             .setSmallIcon(R.drawable.ic_app_logo_foreground)
+            .setColor(defaultTeam6Colors.black.toArgb())
+            .setColorized(true)
             .setAutoCancel(true)
             .build()
 

app/src/main/java/com/depromeet/team6/data/datalocal/datasource/UserInfoLocalDataSource.kt

@@ -18,9 +18,10 @@ class TransitsRemoteDataSource @Inject constructor(
         startLat: String,
         startLon: String,
         endLat: String,
-        endLon: String
+        endLon: String,
+        sortType: Int
     ): Result<List<ResponseCourseSearchDto>> {
-        val response = transitsService.getAvailableCourses(startLat, startLon, endLat, endLon)
+        val response = transitsService.getAvailableCourses(startLat, startLon, endLat, endLon, sortType)
         if (response.isSuccessful) {
             return response.body()?.toResult()
                 ?: Result.failure(IllegalStateException("response is null"))

app/src/main/java/com/depromeet/team6/data/datalocal/service/FcmService.kt

@@ -18,7 +18,8 @@ interface TransitsService {
         @Query("startLat") startLat: String,
         @Query("startLon") startLon: String,
         @Query("endLat") endLat: String,
-        @Query("endLon") endLon: String
+        @Query("endLon") endLon: String,
+        @Query("sortType") sortType: Int
     ): Response<ApiResponse<List<ResponseCourseSearchDto>>>
 
     @GET("$API/$TRANSITS/bus-arrival")

app/src/main/java/com/depromeet/team6/data/dataremote/datasource/TransitsRemoteDataSource.kt

@@ -24,7 +24,9 @@ class AuthRepositoryImpl @Inject constructor(
 
     override suspend fun getLogin(provider: Int, fcmToken: String): Result<Auth> =
         authRemoteDataSource.getLogin(provider = provider, fcmToken = fcmToken)
-            .mapCatching { it.toDomain() }
+            .mapCatching {
+                it.toDomain()
+            }
 
     override suspend fun postLogout(): Response<Unit> =
         authRemoteDataSource.postLogout()

app/src/main/java/com/depromeet/team6/data/dataremote/service/TransitsService.kt

@@ -14,12 +14,13 @@ class TransitsRepositoryImpl @Inject constructor(
     private val transitsRemoteDataSource: TransitsRemoteDataSource
 ) : TransitsRepository {
 
-    override suspend fun getAvailableCourses(startPosition: Address, endPosition: Address): Result<List<CourseInfo>> =
+    override suspend fun getAvailableCourses(startPosition: Address, endPosition: Address, sortType: Int): Result<List<CourseInfo>> =
         transitsRemoteDataSource.getAvailableCourses(
             startLat = startPosition.lat.toString(),
             startLon = startPosition.lon.toString(),
             endLat = endPosition.lat.toString(),
-            endLon = endPosition.lon.toString()
+            endLon = endPosition.lon.toString(),
+            sortType = sortType
         ).map {
             it.toDomain()
         }