Skip to content

Forms Fork date picker #321

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

Merged
merged 4 commits into from
Feb 16, 2024
Merged

Forms Fork date picker #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
36273a1
initial refactor
kaushikrw Feb 14, 2024
624ef21
removed outlined text field decoration box dependency from time picker
kaushikrw Feb 14, 2024
93d1069
updated copyrights
kaushikrw Feb 14, 2024
c0de33f
Update DatePickerTokens.kt
kaushikrw Feb 14, 2024
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
1 change: 1 addition & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-juni
androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling"}
androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview"}
androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest"}
androidx-compose-ui-util = { group = "androidx.compose.ui", name = "ui-util"}
androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" }
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidxLifecycle" }
androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose"}
Expand Down
1 change: 1 addition & 0 deletions toolkit/featureforms/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ dependencies {
implementation(libs.androidx.window)
implementation(libs.androidx.window.core)
implementation(libs.bundles.composeCore)
implementation(libs.androidx.compose.ui.util)
implementation(libs.bundles.core)
implementation(libs.androidx.lifecycle.runtime.ktx)
implementation(libs.androidx.activity.compose)
Expand Down
16 changes: 6 additions & 10 deletions ...ain/java/com/arcgismaps/toolkit/featureforms/components/datetime/picker/DateTimePicker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.AccessTime
import androidx.compose.material.icons.rounded.CalendarMonth
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.DatePicker
import androidx.compose.material3.DatePickerDefaults
import androidx.compose.material3.DatePickerState
import androidx.compose.material3.DisplayMode
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
Expand All @@ -63,8 +58,13 @@ import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog
import androidx.compose.ui.window.DialogProperties
import com.arcgismaps.toolkit.featureforms.R
import com.arcgismaps.toolkit.featureforms.components.datetime.picker.date.DatePicker
import com.arcgismaps.toolkit.featureforms.components.datetime.picker.date.DatePickerDefaults
import com.arcgismaps.toolkit.featureforms.components.datetime.picker.date.DatePickerState
import com.arcgismaps.toolkit.featureforms.components.datetime.picker.date.DisplayMode
import com.arcgismaps.toolkit.featureforms.components.datetime.picker.time.TimePicker
import com.arcgismaps.toolkit.featureforms.components.datetime.picker.time.TimePickerState
import java.time.Instant
Expand Down Expand Up @@ -105,7 +105,6 @@ internal enum class DateTimePickerInput {
* @param onDismissRequest Dismiss the dialog when the user clicks outside the dialog or on the back button.
*
*/
@OptIn(ExperimentalMaterial3Api::class)
@Composable
internal fun DateTimePicker(
state: DateTimePickerState,
Expand Down Expand Up @@ -195,7 +194,6 @@ internal fun DateTimePicker(
}
}

@OptIn(ExperimentalMaterial3Api::class)
@Composable
private fun (ColumnScope).PickerContent(
label: String,
Expand Down Expand Up @@ -316,7 +314,6 @@ private fun PickerFooter(
}
}

@OptIn(ExperimentalMaterial3Api::class)
@Composable
private fun DateTimePickerDialog(
onDismissRequest: () -> Unit,
Expand All @@ -326,9 +323,8 @@ private fun DateTimePickerDialog(
properties: DialogProperties = DialogProperties(usePlatformDefaultWidth = false),
content: @Composable ColumnScope.() -> Unit
) {
AlertDialog(
Dialog(
onDismissRequest = onDismissRequest,
modifier = modifier.wrapContentHeight(),
properties = properties
) {
Surface(
Expand Down
Loading