App bar fix and adroidx migration

build.gradle

@@ -8,7 +8,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.0'
+    classpath 'com.android.tools.build:gradle:3.5.3'
     classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
   }
 }

dependencies.gradle

@@ -7,12 +7,13 @@ ext {
   junitVersion = '4.12'
   runnerVersion = '0.5'
   supportVersion = '27.0.2'
+  constraint_layout = '2.0.0-beta3'
 
-  supportV4 = "com.android.support:support-v4:$supportVersion"
-  supportDesign = "com.android.support:design:$supportVersion"
-  supportAnnotations = "com.android.support:support-annotations:$supportVersion"
-  supportAppCompat = "com.android.support:appcompat-v7:$supportVersion"
-  recyclerviewV7 = "com.android.support:recyclerview-v7:$supportVersion"
+  supportV4 = 'androidx.legacy:legacy-support-v4:1.0.0'
+  supportDesign = "com.google.android.material:material:1.2.0-alpha02"
+  supportAnnotations = 'androidx.annotation:annotation:1.0.0'
+  supportAppCompat = 'androidx.appcompat:appcompat:1.0.0'
+  recyclerviewV7 = 'androidx.recyclerview:recyclerview:1.0.0'
 
   // Test
   junit = "junit:junit:$junitVersion"
@@ -24,10 +25,13 @@ ext {
   hamcrestLibrary = "org.hamcrest:hamcrest-library:$hamcrestVersion"
   hamcrestIntegration = "org.hamcrest:hamcrest-integration:$hamcrestVersion"
 
+  //constraintlayout
+  constraintlayout = "androidx.constraintlayout:constraintlayout:$constraint_layout"
+
   // Other
-  threeTenAbp = 'com.jakewharton.threetenabp:threetenabp:1.1.1'
-  butterknife = 'com.jakewharton:butterknife:8.5.1'
-  butterknifeCompiler = 'com.jakewharton:butterknife-compiler:8.5.1'
+  threeTenAbp = 'com.jakewharton.threetenabp:threetenabp:1.2.1'
+  butterknife = 'com.jakewharton:butterknife:10.2.1'
+  butterknifeCompiler = 'com.jakewharton:butterknife-compiler:10.2.1'
 
   testDep = [junit,
              hamcrestCore,

gradle.properties

@@ -18,4 +18,6 @@
 # org.gradle.parallel=true
 
 VERSION_NAME = 2.0.1
-VERSION_CODE = 19
+VERSION_CODE = 19
+android.useAndroidX=true
+android.enableJetifier=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
-distributionBase = GRADLE_USER_HOME
-distributionPath = wrapper/dists
-distributionUrl  = https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
-zipStoreBase     = GRADLE_USER_HOME
-zipStorePath     = wrapper/dists
+#Fri Dec 20 18:30:58 IST 2019
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

library/build.gradle

@@ -32,8 +32,8 @@ archivesBaseName = 'material-calendarview'
 dependencies {
   implementation rootProject.ext.threeTenAbp
   implementation rootProject.ext.supportV4
-  implementation rootProject.ext.supportAppCompat
-  implementation rootProject.ext.supportAnnotations
+  implementation 'androidx.appcompat:appcompat:1.1.0'
+  implementation 'androidx.annotation:annotation:1.1.0'
 
   rootProject.ext.testDep.each { testImplementation it }
   rootProject.ext.androidTestDep.each { androidTestImplementation it }

library/src/main/java/com/prolificinteractive/materialcalendarview/CalendarDay.java

@@ -2,8 +2,8 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import org.threeten.bp.LocalDate;
 
 /**

library/src/main/java/com/prolificinteractive/materialcalendarview/CalendarPager.java

@@ -1,9 +1,9 @@
 package com.prolificinteractive.materialcalendarview;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
@@ -52,7 +52,7 @@ public boolean onTouchEvent(MotionEvent ev) {
   public boolean canScrollVertically(int direction) {
     /**
      * disables scrolling vertically when paging disabled, fixes scrolling
-     * for nested {@link android.support.v4.view.ViewPager}
+     * for nested {@link ViewPager}
      */
     return pagingEnabled && super.canScrollVertically(direction);
   }
@@ -61,7 +61,7 @@ public boolean canScrollVertically(int direction) {
   public boolean canScrollHorizontally(int direction) {
     /**
      * disables scrolling horizontally when paging disabled, fixes scrolling
-     * for nested {@link android.support.v4.view.ViewPager}
+     * for nested {@link ViewPager}
      */
     return pagingEnabled && super.canScrollHorizontally(direction);
   }

library/src/main/java/com/prolificinteractive/materialcalendarview/CalendarPagerAdapter.java

@@ -1,8 +1,8 @@
 package com.prolificinteractive.materialcalendarview;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.PagerAdapter;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.PagerAdapter;
 import android.view.View;
 import android.view.ViewGroup;
 import com.prolificinteractive.materialcalendarview.MaterialCalendarView.ShowOtherDates;

library/src/main/java/com/prolificinteractive/materialcalendarview/CalendarPagerView.java

@@ -1,7 +1,7 @@
 package com.prolificinteractive.materialcalendarview;
 
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;

library/src/main/java/com/prolificinteractive/materialcalendarview/DayView.java

@@ -13,8 +13,8 @@
 import android.graphics.drawable.StateListDrawable;
 import android.graphics.drawable.shapes.OvalShape;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.AppCompatCheckedTextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatCheckedTextView;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.view.Gravity;
@@ -223,7 +223,7 @@ private static Drawable generateBackground(int color, int fadeTime, Rect bounds)
       drawable.addState(new int[] { android.R.attr.state_pressed }, generateCircleDrawable(color));
     }
 
-    drawable.addState(new int[] { }, generateCircleDrawable(Color.TRANSPARENT));
+//    drawable.addState(new int[] { }, generateCircleDrawable(Color.TRANSPARENT));
 
     return drawable;
   }

library/src/main/java/com/prolificinteractive/materialcalendarview/DayViewFacade.java

@@ -1,7 +1,7 @@
 package com.prolificinteractive.materialcalendarview;
 
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;

library/src/main/java/com/prolificinteractive/materialcalendarview/LocalUtils.java

@@ -1,7 +1,7 @@
 package com.prolificinteractive.materialcalendarview;
 
-import android.support.v4.text.TextUtilsCompat;
-import android.support.v4.view.ViewCompat;
+import androidx.core.text.TextUtilsCompat;
+import androidx.core.view.ViewCompat;
 import java.util.Locale;
 
 class LocalUtils {

library/src/main/java/com/prolificinteractive/materialcalendarview/MaterialCalendarView.java

@@ -9,12 +9,12 @@
 import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.ArrayRes;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.ArrayRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.util.SparseArray;
 import android.util.TypedValue;

library/src/main/java/com/prolificinteractive/materialcalendarview/MaterialCalendarViewInitProvider.java

@@ -6,8 +6,8 @@
 import android.content.pm.ProviderInfo;
 import android.database.Cursor;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.jakewharton.threetenabp.AndroidThreeTen;
 
 /**

library/src/main/java/com/prolificinteractive/materialcalendarview/MonthPagerAdapter.java

@@ -1,6 +1,6 @@
 package com.prolificinteractive.materialcalendarview;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import org.threeten.bp.Period;
 
 /**

library/src/main/java/com/prolificinteractive/materialcalendarview/MonthView.java

@@ -1,7 +1,7 @@
 package com.prolificinteractive.materialcalendarview;
 
 import android.annotation.SuppressLint;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import java.util.Collection;
 import org.threeten.bp.DayOfWeek;
 import org.threeten.bp.LocalDate;

library/src/main/java/com/prolificinteractive/materialcalendarview/OnDateLongClickListener.java

@@ -1,6 +1,6 @@
 package com.prolificinteractive.materialcalendarview;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * The callback used to indicate a date has been long clicked.

library/src/main/java/com/prolificinteractive/materialcalendarview/OnDateSelectedListener.java

@@ -1,6 +1,6 @@
 package com.prolificinteractive.materialcalendarview;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * The callback used to indicate a date has been selected or deselected

library/src/main/java/com/prolificinteractive/materialcalendarview/OnRangeSelectedListener.java

@@ -1,6 +1,6 @@
 package com.prolificinteractive.materialcalendarview;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import java.util.List;
 
 /**

library/src/main/java/com/prolificinteractive/materialcalendarview/TitleChanger.java

@@ -2,8 +2,8 @@
 
 import android.animation.Animator;
 import android.content.res.Resources;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.TypedValue;
 import android.view.ViewPropertyAnimator;

library/src/main/java/com/prolificinteractive/materialcalendarview/WeekDayView.java

@@ -3,8 +3,8 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatTextView;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatTextView;
 import android.view.Gravity;
 import com.prolificinteractive.materialcalendarview.format.WeekDayFormatter;
 import org.threeten.bp.DayOfWeek;

library/src/main/java/com/prolificinteractive/materialcalendarview/WeekPagerAdapter.java

@@ -1,6 +1,6 @@
 package com.prolificinteractive.materialcalendarview;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import org.threeten.bp.DayOfWeek;
 import org.threeten.bp.LocalDate;
 import org.threeten.bp.temporal.ChronoUnit;

library/src/main/java/com/prolificinteractive/materialcalendarview/WeekView.java

@@ -1,7 +1,7 @@
 package com.prolificinteractive.materialcalendarview;
 
 import android.annotation.SuppressLint;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import java.util.Collection;
 import org.threeten.bp.DayOfWeek;
 import org.threeten.bp.LocalDate;

library/src/main/java/com/prolificinteractive/materialcalendarview/format/DateFormatDayFormatter.java

@@ -1,6 +1,6 @@
 package com.prolificinteractive.materialcalendarview.format;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.prolificinteractive.materialcalendarview.CalendarDay;
 import java.text.DateFormat;
 import java.util.Locale;

library/src/main/java/com/prolificinteractive/materialcalendarview/format/DayFormatter.java

@@ -1,6 +1,6 @@
 package com.prolificinteractive.materialcalendarview.format;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.prolificinteractive.materialcalendarview.CalendarDay;
 import java.text.SimpleDateFormat;
 

sample/build.gradle

@@ -33,5 +33,7 @@ dependencies {
   implementation rootProject.ext.supportAppCompat
   implementation rootProject.ext.recyclerviewV7
   implementation rootProject.ext.butterknife
+  implementation rootProject.ext.supportDesign
+  implementation rootProject.ext.constraintlayout
   annotationProcessor rootProject.ext.butterknifeCompiler
 }

sample/src/main/AndroidManifest.xml

@@ -289,6 +289,21 @@
 
     </activity>
 
+      <activity android:name=".CalenderOnAppBarActivity"
+          android:label="Calender On Appbar"
+          android:parentActivityName=".MainActivity"
+          android:theme="@style/AppTheme.NoActionBar">
+          <meta-data
+              android:name="android.support.PARENT_ACTIVITY"
+              android:value=".MainActivity"
+              />
+
+          <intent-filter>
+              <action android:name="android.intent.action.RUN"/>
+              <category android:name="com.prolificinteractive.materialcalendarview.sample.SAMPLE"/>
+          </intent-filter>
+      </activity>
+
   </application>
 
 </manifest>

sample/src/main/java/com/prolificinteractive/materialcalendarview/sample/BasicActivity.java

@@ -1,8 +1,8 @@
 package com.prolificinteractive.materialcalendarview.sample;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.TextView;
 import android.widget.Toast;
 import butterknife.BindView;

sample/src/main/java/com/prolificinteractive/materialcalendarview/sample/BasicActivityDecorated.java

@@ -3,8 +3,8 @@
 import android.graphics.Color;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import com.prolificinteractive.materialcalendarview.CalendarDay;