comeback to support

rasoulmiri · May 9, 2019 · e413c69 · e413c69
1 parent 3691da0
commit e413c69
Show file tree

Hide file tree

Showing 36 changed files with 129 additions and 142 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
diff --git a/gradle.properties b/gradle.properties
@@ -9,8 +9,6 @@
 
 # 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/library/build.gradle b/library/build.gradle
@@ -21,7 +21,7 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.android.support:appcompat-v7:28.+'
+    implementation 'com.android.support:cardview-v7:28.+'
+    implementation 'com.android.support:design:28.+'
 }
diff --git a/library/src/main/java/io/rmiri/skeleton/SkeletonView.java b/library/src/main/java/io/rmiri/skeleton/SkeletonView.java
@@ -2,11 +2,11 @@
 
 import android.content.Context;
 import android.os.Build;
-import androidx.annotation.AttrRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-import androidx.annotation.StyleRes;
+import android.support.annotation.AttrRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
+import android.support.annotation.StyleRes;
 import android.util.AttributeSet;
 
 import io.rmiri.skeleton.master.SkeletonMaster;

diff --git a/library/src/main/java/io/rmiri/skeleton/SkeletonViewGroup.java b/library/src/main/java/io/rmiri/skeleton/SkeletonViewGroup.java
@@ -11,11 +11,11 @@
 import android.graphics.RectF;
 import android.graphics.Shader;
 import android.os.Build;
-import androidx.annotation.AttrRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-import androidx.annotation.StyleRes;
+import android.support.annotation.AttrRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
+import android.support.annotation.StyleRes;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.Pair;
@@ -24,8 +24,8 @@
 
 import java.util.ArrayList;
 
-import io.rmiri.skeleton.master.SkeletonModel;
 import io.rmiri.skeleton.master.SkeletonMaster;
+import io.rmiri.skeleton.master.SkeletonModel;
 import io.rmiri.skeleton.utils.CLog;
 import io.rmiri.skeleton.utils.ColorUtils;
 

diff --git a/library/src/main/java/io/rmiri/skeleton/master/AdapterSkeleton.java b/library/src/main/java/io/rmiri/skeleton/master/AdapterSkeleton.java
@@ -1,12 +1,11 @@
 package io.rmiri.skeleton.master;
 
 import android.content.Context;
+import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewTreeObserver;
 
-import androidx.recyclerview.widget.RecyclerView;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

diff --git a/library/src/main/java/io/rmiri/skeleton/master/SkeletonConfig.java b/library/src/main/java/io/rmiri/skeleton/master/SkeletonConfig.java
@@ -1,6 +1,7 @@
 package io.rmiri.skeleton.master;
 
