From b7ef193ae18437e1e946e5590664846260376f51 Mon Sep 17 00:00:00 2001 From: kirill Date: Wed, 1 Apr 2020 14:47:16 +0300 Subject: [PATCH] Updated sample and library. --- app/build.gradle | 16 ++++++++-------- .../com/sidemenu/sample/MainActivity.java | 18 +++++++++--------- .../sample/fragment/ContentFragment.java | 9 ++++----- app/src/main/res/layout/activity_main.xml | 7 +++---- build.gradle | 10 +++++++++- gradle.properties | 2 ++ gradle/wrapper/gradle-wrapper.properties | 4 ++-- library/build.gradle | 10 +++++----- .../com/sidemenu/util/ViewAnimator.java | 13 +++++++------ 9 files changed, 49 insertions(+), 40 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 11dd2af..7450c92 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,12 +5,12 @@ repositories { } } android { - compileSdkVersion 23 - buildToolsVersion "23.0.2" + compileSdkVersion 29 + buildToolsVersion "29.0.2" defaultConfig { - minSdkVersion 15 - targetSdkVersion 23 + minSdkVersion 16 + targetSdkVersion 29 versionCode 1 versionName "1.0" } @@ -23,8 +23,8 @@ android { } dependencies { - compile project(':library') - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.1.1' - compile 'com.github.ozodrukh:CircularReveal:1.0.4' + implementation project(':library') + implementation fileTree(dir: 'libs', include: ['*.jar']) + 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 8fe894f..c5c4de0 100644 --- a/app/src/main/java/yalantis/com/sidemenu/sample/MainActivity.java +++ b/app/src/main/java/yalantis/com/sidemenu/sample/MainActivity.java @@ -1,13 +1,14 @@ package yalantis.com.sidemenu.sample; +import android.animation.Animator; import android.content.res.Configuration; 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; @@ -17,7 +18,6 @@ import java.util.ArrayList; import java.util.List; -import io.codetail.animation.SupportAnimator; import io.codetail.animation.ViewAnimationUtils; import yalantis.com.sidemenu.interfaces.Resourceble; import yalantis.com.sidemenu.interfaces.ScreenShotable; @@ -44,9 +44,9 @@ protected void onCreate(Bundle savedInstanceState) { getSupportFragmentManager().beginTransaction() .replace(R.id.content_frame, contentFragment) .commit(); - drawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout); + drawerLayout = findViewById(R.id.drawer_layout); drawerLayout.setScrimColor(Color.TRANSPARENT); - linearLayout = (LinearLayout) findViewById(R.id.left_drawer); + linearLayout = findViewById(R.id.left_drawer); linearLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -81,7 +81,7 @@ private void createMenuList() { private void setActionBar() { - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); getSupportActionBar().setHomeButtonEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true); @@ -151,7 +151,7 @@ private ScreenShotable replaceFragment(ScreenShotable screenShotable, int topPos this.res = this.res == R.drawable.content_music ? R.drawable.content_films : R.drawable.content_music; View view = findViewById(R.id.content_frame); int finalRadius = Math.max(view.getWidth(), view.getHeight()); - SupportAnimator animator = ViewAnimationUtils.createCircularReveal(view, 0, topPosition, 0, finalRadius); + Animator animator = ViewAnimationUtils.createCircularReveal(view, 0, topPosition, 0, finalRadius); animator.setInterpolator(new AccelerateInterpolator()); animator.setDuration(ViewAnimator.CIRCULAR_REVEAL_ANIMATION_DURATION); 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 92247be..7e49d58 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,13 @@ buildscript { repositories { jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + 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 @@ -21,6 +25,10 @@ allprojects { group = GROUP repositories { jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } } } apply plugin: 'android-reporting' \ No newline at end of file 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 1a5c027..b4732de 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jan 05 16:16:16 EET 2017 +#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-2.14.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip diff --git a/library/build.gradle b/library/build.gradle index d466597..6d779bd 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -3,12 +3,12 @@ apply plugin: 'com.github.dcendents.android-maven' group='com.yalantis:sidemenu' android { - compileSdkVersion 23 - buildToolsVersion "23.0.2" + compileSdkVersion 29 + buildToolsVersion "29.0.2" defaultConfig { - minSdkVersion 15 - targetSdkVersion 23 + minSdkVersion 16 + targetSdkVersion 29 versionCode 1 versionName "1.0" } @@ -20,7 +20,7 @@ android { } } dependencies { - compile 'com.android.support:appcompat-v7:23.1.1' + 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); } }