(All) Fix content alignment, Add orientation dependent spacing #33

maxkeppeler · Mar 7, 2023 · 344ced7 · 344ced7
1 parent 50ca86b
commit 344ced7
Show file tree

Hide file tree

Showing 14 changed files with 51 additions and 17 deletions.
diff --git a/calendar/src/main/java/com/maxkeppeler/sheets/calendar/CalendarView.kt b/calendar/src/main/java/com/maxkeppeler/sheets/calendar/CalendarView.kt
@@ -200,8 +200,9 @@ fun CalendarView(
  CalendarStyle.WEEK -> null
  },
  buttonsVisible = selection.withButtonView && calendarState.mode == CalendarDisplayMode.CALENDAR
- ) {
+ ) { orientation ->
  ButtonsComponent(
+ orientation = orientation,
  selection = selection,
  onPositiveValid = calendarState.valid,
  onNegative = { selection.onNegativeClick?.invoke() },

diff --git a/clock/src/main/java/com/maxkeppeler/sheets/clock/ClockView.kt b/clock/src/main/java/com/maxkeppeler/sheets/clock/ClockView.kt
@@ -136,8 +136,9 @@ fun ClockView(
  onNextAction = clockState::onNextAction
  )
  }
- ) {
+ ) { orientation ->
  ButtonsComponent(
+ orientation = orientation,
  selection = selection,
  onNegative = { selection.onNegativeClick?.invoke() },
  onPositive = clockState::onFinish,

diff --git a/color/src/main/java/com/maxkeppeler/sheets/color/ColorView.kt b/color/src/main/java/com/maxkeppeler/sheets/color/ColorView.kt
@@ -98,8 +98,9 @@ fun ColorView(
  },
  buttonsVisible = selection.withButtonView
  || config.displayMode != ColorSelectionMode.TEMPLATE
- ) {
+ ) { orientation ->
  ButtonsComponent(
+ orientation = orientation,
  selection = selection,
  onPositiveValid = colorState.valid,
  onNegative = { selection.onNegativeClick?.invoke() },

diff --git a/...src/androidTest/java/com/maxkeppeker/sheets/core/functional/base/ButtonsComponentTests.kt b/...src/androidTest/java/com/maxkeppeker/sheets/core/functional/base/ButtonsComponentTests.kt
@@ -25,6 +25,7 @@ import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.maxkeppeker.sheets.core.models.base.BaseSelection
 import com.maxkeppeker.sheets.core.models.base.IconSource
+import com.maxkeppeker.sheets.core.models.base.LibOrientation
 import com.maxkeppeker.sheets.core.models.base.SelectionButton
 import com.maxkeppeker.sheets.core.utils.TestTags
 import com.maxkeppeker.sheets.core.views.ButtonsComponent
@@ -49,6 +50,7 @@ class ButtonsComponentTests {
  var closeCalled = false
  rule.setContent {
  ButtonsComponent(
+ orientation = LibOrientation.PORTRAIT,
  selection = object : BaseSelection() {},
  onPositive = { positiveCalled = true },
  onNegative = { negativeCalled = true },
@@ -70,6 +72,7 @@ class ButtonsComponentTests {
  var closeCalled = false
  rule.setContent {
  ButtonsComponent(
+ orientation = LibOrientation.PORTRAIT,
  selection = object : BaseSelection() {},
  onPositive = { positiveCalled = true },
  onNegative = { negativeCalled = true },
@@ -91,6 +94,7 @@ class ButtonsComponentTests {
  var closeCalled = false
  rule.setContent {
  ButtonsComponent(
+ orientation = LibOrientation.PORTRAIT,
  selection = object : BaseSelection() {},
  onPositive = { positiveCalled = true },
  onNegative = { negativeCalled = true },
@@ -112,6 +116,7 @@ class ButtonsComponentTests {
  var extraCalled = false
  rule.setContent {
  ButtonsComponent(
+ orientation = LibOrientation.PORTRAIT,
  selection = object : BaseSelection() {
  override val extraButton = SelectionButton("Test button")
  override val onExtraButtonClick = { extraCalled = true }
@@ -134,6 +139,7 @@ class ButtonsComponentTests {
  val text = "test-text-positive"
  rule.setContent {
  ButtonsComponent(
+ orientation = LibOrientation.PORTRAIT,
  selection = object : BaseSelection() {
  override val positiveButton = SelectionButton(text)
  },
@@ -154,6 +160,7 @@ class ButtonsComponentTests {
  val text = "test-text-negative"
  rule.setContent {
  ButtonsComponent(
+ orientation = LibOrientation.PORTRAIT,
  selection = object : BaseSelection() {
  override val negativeButton = SelectionButton(text)
  },
@@ -174,6 +181,7 @@ class ButtonsComponentTests {
  val text = "test-text-extra"
  rule.setContent {
  ButtonsComponent(
+ orientation = LibOrientation.PORTRAIT,
  selection = object : BaseSelection() {
  override val extraButton = SelectionButton(text)
  },
@@ -194,6 +202,7 @@ class ButtonsComponentTests {
  val icon = IconSource(Icons.Rounded.Face)
  rule.setContent {
  ButtonsComponent(
+ orientation = LibOrientation.PORTRAIT,
  selection = object : BaseSelection() {
  override val positiveButton = SelectionButton("", icon)
  },
@@ -217,6 +226,7 @@ class ButtonsComponentTests {
  val icon = IconSource(Icons.Rounded.Face)
  rule.setContent {
  ButtonsComponent(
+ orientation = LibOrientation.PORTRAIT,
  selection = object : BaseSelection() {
  override val negativeButton = SelectionButton("", icon)
  },
@@ -240,6 +250,7 @@ class ButtonsComponentTests {
  val icon = IconSource(Icons.Rounded.Face)
  rule.setContent {
  ButtonsComponent(
+ orientation = LibOrientation.PORTRAIT,
  selection = object : BaseSelection() {
  override val extraButton = SelectionButton("", icon)
  },

diff --git a/core/src/main/java/com/maxkeppeker/sheets/core/CoreView.kt b/core/src/main/java/com/maxkeppeker/sheets/core/CoreView.kt
@@ -47,8 +47,9 @@ fun CoreView(
  header = header,
  layout = { body() },
  buttonsVisible = selection.withButtonView
- ) {
+ ) {orientation ->
  ButtonsComponent(
+ orientation = orientation,
  onPositiveValid = onPositiveValid,
  selection = selection,
  onNegative = { selection.onNegativeClick?.invoke() },

diff --git a/core/src/main/java/com/maxkeppeker/sheets/core/views/ButtonsComponent.kt b/core/src/main/java/com/maxkeppeker/sheets/core/views/ButtonsComponent.kt
@@ -25,13 +25,15 @@ import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import com.maxkeppeker.sheets.core.models.base.BaseSelection
 import com.maxkeppeker.sheets.core.models.base.ButtonStyle
+import com.maxkeppeker.sheets.core.models.base.LibOrientation
 import com.maxkeppeker.sheets.core.models.base.SelectionButton
 import com.maxkeppeker.sheets.core.utils.TestTags
 import com.maxkeppeker.sheets.core.utils.testTags
 import com.maxkeppeler.sheets.core.R
 
 /**
  * Header component of the dialog.
+ * @param orientation The orientation configuration for the dialog.
  * @param selection The selection configuration for the dialog.
  * @param onPositive Listener that is invoked when the positive button is clicked.
  * @param onNegative Listener that is invoked when the negative button is clicked.
@@ -40,17 +42,27 @@ import com.maxkeppeler.sheets.core.R
 @ExperimentalMaterial3Api
 @Composable
 fun ButtonsComponent(
+ orientation: LibOrientation,
  selection: BaseSelection,
  onPositive: () -> Unit,
  onNegative: () -> Unit,
  onClose: () -> Unit,
  onPositiveValid: Boolean = true,
 ) {
 
+ val buttonPadding = when (orientation) {
+ LibOrientation.PORTRAIT -> Modifier
+ .padding(top = dimensionResource(id = R.dimen.scd_normal_150))
+ .padding(bottom = dimensionResource(id = R.dimen.scd_normal_150))
+ .padding(horizontal = dimensionResource(id = R.dimen.scd_normal_150))
+ LibOrientation.LANDSCAPE -> Modifier
+ .padding(top = dimensionResource(id = R.dimen.scd_small_100))
+ .padding(bottom = dimensionResource(id = R.dimen.scd_small_100))
+ .padding(horizontal = dimensionResource(id = R.dimen.scd_small_100))
+ }
+
  Row(
- modifier = Modifier
- .padding(vertical = dimensionResource(id = R.dimen.scd_small_100))
- .padding(horizontal = dimensionResource(id = R.dimen.scd_normal_100)),
+ modifier = buttonPadding,
  verticalAlignment = Alignment.CenterVertically,
  horizontalArrangement = Arrangement.End
  ) {

diff --git a/core/src/main/java/com/maxkeppeker/sheets/core/views/base/FrameBase.kt b/core/src/main/java/com/maxkeppeker/sheets/core/views/base/FrameBase.kt
@@ -57,7 +57,7 @@ fun FrameBase(
  layoutLandscape: @Composable (RowScope.() -> Unit)? = null,
  layoutLandscapeVerticalAlignment: Alignment.Vertical = Alignment.CenterVertically,
  buttonsVisible: Boolean = true,
- buttons: @Composable (ColumnScope.() -> Unit)? = null,
+ buttons: @Composable (ColumnScope.(LibOrientation) -> Unit)? = null,
 ) {
  val layoutDirection = LocalLayoutDirection.current
  val shouldUseLandscapeLayout = shouldUseLandscape()
@@ -82,7 +82,7 @@ fun FrameBase(
 
  Column(
  modifier = Modifier.wrapContentSize(),
- horizontalAlignment = Alignment.End
+ horizontalAlignment = Alignment.Start
  ) {
 
  header?.takeUnless { deviceOrientation == LibOrientation.LANDSCAPE }?.let {
@@ -138,7 +138,7 @@ fun FrameBase(
  buttons?.let { buttons ->
  if (buttonsVisible) {
  Column(modifier = Modifier.testTag(TestTags.FRAME_BASE_BUTTONS)) {
- buttons.invoke(this)
+ buttons.invoke(this, deviceOrientation)
  }
  } else Spacer(
  modifier = Modifier

diff --git a/date_time/src/main/java/com/maxkeppeler/sheets/date_time/DateTimeView.kt b/date_time/src/main/java/com/maxkeppeler/sheets/date_time/DateTimeView.kt
@@ -101,8 +101,9 @@ fun DateTimeView(
  }
  },
  buttonsVisible = selection.withButtonView
- ) {
+ ) { orientation ->
  ButtonsComponent(
+ orientation = orientation,
  onPositiveValid = dateTimeState.valid,
  selection = selection,
  onNegative = { selection.onNegativeClick?.invoke() },

diff --git a/duration/src/main/java/com/maxkeppeler/sheets/duration/DurationView.kt b/duration/src/main/java/com/maxkeppeler/sheets/duration/DurationView.kt
@@ -103,8 +103,9 @@ fun DurationView(
  onEmptyAction = durationState::onEmptyAction
  )
  }
- ) {
+ ) { orientation ->
  ButtonsComponent(
+ orientation = orientation,
  onPositiveValid = durationState.valid,
  selection = selection,
  onNegative = { selection.onNegativeClick?.invoke() },

diff --git a/emoji/src/main/java/com/maxkeppeler/sheets/emoji/EmojiView.kt b/emoji/src/main/java/com/maxkeppeler/sheets/emoji/EmojiView.kt
@@ -122,8 +122,9 @@ fun EmojiView(
  }
  },
  buttonsVisible = selection.withButtonView
- ) {
+ ) { orientation ->
  ButtonsComponent(
+ orientation = orientation,
  onPositiveValid = emojiState.valid,
  selection = selection,
  onNegative = { selection.onNegativeClick?.invoke() },

diff --git a/info/src/main/java/com/maxkeppeler/sheets/info/InfoView.kt b/info/src/main/java/com/maxkeppeler/sheets/info/InfoView.kt
@@ -46,8 +46,9 @@ fun InfoView(
  header = header,
  layout = { BodyComponent(body) },
  buttonsVisible = selection.withButtonView
- ) {
+ ) {orientation ->
  ButtonsComponent(
+ orientation = orientation,
  selection = selection,
  onNegative = { selection.onNegativeClick?.invoke() },
  onPositive = selection.onPositiveClick::invoke,

diff --git a/input/src/main/java/com/maxkeppeler/sheets/input/InputView.kt b/input/src/main/java/com/maxkeppeler/sheets/input/InputView.kt
@@ -60,8 +60,9 @@ fun InputView(
  )
  },
  buttonsVisible = selection.withButtonView
- ) {
+ ) { orientation ->
  ButtonsComponent(
+ orientation = orientation,
  selection = selection,
  onPositiveValid = inputState.valid,
  onNegative = { selection.onNegativeClick?.invoke() },

diff --git a/list/src/main/java/com/maxkeppeler/sheets/list/ListView.kt b/list/src/main/java/com/maxkeppeler/sheets/list/ListView.kt
@@ -83,8 +83,9 @@ fun ListView(
  )
  },
  buttonsVisible = selection.withButtonView
- ) {
+ ) {orientation ->
  ButtonsComponent(
+ orientation = orientation,
  onPositiveValid = listState.valid,
  selection = selection,
  onNegative = { selection.onNegativeClick?.invoke() },

diff --git a/option/src/main/java/com/maxkeppeler/sheets/option/OptionView.kt b/option/src/main/java/com/maxkeppeler/sheets/option/OptionView.kt
@@ -87,8 +87,9 @@ fun OptionView(
  )
  },
  buttonsVisible = selection.withButtonView
- ) {
+ ) {orientation ->
  ButtonsComponent(
+ orientation = orientation,
  onPositiveValid = optionState.valid,
  selection = selection,
  onNegative = { selection.onNegativeClick?.invoke() },