From 1b24adfabb597f2702e21284a003dfafd11647aa Mon Sep 17 00:00:00 2001 From: "b.ergashev" Date: Tue, 11 Dec 2018 14:27:52 +0300 Subject: [PATCH] migration to AndroidX --- build.gradle | 2 +- demo/build.gradle | 8 ++-- .../demo/DemoActivity.java | 4 +- demo/src/main/res/layout/activity_demo.xml | 14 +++--- gradle.properties | 2 + gradle/wrapper/gradle-wrapper.properties | 4 +- multiline-collapsingtoolbar/build.gradle | 10 ++-- .../AnimationUtils.java | 6 +-- .../CollapsingTextHelper.java | 46 +++++++++---------- .../CollapsingToolbarLayout.java | 44 +++++++++--------- .../ViewOffsetHelper.java | 2 +- 11 files changed, 72 insertions(+), 70 deletions(-) create mode 100644 gradle.properties diff --git a/build.gradle b/build.gradle index 369470e..0bc794b 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.1' + classpath 'com.android.tools.build:gradle:3.2.1' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' } diff --git a/demo/build.gradle b/demo/build.gradle index 6fa8aa7..db5571c 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -1,19 +1,19 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { applicationId "net.opacapp.multilinecollapsingtoolbar.demo" minSdkVersion 14 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 1 versionName "1.0" } } dependencies { - compile 'com.android.support:appcompat-v7:27.1.1' - compile 'com.android.support:design:27.1.1' + compile 'androidx.appcompat:appcompat:1.0.2' + compile 'com.google.android.material:material:1.1.0-alpha01' compile project(':multiline-collapsingtoolbar') } diff --git a/demo/src/main/java/net/opacapp/multilinecollapsingtoolbar/demo/DemoActivity.java b/demo/src/main/java/net/opacapp/multilinecollapsingtoolbar/demo/DemoActivity.java index 0be11ab..b0fcc9f 100644 --- a/demo/src/main/java/net/opacapp/multilinecollapsingtoolbar/demo/DemoActivity.java +++ b/demo/src/main/java/net/opacapp/multilinecollapsingtoolbar/demo/DemoActivity.java @@ -1,8 +1,8 @@ package net.opacapp.multilinecollapsingtoolbar.demo; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; diff --git a/demo/src/main/res/layout/activity_demo.xml b/demo/src/main/res/layout/activity_demo.xml index 8e67572..37f4726 100644 --- a/demo/src/main/res/layout/activity_demo.xml +++ b/demo/src/main/res/layout/activity_demo.xml @@ -1,5 +1,5 @@ - - - - + - @@ -47,6 +47,6 @@ android:layout_marginTop="@dimen/activity_vertical_margin" android:layout_marginBottom="@dimen/activity_vertical_margin" android:text="@string/loremipsum" /> - + - + diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..5465fec --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f8ebaad..5fab423 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Mar 27 20:13:09 CEST 2018 +#Tue Dec 11 14:13:41 MSK 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/multiline-collapsingtoolbar/build.gradle b/multiline-collapsingtoolbar/build.gradle index 3a683bb..57487d5 100644 --- a/multiline-collapsingtoolbar/build.gradle +++ b/multiline-collapsingtoolbar/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { minSdkVersion 14 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 11 versionName "27.1.1" } @@ -45,9 +45,9 @@ ext { } dependencies { - compile 'com.android.support:design:27.1.1' - compile 'com.android.support:support-v4:27.1.1' - compile 'com.android.support:appcompat-v7:27.1.1' + implementation 'com.google.android.material:material:1.1.0-alpha01' + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' } diff --git a/multiline-collapsingtoolbar/src/main/java/net/opacapp/multilinecollapsingtoolbar/AnimationUtils.java b/multiline-collapsingtoolbar/src/main/java/net/opacapp/multilinecollapsingtoolbar/AnimationUtils.java index 430fe3c..7b78917 100644 --- a/multiline-collapsingtoolbar/src/main/java/net/opacapp/multilinecollapsingtoolbar/AnimationUtils.java +++ b/multiline-collapsingtoolbar/src/main/java/net/opacapp/multilinecollapsingtoolbar/AnimationUtils.java @@ -16,9 +16,9 @@ package net.opacapp.multilinecollapsingtoolbar; -import android.support.v4.view.animation.FastOutLinearInInterpolator; -import android.support.v4.view.animation.FastOutSlowInInterpolator; -import android.support.v4.view.animation.LinearOutSlowInInterpolator; +import androidx.interpolator.view.animation.FastOutLinearInInterpolator; +import androidx.interpolator.view.animation.FastOutSlowInInterpolator; +import androidx.interpolator.view.animation.LinearOutSlowInInterpolator; import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; import android.view.animation.LinearInterpolator; diff --git a/multiline-collapsingtoolbar/src/main/java/net/opacapp/multilinecollapsingtoolbar/CollapsingTextHelper.java b/multiline-collapsingtoolbar/src/main/java/net/opacapp/multilinecollapsingtoolbar/CollapsingTextHelper.java index d674516..347d19d 100644 --- a/multiline-collapsingtoolbar/src/main/java/net/opacapp/multilinecollapsingtoolbar/CollapsingTextHelper.java +++ b/multiline-collapsingtoolbar/src/main/java/net/opacapp/multilinecollapsingtoolbar/CollapsingTextHelper.java @@ -26,11 +26,11 @@ import android.graphics.RectF; import android.graphics.Typeface; import android.os.Build; -import android.support.annotation.ColorInt; -import android.support.v4.math.MathUtils; -import android.support.v4.text.TextDirectionHeuristicsCompat; -import android.support.v4.view.GravityCompat; -import android.support.v4.view.ViewCompat; +import androidx.annotation.ColorInt; +import androidx.core.math.MathUtils; +import androidx.core.text.TextDirectionHeuristicsCompat; +import androidx.core.view.GravityCompat; +import androidx.core.view.ViewCompat; import android.text.Layout; import android.text.StaticLayout; import android.text.TextPaint; @@ -217,24 +217,24 @@ int getCollapsedTextGravity() { void setCollapsedTextAppearance(int resId) { TypedArray a = mView.getContext().obtainStyledAttributes(resId, - android.support.v7.appcompat.R.styleable.TextAppearance); - if (a.hasValue(android.support.v7.appcompat.R.styleable.TextAppearance_android_textColor)) { + androidx.appcompat.R.styleable.TextAppearance); + if (a.hasValue(androidx.appcompat.R.styleable.TextAppearance_android_textColor)) { mCollapsedTextColor = a.getColorStateList( - android.support.v7.appcompat.R.styleable.TextAppearance_android_textColor); + androidx.appcompat.R.styleable.TextAppearance_android_textColor); } - if (a.hasValue(android.support.v7.appcompat.R.styleable.TextAppearance_android_textSize)) { + if (a.hasValue(androidx.appcompat.R.styleable.TextAppearance_android_textSize)) { mCollapsedTextSize = a.getDimensionPixelSize( - android.support.v7.appcompat.R.styleable.TextAppearance_android_textSize, + androidx.appcompat.R.styleable.TextAppearance_android_textSize, (int) mCollapsedTextSize); } mCollapsedShadowColor = a.getInt( - android.support.v7.appcompat.R.styleable.TextAppearance_android_shadowColor, 0); + androidx.appcompat.R.styleable.TextAppearance_android_shadowColor, 0); mCollapsedShadowDx = a.getFloat( - android.support.v7.appcompat.R.styleable.TextAppearance_android_shadowDx, 0); + androidx.appcompat.R.styleable.TextAppearance_android_shadowDx, 0); mCollapsedShadowDy = a.getFloat( - android.support.v7.appcompat.R.styleable.TextAppearance_android_shadowDy, 0); + androidx.appcompat.R.styleable.TextAppearance_android_shadowDy, 0); mCollapsedShadowRadius = a.getFloat( - android.support.v7.appcompat.R.styleable.TextAppearance_android_shadowRadius, 0); + androidx.appcompat.R.styleable.TextAppearance_android_shadowRadius, 0); a.recycle(); if (Build.VERSION.SDK_INT >= 16) { @@ -246,24 +246,24 @@ void setCollapsedTextAppearance(int resId) { void setExpandedTextAppearance(int resId) { TypedArray a = mView.getContext().obtainStyledAttributes(resId, - android.support.v7.appcompat.R.styleable.TextAppearance); - if (a.hasValue(android.support.v7.appcompat.R.styleable.TextAppearance_android_textColor)) { + androidx.appcompat.R.styleable.TextAppearance); + if (a.hasValue(androidx.appcompat.R.styleable.TextAppearance_android_textColor)) { mExpandedTextColor = a.getColorStateList( - android.support.v7.appcompat.R.styleable.TextAppearance_android_textColor); + androidx.appcompat.R.styleable.TextAppearance_android_textColor); } - if (a.hasValue(android.support.v7.appcompat.R.styleable.TextAppearance_android_textSize)) { + if (a.hasValue(androidx.appcompat.R.styleable.TextAppearance_android_textSize)) { mExpandedTextSize = a.getDimensionPixelSize( - android.support.v7.appcompat.R.styleable.TextAppearance_android_textSize, + androidx.appcompat.R.styleable.TextAppearance_android_textSize, (int) mExpandedTextSize); } mExpandedShadowColor = a.getInt( - android.support.v7.appcompat.R.styleable.TextAppearance_android_shadowColor, 0); + androidx.appcompat.R.styleable.TextAppearance_android_shadowColor, 0); mExpandedShadowDx = a.getFloat( - android.support.v7.appcompat.R.styleable.TextAppearance_android_shadowDx, 0); + androidx.appcompat.R.styleable.TextAppearance_android_shadowDx, 0); mExpandedShadowDy = a.getFloat( - android.support.v7.appcompat.R.styleable.TextAppearance_android_shadowDy, 0); + androidx.appcompat.R.styleable.TextAppearance_android_shadowDy, 0); mExpandedShadowRadius = a.getFloat( - android.support.v7.appcompat.R.styleable.TextAppearance_android_shadowRadius, 0); + androidx.appcompat.R.styleable.TextAppearance_android_shadowRadius, 0); a.recycle(); if (Build.VERSION.SDK_INT >= 16) { diff --git a/multiline-collapsingtoolbar/src/main/java/net/opacapp/multilinecollapsingtoolbar/CollapsingToolbarLayout.java b/multiline-collapsingtoolbar/src/main/java/net/opacapp/multilinecollapsingtoolbar/CollapsingToolbarLayout.java index d5caaa9..9ff43bd 100644 --- a/multiline-collapsingtoolbar/src/main/java/net/opacapp/multilinecollapsingtoolbar/CollapsingToolbarLayout.java +++ b/multiline-collapsingtoolbar/src/main/java/net/opacapp/multilinecollapsingtoolbar/CollapsingToolbarLayout.java @@ -16,7 +16,7 @@ package net.opacapp.multilinecollapsingtoolbar; -import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP; +import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP; import android.animation.ValueAnimator; import android.content.Context; @@ -27,26 +27,26 @@ import android.graphics.Typeface; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.support.annotation.ColorInt; -import android.support.annotation.DrawableRes; -import android.support.annotation.IntDef; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; -import android.support.annotation.RestrictTo; -import android.support.annotation.StyleRes; -import android.support.design.R; -import android.support.design.widget.AppBarLayout; -import android.support.v4.content.ContextCompat; -import android.support.v4.graphics.drawable.DrawableCompat; -import android.support.v4.math.MathUtils; -import android.support.v4.util.ObjectsCompat; -import android.support.v4.view.GravityCompat; -import android.support.v4.view.ViewCompat; -import android.support.v4.view.WindowInsetsCompat; -import android.support.v4.widget.ViewGroupUtils; -import android.support.v7.widget.Toolbar; +import androidx.annotation.ColorInt; +import androidx.annotation.DrawableRes; +import androidx.annotation.IntDef; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; +import androidx.annotation.RestrictTo; +import androidx.annotation.StyleRes; +import com.google.android.material.R; +import com.google.android.material.appbar.AppBarLayout; +import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.core.math.MathUtils; +import androidx.core.util.ObjectsCompat; +import androidx.core.view.GravityCompat; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; +import androidx.coordinatorlayout.widget.ViewGroupUtils; +import androidx.appcompat.widget.Toolbar; import android.text.TextUtils; import android.util.AttributeSet; import android.view.Gravity; @@ -227,7 +227,7 @@ public CollapsingToolbarLayout(Context context, AttributeSet attrs, int defStyle setWillNotDraw(false); ViewCompat.setOnApplyWindowInsetsListener(this, - new android.support.v4.view.OnApplyWindowInsetsListener() { + new androidx.core.view.OnApplyWindowInsetsListener() { @Override public WindowInsetsCompat onApplyWindowInsets(View v, WindowInsetsCompat insets) { diff --git a/multiline-collapsingtoolbar/src/main/java/net/opacapp/multilinecollapsingtoolbar/ViewOffsetHelper.java b/multiline-collapsingtoolbar/src/main/java/net/opacapp/multilinecollapsingtoolbar/ViewOffsetHelper.java index d92b737..f877809 100644 --- a/multiline-collapsingtoolbar/src/main/java/net/opacapp/multilinecollapsingtoolbar/ViewOffsetHelper.java +++ b/multiline-collapsingtoolbar/src/main/java/net/opacapp/multilinecollapsingtoolbar/ViewOffsetHelper.java @@ -16,7 +16,7 @@ package net.opacapp.multilinecollapsingtoolbar; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; import android.view.View; /**