-import androidx.recyclerview.widget.RecyclerView;
+
+import android.support.v7.widget.RecyclerView;
 
 /**
  * Created by Rasoul Miri on 8/22/17.

diff --git a/library/src/main/java/io/rmiri/skeleton/master/SkeletonMaster.java b/library/src/main/java/io/rmiri/skeleton/master/SkeletonMaster.java
@@ -3,11 +3,11 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Build;
-import androidx.annotation.AttrRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-import androidx.annotation.StyleRes;
+import android.support.annotation.AttrRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
+import android.support.annotation.StyleRes;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -9,7 +9,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0.0"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         // Vector support for lower 21
         vectorDrawables.useSupportLibrary true
@@ -25,9 +25,9 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation project(':library')
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.android.support:appcompat-v7:28.+'
+    implementation 'com.android.support:cardview-v7:28.+'
+    implementation 'com.android.support:design:28.+'
     implementation 'com.squareup.picasso:picasso:2.5.2'
+    implementation project(':library')
 }
diff --git a/sample/src/main/java/io/rmiri/skeleton/sample/activity/MainActivity.java b/sample/src/main/java/io/rmiri/skeleton/sample/activity/MainActivity.java
@@ -2,11 +2,10 @@
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.AppCompatButton;
 import android.view.View;
 
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.AppCompatButton;
-
 import io.rmiri.skeleton.sample.R;
 import io.rmiri.skeleton.sample.activity.java.addViewsByJava.AddViewsByJavaActivity;
 import io.rmiri.skeleton.sample.activity.java.gradientJava.GradientJavaActivity;
@@ -16,6 +15,8 @@
 import io.rmiri.skeleton.sample.activity.xml.gradientXml.GradientXmlActivity;
 import io.rmiri.skeleton.sample.activity.xml.shapeXml.ShapeXmlActivity;
 
+;
+
 
 public class MainActivity extends AppCompatActivity implements View.OnClickListener {
 

diff --git a/...in/java/io/rmiri/skeleton/sample/activity/java/addViewsByJava/AddViewsByJavaActivity.java b/...in/java/io/rmiri/skeleton/sample/activity/java/addViewsByJava/AddViewsByJavaActivity.java
@@ -1,14 +1,13 @@
 package io.rmiri.skeleton.sample.activity.java.addViewsByJava;
 
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.AppCompatImageButton;
+import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.AppCompatImageButton;
-import androidx.appcompat.widget.Toolbar;
-
 import java.util.ArrayList;
 
 import io.rmiri.skeleton.SkeletonViewGroup;

diff --git a/...c/main/java/io/rmiri/skeleton/sample/activity/java/gradientJava/GradientJavaActivity.java b/...c/main/java/io/rmiri/skeleton/sample/activity/java/gradientJava/GradientJavaActivity.java
@@ -2,13 +2,12 @@
 
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
 import android.view.View;
 
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
 import java.util.ArrayList;
 
 import io.rmiri.skeleton.master.IsCanSetAdapterListener;

diff --git a/...rc/main/java/io/rmiri/skeleton/sample/activity/java/gradientJava/GradientJavaAdapter.java b/...rc/main/java/io/rmiri/skeleton/sample/activity/java/gradientJava/GradientJavaAdapter.java
@@ -2,16 +2,15 @@
 
 
 import android.content.Context;
+import android.support.v7.widget.AppCompatImageButton;
+import android.support.v7.widget.AppCompatImageView;
+import android.support.v7.widget.CardView;
+import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import androidx.appcompat.widget.AppCompatImageButton;
-import androidx.appcompat.widget.AppCompatImageView;
-import androidx.cardview.widget.CardView;
-import androidx.recyclerview.widget.RecyclerView;
-
 import com.squareup.picasso.Picasso;
 
 import java.util.ArrayList;

diff --git a/...va/io/rmiri/skeleton/sample/activity/xml/autoItemsCountXml/AutoItemsCountXmlActivity.java b/...va/io/rmiri/skeleton/sample/activity/xml/autoItemsCountXml/AutoItemsCountXmlActivity.java
@@ -2,13 +2,12 @@
 
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
 import android.view.View;
 
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
 import java.util.ArrayList;
 
 import io.rmiri.skeleton.master.IsCanSetAdapterListener;

diff --git a/...ava/io/rmiri/skeleton/sample/activity/xml/autoItemsCountXml/AutoItemsCountXmlAdapter.java b/...ava/io/rmiri/skeleton/sample/activity/xml/autoItemsCountXml/AutoItemsCountXmlAdapter.java
@@ -2,13 +2,12 @@
 
 
 import android.content.Context;
+import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import androidx.recyclerview.widget.RecyclerView;
-
 import java.util.ArrayList;
 
 import io.rmiri.skeleton.SkeletonViewGroup;

diff --git a/sample/src/main/java/io/rmiri/skeleton/sample/activity/xml/fade1Xml/Fade1XmlActivity.java b/sample/src/main/java/io/rmiri/skeleton/sample/activity/xml/fade1Xml/Fade1XmlActivity.java
@@ -2,13 +2,12 @@
 
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
 import android.view.View;
 
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
 import java.util.ArrayList;
 
 import io.rmiri.skeleton.master.IsCanSetAdapterListener;

diff --git a/sample/src/main/java/io/rmiri/skeleton/sample/activity/xml/fade1Xml/FadeXml1Adapter.java b/sample/src/main/java/io/rmiri/skeleton/sample/activity/xml/fade1Xml/FadeXml1Adapter.java
@@ -2,16 +2,15 @@
 
 
 import android.content.Context;
+import android.support.v7.widget.AppCompatImageButton;
+import android.support.v7.widget.AppCompatImageView;
+import android.support.v7.widget.CardView;
+import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import androidx.appcompat.widget.AppCompatImageButton;
-import androidx.appcompat.widget.AppCompatImageView;
-import androidx.cardview.widget.CardView;
-import androidx.recyclerview.widget.RecyclerView;
-
 import com.squareup.picasso.Picasso;
 
 import java.util.ArrayList;

diff --git a/sample/src/main/java/io/rmiri/skeleton/sample/activity/xml/fade2Xml/FadeXml2Activity.java b/sample/src/main/java/io/rmiri/skeleton/sample/activity/xml/fade2Xml/FadeXml2Activity.java
@@ -2,13 +2,12 @@
 
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
 import android.view.View;
 
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
 import java.util.ArrayList;
 
 import io.rmiri.skeleton.master.IsCanSetAdapterListener;

diff --git a/sample/src/main/java/io/rmiri/skeleton/sample/activity/xml/fade2Xml/FadeXml2Adapter.java b/sample/src/main/java/io/rmiri/skeleton/sample/activity/xml/fade2Xml/FadeXml2Adapter.java
@@ -2,16 +2,15 @@
 
 
 import android.content.Context;
+import android.support.v7.widget.AppCompatImageButton;
+import android.support.v7.widget.AppCompatImageView;
+import android.support.v7.widget.CardView;
+import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import androidx.appcompat.widget.AppCompatImageButton;
-import androidx.appcompat.widget.AppCompatImageView;
-import androidx.cardview.widget.CardView;
-import androidx.recyclerview.widget.RecyclerView;
-
 import com.squareup.picasso.Picasso;
 
 import java.util.ArrayList;

diff --git a/.../src/main/java/io/rmiri/skeleton/sample/activity/xml/gradientXml/GradientXmlActivity.java b/.../src/main/java/io/rmiri/skeleton/sample/activity/xml/gradientXml/GradientXmlActivity.java
@@ -2,13 +2,12 @@
 
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
 import android.view.View;
 
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
 import java.util.ArrayList;
 
 import io.rmiri.skeleton.master.IsCanSetAdapterListener;

diff --git a/...e/src/main/java/io/rmiri/skeleton/sample/activity/xml/gradientXml/GradientXmlAdapter.java b/...e/src/main/java/io/rmiri/skeleton/sample/activity/xml/gradientXml/GradientXmlAdapter.java
@@ -2,16 +2,15 @@
 
 
 import android.content.Context;
+import android.support.v7.widget.AppCompatImageButton;
+import android.support.v7.widget.AppCompatImageView;
+import android.support.v7.widget.CardView;
+import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import androidx.appcompat.widget.AppCompatImageButton;
-import androidx.appcompat.widget.AppCompatImageView;
-import androidx.cardview.widget.CardView;
-import androidx.recyclerview.widget.RecyclerView;
-
 import com.squareup.picasso.Picasso;
 
 import java.util.ArrayList;

diff --git a/sample/src/main/java/io/rmiri/skeleton/sample/activity/xml/shapeXml/ShapeXmlActivity.java b/sample/src/main/java/io/rmiri/skeleton/sample/activity/xml/shapeXml/ShapeXmlActivity.java
@@ -2,12 +2,11 @@
 
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.TextView;
 
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-
 import io.rmiri.skeleton.SkeletonViewGroup;
 import io.rmiri.skeleton.sample.R;