Merge pull request #116 from YAPP-Github/release/TNT-244

[TNT-244] 0.0.1 버전 배포 💣💣💣
YAPP-Github · Feb 15, 2025 · 18c6a29 · 18c6a29
2 parents 473d49f + 41e49e5
commit 18c6a29
Show file tree

Hide file tree

Showing 10 changed files with 83 additions and 12 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -18,8 +18,8 @@ android {
         applicationId = "co.kr.tnt"
         minSdk = 27
         targetSdk = 35
-        versionCode = 1
-        versionName = "1.0"
+        versionCode = 2
+        versionName = "0.0.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -18,4 +18,31 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+## ------------------------ firebase-crashlytics ------------------------
+-keepattributes SourceFile,LineNumberTable        # Keep file names and line numbers.
+-keep public class * extends java.lang.Exception  # Optional: Keep custom exceptions.
+## ------------------------ firebase-crashlytics ------------------------
+
+## ------------------------ firebase-analytics ------------------------
+-keep public class com.google.firebase.analytics.FirebaseAnalytics {
+    public *;
+}
+-keep public class com.google.android.gms.measurement.AppMeasurement {
+    public *;
+}
+## ------------------------ firebase-analytics ------------------------
+
+## ------------------ kakao -------------------
+-keep class com.kakao.sdk.**.model.* { <fields>; }
+-keep class * extends com.google.gson.TypeAdapter
+
+# https://github.com/square/okhttp/pull/6792
+-dontwarn org.bouncycastle.jsse.**
+-dontwarn org.conscrypt.*
+-dontwarn org.openjsse.**
+## ------------------ kakao -------------------
+
+-keep enum co.kr.tnt.navigation.model.ScreenMode { *; }
+
diff --git a/app/src/main/java/co/kr/tnt/service/MessagingService.kt b/app/src/main/java/co/kr/tnt/service/MessagingService.kt
@@ -11,24 +11,42 @@ import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
 import co.kr.tnt.R
+import co.kr.tnt.domain.repository.SettingRepository
 import co.kr.tnt.main.MainActivity
 import com.google.firebase.messaging.Constants.MessageNotificationKeys
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
+import javax.inject.Inject
 
 @AndroidEntryPoint
-class MessagingService : FirebaseMessagingService() {
+class MessagingService: FirebaseMessagingService() {
+    @Inject
+    lateinit var settingRepository: SettingRepository
+
+    private val job = SupervisorJob()
+    private val scope = CoroutineScope(Dispatchers.IO + job)
 
     override fun onMessageReceived(message: RemoteMessage) {
         super.onMessageReceived(message)
 
-        // TODO message.data 형태로 오도록 요청
-        launchNotification(
-            title = message.data["title"] ?: "트레이너 연결 알림",
-            content = message.data["content"] ?: "트레이니님과 연결되었어요!",
-            pendingIntent = createPendingIntent(message.data)
-        )
+        scope.launch {
+            // TODO message.data 형태로 오도록 요청
+            val isEnabled = settingRepository.isEnablePushNotification().first()
+
+            if (isEnabled) {
+                launchNotification(
+                    title = message.data["title"] ?: "트레이너 연결 알림",
+                    content = message.data["content"] ?: "트레이니님과 연결되었어요!",
+                    pendingIntent = createPendingIntent(message.data)
+                )
+            }
+        }
     }
 
     private fun createPendingIntent(

diff --git a/feature/trainee/mypage/src/main/java/co/kr/tnt/trainee/mypage/TraineeMyPageContract.kt b/feature/trainee/mypage/src/main/java/co/kr/tnt/trainee/mypage/TraineeMyPageContract.kt
@@ -10,6 +10,7 @@ internal class TraineeMyPageContract {
         val user: User.Trainee = User.Trainee.EMPTY,
         val trainerName: String = "",
         val isEnablePushNotification: Boolean = true,
+        val isLoading: Boolean = false,
         val dialogState: DialogState = DialogState.NONE,
     ) : UiState {
         enum class DialogState {

diff --git a/feature/trainee/mypage/src/main/java/co/kr/tnt/trainee/mypage/TraineeMyPageScreen.kt b/feature/trainee/mypage/src/main/java/co/kr/tnt/trainee/mypage/TraineeMyPageScreen.kt
@@ -40,6 +40,7 @@ import co.kr.tnt.trainee.mypage.TraineeMyPageContract.TraineeMyPageEffect
 import co.kr.tnt.trainee.mypage.TraineeMyPageContract.TraineeMyPageUiEvent
 import co.kr.tnt.trainee.mypage.TraineeMyPageContract.TraineeMyPageUiState
 import co.kr.tnt.trainee.mypage.TraineeMyPageContract.TraineeMyPageUiState.DialogState
+import co.kr.tnt.ui.component.TnTLoadingScreen
 import co.kr.tnt.ui.component.TnTMyPageButton
 import co.kr.tnt.ui.extensions.getAppVersion
 import co.kr.tnt.ui.extensions.moveToAppSetting
@@ -96,6 +97,10 @@ internal fun TraineeMyPageRoute(
         onDismissDialog = { viewModel.setEvent(TraineeMyPageUiEvent.OnDismissDialog) },
     )
 
+    if (uiState.isLoading) {
+        TnTLoadingScreen()
+    }
+
     LaunchedEffect(viewModel.effect) {
         viewModel.effect.collect { effect ->
             when (effect) {

diff --git a/feature/trainee/mypage/src/main/java/co/kr/tnt/trainee/mypage/TraineeMyPageViewModel.kt b/feature/trainee/mypage/src/main/java/co/kr/tnt/trainee/mypage/TraineeMyPageViewModel.kt
@@ -135,26 +135,32 @@ internal class TraineeMyPageViewModel @Inject constructor(
 
         private fun logout() {
             viewModelScope.launch {
+                updateState { copy(isLoading = true) }
                 runCatching {
                     loginRepository.logout()
                     kakaoLoginSdk.logout()
                 }.onSuccess {
                     updateState { copy(dialogState = DialogState.LOGOUT) }
                 }.onFailure {
                     sendEffect(TraineeMyPageEffect.ShowToast("로그아웃에 실패하였습니다."))
+                }.also {
+                    updateState { copy(isLoading = false) }
                 }
             }
         }
 
         private fun withdraw() {
             viewModelScope.launch {
+                updateState { copy(isLoading = true) }
                 runCatching {
                     loginRepository.withdraw()
                     kakaoLoginSdk.unlink()
                 }.onSuccess {
                     updateState { copy(dialogState = DialogState.DELETE_ACCOUNT) }
                 }.onFailure {
                     sendEffect(TraineeMyPageEffect.ShowToast("탈퇴에 실패하였습니다."))
+                }.also {
+                    updateState { copy(isLoading = false) }
                 }
             }
         }

diff --git a/feature/trainer/home/src/main/java/co/kr/tnt/trainer/home/TrainerHomeScreen.kt b/feature/trainer/home/src/main/java/co/kr/tnt/trainer/home/TrainerHomeScreen.kt
@@ -56,6 +56,7 @@ import co.kr.tnt.trainer.home.TrainerHomeContract.TrainerHomeUiEvent
 import co.kr.tnt.trainer.home.TrainerHomeContract.TrainerHomeUiState
 import co.kr.tnt.ui.component.TnTCheckToggleDialog
 import co.kr.tnt.ui.component.TnTHomeTopBar
+import co.kr.tnt.ui.utils.throttled
 import coil.compose.rememberAsyncImagePainter
 import coil.request.ImageRequest
 import com.kizitonwose.calendar.compose.CalendarState
@@ -355,7 +356,7 @@ private fun PtSessionCard(
                 .clip(RoundedCornerShape(8.dp))
                 .then(
                     if (ptSession.isCompleted.not()) {
-                        Modifier.clickable { onClickComplete(ptSession) }
+                        Modifier.clickable(onClick = throttled { onClickComplete(ptSession) })
                     } else {
                         Modifier
                     },
@@ -374,6 +375,7 @@ private fun PtSessionCard(
         Spacer(modifier = Modifier.width(20.dp))
         ptSession.run {
             // TODO 컴포넌트 개선
+            // TODO 정식 출시 후 PT 수업 기록 남기기 활성화
             TnTSessionRecordCard(
                 isTrainer = true,
                 name = traineeName,
@@ -383,7 +385,7 @@ private fun PtSessionCard(
                 defaultImage = painterResource(R.drawable.img_default),
                 profileImage = painter,
                 leadingEmoji = "\uD83D\uDCAA",
-                showSessionRecordCreation = ptSession.isCompleted,
+                showSessionRecordCreation = false,
                 onClick = {},
             )
         }

diff --git a/feature/trainer/mypage/src/main/java/co/kr/tnt/trainer/mypage/TrainerMyPageContract.kt b/feature/trainer/mypage/src/main/java/co/kr/tnt/trainer/mypage/TrainerMyPageContract.kt
@@ -9,6 +9,7 @@ internal class TrainerMyPageContract {
     data class TrainerMyPageUiState(
         val user: User.Trainer = User.Trainer.EMPTY,
         val isEnablePushNotification: Boolean = true,
+        val isLoading: Boolean = false,
         val dialogState: DialogState = DialogState.NONE,
     ) : UiState {
         enum class DialogState {

diff --git a/feature/trainer/mypage/src/main/java/co/kr/tnt/trainer/mypage/TrainerMyPageScreen.kt b/feature/trainer/mypage/src/main/java/co/kr/tnt/trainer/mypage/TrainerMyPageScreen.kt
@@ -45,6 +45,7 @@ import co.kr.tnt.trainer.mypage.TrainerMyPageContract.TrainerMyPageSideEffect
 import co.kr.tnt.trainer.mypage.TrainerMyPageContract.TrainerMyPageUiEvent
 import co.kr.tnt.trainer.mypage.TrainerMyPageContract.TrainerMyPageUiState
 import co.kr.tnt.trainer.mypage.TrainerMyPageContract.TrainerMyPageUiState.DialogState
+import co.kr.tnt.ui.component.TnTLoadingScreen
 import co.kr.tnt.ui.component.TnTMyPageButton
 import co.kr.tnt.ui.extensions.getAppVersion
 import co.kr.tnt.ui.extensions.moveToAppSetting
@@ -98,6 +99,10 @@ internal fun TrainerMyPageRoute(
         onDismissDialog = { viewModel.setEvent(TrainerMyPageUiEvent.OnDismissDialog) },
     )
 
+    if (state.isLoading) {
+        TnTLoadingScreen()
+    }
+
     LaunchedEffect(viewModel.effect) {
         viewModel.effect.collect { effect ->
             when (effect) {

diff --git a/feature/trainer/mypage/src/main/java/co/kr/tnt/trainer/mypage/TrainerMyPageViewModel.kt b/feature/trainer/mypage/src/main/java/co/kr/tnt/trainer/mypage/TrainerMyPageViewModel.kt
@@ -121,26 +121,32 @@ internal class TrainerMyPageViewModel @Inject constructor(
 
     private fun logout() {
         viewModelScope.launch {
+            updateState { copy(isLoading = true) }
             runCatching {
                 loginRepository.logout()
                 kakaoLoginSdk.logout()
             }.onSuccess {
                 updateState { copy(dialogState = DialogState.LOGOUT) }
             }.onFailure {
                 sendEffect(TrainerMyPageSideEffect.ShowToast("로그아웃에 실패하였습니다."))
+            }.also {
+                updateState { copy(isLoading = false) }
             }
         }
     }
 
     private fun withdraw() {
         viewModelScope.launch {
+            updateState { copy(isLoading = true) }
             runCatching {
                 loginRepository.withdraw()
                 kakaoLoginSdk.unlink()
             }.onSuccess {
                 updateState { copy(dialogState = DialogState.DELETE_ACCOUNT) }
             }.onFailure {
                 sendEffect(TrainerMyPageSideEffect.ShowToast("탈퇴에 실패하였습니다."))
+            }.also {
+                updateState { copy(isLoading = false) }
             }
         }
     }