Skip to content

Modify layout styles for Material Design #81

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

Open
ugonna wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Modify layout styles for Material Design #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bdd16fb
Changes layout of date-picker "done" button
ugonna Nov 18, 2014
d737864
Changes date-picker header colors
ugonna Nov 18, 2014
64fbb43
Shows short months in a way that works in pre 2.3 (See commit 949b848)
ugonna Nov 18, 2014
d7b69c8
Fixes potential error in using vibrator system service
ugonna Nov 18, 2014
deee8ac
Added logic for "Cancel" button in date-picker
ugonna Nov 18, 2014
cc7e044
Adjusts calendar font sizes in date-picker to match native 5.0 DatePi…
ugonna Nov 18, 2014
85f9dc6
Adjusts layout of date-picker in landscape
ugonna Nov 18, 2014
d606322
Refactored "done" button layout name for more generic use in other la…
ugonna Nov 22, 2014
9218d80
Changes layout of time-picker dialog
ugonna Nov 22, 2014
db5cbc3
Added logic for "Cancel" button in time-picker
ugonna Nov 22, 2014
27f9d05
Changed background color of "done" button view to match surrounding c…
ugonna Nov 22, 2014
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
6 changes: 3 additions & 3 deletions datetimepicker-library/res/color/date_picker_selector.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:color="@color/darker_blue" />
<item android:state_selected="true" android:state_pressed="false" android:color="@color/blue" />
<item android:state_selected="false" android:state_pressed="false" android:color="@color/date_picker_text_normal" />
<item android:state_pressed="true" android:color="@color/grey" />
<item android:state_selected="true" android:state_pressed="false" android:color="@color/white" />
<item android:state_selected="false" android:state_pressed="false" android:color="@color/transparent_white" />
</selector>
11 changes: 5 additions & 6 deletions datetimepicker-library/res/layout-land/date_picker_dialog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:gravity="center" android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="@dimen/date_picker_view_animator_height"
<LinearLayout android:gravity="center" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="@dimen/date_picker_view_animator_height"
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout android:layout_gravity="center" android:orientation="vertical" android:background="@color/white" android:layout_width="wrap_content" android:layout_height="fill_parent">
<LinearLayout android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="0.0dip" android:layout_weight="1.0">
<LinearLayout android:layout_gravity="center" android:orientation="horizontal" android:background="@color/white" android:layout_width="wrap_content" android:layout_height="fill_parent">
<LinearLayout android:orientation="vertical" android:layout_width="0.0dip" android:layout_height="match_parent" android:layout_weight="1.0">
<include layout="@layout/date_picker_header_view" />
<include layout="@layout/date_picker_selected_date" />
</LinearLayout>
<View android:background="@color/line_background" android:layout_width="fill_parent" android:layout_height="1.0dip" />
<include layout="@layout/date_picker_done_button" />
<include layout="@layout/date_picker_view_animator" />
</LinearLayout>
<include layout="@layout/date_picker_view_animator" />
<include layout="@layout/picker_done_button" android:layout_width="match_parent" android:layout_height="wrap_content" />
</LinearLayout>
56 changes: 19 additions & 37 deletions datetimepicker-library/res/layout-land/time_picker_dialog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,56 +16,38 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/time_picker_dialog"
android:layout_height="@dimen/dialog_height"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="horizontal"
android:orientation="vertical"
android:focusable="true"
android:layout_marginLeft="@dimen/minimum_margin_sides"
android:layout_marginRight="@dimen/minimum_margin_sides"
android:layout_marginTop="@dimen/minimum_margin_top_bottom"
android:layout_marginBottom="@dimen/minimum_margin_top_bottom" >
<LinearLayout
android:layout_width="@dimen/left_side_width"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_width="wrap_content"
android:layout_height="@dimen/dialog_height"
android:orientation="horizontal">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:background="@color/white" >
android:layout_width="@dimen/left_side_width"
android:layout_height="match_parent"
android:background="@color/blue" >
<include
layout="@layout/time_header_label"
android:layout_width="match_parent"
android:layout_height="@dimen/header_height"
android:layout_gravity="center" />
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="@color/line_background" />
<LinearLayout
style="?android:attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@color/white" >
<Button
android:id="@+id/done_button"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="48dp"
android:text="@string/done_label"
android:textSize="@dimen/done_label_size"
android:textColor="@color/done_text_color" />
</LinearLayout>
<com.sleepbot.datetimepicker.time.RadialPickerLayout
android:id="@+id/time_picker"
android:layout_width="@dimen/picker_dimen"
android:layout_height="match_parent"
android:layout_gravity="center"
android:focusable="true"
android:focusableInTouchMode="true"
android:background="@color/circle_background" />
</LinearLayout>
<com.sleepbot.datetimepicker.time.RadialPickerLayout
android:id="@+id/time_picker"
android:layout_width="@dimen/picker_dimen"
android:layout_height="match_parent"
android:layout_gravity="center"
android:focusable="true"
android:focusableInTouchMode="true"
android:background="@color/circle_background" />
<include layout="@layout/picker_done_button"
android:layout_height="wrap_content"
android:layout_width="match_parent" />
</LinearLayout>
11 changes: 5 additions & 6 deletions datetimepicker-library/res/layout-sw600dp-land/date_picker_dialog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:gravity="center" android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="@dimen/date_picker_view_animator_height"
<LinearLayout android:gravity="center" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="@dimen/date_picker_view_animator_height"
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout android:layout_gravity="center" android:orientation="vertical" android:background="@color/white" android:layout_width="wrap_content" android:layout_height="fill_parent">
<LinearLayout android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="0.0dip" android:layout_weight="1.0">
<LinearLayout android:layout_gravity="center" android:orientation="horizontal" android:background="@color/white" android:layout_width="wrap_content" android:layout_height="fill_parent">
<LinearLayout android:orientation="vertical" android:layout_width="0.0dip" android:layout_height="match_parent" android:layout_weight="1.0">
<include layout="@layout/date_picker_header_view" />
<include layout="@layout/date_picker_selected_date" />
</LinearLayout>
<View android:background="@color/line_background" android:layout_width="fill_parent" android:layout_height="1.0dip" />
<include layout="@layout/date_picker_done_button" />
<include layout="@layout/date_picker_view_animator" />
</LinearLayout>
<include layout="@layout/date_picker_view_animator" />
<include layout="@layout/picker_done_button" />
</LinearLayout>
3 changes: 1 addition & 2 deletions datetimepicker-library/res/layout-sw600dp/date_picker_dialog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
<include layout="@layout/date_picker_selected_date" />
</LinearLayout>
<include layout="@layout/date_picker_view_animator" />
<View android:background="@color/line_background" android:layout_width="fill_parent" android:layout_height="1.0dip" />
<include layout="@layout/date_picker_done_button" />
<include layout="@layout/picker_done_button" />
</LinearLayout>
3 changes: 1 addition & 2 deletions datetimepicker-library/res/layout-w270dp-h560dp/date_picker_dialog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
<include layout="@layout/date_picker_selected_date" />
</LinearLayout>
<include layout="@layout/date_picker_view_animator" />
<View android:background="@color/line_background" android:layout_width="fill_parent" android:layout_height="1.0dip" />
<include layout="@layout/date_picker_done_button" />
<include layout="@layout/picker_done_button" />
</LinearLayout>
3 changes: 1 addition & 2 deletions datetimepicker-library/res/layout/date_picker_dialog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@
<include layout="@layout/date_picker_selected_date" />
</LinearLayout>
<include layout="@layout/date_picker_view_animator" />
<View android:background="@color/line_background" android:layout_width="@dimen/date_picker_component_width" android:layout_height="1.0dip" />
<include layout="@layout/date_picker_done_button" />
<include layout="@layout/picker_done_button" />
</LinearLayout>
18 changes: 0 additions & 18 deletions datetimepicker-library/res/layout/date_picker_done_button.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion datetimepicker-library/res/layout/date_picker_selected_date.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:gravity="center" android:orientation="vertical" android:id="@id/day_picker_selected_date_layout" android:background="@color/white" android:layout_width="@dimen/date_picker_component_width" android:layout_height="0.0dip" android:layout_weight="1.0"
<LinearLayout android:gravity="center" android:orientation="vertical" android:id="@id/day_picker_selected_date_layout" android:background="@color/blue" android:layout_width="@dimen/date_picker_component_width" android:layout_height="0.0dip" android:layout_weight="1.0"
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout android:textColor="@color/date_picker_selector" android:layout_gravity="center" android:orientation="vertical" android:id="@id/date_picker_month_and_day" android:clickable="true" android:layout_width="fill_parent" android:layout_height="wrap_content">
<TextView android:textSize="@dimen/selected_date_month_size" android:textColor="@color/date_picker_selector" android:gravity="bottom|center" android:id="@id/date_picker_month" android:duplicateParentState="true" android:layout_width="fill_parent" android:layout_height="wrap_content" android:includeFontPadding="false" />
Expand Down
34 changes: 34 additions & 0 deletions datetimepicker-library/res/layout/picker_done_button.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="@dimen/date_picker_component_width"
android:layout_height="wrap_content"
android:background="@color/circle_background"
android:padding="@dimen/view_margin_medium"
style="?android:attr/buttonBarStyle">

