Skip to content

Commit

Permalink
Adding dark theme, some translation cleanup, increment Android Maven …
Browse files Browse the repository at this point in the history
…plugin version.
  • Loading branch information
derekbrameyer committed Mar 21, 2014
1 parent 5646215 commit 903a7f9
Show file tree
Hide file tree
Showing 33 changed files with 1,824 additions and 1,038 deletions.
2 changes: 1 addition & 1 deletion library/res/color/done_text_color.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">

<item android:state_enabled="false" android:color="@color/done_text_color_disabled"/>
<item android:state_enabled="true" android:color="@color/done_text_color_normal"/>
<item android:color="@color/done_text_color_normal"/>

</selector>
21 changes: 21 additions & 0 deletions library/res/color/done_text_color_dark.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2013 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">

<item android:state_enabled="false" android:color="@color/done_text_color_dark_disabled"/>
<item android:color="@color/done_text_color_dark_normal"/>

</selector>
25 changes: 25 additions & 0 deletions library/res/drawable/done_background_color.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2013 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true"
android:state_pressed="false"
android:drawable="@color/blue_focused" />

<item android:state_pressed="true"
android:drawable="@color/blue" />

<item android:drawable="@color/circle_background" />
</selector>
25 changes: 25 additions & 0 deletions library/res/drawable/done_background_color_dark.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2013 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true"
android:state_pressed="false"
android:drawable="@color/red_focused" />

<item android:state_pressed="true"
android:drawable="@color/red" />

<item android:drawable="@color/light_gray" />
</selector>
87 changes: 41 additions & 46 deletions library/res/layout-land/radial_time_picker_dialog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,57 +15,52 @@
~ limitations under the License
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/time_picker_dialog"
android:layout_height="@dimen/dialog_height"
android:layout_width="wrap_content"
android:orientation="horizontal"
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">
android:id="@+id/time_picker_dialog"
android:layout_height="@dimen/dialog_height"
android:layout_width="wrap_content"
android:orientation="horizontal"
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="@dimen/left_side_width"
android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:background="@color/white">
android:id="@+id/time_display_background"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:background="@color/white" >
<include
layout="@layout/radial_time_header_label"
android:layout_width="match_parent"
android:layout_height="@dimen/header_height"
android:layout_gravity="center"/>
layout="@layout/radial_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>
android:id="@+id/line"
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="@color/line_background" />
<Button
android:id="@+id/done_button"
android:background="@drawable/done_background_color"
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.doomonafireball.betterpickers.radialtimepicker.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"/>
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>
1 change: 1 addition & 0 deletions library/res/layout/radial_time_header_label.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
~ limitations under the License
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/time_display"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
Expand Down
26 changes: 11 additions & 15 deletions library/res/layout/radial_time_picker_dialog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
~ limitations under the License
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/time_picker_dialog"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/circle_background"
android:id="@+id/time_picker_dialog"
android:focusable="true" >
<FrameLayout
android:id="@+id/time_display_background"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white" >
Expand All @@ -36,25 +36,21 @@
android:layout_height="@dimen/picker_dimen"
android:layout_width="wrap_content"
android:layout_gravity="center"
android:background="@color/circle_background"
android:focusable="true"
android:focusableInTouchMode="true" />
<View
android:id="@+id/line"
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="@color/line_background" />
<LinearLayout
style="?android:attr/buttonBarStyle"
<Button
android:id="@+id/done_button"
android:background="@drawable/done_background_color"
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>
android:minHeight="48dp"
android:text="@string/done_label"
android:textSize="@dimen/done_label_size"
android:textColor="@color/done_text_color" />
</LinearLayout>
24 changes: 24 additions & 0 deletions library/res/values-mdpi/dimens.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="date_picker_component_width">270dp</dimen>
<dimen name="date_picker_header_height">30dp</dimen>
<dimen name="selected_calendar_layout_height">100dp</dimen>
<dimen name="date_picker_view_animator_height">270dp</dimen>
<dimen name="done_button_height">42dp</dimen>

<dimen name="month_list_item_header_height">50dp</dimen>
<dimen name="month_day_label_text_size">10sp</dimen>
<dimen name="day_number_select_circle_radius">16dp</dimen>
<dimen name="month_select_circle_radius">45dp</dimen>
<dimen name="selected_date_year_size">24dp</dimen>
<dimen name="selected_date_day_size">50dp</dimen>
<dimen name="selected_date_month_size">24dp</dimen>
<dimen name="date_picker_header_text_size">14dp</dimen>
<dimen name="month_label_size">16sp</dimen>
<dimen name="day_number_size">16sp</dimen>
<dimen name="year_label_height">64dp</dimen>
<dimen name="year_label_text_size">22dp</dimen>

<dimen name="recurrence_picker_height">340dp</dimen>
<dimen name="recurrence_picker_width">300dp</dimen>
</resources>
Loading

0 comments on commit 903a7f9

Please sign in to comment.