diff --git a/tabletApp/features/core/src/commonMain/kotlin/band/effective/office/tablet/ui/bookingComponents/pickerDateTime/DatePickerView.kt b/tabletApp/features/core/src/commonMain/kotlin/band/effective/office/tablet/ui/bookingComponents/pickerDateTime/DatePickerView.kt
index 362e53e4493894179683d8a5bd0ad643f6e42d54..0fa0d60b47ddd5a5981a5516472b0d896b5532fe 100644
--- a/tabletApp/features/core/src/commonMain/kotlin/band/effective/office/tablet/ui/bookingComponents/pickerDateTime/DatePickerView.kt
+++ b/tabletApp/features/core/src/commonMain/kotlin/band/effective/office/tablet/ui/bookingComponents/pickerDateTime/DatePickerView.kt
@@ -2,6 +2,7 @@ package band.effective.office.tablet.ui.bookingComponents.pickerDateTime
import android.os.Build
import androidx.annotation.RequiresApi
+import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
@@ -24,6 +25,7 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
+import band.effective.office.tablet.features.core.MainRes
import band.effective.office.tablet.ui.theme.LocalCustomColorsPalette
import band.effective.office.tablet.ui.theme.header4
import band.effective.office.tablet.ui.theme.header6
@@ -37,6 +39,7 @@ import epicarchitect.calendar.compose.datepicker.EpicDatePicker
import epicarchitect.calendar.compose.datepicker.state.EpicDatePickerState
import epicarchitect.calendar.compose.datepicker.state.LocalEpicDatePickerState
import epicarchitect.calendar.compose.pager.state.EpicCalendarPagerState
+import io.github.skeptick.libres.compose.painterResource
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch
import kotlinx.datetime.LocalDate
@@ -99,10 +102,10 @@ private fun DatePickerTitleView(
)
) {
- Text(
- text = " < ",
- style = header4,
- color = LocalCustomColorsPalette.current.tertiaryTextAndIcon
+ Image(
+ modifier = Modifier,
+ painter = painterResource(MainRes.image.arrow_left),
+ contentDescription = null
)
}
Text(
@@ -123,10 +126,10 @@ private fun DatePickerTitleView(
)
) {
- Text(
- text = " > ",
- color = LocalCustomColorsPalette.current.tertiaryTextAndIcon,
- style = header4,
+ Image(
+ modifier = Modifier,
+ painter = painterResource(MainRes.image.arrow_right),
+ contentDescription = null
)
}
}
diff --git a/tabletApp/features/core/src/commonMain/kotlin/band/effective/office/tablet/ui/bookingComponents/pickerDateTime/DateTimePickerModalView.kt b/tabletApp/features/core/src/commonMain/kotlin/band/effective/office/tablet/ui/bookingComponents/pickerDateTime/DateTimePickerModalView.kt
index 9b501e1440a867e35cb3725448f754419bf386bc..3c97bf6a698c1721eaf9a80f7dfa2beb1ed739bf 100644
--- a/tabletApp/features/core/src/commonMain/kotlin/band/effective/office/tablet/ui/bookingComponents/pickerDateTime/DateTimePickerModalView.kt
+++ b/tabletApp/features/core/src/commonMain/kotlin/band/effective/office/tablet/ui/bookingComponents/pickerDateTime/DateTimePickerModalView.kt
@@ -5,6 +5,7 @@ import androidx.annotation.RequiresApi
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.MaterialTheme
import androidx.compose.material.Text
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults.buttonColors
@@ -15,6 +16,7 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog
import androidx.compose.ui.window.DialogProperties
+import band.effective.office.tablet.features.core.MainRes
import band.effective.office.tablet.ui.common.CrossButtonView
import band.effective.office.tablet.ui.theme.LocalCustomColorsPalette
import band.effective.office.tablet.ui.theme.header8
@@ -47,7 +49,7 @@ fun DateTimePickerModalView(
dayOfMonthViewHeight = 32.dp
)
),
- selectionContainerColor = LocalCustomColorsPalette.current.pressedPrimaryButton,
+ selectionContainerColor = MaterialTheme.colors.secondary,
),
selectedDates =
listOf(
@@ -135,29 +137,30 @@ fun DateTimePickerModalView(
selectedDateTime[Calendar.MINUTE]
)
Spacer(modifier = Modifier.height(10.dp))
- Button(
- modifier = Modifier
- //.fillMaxHeight(1f)
- .fillMaxWidth(0.3f),
- onClick = {
- onSetDate(
- selectedDateTime[Calendar.DATE],
- selectedDateTime[Calendar.MONTH],
- selectedDateTime[Calendar.YEAR],
- selectedDateTime[Calendar.HOUR_OF_DAY],
- selectedDateTime[Calendar.MINUTE]
+ Box(modifier = Modifier.fillMaxSize()) {
+ Button(
+ modifier = Modifier.align(Alignment.Center)
+ .fillMaxWidth(0.3f),
+ onClick = {
+ onSetDate(
+ selectedDateTime[Calendar.DATE],
+ selectedDateTime[Calendar.MONTH],
+ selectedDateTime[Calendar.YEAR],
+ selectedDateTime[Calendar.HOUR_OF_DAY],
+ selectedDateTime[Calendar.MINUTE]
+ )
+ onCloseRequest()
+ },
+ colors = buttonColors(
+ containerColor = LocalCustomColorsPalette.current.pressedPrimaryButton
)
- onCloseRequest()
- },
- colors = buttonColors(
- containerColor = LocalCustomColorsPalette.current.pressedPrimaryButton
- )
- ) {
- Text(
- text = selectedDateTime.date() + " с ${selectedDateTime.time24()}",
- style = header8,
- color = LocalCustomColorsPalette.current.primaryTextAndIcon,
- )
+ ) {
+ Text(
+ text = MainRes.string.apply_date_time_for_booking,
+ style = header8,
+ color = LocalCustomColorsPalette.current.primaryTextAndIcon,
+ )
+ }
}
}
}
diff --git a/tabletApp/features/core/src/commonMain/kotlin/band/effective/office/tablet/ui/bookingComponents/pickerDateTime/TimePickerView.kt b/tabletApp/features/core/src/commonMain/kotlin/band/effective/office/tablet/ui/bookingComponents/pickerDateTime/TimePickerView.kt
index a41d953cb6fe142cfa1e4b25d652ad70b3dc34ab..323741b740bf441a0cd47c38dea9dd70d41f8dc5 100644
--- a/tabletApp/features/core/src/commonMain/kotlin/band/effective/office/tablet/ui/bookingComponents/pickerDateTime/TimePickerView.kt
+++ b/tabletApp/features/core/src/commonMain/kotlin/band/effective/office/tablet/ui/bookingComponents/pickerDateTime/TimePickerView.kt
@@ -49,7 +49,7 @@ fun TimePickerView(currentDate: Calendar, selectedTime: Calendar) {
}
WheelTimePicker(
- modifier = Modifier.height(180.dp),
+ modifier = Modifier.height(180.dp).fillMaxWidth(1f),
size = DpSize(248.dp, 180.dp),
textStyle = header6,
textColor = LocalCustomColorsPalette.current.primaryTextAndIcon,
diff --git a/tabletApp/features/core/src/commonMain/libres/strings/strings_ru.xml b/tabletApp/features/core/src/commonMain/libres/strings/strings_ru.xml
index f463df50ec9a7edf745006e3221bb034cd415176..e16e1865ddc360b4b21be2906226191c183209cc 100644
--- a/tabletApp/features/core/src/commonMain/libres/strings/strings_ru.xml
+++ b/tabletApp/features/core/src/commonMain/libres/strings/strings_ru.xml
@@ -13,4 +13,5 @@
ч
Выберите организатора
Занять с
+ Подтвердить
\ No newline at end of file