<Button
android:textSize="@dimen/done_label_size"
android:textColor="@color/done_text_color"
android:id="@id/cancel_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/view_margin_medium"
android:text="@string/cancel_label"
android:layout_toStartOf="@id/done_button"
android:layout_toLeftOf="@id/done_button"
style="@style/button_bar_button" />

<Button
android:textSize="@dimen/done_label_size"
android:textColor="@color/done_text_color"
android:id="@id/done_button"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_margin="@dimen/view_margin_medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/done_label"
style="@style/button_bar_button" />
</RelativeLayout>
4 changes: 2 additions & 2 deletions datetimepicker-library/res/layout/time_header_label.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:background="@color/white" >
android:background="@color/blue" >
<View
android:id="@+id/center_view"
android:layout_width="1dp"
Expand Down Expand Up @@ -51,7 +51,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/time_placeholder"
android:textColor="@color/blue"
android:textColor="@color/white"
android:gravity="center_horizontal"
android:layout_gravity="center"
style="@style/time_label" />
Expand Down
22 changes: 3 additions & 19 deletions datetimepicker-library/res/layout/time_picker_dialog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,7 @@
android:layout_gravity="center"
android:focusable="true"
android:focusableInTouchMode="true" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="@color/line_background" />
<LinearLayout
style="?android:attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<Button
android:id="@+id/done_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="48dp"
android:text="@string/done_label"
android:textSize="@dimen/done_label_size"
android:textColor="@color/done_text_color"
style="?android:attr/buttonBarButtonStyle" />
</LinearLayout>
<include layout="@layout/picker_done_button"
android:layout_height="wrap_content"
android:layout_width="match_parent" />
</LinearLayout>
12 changes: 12 additions & 0 deletions datetimepicker-library/res/values-v14/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="button_bar_button" parent="@android:style/Widget.Holo.Button.Borderless">
<item name="android:gravity">center</item>
<item name="android:minHeight">36dip</item>
<item name="android:minWidth">64dip</item>
<item name="android:paddingBottom">8dip</item>
<item name="android:paddingTop">8dip</item>
<item name="android:textAllCaps">true</item>
<item name="android:textStyle">bold</item>
</style>
</resources>
2 changes: 1 addition & 1 deletion datetimepicker-library/res/values-v16/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- DO NOT TRANSLATE -->
<string name="day_of_week_label_typeface">sans-serif-light</string>
<string name="day_of_week_label_typeface">sans-serif-medium</string>
</resources>
4 changes: 4 additions & 0 deletions datetimepicker-library/res/values-v17/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

