From 97842a8cff021ba6a173e2186ef58df6b50b1bc0 Mon Sep 17 00:00:00 2001 From: Vladimir Jovanovic Date: Sat, 23 Mar 2019 11:38:52 +0100 Subject: [PATCH] Migration to AndroidX --- README.md | 59 +++++++++++-------- lemniscate/build.gradle | 8 +-- .../lemniscate/base/BaseCurveProgressView.kt | 2 +- sample/build.gradle | 13 ++-- .../lemniscate/sample/FragmentCurve.kt | 2 +- .../lemniscate/sample/FragmentSettings.kt | 4 +- .../lemniscate/sample/MainActivity.kt | 12 ++-- .../lemniscate/sample/PresentationActivity.kt | 4 +- .../main/res/layout-land/activity_main.xml | 2 +- sample/src/main/res/layout/activity_main.xml | 2 +- sample/src/main/res/layout/fragment_curve.xml | 4 +- .../src/main/res/layout/fragment_settings.xml | 36 +++++------ sample/src/main/res/layout/toolbar.xml | 4 +- 13 files changed, 81 insertions(+), 71 deletions(-) diff --git a/README.md b/README.md index 084a68e..d0320bf 100644 --- a/README.md +++ b/README.md @@ -28,36 +28,49 @@ The application is intentionally simple, without any libraries, to be understand Setup ----- -Add to your module's build.gradle: +Add to your module's `build.gradle`: - allprojects { - repositories { - ... - maven { url 'https://jitpack.io' } - } - } - -and to your app build.gradle: - - dependencies { - implementation 'com.github.VladimirWrites:Lemniscate:1.4.5' +```groovy +allprojects { + repositories { + ... + maven { url 'https://jitpack.io' } } +} +``` + +and to your app `build.gradle`: + +###### AndroidX +```groovy +dependencies { + implementation 'com.github.VladimirWrites:Lemniscate:1.4.5' +} +``` + +###### Android Support Library +```groovy +dependencies { + implementation 'com.github.VladimirWrites:Lemniscate:2.0.0' +} +``` Usage ----- Example of usage: - - +```xml + +``` ###### Params available in all views: diff --git a/lemniscate/build.gradle b/lemniscate/build.gradle index e07072c..98f0dc6 100644 --- a/lemniscate/build.gradle +++ b/lemniscate/build.gradle @@ -13,9 +13,9 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 28 - versionCode 145 - versionName "1.4.5" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + versionCode 200 + versionName "2.0.0" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { debug { @@ -69,7 +69,7 @@ dependencies { testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0' testImplementation 'com.google.truth:truth:0.43' testImplementation 'org.robolectric:robolectric:4.2' - implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'androidx.appcompat:appcompat:1.0.2' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } repositories { diff --git a/lemniscate/src/main/java/com/vlad1m1r/lemniscate/base/BaseCurveProgressView.kt b/lemniscate/src/main/java/com/vlad1m1r/lemniscate/base/BaseCurveProgressView.kt index 69d596c..6587740 100644 --- a/lemniscate/src/main/java/com/vlad1m1r/lemniscate/base/BaseCurveProgressView.kt +++ b/lemniscate/src/main/java/com/vlad1m1r/lemniscate/base/BaseCurveProgressView.kt @@ -22,7 +22,7 @@ import android.graphics.Canvas import android.graphics.Path import android.os.Parcel import android.os.Parcelable -import android.support.v4.view.AbsSavedState +import androidx.customview.view.AbsSavedState import android.util.AttributeSet import android.view.View import android.view.animation.LinearInterpolator diff --git a/sample/build.gradle b/sample/build.gradle index 403dc74..bf4bcf8 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -10,9 +10,9 @@ android { applicationId "com.vlad1m1r.lemniscate.sample" minSdkVersion 14 targetSdkVersion 28 - versionCode 123 - versionName "1.2.3" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + versionCode 130 + versionName "1.3.0" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { debug{ @@ -27,11 +27,8 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { - exclude group: 'com.android.support', module: 'support-annotations' - }) - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'me.relex:circleindicator:1.2.2@aar' + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'me.relex:circleindicator:2.1.0' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" testImplementation 'junit:junit:4.12' implementation project(':lemniscate') diff --git a/sample/src/main/java/com/vlad1m1r/lemniscate/sample/FragmentCurve.kt b/sample/src/main/java/com/vlad1m1r/lemniscate/sample/FragmentCurve.kt index ff48b98..73ad229 100644 --- a/sample/src/main/java/com/vlad1m1r/lemniscate/sample/FragmentCurve.kt +++ b/sample/src/main/java/com/vlad1m1r/lemniscate/sample/FragmentCurve.kt @@ -18,7 +18,7 @@ package com.vlad1m1r.lemniscate.sample import android.content.Context import android.os.Bundle -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/sample/src/main/java/com/vlad1m1r/lemniscate/sample/FragmentSettings.kt b/sample/src/main/java/com/vlad1m1r/lemniscate/sample/FragmentSettings.kt index 3905e21..808d42d 100644 --- a/sample/src/main/java/com/vlad1m1r/lemniscate/sample/FragmentSettings.kt +++ b/sample/src/main/java/com/vlad1m1r/lemniscate/sample/FragmentSettings.kt @@ -18,8 +18,8 @@ package com.vlad1m1r.lemniscate.sample import android.content.res.Resources import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v4.content.ContextCompat +import androidx.fragment.app.Fragment +import androidx.core.content.ContextCompat import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/sample/src/main/java/com/vlad1m1r/lemniscate/sample/MainActivity.kt b/sample/src/main/java/com/vlad1m1r/lemniscate/sample/MainActivity.kt index 006670d..4ad4242 100644 --- a/sample/src/main/java/com/vlad1m1r/lemniscate/sample/MainActivity.kt +++ b/sample/src/main/java/com/vlad1m1r/lemniscate/sample/MainActivity.kt @@ -19,12 +19,12 @@ package com.vlad1m1r.lemniscate.sample import android.content.Intent import android.net.Uri import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentManager -import android.support.v4.app.FragmentStatePagerAdapter -import android.support.v4.view.ViewPager -import android.support.v7.app.AppCompatActivity -import android.support.v7.widget.Toolbar +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentStatePagerAdapter +import androidx.viewpager.widget.ViewPager +import androidx.appcompat.app.AppCompatActivity +import androidx.appcompat.widget.Toolbar import android.view.Menu import android.view.MenuItem diff --git a/sample/src/main/java/com/vlad1m1r/lemniscate/sample/PresentationActivity.kt b/sample/src/main/java/com/vlad1m1r/lemniscate/sample/PresentationActivity.kt index 4a1fb79..7fdb77f 100644 --- a/sample/src/main/java/com/vlad1m1r/lemniscate/sample/PresentationActivity.kt +++ b/sample/src/main/java/com/vlad1m1r/lemniscate/sample/PresentationActivity.kt @@ -17,8 +17,8 @@ package com.vlad1m1r.lemniscate.sample 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 class PresentationActivity : AppCompatActivity() { diff --git a/sample/src/main/res/layout-land/activity_main.xml b/sample/src/main/res/layout-land/activity_main.xml index c434bc6..faed7f3 100644 --- a/sample/src/main/res/layout-land/activity_main.xml +++ b/sample/src/main/res/layout-land/activity_main.xml @@ -19,7 +19,7 @@ android:layout_height="wrap_content" android:layout_weight="1"> - diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml index 1851553..2925f59 100644 --- a/sample/src/main/res/layout/activity_main.xml +++ b/sample/src/main/res/layout/activity_main.xml @@ -13,7 +13,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - diff --git a/sample/src/main/res/layout/fragment_curve.xml b/sample/src/main/res/layout/fragment_curve.xml index 01758a0..44a9046 100644 --- a/sample/src/main/res/layout/fragment_curve.xml +++ b/sample/src/main/res/layout/fragment_curve.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" xmlns:tools="http://schemas.android.com/tools"> - - \ No newline at end of file + diff --git a/sample/src/main/res/layout/fragment_settings.xml b/sample/src/main/res/layout/fragment_settings.xml index 56ee45c..8525030 100644 --- a/sample/src/main/res/layout/fragment_settings.xml +++ b/sample/src/main/res/layout/fragment_settings.xml @@ -14,7 +14,7 @@ android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"> - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/sample/src/main/res/layout/toolbar.xml b/sample/src/main/res/layout/toolbar.xml index a6f274d..89d19e9 100644 --- a/sample/src/main/res/layout/toolbar.xml +++ b/sample/src/main/res/layout/toolbar.xml @@ -1,5 +1,5 @@ - \ No newline at end of file + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>