Merge pull request #15 from blank15/master

- fix bug in end date
kal72 · Feb 29, 2020 · 3759f3b · 3759f3b
2 parents 9758f42 + cc413c9
commit 3759f3b
Show file tree

Hide file tree

Showing 15 changed files with 156 additions and 70 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/gradle.properties b/gradle.properties
@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.

diff --git a/rackmonthpicker/build.gradle b/rackmonthpicker/build.gradle
@@ -10,7 +10,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {
@@ -23,10 +23,10 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'junit:junit:4.12'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
 }
diff --git a/rackmonthpicker/src/androidTest/java/com/kal/rackmonthpicker/ExampleInstrumentedTest.java b/rackmonthpicker/src/androidTest/java/com/kal/rackmonthpicker/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.kal.rackmonthpicker;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/rackmonthpicker/src/main/java/com/kal/rackmonthpicker/MonthAdapter.java b/rackmonthpicker/src/main/java/com/kal/rackmonthpicker/MonthAdapter.java
@@ -4,8 +4,8 @@
 import android.graphics.drawable.GradientDrawable;
 import android.graphics.drawable.LayerDrawable;
 import android.graphics.drawable.StateListDrawable;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -99,7 +99,7 @@ public int getStartDate() {
 
     public int getEndDate() {
         Calendar cal = Calendar.getInstance();
-        cal.set(Calendar.MONTH, selectedItem + 1);
+        cal.set(Calendar.MONTH, selectedItem );
         cal.set(Calendar.DAY_OF_MONTH, selectedItem + 1);
         int maxDay = cal.getActualMaximum(Calendar.DAY_OF_MONTH);
         return maxDay;
@@ -120,8 +120,8 @@ class MonthHolder extends RecyclerView.ViewHolder implements View.OnClickListene
 
         public MonthHolder(View itemView) {
             super(itemView);
-            layoutMain = (LinearLayout) itemView.findViewById(R.id.main_layout);
-            textViewMonth = (TextView) itemView.findViewById(R.id.text_month);
+            layoutMain = itemView.findViewById(R.id.main_layout);
+            textViewMonth =  itemView.findViewById(R.id.text_month);
             if (color != 0)
                 setMonthBackgroundSelected(color);
 

diff --git a/rackmonthpicker/src/main/java/com/kal/rackmonthpicker/RackMonthPicker.java b/rackmonthpicker/src/main/java/com/kal/rackmonthpicker/RackMonthPicker.java
@@ -4,11 +4,11 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.drawable.ColorDrawable;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.util.Log;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AlertDialog;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/...nthpicker/src/main/java/com/kal/rackmonthpicker/listener/OnCancelMonthDialogListener.java b/...nthpicker/src/main/java/com/kal/rackmonthpicker/listener/OnCancelMonthDialogListener.java
@@ -1,6 +1,6 @@
 package com.kal.rackmonthpicker.listener;
 
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 
 /**
  * Created by kristiawan on 31/12/16.

diff --git a/rackmonthpicker/src/main/res/layout/dialog_month_picker.xml b/rackmonthpicker/src/main/res/layout/dialog_month_picker.xml
@@ -31,12 +31,12 @@
                 android:orientation="horizontal"
                 android:padding="16dp">
 
-                <TextView
+                <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:fontFamily="sans-serif"
-                    android:text="Month Picker"
+                    android:text="@string/month_picker"
                     android:textColor="@android:color/white"
                     android:textSize="18sp"
                     android:textStyle="bold" />
@@ -62,13 +62,13 @@
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="5dp">
 
-                        <ImageView
+                        <androidx.appcompat.widget.AppCompatImageView
                             android:id="@+id/btn_previous"
                             android:layout_width="60dp"
                             android:layout_height="25dp"
                             android:src="@drawable/back" />
 
-                        <ImageView
+                        <androidx.appcompat.widget.AppCompatImageView
                             android:id="@+id/btn_next"
                             android:layout_width="60dp"
                             android:layout_height="25dp"
@@ -77,27 +77,27 @@
                             android:layout_alignParentTop="true"
                             android:src="@drawable/forward" />
 
-                        <TextView
+                        <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/text_year"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_centerHorizontal="true"
                             android:layout_centerVertical="true"
                             android:fontFamily="sans-serif"
-                            android:text="2016"
+                            tools:text="2016"
                             android:textColor="@color/black_de"
                             android:textSize="18sp" />
                     </RelativeLayout>
 
-                    <android.support.v7.widget.RecyclerView
+                    <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/recycler_view"
                         android:paddingRight="24dp"
                         android:paddingLeft="24dp"
                         android:layout_gravity="center"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content">
 
-                    </android.support.v7.widget.RecyclerView>
+                    </androidx.recyclerview.widget.RecyclerView>
                 </LinearLayout>
             </ScrollView>
         </LinearLayout>
@@ -111,28 +111,26 @@
             android:paddingBottom="10dp"
             android:paddingTop="16dp">
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_n"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/button"
+                style="@style/Widget.AppCompat.Button.Colored"
                 android:fontFamily="sans-serif"
                 android:padding="10dp"
                 android:stateListAnimator="@null"
-                android:text="CANCEL"
-                android:textColor="@color/color_primary" />
+                android:text="@string/cancel" />
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_p"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginRight="16dp"
-                android:background="@drawable/button"
                 android:fontFamily="sans-serif"
+                style="@style/Widget.AppCompat.Button.Colored"
                 android:padding="10dp"
                 android:stateListAnimator="@null"
-                android:text="OK"
-                android:textColor="@color/color_primary" />
+                android:text="@string/ok"/>
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
diff --git a/rackmonthpicker/src/main/res/layout/item_view_month.xml b/rackmonthpicker/src/main/res/layout/item_view_month.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_layout"
     android:layout_width="52dp"
     android:layout_height="52dp"
@@ -8,11 +9,11 @@
     android:layout_margin="5dp"
     android:orientation="vertical">
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/text_month"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="19sp"
         android:textColor="@drawable/text_selector"
-        android:text="Jan"/>
+        tools:text="Jan"/>
 </LinearLayout>
diff --git a/rackmonthpicker/src/main/res/values/strings.xml b/rackmonthpicker/src/main/res/values/strings.xml
@@ -1,3 +1,6 @@
 <resources>
     <string name="app_name">DateMonthDialog</string>
+    <string name="month_picker">Month Picker</string>
+    <string name="cancel">CANCEL</string>
+    <string name="ok">OK</string>
 </resources>
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -9,7 +9,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -21,10 +21,10 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation project(':rackmonthpicker')
 }