Skip to content

Commit

Permalink
Merge pull request #45 from aminography/ui_symmetricity_api_below_17
Browse files Browse the repository at this point in the history 
Fixing ui symmetricity on api<17
  • Loading branch information
@aminography
aminography authored Jan 3, 2021
2 parents 64ded9f + b7899f9 commit f7ba94f
Show file tree
Hide file tree
Showing 14 changed files with 56 additions and 55 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ repositories {
}
dependencies {
implementation 'com.aminography:primedatepicker:3.3.1'
implementation 'com.aminography:primedatepicker:3.3.2'
implementation 'com.aminography:primecalendar:1.3.2'
}
```
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
buildscript {
def versionMajor = 3 // X
def versionMinor = 3 // Y
def versionPatch = 1 // Z
def versionPatch = 2 // Z

ext.version_code = versionMajor * 10000 + versionMinor * 100 + versionPatch
ext.version_name = "${versionMajor}.${versionMinor}.${versionPatch}"
Expand Down
12 changes: 6 additions & 6 deletions library/src/main/res/layout/action_bar_container.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/material_size_12"
android:paddingStart="@dimen/material_size_12"
android:paddingLeft="@dimen/material_size_12"
android:paddingTop="@dimen/material_size_8"
android:paddingEnd="@dimen/material_size_12"
android:paddingRight="@dimen/material_size_12"
android:paddingBottom="@dimen/material_size_8"
app:bottomLabelTextSize="0dp"
app:layout_constraintBottom_toBottomOf="parent"
Expand All @@ -48,9 +48,9 @@
android:id="@+id/negativeTwoLineTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/material_size_12"
android:paddingLeft="@dimen/material_size_12"
android:paddingTop="@dimen/material_size_8"
android:paddingEnd="@dimen/material_size_12"
android:paddingRight="@dimen/material_size_12"
android:paddingBottom="@dimen/material_size_8"
app:bottomLabelTextSize="0dp"
app:layout_constraintBottom_toBottomOf="parent"
Expand All @@ -76,9 +76,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/material_size_12"
android:paddingStart="@dimen/material_size_12"
android:paddingLeft="@dimen/material_size_12"
android:paddingTop="@dimen/material_size_8"
android:paddingEnd="@dimen/material_size_12"
android:paddingRight="@dimen/material_size_12"
android:paddingBottom="@dimen/material_size_8"
app:bottomLabelTextSize="0dp"
app:layout_constraintBottom_toBottomOf="parent"
Expand Down
12 changes: 6 additions & 6 deletions library/src/main/res/layout/action_bar_container_rtl.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/material_size_12"
android:paddingStart="@dimen/material_size_12"
android:paddingLeft="@dimen/material_size_12"
android:paddingTop="@dimen/material_size_8"
android:paddingEnd="@dimen/material_size_12"
android:paddingRight="@dimen/material_size_12"
android:paddingBottom="@dimen/material_size_8"
app:bottomLabelTextSize="0dp"
app:layout_constraintBottom_toBottomOf="parent"
Expand All @@ -48,9 +48,9 @@
android:id="@+id/negativeTwoLineTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/material_size_12"
android:paddingLeft="@dimen/material_size_12"
android:paddingTop="@dimen/material_size_8"
android:paddingEnd="@dimen/material_size_12"
android:paddingRight="@dimen/material_size_12"
android:paddingBottom="@dimen/material_size_8"
app:bottomLabelTextSize="0dp"
app:layout_constraintBottom_toBottomOf="parent"
Expand All @@ -76,9 +76,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/material_size_12"
android:paddingStart="@dimen/material_size_12"
android:paddingLeft="@dimen/material_size_12"
android:paddingTop="@dimen/material_size_8"
android:paddingEnd="@dimen/material_size_12"
android:paddingRight="@dimen/material_size_12"
android:paddingBottom="@dimen/material_size_8"
app:bottomLabelTextSize="0dp"
app:layout_constraintBottom_toBottomOf="parent"
Expand Down
8 changes: 4 additions & 4 deletions library/src/main/res/layout/fragment_date_picker_bottom_sheet.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
android:id="@+id/selectionBarLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingStart="8dp"
android:paddingTop="4dp"
android:paddingEnd="8dp"
android:paddingBottom="2dp"
android:paddingLeft="@dimen/material_size_8"
android:paddingTop="@dimen/material_size_4"
android:paddingRight="@dimen/material_size_8"
android:paddingBottom="@dimen/material_size_2"
app:layout_constraintBottom_toTopOf="@id/calendarView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down
4 changes: 2 additions & 2 deletions library/src/main/res/layout/fragment_date_picker_dialog.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
android:id="@+id/selectionBarLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingStart="8dp"
android:paddingLeft="@dimen/material_size_8"
android:paddingTop="8dp"
android:paddingBottom="2dp"
android:paddingEnd="8dp"
android:paddingRight="@dimen/material_size_8"
app:layout_constraintBottom_toTopOf="@id/calendarView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down
8 changes: 4 additions & 4 deletions library/src/main/res/layout/goto_container.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
android:id="@+id/closeButtonImageView"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginStart="@dimen/material_size_16"
android:layout_marginLeft="@dimen/material_size_16"
android:layout_marginTop="@dimen/material_size_8"
android:layout_marginEnd="@dimen/material_size_16"
android:layout_marginRight="@dimen/material_size_16"
android:alpha="0.67"
android:paddingTop="@dimen/material_size_8"
android:paddingBottom="@dimen/material_size_8"
Expand All @@ -80,8 +80,8 @@
android:id="@+id/goButtonImageView"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginStart="@dimen/material_size_16"
android:layout_marginEnd="@dimen/material_size_16"
android:layout_marginLeft="@dimen/material_size_16"
android:layout_marginRight="@dimen/material_size_16"
android:layout_marginBottom="@dimen/material_size_4"
android:alpha="0.67"
android:paddingTop="@dimen/material_size_8"
Expand Down
8 changes: 4 additions & 4 deletions library/src/main/res/layout/goto_container_rtl.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
android:id="@+id/closeButtonImageView"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginStart="@dimen/material_size_16"
android:layout_marginLeft="@dimen/material_size_16"
android:layout_marginTop="@dimen/material_size_8"
android:layout_marginEnd="@dimen/material_size_16"
android:layout_marginRight="@dimen/material_size_16"
android:alpha="0.67"
android:paddingTop="@dimen/material_size_8"
android:paddingBottom="@dimen/material_size_8"
Expand All @@ -80,8 +80,8 @@
android:id="@+id/goButtonImageView"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginStart="@dimen/material_size_16"
android:layout_marginEnd="@dimen/material_size_16"
android:layout_marginLeft="@dimen/material_size_16"
android:layout_marginRight="@dimen/material_size_16"
android:layout_marginBottom="@dimen/material_size_4"
android:alpha="0.67"
android:paddingTop="@dimen/material_size_8"
Expand Down
4 changes: 2 additions & 2 deletions library/src/main/res/layout/list_item_picked_day.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
android:id="@+id/twoLineTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/material_size_8"
android:paddingLeft="@dimen/material_size_8"
android:paddingTop="@dimen/material_size_4"
android:paddingEnd="@dimen/material_size_8"
android:paddingRight="@dimen/material_size_8"
android:paddingBottom="@dimen/material_size_4"
app:bottomLabelTextColor="@color/white"
app:bottomLabelTextSize="@dimen/text_size_header_multi_small"
Expand Down
4 changes: 2 additions & 2 deletions library/src/main/res/layout/list_item_picked_day_empty.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
android:id="@+id/twoLineTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/material_size_8"
android:paddingLeft="@dimen/material_size_8"
android:paddingTop="@dimen/material_size_4"
android:paddingEnd="@dimen/material_size_8"
android:paddingRight="@dimen/material_size_8"
android:paddingBottom="@dimen/material_size_4"
app:bottomLabelTextColor="@color/transparent"
app:bottomLabelTextSize="@dimen/text_size_header_multi_small"
Expand Down
7 changes: 4 additions & 3 deletions library/src/main/res/layout/selection_bar_multiple_days_container.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,14 @@
android:clipChildren="false"
android:clipToPadding="true"
android:fadingEdgeLength="@dimen/material_size_2"
android:paddingStart="@dimen/material_size_4"
android:paddingEnd="@dimen/material_size_4"
android:paddingLeft="@dimen/material_size_4"
android:paddingRight="@dimen/material_size_4"
android:requiresFadingEdge="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:listitem="@layout/list_item_picked_day" />
tools:listitem="@layout/list_item_picked_day"
tools:targetApi="ice_cream_sandwich" />

</androidx.constraintlayout.widget.ConstraintLayout>
8 changes: 4 additions & 4 deletions library/src/main/res/layout/selection_bar_range_days_container.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
android:layout_gravity="center"
android:layout_marginStart="@dimen/material_size_4"
android:layout_marginLeft="@dimen/material_size_4"
android:paddingStart="@dimen/material_size_8"
android:paddingLeft="@dimen/material_size_8"
android:paddingTop="@dimen/material_size_4"
android:paddingEnd="@dimen/material_size_8"
android:paddingRight="@dimen/material_size_8"
android:paddingBottom="@dimen/material_size_4"
app:topLabelText="@string/prime_date_picker_from"
app:topLabelTextColor="@color/white"
Expand All @@ -69,9 +69,9 @@
android:layout_gravity="center"
android:layout_marginEnd="@dimen/material_size_4"
android:layout_marginRight="@dimen/material_size_4"
android:paddingStart="@dimen/material_size_8"
android:paddingLeft="@dimen/material_size_8"
android:paddingTop="@dimen/material_size_4"
android:paddingEnd="@dimen/material_size_8"
android:paddingRight="@dimen/material_size_8"
android:paddingBottom="@dimen/material_size_4"
app:topLabelText="@string/prime_date_picker_to"
app:topLabelTextColor="@color/white"
Expand Down
28 changes: 14 additions & 14 deletions library/src/main/res/layout/selection_bar_range_days_container_rtl.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,20 @@
android:layout_gravity="center"
android:layout_marginEnd="@dimen/material_size_4"
android:layout_marginRight="@dimen/material_size_4"
android:paddingStart="@dimen/material_size_8"
android:paddingLeft="@dimen/material_size_8"
android:paddingTop="@dimen/material_size_4"
android:paddingEnd="@dimen/material_size_8"
android:paddingRight="@dimen/material_size_8"
android:paddingBottom="@dimen/material_size_4"
app:topLabelText="@string/prime_date_picker_from"
app:topLabelTextColor="@color/white"
app:topLabelTextSize="@dimen/text_size_small"
app:bottomLabelTextColor="@color/white"
app:bottomLabelTextSize="@dimen/text_size_normal"
app:gapBetweenLines="@dimen/defaultGapBetweenLines"
app:layout_constraintBottom_toBottomOf="@id/rangeStartBackView"
app:layout_constraintEnd_toEndOf="@id/rangeStartBackView"
app:layout_constraintStart_toStartOf="@id/rangeStartBackView"
app:layout_constraintTop_toTopOf="@id/rangeStartBackView"
app:bottomLabelTextColor="@color/white"
app:bottomLabelTextSize="@dimen/text_size_normal" />
app:topLabelText="@string/prime_date_picker_from"
app:topLabelTextColor="@color/white"
app:topLabelTextSize="@dimen/text_size_small" />

<com.aminography.primedatepicker.picker.component.TwoLinesTextView
android:id="@+id/rangeEndTextView"
Expand All @@ -69,19 +69,19 @@
android:layout_gravity="center"
android:layout_marginStart="@dimen/material_size_4"
android:layout_marginLeft="@dimen/material_size_4"
android:paddingStart="@dimen/material_size_8"
android:paddingLeft="@dimen/material_size_8"
android:paddingTop="@dimen/material_size_4"
android:paddingEnd="@dimen/material_size_8"
android:paddingRight="@dimen/material_size_8"
android:paddingBottom="@dimen/material_size_4"
app:topLabelText="@string/prime_date_picker_to"
app:topLabelTextColor="@color/white"
app:topLabelTextSize="@dimen/text_size_small"
app:bottomLabelTextColor="@color/white"
app:bottomLabelTextSize="@dimen/text_size_normal"
app:gapBetweenLines="@dimen/defaultGapBetweenLines"
app:layout_constraintBottom_toBottomOf="@id/rangeEndBackView"
app:layout_constraintEnd_toEndOf="@id/rangeEndBackView"
app:layout_constraintStart_toStartOf="@id/rangeEndBackView"
app:layout_constraintTop_toTopOf="@id/rangeEndBackView"
app:bottomLabelTextColor="@color/white"
app:bottomLabelTextSize="@dimen/text_size_normal" />
app:topLabelText="@string/prime_date_picker_to"
app:topLabelTextColor="@color/white"
app:topLabelTextSize="@dimen/text_size_small" />

</androidx.constraintlayout.widget.ConstraintLayout>
4 changes: 2 additions & 2 deletions library/src/main/res/layout/selection_bar_single_day_container.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingStart="@dimen/material_size_8"
android:paddingLeft="@dimen/material_size_8"
android:paddingTop="@dimen/material_size_4"
android:paddingEnd="@dimen/material_size_8"
android:paddingRight="@dimen/material_size_8"
android:paddingBottom="@dimen/material_size_4"
app:topLabelText="@string/prime_date_picker_selected_day"
app:topLabelTextColor="@color/white"
Expand Down

0 comments on commit f7ba94f

Please sign in to comment.