diff --git a/app/build.gradle b/app/build.gradle index b5da977..66c4e48 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion = "23.0.1" + compileSdkVersion 29 + buildToolsVersion = "29.0.3" defaultConfig { applicationId "saulmm.myapplication" minSdkVersion 21 - targetSdkVersion 23 + targetSdkVersion 29 versionCode 1 versionName "1.0" } @@ -20,9 +20,9 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.2.1' - compile 'com.android.support:design:23.2.1' - compile 'com.android.support:cardview-v7:23.2.1' - compile 'de.hdodenhof:circleimageview:1.3.0' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'com.google.android.material:material:1.1.0' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'de.hdodenhof:circleimageview:1.3.0' } diff --git a/app/src/main/java/saulmm/myapplication/AvatarImageBehavior.java b/app/src/main/java/saulmm/myapplication/AvatarImageBehavior.java index e995f1c..04f951d 100644 --- a/app/src/main/java/saulmm/myapplication/AvatarImageBehavior.java +++ b/app/src/main/java/saulmm/myapplication/AvatarImageBehavior.java @@ -2,11 +2,12 @@ import android.content.Context; import android.content.res.TypedArray; -import android.support.design.widget.CoordinatorLayout; -import android.support.v7.widget.Toolbar; import android.util.AttributeSet; import android.view.View; +import androidx.appcompat.widget.Toolbar; +import androidx.coordinatorlayout.widget.CoordinatorLayout; + import de.hdodenhof.circleimageview.CircleImageView; @SuppressWarnings("unused") diff --git a/app/src/main/java/saulmm/myapplication/MainActivity.java b/app/src/main/java/saulmm/myapplication/MainActivity.java index 1870a8d..b2934f6 100644 --- a/app/src/main/java/saulmm/myapplication/MainActivity.java +++ b/app/src/main/java/saulmm/myapplication/MainActivity.java @@ -1,10 +1,6 @@ package saulmm.myapplication; import android.os.Bundle; -import android.support.design.widget.AppBarLayout; -import android.support.design.widget.CollapsingToolbarLayout; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.view.Menu; import android.view.View; import android.view.animation.AlphaAnimation; @@ -13,6 +9,11 @@ import android.widget.LinearLayout; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; + +import com.google.android.material.appbar.AppBarLayout; + public class MainActivity extends AppCompatActivity implements AppBarLayout.OnOffsetChangedListener { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index e408cb7..0c9f73f 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,4 +1,4 @@ - - - - - + + - - - + - + - - + - + diff --git a/build.gradle b/build.gradle index c2a9c99..cdceb54 100644 --- a/build.gradle +++ b/build.gradle @@ -4,14 +4,16 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-alpha3' + classpath 'com.android.tools.build:gradle:4.0.0' } } allprojects { repositories { jcenter() + google() } } diff --git a/gradle.properties b/gradle.properties index 1d3591c..915f0e6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,6 @@ # When configured, Gradle will run in incubating parallel mode. # 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 \ No newline at end of file +# org.gradle.parallel=true +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file