From 1b72767430aa45a54f593f4d3d99db6f0ee30c6e Mon Sep 17 00:00:00 2001 From: dani Date: Thu, 24 May 2018 14:24:28 +0200 Subject: [PATCH] update to androix android-p --- .idea/.name | 1 - .idea/compiler.xml | 22 ----- .idea/copyright/profiles_settings.xml | 3 - .idea/misc.xml | 11 ++- .idea/vcs.xml | 2 +- StateProgressBar.iml | 4 +- build.gradle | 6 +- gradle.properties | 2 + gradle/wrapper/gradle-wrapper.properties | 4 +- sample/build.gradle | 16 ++-- sample/sample.iml | 88 ++++++++++++++----- .../stateprogressbarsample/BaseActivity.java | 2 +- .../BaseDescriptionActivity.java | 2 +- .../ListBaseActivity.java | 6 +- .../adapter/ApiFeatureAdapter.java | 2 +- .../adapter/StatesListAdapter.java | 2 +- .../custom/DividerItemDecoration.java | 4 +- sample/src/main/res/layout/activity_main.xml | 2 +- .../main/res/layout/activity_states_list.xml | 2 +- stateprogressbar/build.gradle | 16 ++-- .../stateprogressbar/StateProgressBar.java | 2 +- stateprogressbar/stateprogressbar.iml | 67 +++++++++----- 22 files changed, 153 insertions(+), 113 deletions(-) delete mode 100644 .idea/.name delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/profiles_settings.xml diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 5796353..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -StateProgressBar \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3963879..5e73d4b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,21 +5,24 @@ diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/StateProgressBar.iml b/StateProgressBar.iml index 40f6a7e..30752a0 100644 --- a/StateProgressBar.iml +++ b/StateProgressBar.iml @@ -1,5 +1,5 @@ - + @@ -13,7 +13,7 @@ - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 80fc77f..93c6d84 100644 --- a/build.gradle +++ b/build.gradle @@ -6,9 +6,9 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4' - classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' + classpath 'com.android.tools.build:gradle:3.2.0-alpha15' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/gradle.properties b/gradle.properties index 7975d4b..8c4b033 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,3 +15,5 @@ #Wed Jul 05 13:59:29 BRT 2017 # Remove this sometimes to resolve gradle issue +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 662e1af..d325b98 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Jan 27 16:37:10 GMT 2018 +#Thu May 24 14:07:20 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/sample/build.gradle b/sample/build.gradle index 0966058..2211a74 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 'android-P' + buildToolsVersion '28.0.0-rc2' defaultConfig { applicationId "com.kofigyan.stateprogressbarsample" - minSdkVersion 11 - targetSdkVersion 23 + minSdkVersion 14 + targetSdkVersion 27 versionCode 1 versionName "1.0" } @@ -20,8 +20,8 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.0.0' - compile 'com.android.support:recyclerview-v7:23.0.0' - compile project(":stateprogressbar") + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.0.0-alpha1' + implementation 'androidx.recyclerview:recyclerview:1.0.0-alpha1' + implementation project(":stateprogressbar") } diff --git a/sample/sample.iml b/sample/sample.iml index 4a5e395..3e7a986 100644 --- a/sample/sample.iml +++ b/sample/sample.iml @@ -1,5 +1,5 @@ - + @@ -23,19 +23,19 @@ - - + + - + - + @@ -49,13 +49,6 @@ - - - - - - - @@ -63,6 +56,13 @@ + + + + + + + @@ -84,31 +84,71 @@ - + + + - + - + + + + + + + - + + + + + + + + + - + + - - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file diff --git a/sample/src/main/java/com/kofigyan/stateprogressbarsample/BaseActivity.java b/sample/src/main/java/com/kofigyan/stateprogressbarsample/BaseActivity.java index 94afc85..26a3faf 100644 --- a/sample/src/main/java/com/kofigyan/stateprogressbarsample/BaseActivity.java +++ b/sample/src/main/java/com/kofigyan/stateprogressbarsample/BaseActivity.java @@ -1,7 +1,7 @@ package com.kofigyan.stateprogressbarsample; import android.app.Activity; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.view.Menu; import android.view.MenuItem; diff --git a/sample/src/main/java/com/kofigyan/stateprogressbarsample/BaseDescriptionActivity.java b/sample/src/main/java/com/kofigyan/stateprogressbarsample/BaseDescriptionActivity.java index c774b74..86f9ff2 100644 --- a/sample/src/main/java/com/kofigyan/stateprogressbarsample/BaseDescriptionActivity.java +++ b/sample/src/main/java/com/kofigyan/stateprogressbarsample/BaseDescriptionActivity.java @@ -1,6 +1,6 @@ package com.kofigyan.stateprogressbarsample; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.view.Menu; import android.view.MenuItem; diff --git a/sample/src/main/java/com/kofigyan/stateprogressbarsample/ListBaseActivity.java b/sample/src/main/java/com/kofigyan/stateprogressbarsample/ListBaseActivity.java index 5760362..9a02a1f 100644 --- a/sample/src/main/java/com/kofigyan/stateprogressbarsample/ListBaseActivity.java +++ b/sample/src/main/java/com/kofigyan/stateprogressbarsample/ListBaseActivity.java @@ -3,9 +3,9 @@ import android.app.Activity; import android.content.Intent; import android.net.Uri; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.Menu; import android.view.MenuItem; diff --git a/sample/src/main/java/com/kofigyan/stateprogressbarsample/not_stateprogressbar/adapter/ApiFeatureAdapter.java b/sample/src/main/java/com/kofigyan/stateprogressbarsample/not_stateprogressbar/adapter/ApiFeatureAdapter.java index 5e99564..cbe6499 100644 --- a/sample/src/main/java/com/kofigyan/stateprogressbarsample/not_stateprogressbar/adapter/ApiFeatureAdapter.java +++ b/sample/src/main/java/com/kofigyan/stateprogressbarsample/not_stateprogressbar/adapter/ApiFeatureAdapter.java @@ -2,7 +2,7 @@ import android.content.Context; import android.content.Intent; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/sample/src/main/java/com/kofigyan/stateprogressbarsample/not_stateprogressbar/adapter/StatesListAdapter.java b/sample/src/main/java/com/kofigyan/stateprogressbarsample/not_stateprogressbar/adapter/StatesListAdapter.java index 2d1795c..066f8e7 100644 --- a/sample/src/main/java/com/kofigyan/stateprogressbarsample/not_stateprogressbar/adapter/StatesListAdapter.java +++ b/sample/src/main/java/com/kofigyan/stateprogressbarsample/not_stateprogressbar/adapter/StatesListAdapter.java @@ -2,7 +2,7 @@ import android.content.Context; import android.content.Intent; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/sample/src/main/java/com/kofigyan/stateprogressbarsample/not_stateprogressbar/custom/DividerItemDecoration.java b/sample/src/main/java/com/kofigyan/stateprogressbarsample/not_stateprogressbar/custom/DividerItemDecoration.java index 13f773d..5d93197 100644 --- a/sample/src/main/java/com/kofigyan/stateprogressbarsample/not_stateprogressbar/custom/DividerItemDecoration.java +++ b/sample/src/main/java/com/kofigyan/stateprogressbarsample/not_stateprogressbar/custom/DividerItemDecoration.java @@ -5,8 +5,8 @@ import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml index 410a501..f165f48 100644 --- a/sample/src/main/res/layout/activity_main.xml +++ b/sample/src/main/res/layout/activity_main.xml @@ -5,7 +5,7 @@ android:paddingTop="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin" tools:context=".MainActivity"> - - - + @@ -24,19 +24,19 @@ - - + + - + - + @@ -85,36 +85,57 @@ - - - - - + + - - + - - + + + + + + + - - - - - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file