v0.3.2

🔧 Bug Fixes - 공유하기로 상품 등록 완료 후 앱이 꺼지는 현상 수정 - 상품 중복 등록 시 홈 화면으로 돌아가도록 수정 - 상품 수정 시 상세화면으로 돌아가도록 수정 - 시작화면, 로그인 화면에서 글씨 크기 초과 시 텍스트 크기 자동 조정 Co-Authored-By: EunhoKang <[email protected]> Co-Authored-By: ootr47 <[email protected]> Co-Authored-By: 손문기 <[email protected]> Co-Authored-By: ByeongIk Choi <[email protected]>
boostcampwm2023 · Dec 12, 2023 · be7fe31 · be7fe31
1 parent 5cd2c8d
commit be7fe31
Show file tree

Hide file tree

Showing 13 changed files with 250 additions and 489 deletions.
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
@@ -19,8 +19,8 @@ android {
         applicationId = "app.priceguard"
         minSdk = 29
         targetSdk = 34
-        versionCode = 5
-        versionName = "0.3.1"
+        versionCode = 6
+        versionName = "0.3.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/android/app/src/main/java/app/priceguard/ui/additem/setprice/SetTargetPriceFragment.kt b/android/app/src/main/java/app/priceguard/ui/additem/setprice/SetTargetPriceFragment.kt
@@ -156,7 +156,7 @@ class SetTargetPriceFragment : Fragment() {
                         showDialogWithAction(
                             getString(R.string.success_add),
                             getString(R.string.success_add_message),
-                            DialogConfirmAction.FINISH
+                            DialogConfirmAction.HOME
                         )
                     }
 
@@ -174,7 +174,7 @@ class SetTargetPriceFragment : Fragment() {
                                 showDialogWithAction(
                                     getString(R.string.error_add_product),
                                     getString(R.string.exist_product),
-                                    DialogConfirmAction.FINISH
+                                    DialogConfirmAction.HOME
                                 )
                             }
 

diff --git a/android/app/src/main/java/app/priceguard/ui/data/DialogConfirmAction.kt b/android/app/src/main/java/app/priceguard/ui/data/DialogConfirmAction.kt
@@ -3,5 +3,6 @@ package app.priceguard.ui.data
 enum class DialogConfirmAction {
     NOTHING,
     FINISH,
+    HOME,
     CUSTOM
 }
diff --git a/android/app/src/main/java/app/priceguard/ui/util/ConfirmDialogFragment.kt b/android/app/src/main/java/app/priceguard/ui/util/ConfirmDialogFragment.kt
@@ -1,10 +1,12 @@
 package app.priceguard.ui.util
 
 import android.app.Dialog
+import android.content.Intent
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
 import app.priceguard.R
 import app.priceguard.ui.data.DialogConfirmAction
+import app.priceguard.ui.home.HomeActivity
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class ConfirmDialogFragment : DialogFragment() {
@@ -36,6 +38,10 @@ class ConfirmDialogFragment : DialogFragment() {
                         resultListener?.onDialogResult(true)
                     }
 
+                    DialogConfirmAction.HOME -> {
+                        goToHomeActivity()
+                    }
+
                     DialogConfirmAction.NOTHING -> {}
                 }
                 dismiss()
@@ -61,6 +67,16 @@ class ConfirmDialogFragment : DialogFragment() {
         }
     }
 
+    private fun goToHomeActivity() {
+        val activityIntent = requireActivity().intent
+        if (activityIntent?.action == Intent.ACTION_SEND) {
+            val intent = Intent(requireActivity(), HomeActivity::class.java)
+            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+            startActivity(intent)
+        }
+        requireActivity().finish()
+    }
+
     override fun onStart() {
         super.onStart()
 

diff --git a/android/app/src/main/res/layout-land/activity_intro.xml b/android/app/src/main/res/layout-land/activity_intro.xml
diff --git a/android/app/src/main/res/layout-land/activity_login.xml b/android/app/src/main/res/layout-land/activity_login.xml
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,5 +3,6 @@ package app.priceguard.ui.data @@
     enum class DialogConfirmAction {
         NOTHING,
         FINISH,
+        HOME,
         CUSTOM
     }