Răsfoiți Sursa

DateTime dialogs should only use dialogWrapContent in landscape, resolves #1780

Aidan Follestad 6 ani în urmă
părinte
comite
34007179d8

+ 2 - 1
datetime/src/main/java/com/afollestad/materialdialogs/datetime/DatePickerExt.kt

@@ -23,6 +23,7 @@ import com.afollestad.materialdialogs.customview.customView
 import com.afollestad.materialdialogs.datetime.utils.getDatePicker
 import com.afollestad.materialdialogs.datetime.utils.toCalendar
 import java.util.Calendar
+import com.afollestad.materialdialogs.utils.MDUtil.isLandscape
 
 /**
  * Makes the dialog a date picker.
@@ -36,7 +37,7 @@ fun MaterialDialog.datePicker(
   customView(
       R.layout.md_datetime_picker_date,
       noVerticalPadding = true,
-      dialogWrapContent = true
+      dialogWrapContent = windowContext.isLandscape()
   )
 
   if (minDate != null) {

+ 2 - 1
datetime/src/main/java/com/afollestad/materialdialogs/datetime/DateTimePickerExt.kt

@@ -33,6 +33,7 @@ import com.afollestad.materialdialogs.datetime.utils.isFutureTime
 import com.afollestad.materialdialogs.datetime.utils.minute
 import com.afollestad.materialdialogs.datetime.utils.toCalendar
 import com.afollestad.materialdialogs.utils.MDUtil.resolveColor
+import com.afollestad.materialdialogs.utils.MDUtil.isLandscape
 import java.util.Calendar
 
 typealias DateTimeCallback = ((dialog: MaterialDialog, datetime: Calendar) -> Unit)?
@@ -50,7 +51,7 @@ fun MaterialDialog.dateTimePicker(
   customView(
       R.layout.md_datetime_picker_pager,
       noVerticalPadding = true,
-      dialogWrapContent = true
+      dialogWrapContent = windowContext.isLandscape()
   )
 
   val viewPager = getPager()

+ 2 - 1
datetime/src/main/java/com/afollestad/materialdialogs/datetime/TimePickerExt.kt

@@ -25,6 +25,7 @@ import com.afollestad.materialdialogs.datetime.utils.hour
 import com.afollestad.materialdialogs.datetime.utils.minute
 import com.afollestad.materialdialogs.datetime.utils.toCalendar
 import java.util.Calendar
+import com.afollestad.materialdialogs.utils.MDUtil.isLandscape
 
 /**
  * Makes the dialog a time picker.
@@ -37,7 +38,7 @@ fun MaterialDialog.timePicker(
   customView(
       R.layout.md_datetime_picker_time,
       noVerticalPadding = true,
-      dialogWrapContent = true
+      dialogWrapContent = windowContext.isLandscape()
   )
 
   getTimePicker().apply {