</resources>
6 changes: 4 additions & 2 deletions datetimepicker-library/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="white">#ffffffff</color>
<color name="grey">#ddd</color>
<color name="circle_background">#fff2f2f2</color>
<color name="line_background">#ffcccccc</color>
<color name="done_text_color_normal">#ff333333</color>
<color name="done_text_color_normal">@color/blue</color>
<color name="done_text_color_disabled">#ffcccccc</color>
<color name="blue">#ff33b5e5</color>
<color name="darker_blue">#ff0099cc</color>
<color name="date_picker_text_normal">#ff999999</color>
<color name="calendar_header">#ff999999</color>
<color name="calendar_header">@color/darker_blue</color>
<color name="date_picker_view_animator">#fff2f2f2</color>

<color name="ampm_text_color">#8c8c8c</color>
<color name="numbers_text_color">#8c8c8c</color>

<color name="transparent_white">#aaffffff</color>
<color name="transparent_black">#7F000000</color>
</resources>
7 changes: 5 additions & 2 deletions datetimepicker-library/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="done_label_size">14sp</dimen>
<dimen name="done_button_panel_height">48dip</dimen>
<dimen name="date_picker_component_width">270dip</dimen>
<dimen name="date_picker_header_height">30dip</dimen>
<dimen name="selected_calendar_layout_height">155dip</dimen>
<dimen name="date_picker_view_animator_height">270dip</dimen>
<dimen name="month_list_item_header_height">50dip</dimen>
<dimen name="month_day_label_text_size">10sp</dimen>
<dimen name="month_day_label_text_size">12sp</dimen>
<dimen name="day_number_select_circle_radius">16dip</dimen>
<dimen name="month_select_circle_radius">45dip</dimen>
<dimen name="selected_date_year_size">30dip</dimen>
<dimen name="selected_date_day_size">75dip</dimen>
<dimen name="selected_date_month_size">30dip</dimen>
<dimen name="date_picker_header_text_size">14dip</dimen>
<dimen name="month_label_size">16sp</dimen>
<dimen name="day_number_size">16sp</dimen>
<dimen name="day_number_size">12sp</dimen>
<dimen name="year_label_height">64dip</dimen>
<dimen name="year_label_text_size">22dip</dimen>

