diff --git a/build.gradle b/build.gradle index 82697f55..49dd7f02 100644 --- a/build.gradle +++ b/build.gradle @@ -2,25 +2,18 @@ buildscript { repositories { + google() jcenter() - maven { - url "https://jitpack.io" - } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0' - classpath 'com.github.dcendents:android-maven-plugin:1.2' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + classpath 'com.android.tools.build:gradle:4.1.3' +// classpath 'com.github.dcendents:android-maven-plugin:1.2' } } allprojects { repositories { + google() jcenter() - maven { - url "https://jitpack.io" - } } } diff --git a/demo/build.gradle b/demo/build.gradle index 09dca2ba..4eab99e3 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -25,11 +25,12 @@ android { } dependencies { - compile project(":library") - compile 'com.android.support:recyclerview-v7:25.1.1' - compile 'com.daimajia.easing:library:1.0.0@aar' - compile 'com.daimajia.androidanimations:library:1.1.2@aar' + implementation project(':library') + implementation 'androidx.recyclerview:recyclerview:1.1.0' + +// compile 'com.daimajia.easing:library:1.0.0@aar' +// compile 'com.daimajia.androidanimations:library:1.1.2@aar' compile 'com.nineoldandroids:library:2.4.0' - // This dude gave a shoutout to you (daimajia) on his github page: - compile 'jp.wasabeef:recyclerview-animators:1.0.3@aar' +// // This dude gave a shoutout to you (daimajia) on his github page: +// compile 'jp.wasabeef:recyclerview-animators:1.0.3@aar' } diff --git a/demo/src/main/java/com/daimajia/swipedemo/RecyclerViewExample.java b/demo/src/main/java/com/daimajia/swipedemo/RecyclerViewExample.java index fd42733f..f01bbe8f 100644 --- a/demo/src/main/java/com/daimajia/swipedemo/RecyclerViewExample.java +++ b/demo/src/main/java/com/daimajia/swipedemo/RecyclerViewExample.java @@ -5,12 +5,13 @@ import android.content.Intent; import android.os.Build; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.util.Log; import android.view.Menu; import android.view.MenuItem; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.daimajia.swipe.util.Attributes; import com.daimajia.swipedemo.adapter.RecyclerViewAdapter; import com.daimajia.swipedemo.adapter.util.DividerItemDecoration; @@ -18,8 +19,6 @@ import java.util.ArrayList; import java.util.Arrays; -import jp.wasabeef.recyclerview.animators.FadeInLeftAnimator; - public class RecyclerViewExample extends Activity { /** @@ -52,8 +51,8 @@ protected void onCreate(Bundle savedInstanceState) { recyclerView.setLayoutManager(new LinearLayoutManager(this)); // Item Decorator: - recyclerView.addItemDecoration(new DividerItemDecoration(getResources().getDrawable(R.drawable.divider))); - recyclerView.setItemAnimator(new FadeInLeftAnimator()); +// recyclerView.addItemDecoration(new DividerItemDecoration(getResources().getDrawable(R.drawable.divider))); +// recyclerView.setItemAnimator(new FadeInLeftAnimator()); // Adapter: String[] adapterData = new String[]{"Alabama", "Alaska", "Arizona", "Arkansas", "California", "Colorado", "Connecticut", "Delaware", "Florida", "Georgia", "Hawaii", "Idaho", "Illinois", "Indiana", "Iowa", "Kansas", "Kentucky", "Louisiana", "Maine", "Maryland", "Massachusetts", "Michigan", "Minnesota", "Mississippi", "Missouri", "Montana", "Nebraska", "Nevada", "New Hampshire", "New Jersey", "New Mexico", "New York", "North Carolina", "North Dakota", "Ohio", "Oklahoma", "Oregon", "Pennsylvania", "Rhode Island", "South Carolina", "South Dakota", "Tennessee", "Texas", "Utah", "Vermont", "Virginia", "Washington", "West Virginia", "Wisconsin", "Wyoming"}; diff --git a/demo/src/main/java/com/daimajia/swipedemo/adapter/ListViewAdapter.java b/demo/src/main/java/com/daimajia/swipedemo/adapter/ListViewAdapter.java index e34f31de..cf0bd020 100644 --- a/demo/src/main/java/com/daimajia/swipedemo/adapter/ListViewAdapter.java +++ b/demo/src/main/java/com/daimajia/swipedemo/adapter/ListViewAdapter.java @@ -7,8 +7,6 @@ import android.widget.TextView; import android.widget.Toast; -import com.daimajia.androidanimations.library.Techniques; -import com.daimajia.androidanimations.library.YoYo; import com.daimajia.swipe.SimpleSwipeListener; import com.daimajia.swipe.SwipeLayout; import com.daimajia.swipe.adapters.BaseSwipeAdapter; @@ -34,7 +32,7 @@ public View generateView(int position, ViewGroup parent) { swipeLayout.addSwipeListener(new SimpleSwipeListener() { @Override public void onOpen(SwipeLayout layout) { - YoYo.with(Techniques.Tada).duration(500).delay(100).playOn(layout.findViewById(R.id.trash)); +// YoYo.with(Techniques.Tada).duration(500).delay(100).playOn(layout.findViewById(R.id.trash)); } }); swipeLayout.setOnDoubleClickListener(new SwipeLayout.DoubleClickListener() { diff --git a/demo/src/main/java/com/daimajia/swipedemo/adapter/RecyclerViewAdapter.java b/demo/src/main/java/com/daimajia/swipedemo/adapter/RecyclerViewAdapter.java index 3b4c34d4..a0b14868 100644 --- a/demo/src/main/java/com/daimajia/swipedemo/adapter/RecyclerViewAdapter.java +++ b/demo/src/main/java/com/daimajia/swipedemo/adapter/RecyclerViewAdapter.java @@ -1,7 +1,6 @@ package com.daimajia.swipedemo.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -10,8 +9,8 @@ import android.widget.TextView; import android.widget.Toast; -import com.daimajia.androidanimations.library.Techniques; -import com.daimajia.androidanimations.library.YoYo; +import androidx.recyclerview.widget.RecyclerView; + import com.daimajia.swipe.SimpleSwipeListener; import com.daimajia.swipe.SwipeLayout; import com.daimajia.swipe.adapters.RecyclerSwipeAdapter; @@ -67,7 +66,7 @@ public void onBindViewHolder(final SimpleViewHolder viewHolder, final int positi viewHolder.swipeLayout.addSwipeListener(new SimpleSwipeListener() { @Override public void onOpen(SwipeLayout layout) { - YoYo.with(Techniques.Tada).duration(500).delay(100).playOn(layout.findViewById(R.id.trash)); +// YoYo.with(Techniques.Tada).duration(500).delay(100).playOn(layout.findViewById(R.id.trash)); } }); viewHolder.swipeLayout.setOnDoubleClickListener(new SwipeLayout.DoubleClickListener() { diff --git a/demo/src/main/java/com/daimajia/swipedemo/adapter/util/DividerItemDecoration.java b/demo/src/main/java/com/daimajia/swipedemo/adapter/util/DividerItemDecoration.java index 85b5b3d2..e2812ec9 100644 --- a/demo/src/main/java/com/daimajia/swipedemo/adapter/util/DividerItemDecoration.java +++ b/demo/src/main/java/com/daimajia/swipedemo/adapter/util/DividerItemDecoration.java @@ -5,11 +5,12 @@ import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.util.AttributeSet; import android.view.View; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + public class DividerItemDecoration extends RecyclerView.ItemDecoration { private Drawable mDivider; diff --git a/demo/src/main/java/com/daimajia/swipedemo/adapter/util/RecyclerItemClickListener.java b/demo/src/main/java/com/daimajia/swipedemo/adapter/util/RecyclerItemClickListener.java index 613e8e52..de2d5725 100644 --- a/demo/src/main/java/com/daimajia/swipedemo/adapter/util/RecyclerItemClickListener.java +++ b/demo/src/main/java/com/daimajia/swipedemo/adapter/util/RecyclerItemClickListener.java @@ -1,11 +1,12 @@ package com.daimajia.swipedemo.adapter.util; import android.content.Context; -import android.support.v7.widget.RecyclerView; import android.view.GestureDetector; import android.view.MotionEvent; import android.view.View; +import androidx.recyclerview.widget.RecyclerView; + public class RecyclerItemClickListener implements RecyclerView.OnItemTouchListener { private OnItemClickListener mListener; diff --git a/gradle.properties b/gradle.properties index beab8970..81db15e7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,13 +16,13 @@ # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true - +android.useAndroidX=true VERSION_NAME=1.2.0 VERSION_CODE=22 GROUP=com.daimajia.swipelayout -ANDROID_BUILD_MIN_SDK_VERSION=9 -ANDROID_BUILD_TARGET_SDK_VERSION=25 -ANDROID_BUILD_SDK_VERSION=25 -ANDROID_BUILD_TOOLS_VERSION=25.0.2 +ANDROID_BUILD_MIN_SDK_VERSION=21 +ANDROID_BUILD_TARGET_SDK_VERSION=30 +ANDROID_BUILD_SDK_VERSION=30 +ANDROID_BUILD_TOOLS_VERSION=30.0.3 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 8c0fb64a..05ef575b 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 776d2a5a..743c3183 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Mar 09 16:07:03 CST 2017 +#Mon Jun 08 14:17:05 CEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip diff --git a/gradlew b/gradlew index 91a7e269..9d82f789 100755 --- a/gradlew +++ b/gradlew @@ -42,11 +42,6 @@ case "`uname`" in ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - # Attempt to set APP_HOME # Resolve links: $0 may be a link PRG="$0" @@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do fi done SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- +cd "`dirname \"$PRG\"`/" >/dev/null APP_HOME="`pwd -P`" -cd "$SAVED" >&- +cd "$SAVED" >/dev/null CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -114,6 +109,7 @@ fi if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` diff --git a/library/build.gradle b/library/build.gradle index 906272e1..cf1ed3d3 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,26 +1,79 @@ apply plugin: 'com.android.library' android { - compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION) - buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION + compileSdkVersion 30 defaultConfig { - minSdkVersion 9 - targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION) + minSdkVersion 21 + targetSdkVersion 30 } + buildTypes { + release { + minifyEnabled false + } + internal { + minifyEnabled false + } + } + flavorDimensions "language" + + productFlavors { + de { + dimension "language" + } + usmle { + dimension "language" + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + } dependencies { - compile 'com.android.support:recyclerview-v7:25.2.0' - compile 'com.android.support:support-v4:25.2.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0' } -apply from: './gradle-mvn-push.gradle' +//apply from: './gradle-mvn-push.gradle' // build a jar with source files -task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier = 'sources' -} -artifacts { - archives sourcesJar +//task sourcesJar(type: Jar) { +// from android.sourceSets.main.java.srcDirs +// classifier = 'sources' +//} +//artifacts { +// archives sourcesJar +//} + +android { + compileSdkVersion 30 + + defaultConfig { + minSdkVersion 21 + targetSdkVersion 30 + } + buildTypes { + release { + minifyEnabled false + } + internal { + minifyEnabled false + } + } + flavorDimensions "language" + + productFlavors { + de { + dimension "language" + } + usmle { + dimension "language" + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + } diff --git a/library/src/main/java/com/daimajia/swipe/SwipeLayout.java b/library/src/main/java/com/daimajia/swipe/SwipeLayout.java index 6703123c..12c53bc8 100644 --- a/library/src/main/java/com/daimajia/swipe/SwipeLayout.java +++ b/library/src/main/java/com/daimajia/swipe/SwipeLayout.java @@ -3,9 +3,6 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Rect; -import android.support.v4.view.GravityCompat; -import android.support.v4.view.ViewCompat; -import android.support.v4.widget.ViewDragHelper; import android.util.AttributeSet; import android.view.GestureDetector; import android.view.Gravity; @@ -19,6 +16,10 @@ import android.widget.AdapterView; import android.widget.FrameLayout; +import androidx.core.view.GravityCompat; +import androidx.core.view.ViewCompat; +import androidx.customview.widget.ViewDragHelper; + import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; diff --git a/library/src/main/java/com/daimajia/swipe/adapters/CursorSwipeAdapter.java b/library/src/main/java/com/daimajia/swipe/adapters/CursorSwipeAdapter.java index 3e6a62c7..b9db708e 100644 --- a/library/src/main/java/com/daimajia/swipe/adapters/CursorSwipeAdapter.java +++ b/library/src/main/java/com/daimajia/swipe/adapters/CursorSwipeAdapter.java @@ -2,9 +2,10 @@ import android.content.Context; import android.database.Cursor; -import android.support.v4.widget.CursorAdapter; + import android.view.View; import android.view.ViewGroup; +import android.widget.CursorAdapter; import com.daimajia.swipe.SwipeLayout; import com.daimajia.swipe.implments.SwipeItemMangerImpl; diff --git a/library/src/main/java/com/daimajia/swipe/adapters/RecyclerSwipeAdapter.java b/library/src/main/java/com/daimajia/swipe/adapters/RecyclerSwipeAdapter.java index f6e9aed3..267deb19 100644 --- a/library/src/main/java/com/daimajia/swipe/adapters/RecyclerSwipeAdapter.java +++ b/library/src/main/java/com/daimajia/swipe/adapters/RecyclerSwipeAdapter.java @@ -1,8 +1,9 @@ package com.daimajia.swipe.adapters; -import android.support.v7.widget.RecyclerView; import android.view.ViewGroup; +import androidx.recyclerview.widget.RecyclerView; + import com.daimajia.swipe.SwipeLayout; import com.daimajia.swipe.implments.SwipeItemMangerImpl; import com.daimajia.swipe.interfaces.SwipeAdapterInterface; diff --git a/library/src/main/java/com/daimajia/swipe/adapters/SimpleCursorSwipeAdapter.java b/library/src/main/java/com/daimajia/swipe/adapters/SimpleCursorSwipeAdapter.java index 19b04ad2..af90897d 100644 --- a/library/src/main/java/com/daimajia/swipe/adapters/SimpleCursorSwipeAdapter.java +++ b/library/src/main/java/com/daimajia/swipe/adapters/SimpleCursorSwipeAdapter.java @@ -2,9 +2,9 @@ import android.content.Context; import android.database.Cursor; -import android.support.v4.widget.SimpleCursorAdapter; import android.view.View; import android.view.ViewGroup; +import android.widget.SimpleCursorAdapter; import com.daimajia.swipe.SwipeLayout; import com.daimajia.swipe.implments.SwipeItemMangerImpl; diff --git a/settings.gradle b/settings.gradle index 462ba77a..2150f22a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':demo', ':library' +include ':library', ':demo'