Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix bug text date field disappears during editing #1036

Merged
merged 2 commits into from
Nov 22, 2023
Merged

fix bug text date field disappears during editing #1036

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f280b8
Fix for [BUG] Text date field disappears during editing #1035
patrickunterwegs Nov 22, 2023
41d028b
Commented out inactive code
patrickunterwegs Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 37 additions & 10 deletions app/src/main/java/at/techbee/jtx/ui/reusable/dialogs/DatePickerDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,40 @@
package at.techbee.jtx.ui.reusable.dialogs

import androidx.compose.animation.AnimatedVisibility
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.requiredWidth
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.MoreTime
import androidx.compose.material.icons.outlined.Today
import androidx.compose.material.icons.outlined.TravelExplore
import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Checkbox
import androidx.compose.material3.DatePicker
import androidx.compose.material3.DisplayMode
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.SecondaryTabRow
import androidx.compose.material3.Tab
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.material3.TimePicker
import androidx.compose.material3.rememberDatePickerState
import androidx.compose.material3.rememberTimePickerState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableIntStateOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalInspectionMode
Expand All @@ -35,7 +59,7 @@ import at.techbee.jtx.util.DateTimeUtils
import java.time.Instant
import java.time.ZoneId
import java.time.ZonedDateTime
import java.util.*
import java.util.TimeZone
import kotlin.collections.contains


Expand All @@ -57,28 +81,30 @@ fun DatePickerDialog(
val tabIndexTimezone = 2
var selectedTab by remember { mutableIntStateOf(0) }

/*
fun isValidDate(date: Long): Boolean {
/*
val zonedDate = ZonedDateTime.ofInstant(Instant.ofEpochMilli(date), ZoneId.of("UTC")).withHour(0).withMinute(0).withSecond(0).withNano(0).withZoneSameLocal(DateTimeUtils.requireTzId(timezone))
val zonedMinDate = minDate?.withZoneSameLocal(DateTimeUtils.requireTzId(timezone))
val zonedMaxDate = maxDate?.withZoneSameLocal(DateTimeUtils.requireTzId(timezone))
return if(timezone == TZ_ALLDAY)
zonedDate.year*zonedDate.dayOfYear in (zonedMinDate?.year?:0)*(zonedMinDate?.dayOfYear?:0) until (zonedMaxDate?.year?:3000)*(zonedMaxDate?.dayOfYear?:367)
else
zonedDate.year*zonedDate.dayOfYear in (zonedMinDate?.year?:0)*(zonedMinDate?.dayOfYear?:0) .. (zonedMaxDate?.year?:3000)*(zonedMaxDate?.dayOfYear?:367)
*/
return true
}
*/

val initialZonedDateTime = datetime
?.let { ZonedDateTime.ofInstant(Instant.ofEpochMilli(it), DateTimeUtils.requireTzId(timezone)) }
?: minDate

val datePickerState = rememberDatePickerState(
initialSelectedDateMillis = initialZonedDateTime?.toInstant()?.toEpochMilli()?.plus(initialZonedDateTime.offset.totalSeconds*1000),
initialSelectedDateMillis = initialZonedDateTime?.toInstant()?.toEpochMilli()?.plus(initialZonedDateTime.offset.totalSeconds*1000)
/*
selectableDates = object: SelectableDates {
override fun isSelectableDate(utcTimeMillis: Long) = isValidDate((utcTimeMillis))
}
*/
)
val timePickerState = rememberTimePickerState(initialZonedDateTime?.hour?:0, initialZonedDateTime?.minute?:0)

Expand Down Expand Up @@ -113,6 +139,7 @@ fun DatePickerDialog(
checked = datePickerState.selectedDateMillis != null,
onCheckedChange = {
datePickerState.selectedDateMillis = if (it) defaultDateTime.withZoneSameLocal(ZoneId.of("UTC")).toInstant().toEpochMilli() else null
datePickerState.displayMode = DisplayMode.Picker
newTimezone = if (it) TZ_ALLDAY else null
selectedTab = tabIndexDate
},
Expand Down Expand Up @@ -183,7 +210,7 @@ fun DatePickerDialog(
}
}

AnimatedVisibility(selectedTab == tabIndexDate && datePickerState.selectedDateMillis == null) {
AnimatedVisibility(selectedTab == tabIndexDate && datePickerState.selectedDateMillis == null && datePickerState.displayMode != DisplayMode.Input) {
Text(
stringResource(id = R.string.not_set2),
fontStyle = FontStyle.Italic,
Expand All @@ -194,7 +221,7 @@ fun DatePickerDialog(
)
}

AnimatedVisibility(selectedTab == tabIndexDate && datePickerState.selectedDateMillis != null) {
AnimatedVisibility(selectedTab == tabIndexDate && (datePickerState.selectedDateMillis != null || datePickerState.displayMode == DisplayMode.Input)) {
Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
DatePicker(
state = datePickerState,
Expand Down Expand Up @@ -250,7 +277,7 @@ fun DatePickerDialog(


TextButton(
enabled = datePickerState.selectedDateMillis?.let { isValidDate(it) } ?: true,
//enabled = datePickerState.selectedDateMillis?.let { isValidDate(it) } ?: true,
onClick = {
if (newTimezone != null && newTimezone != TZ_ALLDAY && !TimeZone.getAvailableIDs()
.contains(newTimezone)
Expand Down