From be7fe3165720bd4dbc19f0aef4246f58dc3b4c23 Mon Sep 17 00:00:00 2001 From: Taewan Park Date: Tue, 12 Dec 2023 23:54:09 +0900 Subject: [PATCH] v0.3.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit πŸ”§ Bug Fixes - κ³΅μœ ν•˜κΈ°λ‘œ μƒν’ˆ 등둝 μ™„λ£Œ ν›„ 앱이 κΊΌμ§€λŠ” ν˜„μƒ μˆ˜μ • - μƒν’ˆ 쀑볡 등둝 μ‹œ ν™ˆ ν™”λ©΄μœΌλ‘œ λŒμ•„κ°€λ„λ‘ μˆ˜μ • - μƒν’ˆ μˆ˜μ • μ‹œ μƒμ„Έν™”λ©΄μœΌλ‘œ λŒμ•„κ°€λ„λ‘ μˆ˜μ • - μ‹œμž‘ν™”λ©΄, 둜그인 ν™”λ©΄μ—μ„œ 글씨 크기 초과 μ‹œ ν…μŠ€νŠΈ 크기 μžλ™ μ‘°μ • Co-Authored-By: EunhoKang Co-Authored-By: ootr47 <83055885+ootr47@users.noreply.github.com> Co-Authored-By: 손문기 <39684860+Muungi@users.noreply.github.com> Co-Authored-By: ByeongIk Choi --- android/app/build.gradle.kts | 4 +- .../setprice/SetTargetPriceFragment.kt | 4 +- .../priceguard/ui/data/DialogConfirmAction.kt | 1 + .../ui/util/ConfirmDialogFragment.kt | 16 ++ .../main/res/layout-land/activity_intro.xml | 76 ----- .../main/res/layout-land/activity_login.xml | 153 ---------- .../src/main/res/layout/activity_intro.xml | 123 ++++---- .../src/main/res/layout/activity_login.xml | 271 ++++++++++-------- .../src/main/res/layout/fragment_my_page.xml | 8 +- android/release_notes.txt | 29 +- backend/src/cache/cache.service.ts | 4 +- backend/src/constants.ts | 2 +- backend/src/product/product.service.ts | 48 +--- 13 files changed, 250 insertions(+), 489 deletions(-) delete mode 100644 android/app/src/main/res/layout-land/activity_intro.xml delete mode 100644 android/app/src/main/res/layout-land/activity_login.xml diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 251fd6a..6f2d627 100644 --- 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 index aa7e39b..b3889e3 100644 --- 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 index 18de82e..59455a9 100644 --- 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 index fdd309e..f68a051 100644 --- 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 deleted file mode 100644 index c555fdf..0000000 --- a/android/app/src/main/res/layout-land/activity_intro.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - -