diff --git a/app/build.gradle b/app/build.gradle index 2cf63e3..7450c92 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,12 +5,12 @@ repositories { } } android { - compileSdkVersion 28 - buildToolsVersion "28.0.3" + compileSdkVersion 29 + buildToolsVersion "29.0.2" defaultConfig { minSdkVersion 16 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 1 versionName "1.0" } @@ -25,6 +25,6 @@ android { dependencies { implementation project(':library') implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'com.github.ozodrukh:CircularReveal:2.1.0' } diff --git a/app/src/main/java/yalantis/com/sidemenu/sample/MainActivity.java b/app/src/main/java/yalantis/com/sidemenu/sample/MainActivity.java index 59aafda..43c6666 100644 --- a/app/src/main/java/yalantis/com/sidemenu/sample/MainActivity.java +++ b/app/src/main/java/yalantis/com/sidemenu/sample/MainActivity.java @@ -5,10 +5,10 @@ import android.graphics.Color; import android.graphics.drawable.BitmapDrawable; import android.os.Bundle; -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.Menu; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/yalantis/com/sidemenu/sample/fragment/ContentFragment.java b/app/src/main/java/yalantis/com/sidemenu/sample/fragment/ContentFragment.java index 0842e8f..68c420f 100644 --- a/app/src/main/java/yalantis/com/sidemenu/sample/fragment/ContentFragment.java +++ b/app/src/main/java/yalantis/com/sidemenu/sample/fragment/ContentFragment.java @@ -3,8 +3,8 @@ import android.graphics.Bitmap; import android.graphics.Canvas; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,8 +27,7 @@ public class ContentFragment extends Fragment implements ScreenShotable { public static final String MOVIE = "Movie"; private View containerView; - protected ImageView mImageView; - protected int res; + private int res; private Bitmap bitmap; public static ContentFragment newInstance(int resId) { @@ -56,7 +55,7 @@ public void onCreate(Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View rootView = inflater.inflate(R.layout.fragment_main, container, false); - mImageView = (ImageView) rootView.findViewById(R.id.image_content); + ImageView mImageView = rootView.findViewById(R.id.image_content); mImageView.setClickable(true); mImageView.setFocusable(true); mImageView.setImageResource(res); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 9ca433e..b9ea901 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,4 +1,4 @@ - @@ -22,7 +21,7 @@ android:layout_height="match_parent" android:orientation="vertical"/> - - \ No newline at end of file + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 3a3193f..641aff7 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:3.6.1' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle.properties b/gradle.properties index c9cc08d..007178d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,3 +12,5 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=yalantis POM_DEVELOPER_NAME=Yalantis +android.useAndroidX=true +android.enableJetifier=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index abb087f..b4732de 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jan 31 15:40:02 EET 2019 +#Wed Apr 01 14:36:48 EEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip diff --git a/library/build.gradle b/library/build.gradle index 8f292ea..6d779bd 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,13 +1,14 @@ apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' +group='com.yalantis:sidemenu' android { - compileSdkVersion 28 - buildToolsVersion "28.0.3" + compileSdkVersion 29 + buildToolsVersion "29.0.2" defaultConfig { - minSdkVersion 15 - targetSdkVersion 28 + minSdkVersion 16 + targetSdkVersion 29 versionCode 1 versionName "1.0" } @@ -19,7 +20,7 @@ android { } } dependencies { - implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'androidx.appcompat:appcompat:1.1.0' } task androidJavadocs(type: Javadoc) { diff --git a/library/src/main/java/yalantis/com/sidemenu/util/ViewAnimator.java b/library/src/main/java/yalantis/com/sidemenu/util/ViewAnimator.java index 3b4be28..734eec8 100644 --- a/library/src/main/java/yalantis/com/sidemenu/util/ViewAnimator.java +++ b/library/src/main/java/yalantis/com/sidemenu/util/ViewAnimator.java @@ -1,13 +1,14 @@ package yalantis.com.sidemenu.util; import android.os.Handler; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.AppCompatActivity; import android.view.View; import android.view.animation.AccelerateInterpolator; import android.view.animation.Animation; import android.widget.ImageView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.drawerlayout.widget.DrawerLayout; + import java.util.ArrayList; import java.util.List; @@ -176,13 +177,13 @@ private void switchItem(Resourceble slideMenuItem, int topPosition) { public interface ViewAnimatorListener { - public ScreenShotable onSwitch(Resourceble slideMenuItem, ScreenShotable screenShotable, int position); + ScreenShotable onSwitch(Resourceble slideMenuItem, ScreenShotable screenShotable, int position); - public void disableHomeButton(); + void disableHomeButton(); - public void enableHomeButton(); + void enableHomeButton(); - public void addViewToContainer(View view); + void addViewToContainer(View view); } }