* fix incorrect selected date within HijriCalender (for version 2)

* fix hidden labels with some fonts
alhazmy13 · Aug 13, 2017 · 9e46a74 · 9e46a74
1 parent 11ccd19
commit 9e46a74
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 ![](https://img.shields.io/badge/Platform-Android-brightgreen.svg)
 ![](https://img.shields.io/badge/Android-CustomView-blue.svg)
 ![](https://img.shields.io/crates/l/rustc-serialize.svg)
-![](https://img.shields.io/badge/version-2.0.1-blue.svg)
+![](https://img.shields.io/badge/version-2.0.2-blue.svg)
 
 This library offers a hijri (Islamic Calendar) Date Picker  designed on [Google's Material Design Principals For Pickers](http://www.google.com/design/spec/components/pickers.html) for Android 4.1 (API 16) +.
 
@@ -28,15 +28,15 @@ You can report any issue on issues page. **Note: If you speak Arabic, you can su
 <dependency>
 <groupId>net.alhazmy13.hijridatepicker</groupId>
 <artifactId>library</artifactId>
-<version>2.0.1</version>
+<version>2.0.2</version>
 </dependency>
 ```
 **Gradle**
 
 ```gradle
 
 dependencies {
-	compile 'net.alhazmy13.hijridatepicker:library:2.0.1'
+	compile 'net.alhazmy13.hijridatepicker:library:2.0.2'
 }
 ```
 

diff --git a/library/build.gradle b/library/build.gradle
@@ -8,7 +8,7 @@ publish {
     groupId = 'net.alhazmy13.hijridatepicker'
     artifactId = 'library'
     uploadName = 'HijriDatePicker-v2'
-    publishVersion = '2.0.1'
+    publishVersion = '2.0.2'
     desc = 'Hijri Date Picker'
     dryRun = false
     website = 'https://github.com/alhzmy13/HijriDatePicker'

diff --git a/library/library.iml b/library/library.iml
@@ -63,20 +63,20 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/docs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />

diff --git a/library/src/main/java/net/alhazmy13/hijridatepicker/date/hijri/HijriDatePickerDialog.java b/library/src/main/java/net/alhazmy13/hijridatepicker/date/hijri/HijriDatePickerDialog.java
@@ -547,7 +547,11 @@ private void updateDisplay(boolean announce) {
         }
 
         if (mVersion == Version.VERSION_2) {
-            mSelectedDayTextView.setText(VERSION_2_FORMAT.format(mCalendar.getTime()));
+            String day =
+                    mCalendar.getDisplayName(UmmalquraCalendar.DAY_OF_WEEK,UmmalquraCalendar.SHORT,getLocal())
+                    +", "+ mCalendar.getDisplayName(UmmalquraCalendar.MONTH,UmmalquraCalendar.SHORT,getLocal())
+                    + " "+mCalendar.get(Calendar.DAY_OF_MONTH);
+            mSelectedDayTextView.setText(day);
             if (mTitle != null)
                 mDatePickerHeaderView.setText(mTitle.toUpperCase(Locale.getDefault()));
             else

diff --git a/library/src/main/res/layout/mdtp_date_picker_selected_date.xml b/library/src/main/res/layout/mdtp_date_picker_selected_date.xml
@@ -19,7 +19,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/mdtp_day_picker_selected_date_layout"
     android:layout_width="@dimen/mdtp_date_picker_component_width"
-    android:layout_height="@dimen/mdtp_selected_date_height"
+    android:layout_height="wrap_content"
     android:layout_weight="1"
     android:background="@color/mdtp_accent_color"
     android:gravity="center"

diff --git a/library/src/main/res/layout/mdtp_date_picker_selected_date_v2.xml b/library/src/main/res/layout/mdtp_date_picker_selected_date_v2.xml
@@ -19,7 +19,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/mdtp_day_picker_selected_date_layout"
     android:layout_width="@dimen/mdtp_date_picker_header_width"
-    android:layout_height="@dimen/mdtp_date_picker_header_height"
+    android:layout_height="wrap_content"
     android:layout_weight="1"
     android:background="@color/mdtp_accent_color"
     android:gravity="top"

diff --git a/library/src/main/res/layout/mdtp_hijri_date_picker_selected_date.xml b/library/src/main/res/layout/mdtp_hijri_date_picker_selected_date.xml
@@ -19,7 +19,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/mdtp_hijri_day_picker_selected_date_layout"
     android:layout_width="@dimen/mdtp_date_picker_component_width"
-    android:layout_height="@dimen/mdtp_selected_date_height"
+    android:layout_height="wrap_content"
     android:layout_weight="1"
     android:background="@color/mdtp_accent_color"
     android:gravity="center"

diff --git a/library/src/main/res/layout/mdtp_hijri_date_picker_selected_date_v2.xml b/library/src/main/res/layout/mdtp_hijri_date_picker_selected_date_v2.xml
@@ -19,7 +19,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/mdtp_hijri_day_picker_selected_date_layout"
     android:layout_width="@dimen/mdtp_date_picker_header_width"
-    android:layout_height="@dimen/mdtp_date_picker_header_height"
+    android:layout_height="wrap_content"
     android:layout_weight="1"
     android:background="@color/mdtp_accent_color"
     android:gravity="top"

diff --git a/sample/sample.iml b/sample/sample.iml
@@ -62,20 +62,20 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />