Skip to content

Commit e92d48d

Browse files
committed
fix: date picker dialog
1 parent 0f6551e commit e92d48d

4 files changed

Lines changed: 10 additions & 6 deletions

File tree

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ android {
1717
applicationId = "ru.kheynov.secretsanta"
1818
minSdk = 21
1919
targetSdk = 33
20-
versionCode = 5
21-
versionName = "0.2.1"
20+
versionCode = 6
21+
versionName = "0.2.2"
2222

2323
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2424
}

app/release/output-metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"type": "SINGLE",
1212
"filters": [],
1313
"attributes": [],
14-
"versionCode": 5,
15-
"versionName": "0.2.1",
14+
"versionCode": 6,
15+
"versionName": "0.2.2",
1616
"outputFile": "app-release.apk"
1717
}
1818
],

app/src/main/java/ru/kheynov/secretsanta/presentation/screens/create_room/CreateRoomFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class CreateRoomFragment : Fragment() {
7878
val datePicker =
7979
DatePickerDialog(requireContext(), { _, year_picker, month_picker, day_picker ->
8080
Log.i(tag, "$day_picker $month_picker $year_picker")
81-
if (year_picker == year && month_picker == month && day_picker < day) {
81+
if (year_picker == year && month_picker == month && day_picker == day) {
8282
viewModel.setDate(null)
8383
} else {
8484
viewModel.setDate(LocalDate.of(year_picker, month_picker + 1, day_picker))

app/src/main/java/ru/kheynov/secretsanta/presentation/screens/create_room/CreateRoomFragmentViewModel.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,11 @@ class CreateRoomFragmentViewModel @Inject constructor(
6666

6767
val price: Int? = maxPrice.let {
6868
if (it.isNullOrBlank() || it == "0") null
69-
else try {
69+
else if (it.length > 7) {
70+
_actions.send(Action.ShowError(UiText.StringResource(R.string.wrong_max_price)))
71+
_state.value = State.Idle
72+
return@launch
73+
} else try {
7074
it.toInt()
7175
} catch (e: Exception) {
7276
_actions.send(Action.ShowError(UiText.StringResource(R.string.wrong_max_price)))

0 commit comments

Comments
 (0)