Merge pull request #84 from Yalantis/fix/updateComponents

PenzK · web-flow · commit 90bbf8f8105b · 2019-01-31T16:02:59.000+02:00
Updated target versions
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,12 +5,12 @@ repositories {
     }
 }
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 23
+        minSdkVersion 16
+        targetSdkVersion 28
         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 'com.android.support:appcompat-v7:28.0.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
@@ -1,5 +1,6 @@
 package yalantis.com.sidemenu.sample;
 
+import android.animation.Animator;
 import android.content.res.Configuration;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
@@ -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;
@@ -30,7 +30,6 @@ public class MainActivity extends AppCompatActivity implements ViewAnimator.View
     private DrawerLayout drawerLayout;
     private ActionBarDrawerToggle drawerToggle;
     private List<SlideMenuItem> list = new ArrayList<>();
-    private ContentFragment contentFragment;
     private ViewAnimator viewAnimator;
     private int res = R.drawable.content_music;
     private LinearLayout linearLayout;
@@ -40,13 +39,13 @@ public class MainActivity extends AppCompatActivity implements ViewAnimator.View
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        contentFragment = ContentFragment.newInstance(R.drawable.content_music);
+        ContentFragment contentFragment = ContentFragment.newInstance(R.drawable.content_music);
         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 +80,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);
@@ -112,7 +111,7 @@ public void onDrawerOpened(View drawerView) {
                 super.onDrawerOpened(drawerView);
             }
         };
-        drawerLayout.setDrawerListener(drawerToggle);
+        drawerLayout.addDrawerListener(drawerToggle);
     }
 
     @Override
@@ -151,11 +150,11 @@ 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);
 
-        findViewById(R.id.content_overlay).setBackgroundDrawable(new BitmapDrawable(getResources(), screenShotable.getBitmap()));
+        findViewById(R.id.content_overlay).setBackground(new BitmapDrawable(getResources(), screenShotable.getBitmap()));
         animator.start();
         ContentFragment contentFragment = ContentFragment.newInstance(this.res);
         getSupportFragmentManager().beginTransaction().replace(R.id.content_frame, contentFragment).commit();
diff --git a/build.gradle b/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -21,6 +22,7 @@ allprojects {
     group = GROUP
     repositories {
         jcenter()
+        google()
     }
 }
 apply plugin: 'android-reporting'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jan 05 16:16:16 EET 2017
+#Thu Jan 31 15:40:02 EET 2019
 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-4.10.1-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -1,14 +1,13 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
-group='com.yalantis:sidemenu'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 23
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
     }
@@ -20,7 +19,7 @@ android {
     }
 }
 dependencies {
-    compile 'com.android.support:appcompat-v7:23.1.1'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
 }
 
 task androidJavadocs(type: Javadoc) {

Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,12 @@ repositories {`
`5`	`5`	`}`
`6`	`6`	`}`
`7`	`7`	`android {`
`8`		`- compileSdkVersion 23`
`9`		`- buildToolsVersion "23.0.2"`
	`8`	`+ compileSdkVersion 28`
	`9`	`+ buildToolsVersion "28.0.3"`
`10`	`10`
`11`	`11`	`defaultConfig {`
`12`		`- minSdkVersion 15`
`13`		`- targetSdkVersion 23`
	`12`	`+ minSdkVersion 16`
	`13`	`+ targetSdkVersion 28`
`14`	`14`	`versionCode 1`
`15`	`15`	`versionName "1.0"`
`16`	`16`	`}`
`@@ -23,8 +23,8 @@ android {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`dependencies {`
`26`		`- compile project(':library')`
`27`		`- compile fileTree(dir: 'libs', include: ['*.jar'])`
`28`		`- compile 'com.android.support:appcompat-v7:23.1.1'`
`29`		`- compile 'com.github.ozodrukh:CircularReveal:1.0.4'`
	`26`	`+ implementation project(':library')`
	`27`	`+ implementation fileTree(dir: 'libs', include: ['*.jar'])`
	`28`	`+ implementation 'com.android.support:appcompat-v7:28.0.0'`
	`29`	`+ implementation 'com.github.ozodrukh:CircularReveal:2.1.0'`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,10 @@`
`3`	`3`	`buildscript {`
`4`	`4`	`repositories {`
`5`	`5`	`jcenter()`
	`6`	`+ google()`
`6`	`7`	`}`
`7`	`8`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:2.2.3'`
	`9`	`+ classpath 'com.android.tools.build:gradle:3.3.0'`
`9`	`10`	`classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'`
`10`	`11`
`11`	`12`	`// NOTE: Do not place your application dependencies here; they belong`
`@@ -21,6 +22,7 @@ allprojects {`
`21`	`22`	`group = GROUP`
`22`	`23`	`repositories {`
`23`	`24`	`jcenter()`
	`25`	`+ google()`
`24`	`26`	`}`
`25`	`27`	`}`
`26`	`28`	`apply plugin: 'android-reporting'`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,13 @@`
`1`	`1`	`apply plugin: 'com.android.library'`
`2`	`2`	`apply plugin: 'com.github.dcendents.android-maven'`
`3`		`-group='com.yalantis:sidemenu'`
`4`	`3`
`5`	`4`	`android {`
`6`		`- compileSdkVersion 23`
`7`		`- buildToolsVersion "23.0.2"`
	`5`	`+ compileSdkVersion 28`
	`6`	`+ buildToolsVersion "28.0.3"`
`8`	`7`
`9`	`8`	`defaultConfig {`
`10`	`9`	`minSdkVersion 15`
`11`		`- targetSdkVersion 23`
	`10`	`+ targetSdkVersion 28`
`12`	`11`	`versionCode 1`
`13`	`12`	`versionName "1.0"`
`14`	`13`	`}`
`@@ -20,7 +19,7 @@ android {`
`20`	`19`	`}`
`21`	`20`	`}`
`22`	`21`	`dependencies {`
`23`		`- compile 'com.android.support:appcompat-v7:23.1.1'`
	`22`	`+ implementation 'com.android.support:appcompat-v7:28.0.0'`
`24`	`23`	`}`
`25`	`24`
`26`	`25`	`task androidJavadocs(type: Javadoc) {`