Skip to content

Commit be7fe31

Browse files
Taewan-PEunhoKangootr47Muungisickbirdd
committed
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]>
1 parent 5cd2c8d commit be7fe31

File tree

13 files changed

+250
-489
lines changed

13 files changed

+250
-489
lines changed

β€Žandroid/app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ android {
1919
applicationId = "app.priceguard"
2020
minSdk = 29
2121
targetSdk = 34
22-
versionCode = 5
23-
versionName = "0.3.1"
22+
versionCode = 6
23+
versionName = "0.3.2"
2424

2525
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2626
}

β€Žandroid/app/src/main/java/app/priceguard/ui/additem/setprice/SetTargetPriceFragment.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ class SetTargetPriceFragment : Fragment() {
156156
showDialogWithAction(
157157
getString(R.string.success_add),
158158
getString(R.string.success_add_message),
159-
DialogConfirmAction.FINISH
159+
DialogConfirmAction.HOME
160160
)
161161
}
162162

@@ -174,7 +174,7 @@ class SetTargetPriceFragment : Fragment() {
174174
showDialogWithAction(
175175
getString(R.string.error_add_product),
176176
getString(R.string.exist_product),
177-
DialogConfirmAction.FINISH
177+
DialogConfirmAction.HOME
178178
)
179179
}
180180

β€Žandroid/app/src/main/java/app/priceguard/ui/data/DialogConfirmAction.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ package app.priceguard.ui.data
33
enum class DialogConfirmAction {
44
NOTHING,
55
FINISH,
6+
HOME,
67
CUSTOM
78
}

β€Žandroid/app/src/main/java/app/priceguard/ui/util/ConfirmDialogFragment.kt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package app.priceguard.ui.util
22

33
import android.app.Dialog
4+
import android.content.Intent
45
import android.os.Bundle
56
import androidx.fragment.app.DialogFragment
67
import app.priceguard.R
78
import app.priceguard.ui.data.DialogConfirmAction
9+
import app.priceguard.ui.home.HomeActivity
810
import com.google.android.material.dialog.MaterialAlertDialogBuilder
911

1012
class ConfirmDialogFragment : DialogFragment() {
@@ -36,6 +38,10 @@ class ConfirmDialogFragment : DialogFragment() {
3638
resultListener?.onDialogResult(true)
3739
}
3840

41+
DialogConfirmAction.HOME -> {
42+
goToHomeActivity()
43+
}
44+
3945
DialogConfirmAction.NOTHING -> {}
4046
}
4147
dismiss()
@@ -61,6 +67,16 @@ class ConfirmDialogFragment : DialogFragment() {
6167
}
6268
}
6369

70+
private fun goToHomeActivity() {
71+
val activityIntent = requireActivity().intent
72+
if (activityIntent?.action == Intent.ACTION_SEND) {
73+
val intent = Intent(requireActivity(), HomeActivity::class.java)
74+
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
75+
startActivity(intent)
76+
}
77+
requireActivity().finish()
78+
}
79+
6480
override fun onStart() {
6581
super.onStart()
6682

β€Žandroid/app/src/main/res/layout-land/activity_intro.xml

Lines changed: 0 additions & 76 deletions
This file was deleted.

β€Žandroid/app/src/main/res/layout-land/activity_login.xml

Lines changed: 0 additions & 153 deletions
This file was deleted.

0 commit comments

Comments
Β (0)