Migrate to androidX

healthium · Jul 21, 2020 · 04b2731 · 04b2731
1 parent 7c1fbb3
commit 04b2731
Show file tree

Hide file tree

Showing 52 changed files with 96 additions and 95 deletions.
diff --git a/demo/extras/build.gradle b/demo/extras/build.gradle
@@ -49,8 +49,8 @@ dependencies {
     compile project(':extra:extra-dragdrop')
 
     // Support Libraries
-    compile 'com.android.support:support-v4:27.0.2'
-    compile 'com.android.support:appcompat-v7:27.0.2'
+    compile 'androidx.legacy:legacy-support-v4:1.0.0'
+    compile 'androidx.appcompat:appcompat:1.0.0'
 
     //OkHttp
     //temporary patch for android-L for Okio packaging problem (see https://gist.github.com/JakeWharton/017738659d4f38adedc2)

diff --git a/demo/extras/src/main/java/it/gmariotti/cardslib/demo/extras/MainActivity.java b/demo/extras/src/main/java/it/gmariotti/cardslib/demo/extras/MainActivity.java
@@ -26,9 +26,9 @@
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
-import android.support.v4.app.ActionBarDrawerToggle;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
+import androidx.legacy.app.ActionBarDrawerToggle;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;

diff --git a/demo/extras/src/main/java/it/gmariotti/cardslib/demo/extras/fragment/BaseFragment.java b/demo/extras/src/main/java/it/gmariotti/cardslib/demo/extras/fragment/BaseFragment.java
@@ -21,7 +21,7 @@
 
 import android.app.Fragment;
 import android.os.Bundle;
-import android.support.v4.app.NavUtils;
+import androidx.core.app.NavUtils;
 import android.view.MenuItem;
 
 /**

diff --git a/demo/extras/src/main/java/it/gmariotti/cardslib/demo/extras/fragment/TwoWayViewFragment.java b/demo/extras/src/main/java/it/gmariotti/cardslib/demo/extras/fragment/TwoWayViewFragment.java
@@ -22,7 +22,7 @@
 import android.app.FragmentTransaction;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/...in/java/it/gmariotti/cardslib/demo/extras/fragment/nativeview/GoogleProgressFragment.java b/...in/java/it/gmariotti/cardslib/demo/extras/fragment/nativeview/GoogleProgressFragment.java
@@ -21,7 +21,7 @@
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;

diff --git a/demo/extras/src/main/java/it/gmariotti/cardslib/demo/extras/ui/BaseActivity.java b/demo/extras/src/main/java/it/gmariotti/cardslib/demo/extras/ui/BaseActivity.java
@@ -27,10 +27,10 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.core.view.ViewCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.ActionBarActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.View;

diff --git a/demo/extras/src/main/java/it/gmariotti/cardslib/demo/extras/utils/LPreviewUtils.java b/demo/extras/src/main/java/it/gmariotti/cardslib/demo/extras/utils/LPreviewUtils.java
@@ -18,7 +18,7 @@
 
 package it.gmariotti.cardslib.demo.extras.utils;
 
-import android.support.v7.app.ActionBarActivity;
+import androidx.appcompat.app.ActionBarActivity;
 
 /**
  * An abstract interface to use SDK-L and SDK-19

diff --git a/demo/extras/src/main/java/it/gmariotti/cardslib/demo/extras/utils/LPreviewUtilsBase.java b/demo/extras/src/main/java/it/gmariotti/cardslib/demo/extras/utils/LPreviewUtilsBase.java
@@ -24,10 +24,10 @@
 import android.graphics.Color;
 import android.graphics.Outline;
 import android.os.Build;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarActivity;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.widget.Toolbar;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.ActionBarActivity;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.view.ViewOutlineProvider;
 import android.widget.ImageButton;

diff --git a/demo/extras/src/main/res/layout/carddemo_activity_native.xml b/demo/extras/src/main/res/layout/carddemo_activity_native.xml
@@ -17,7 +17,7 @@
   -->
 
 <!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. -->
-<android.support.v4.widget.DrawerLayout
+<androidx.drawerlayout.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawer_layout"
@@ -43,4 +43,4 @@
     <!-- Nav drawer -->
     <include layout="@layout/navdrawer" />
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/demo/extras/src/main/res/layout/demo_extras_activity_main.xml b/demo/extras/src/main/res/layout/demo_extras_activity_main.xml
@@ -16,7 +16,7 @@
   ~  *****************************************************************************
   -->
 
-<android.support.v4.widget.DrawerLayout
+<androidx.drawerlayout.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/drawer_layout_extras"
     android:layout_width="match_parent"
@@ -41,4 +41,4 @@
         android:divider="@android:color/darker_gray"
         android:dividerHeight="1dp"></ListView>
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/demo/extras/src/main/res/layout/toolbar_actionbar_extended.xml b/demo/extras/src/main/res/layout/toolbar_actionbar_extended.xml
@@ -16,7 +16,7 @@
   ~  *****************************************************************************
   -->
 
-<android.support.v7.widget.Toolbar
+<androidx.appcompat.widget.Toolbar
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@style/HeaderBar"
@@ -30,4 +30,4 @@
 
     <include layout="@layout/demo_barheader_full_include"></include>
 
-</android.support.v7.widget.Toolbar>
+</androidx.appcompat.widget.Toolbar>
diff --git a/demo/extras/src/main/res/layout/toolbar_actionbar_with_headerbar.xml b/demo/extras/src/main/res/layout/toolbar_actionbar_with_headerbar.xml
@@ -16,7 +16,7 @@
   ~  *****************************************************************************
   -->
 
-<android.support.v7.widget.Toolbar
+<androidx.appcompat.widget.Toolbar
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@style/HeaderBar"

diff --git a/demo/stock/build.gradle b/demo/stock/build.gradle
@@ -45,8 +45,8 @@ dependencies {
     implementation project(':library-cards')
     implementation project(':library-recyclerview')
     // Support Libraries
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
 
     //androidTestCompile 'com.jakewharton.espresso:espresso:1.1-r2'
 }

diff --git a/demo/stock/src/main/java/it/gmariotti/cardslib/demo/MainActivity.java b/demo/stock/src/main/java/it/gmariotti/cardslib/demo/MainActivity.java
@@ -26,9 +26,9 @@
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
-import android.support.v4.app.ActionBarDrawerToggle;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
+import androidx.legacy.app.ActionBarDrawerToggle;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
 import android.text.Html;
 import android.util.Log;
 import android.view.ActionMode;

diff --git a/demo/stock/src/main/java/it/gmariotti/cardslib/demo/MainNativeActivity.java b/demo/stock/src/main/java/it/gmariotti/cardslib/demo/MainNativeActivity.java
@@ -26,9 +26,9 @@
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
-import android.support.v4.app.ActionBarDrawerToggle;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
+import androidx.legacy.app.ActionBarDrawerToggle;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
 import android.util.Log;
 import android.view.ActionMode;
 import android.view.Menu;

diff --git a/demo/stock/src/main/java/it/gmariotti/cardslib/demo/fragment/BaseFragment.java b/demo/stock/src/main/java/it/gmariotti/cardslib/demo/fragment/BaseFragment.java
@@ -20,7 +20,7 @@
 
 import android.app.Fragment;
 import android.os.Bundle;
-import android.support.v4.app.NavUtils;
+import androidx.core.app.NavUtils;
 import android.view.MenuItem;
 
 /**

diff --git a/.../src/main/java/it/gmariotti/cardslib/demo/fragment/nativeview/NativeMiscCardFragment.java b/.../src/main/java/it/gmariotti/cardslib/demo/fragment/nativeview/NativeMiscCardFragment.java
@@ -24,7 +24,7 @@
 import android.graphics.Outline;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/.../main/java/it/gmariotti/cardslib/demo/fragment/nativeview/NativeRecyclerViewFragment.java b/.../main/java/it/gmariotti/cardslib/demo/fragment/nativeview/NativeRecyclerViewFragment.java
@@ -21,7 +21,7 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.SystemClock;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;

diff --git a/...t/gmariotti/cardslib/demo/fragment/nativeview/NativeRecyclerViewMaterialCardFragment.java b/...t/gmariotti/cardslib/demo/fragment/nativeview/NativeRecyclerViewMaterialCardFragment.java
@@ -21,7 +21,7 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.SystemClock;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/demo/stock/src/main/java/it/gmariotti/cardslib/demo/fragment/v1/RecyclerViewFragment.java b/demo/stock/src/main/java/it/gmariotti/cardslib/demo/fragment/v1/RecyclerViewFragment.java
@@ -21,7 +21,7 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.SystemClock;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;

diff --git a/demo/stock/src/main/java/it/gmariotti/cardslib/demo/ui/BaseActivity.java b/demo/stock/src/main/java/it/gmariotti/cardslib/demo/ui/BaseActivity.java
@@ -27,10 +27,10 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.core.view.ViewCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.View;

diff --git a/demo/stock/src/main/java/it/gmariotti/cardslib/demo/ui/DemoSingleTopicActivity.java b/demo/stock/src/main/java/it/gmariotti/cardslib/demo/ui/DemoSingleTopicActivity.java
@@ -21,7 +21,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
 

diff --git a/demo/stock/src/main/java/it/gmariotti/cardslib/demo/ui/widget/ScrimInsetsScrollView.java b/demo/stock/src/main/java/it/gmariotti/cardslib/demo/ui/widget/ScrimInsetsScrollView.java
@@ -20,7 +20,7 @@
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.widget.ScrollView;
 

diff --git a/demo/stock/src/main/java/it/gmariotti/cardslib/demo/utils/LPreviewUtils.java b/demo/stock/src/main/java/it/gmariotti/cardslib/demo/utils/LPreviewUtils.java
@@ -19,7 +19,7 @@
 
 package it.gmariotti.cardslib.demo.utils;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 /**
  * An abstract interface to use SDK-L and SDK-19

diff --git a/demo/stock/src/main/java/it/gmariotti/cardslib/demo/utils/LPreviewUtilsBase.java b/demo/stock/src/main/java/it/gmariotti/cardslib/demo/utils/LPreviewUtilsBase.java
@@ -25,10 +25,10 @@
 import android.graphics.Color;
 import android.graphics.Outline;
 import android.os.Build;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.view.ViewOutlineProvider;
 import android.widget.ImageButton;

diff --git a/demo/stock/src/main/res/layout/carddemo_activity_guidelines.xml b/demo/stock/src/main/res/layout/carddemo_activity_guidelines.xml
@@ -17,7 +17,7 @@
   -->
 
 <!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. -->
-<android.support.v4.widget.DrawerLayout
+<androidx.drawerlayout.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawer_layout"
@@ -65,4 +65,4 @@
     <include layout="@layout/navdrawer" />
 
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/demo/stock/src/main/res/layout/carddemo_activity_main.xml b/demo/stock/src/main/res/layout/carddemo_activity_main.xml
@@ -17,7 +17,7 @@
   -->
 
 <!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. -->
-<android.support.v4.widget.DrawerLayout
+<androidx.drawerlayout.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawer_layout"
@@ -43,4 +43,4 @@
     <include layout="@layout/navdrawer" />
 
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/demo/stock/src/main/res/layout/carddemo_activity_native.xml b/demo/stock/src/main/res/layout/carddemo_activity_native.xml
@@ -17,7 +17,7 @@
   -->
 
 <!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. -->
-<android.support.v4.widget.DrawerLayout
+<androidx.drawerlayout.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawer_layout"
@@ -45,4 +45,4 @@
     <include layout="@layout/navdrawer" />
 
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/demo/stock/src/main/res/layout/demo_activity_main.xml b/demo/stock/src/main/res/layout/demo_activity_main.xml
@@ -16,7 +16,7 @@
   ~  *****************************************************************************
   -->
 
-<android.support.v4.widget.DrawerLayout
+<androidx.drawerlayout.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
@@ -40,4 +40,4 @@
         android:divider="@android:color/darker_gray"
         android:dividerHeight="1dp"></ListView>
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/demo/stock/src/main/res/layout/toolbar_actionbar.xml b/demo/stock/src/main/res/layout/toolbar_actionbar.xml
@@ -16,7 +16,7 @@
   ~  *****************************************************************************
   -->
 
-<android.support.v7.widget.Toolbar
+<androidx.appcompat.widget.Toolbar
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@style/HeaderBar"

diff --git a/demo/stock/src/main/res/layout/toolbar_actionbar_extended.xml b/demo/stock/src/main/res/layout/toolbar_actionbar_extended.xml
@@ -16,7 +16,7 @@
   ~  *****************************************************************************
   -->
 
-<android.support.v7.widget.Toolbar
+<androidx.appcompat.widget.Toolbar
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@style/HeaderBar"
@@ -30,4 +30,4 @@
 
     <include layout="@layout/demo_barheader_full_include"></include>
 
-</android.support.v7.widget.Toolbar>
+</androidx.appcompat.widget.Toolbar>
diff --git a/demo/stock/src/main/res/layout/toolbar_actionbar_with_headerbar.xml b/demo/stock/src/main/res/layout/toolbar_actionbar_with_headerbar.xml
@@ -16,7 +16,7 @@
   ~  *****************************************************************************
   -->
 
-<android.support.v7.widget.Toolbar
+<androidx.appcompat.widget.Toolbar
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@style/HeaderBar"

diff --git a/demo/stock/src/main/res/menu/sharemenu.xml b/demo/stock/src/main/res/menu/sharemenu.xml
@@ -25,7 +25,7 @@
           app:showAsAction="ifRoom"
           android:title="@string/action_share"
           android:orderInCategory="1"
-          app:actionProviderClass="android.support.v7.widget.ShareActionProvider" />
+          app:actionProviderClass="androidx.appcompat.widget.ShareActionProvider" />
 
   <!--  <item
         android:id="@+id/menu_refresh"

diff --git a/...gmariotti/cardslib/library/extra/dragdroplist/internal/CardTouchViewDraggableManager.java b/...gmariotti/cardslib/library/extra/dragdroplist/internal/CardTouchViewDraggableManager.java
@@ -18,8 +18,8 @@
 
 package it.gmariotti.cardslib.library.extra.dragdroplist.internal;
 
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
 import android.view.View;
 
 import com.nhaarman.listviewanimations.itemmanipulation.dragdrop.DraggableManager;