Merge branch 'release/1.1.0'

Author: Artjom König

.gitignore

@@ -21,3 +21,4 @@ local.properties
 
 # Proguard folder generated by Eclipse
 proguard/
+datetimepicker.iml

README.md

@@ -1,7 +1,7 @@
 StylableDateTimePicker
 ======================
 
-A styleable version of the date/time picker for Android 4.0+
+A styleable version of the date/time picker for Android 4.0+ with embedding support (using as normal fragment)
 
 ![Styled DatePicker](/../screenshots/screenshots/screenshot.png?raw=true "Example Theme")
 
@@ -15,6 +15,9 @@ Declare your style:
     <item name="buttonTextColor">...</item>
     <item name="circleHighlightColor">...</item>
     <item name="defaultTextColor">...</item>
+    <item name="selectedDayTextSize">...</item>
+    <item name="selectedMonthTextSize">...</item>
+    <item name="selectedYearTextSize">...</item>
 </style>
 ```
 
@@ -23,3 +26,11 @@ Create the DatePicker/TimePicker with
 ```java
 DatePickerDialog dialog = DatePickerDialog.newInstance(callBack, year, monthOfYear, dayOfMonth, R.style.DateTimePicker);
 ```
+You can also add the pickers as content in your view hierarchy:
+
+```java
+DatePickerDialog picker = DatePickerDialog.newInstance(...);
+FragmentTransaction ft = getFragmentManager().beginTransaction();
+ft.add(R.id.picker_wrapper, picker);
+ft.commit();
+```

build.gradle

@@ -10,7 +10,7 @@ dependencies {
 
 android {
     compileSdkVersion 19
-    buildToolsVersion "19.1.0"
+    buildToolsVersion '19.1.0'
 
     defaultConfig {
         minSdkVersion 14

datetimepicker.iml

@@ -15,24 +15,26 @@
      limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/date_picker_component_width"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/date_picker_view_animator"
     android:gravity="center"
     android:orientation="vertical" >
 
     <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/selected_calendar_layout_height"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
         android:orientation="vertical" >
 
+        <include layout="@layout/date_picker_header_view" />
         <include layout="@layout/date_picker_selected_date" />
     </LinearLayout>
 
     <include layout="@layout/date_picker_view_animator" />
 
     <View
-        android:layout_width="@dimen/date_picker_component_width"
+        android:layout_width="match_parent"
         android:layout_height="1dip"
         android:background="@color/line_background" />
 

res/layout-w270dp-h560dp/date_picker_dialog.xml

@@ -15,7 +15,7 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     style="?android:attr/buttonBarStyle"
-    android:layout_width="@dimen/date_picker_component_width"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical" >
 

res/layout/date_picker_dialog.xml

@@ -16,7 +16,7 @@
 -->
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
           android:id="@+id/date_picker_header"
-    android:layout_width="@dimen/date_picker_component_width"
+    android:layout_width="match_parent"
     android:layout_height="@dimen/date_picker_header_height"
     android:background="?headerBackgroundColor"
     android:gravity="center"

res/layout/date_picker_done_button.xml

@@ -17,11 +17,12 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/day_picker_selected_date_layout"
-    android:layout_width="@dimen/date_picker_component_width"
-    android:layout_height="0dip"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
     android:layout_weight="1"
     android:background="@color/white"
     android:gravity="center"
+    android:padding="8dp"
     android:orientation="vertical" >
 
     <com.android.datetimepicker.AccessibleLinearLayout
@@ -41,20 +42,18 @@
             android:gravity="center_horizontal|bottom"
             android:includeFontPadding="false"
             android:textColor="?hightlightedTextColor"
-            android:textSize="@dimen/selected_date_month_size" />
+            android:textSize="?selectedMonthTextSize" />
 
         <TextView
             android:id="@+id/date_picker_day"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginBottom="-10dip"
-            android:layout_marginTop="-10dip"
             android:duplicateParentState="true"
             android:gravity="center"
             android:includeFontPadding="false"
             android:textColor="?hightlightedTextColor"
-            android:textSize="@dimen/selected_date_day_size" />
+            android:textSize="?selectedDayTextSize" />
     </com.android.datetimepicker.AccessibleLinearLayout>
 
     <com.android.datetimepicker.AccessibleTextView
@@ -65,6 +64,6 @@
         android:gravity="center_horizontal|top"
         android:includeFontPadding="false"
         android:textColor="?hightlightedTextColor"
-        android:textSize="@dimen/selected_date_year_size" />
+        android:textSize="?selectedYearTextSize" />
 
 </LinearLayout>

res/layout/date_picker_header_view.xml

@@ -16,7 +16,7 @@
 <com.android.datetimepicker.date.AccessibleDateAnimator
      xmlns:android="http://schemas.android.com/apk/res/android"
      android:id="@+id/animator"
-     android:layout_width="@dimen/date_picker_component_width"
+     android:layout_width="match_parent"
      android:layout_height="@dimen/date_picker_view_animator_height"
      android:gravity="center"
      android:background="@color/date_picker_view_animator" />