Expand All @@ -28,6 +29,8 @@
<dimen name="minimum_margin_sides">48dip</dimen>
<dimen name="minimum_margin_top_bottom">24dip</dimen>

<dimen name="view_margin_medium">8dip</dimen>

<item name="circle_radius_multiplier" format="float" type="string">0.82</item>
<item name="circle_radius_multiplier_24HourMode" format="float" type="string">0.85</item>
<item name="selection_radius_multiplier" format="float" type="string">0.16</item>
Expand Down
3 changes: 2 additions & 1 deletion datetimepicker-library/res/values/ids.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item type="id" name="done">false</item>
<item type="id" name="done_button">false</item>
<item type="id" name="cancel_button">false</item>
<item type="id" name="date_picker_header">false</item>
<item type="id" name="day_picker_selected_date_layout">false</item>
<item type="id" name="date_picker_month_and_day">false</item>
Expand Down
3 changes: 2 additions & 1 deletion datetimepicker-library/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:xliff="http://schemas.android.com/apk/res/android">
<string name="done_label">Done</string>
<string name="done_label">OK</string>
<string name="cancel_label">Cancel</string>
<string name="day_picker_description">Month grid of days</string>
<string name="year_picker_description">Year list</string>
<string name="select_day">Select month and day</string>
Expand Down
16 changes: 14 additions & 2 deletions datetimepicker-library/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,26 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="time_label">
<item name="android:textSize">@dimen/time_label_size</item>
<item name="android:textColor">@color/numbers_text_color</item>
<item name="android:textColor">@color/transparent_white</item>
</style>

<style name="ampm_label">
<item name="android:textSize">@dimen/ampm_label_size</item>
<item name="android:textColor">@color/ampm_text_color</item>
<item name="android:textColor">@color/transparent_white</item>
<item name="android:textStyle">bold</item>
</style>

<style name="day_of_week_label_condensed" />

<style name="button_bar_button">
<item name="android:background">?android:attr/selectableItemBackground</item>
<item name="android:gravity">center</item>
<item name="android:minHeight">36dip</item>
<item name="android:minWidth">64dip</item>
<item name="android:paddingBottom">8dip</item>
<item name="android:paddingLeft">8dip</item>
<item name="android:paddingTop">8dip</item>
<item name="android:paddingRight">8dip</item>
<item name="android:textStyle">bold</item>
</style>
</resources>
Loading