Migration to AndroidX

VladimirWrites · Mar 23, 2019 · 97842a8 · 97842a8
1 parent 755965d
commit 97842a8
Show file tree

Hide file tree

Showing 13 changed files with 81 additions and 71 deletions.
diff --git 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:
-
-    <com.vlad1m1r.lemniscate.BernoullisProgressView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:duration="1000"
-        app:hasHole="false"
-        app:lineColor="@color/colorPrimary"
-        app:maxLineLength="0.8"
-        app:minLineLength="0.4"
-        app:sizeMultiplier="1"
-        app:strokeWidth="5dp"/>
+```xml
+<com.vlad1m1r.lemniscate.BernoullisProgressView
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:duration="1000"
+    app:hasHole="false"
+    app:lineColor="@color/colorPrimary"
+    app:maxLineLength="0.8"
+    app:minLineLength="0.4"
+    app:sizeMultiplier="1"
+    app:strokeWidth="5dp"/>
+```
 
 ###### Params available in all views:
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -19,7 +19,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1">
 
-            <android.support.v4.view.ViewPager
+            <androidx.viewpager.widget.ViewPager
                 android:id="@+id/viewPager"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />

diff --git 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">
 
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
             android:id="@+id/viewPager"
             android:layout_width="wrap_content"
             android:layout_height="200dp" />

diff --git 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">
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/textCurveName"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -25,4 +25,4 @@
 
 
     </LinearLayout>
-</FrameLayout>
+</FrameLayout>
diff --git 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">
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/stroke_width"
@@ -26,7 +26,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/margin_small"/>
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/textStrokeWidth"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -41,7 +41,7 @@
             android:layout_marginTop="@dimen/margin_normal"
             android:background="@color/divider"/>
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/stroke_color"
@@ -105,7 +105,7 @@
             android:layout_marginTop="@dimen/margin_normal"
             android:background="@color/divider"/>
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/line_min_length"
@@ -118,7 +118,7 @@
             android:layout_marginTop="@dimen/margin_small"
             />
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/textMinLineLength"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -127,7 +127,7 @@
             android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
             tools:text="0.4" />
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/line_max_length"
@@ -140,7 +140,7 @@
             android:layout_marginTop="@dimen/margin_small"
             />
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/textMaxLineLength"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -169,7 +169,7 @@
             android:layout_marginTop="@dimen/margin_normal"
             android:background="@color/divider"/>
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/margin_small"
@@ -183,7 +183,7 @@
             android:layout_height="wrap_content"
             />
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/textSizeMultiplier"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -199,7 +199,7 @@
             android:layout_marginTop="@dimen/margin_normal"
             android:background="@color/divider"/>
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/duration"
@@ -212,7 +212,7 @@
             android:layout_marginTop="@dimen/margin_small"
             />
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/textAnimationDuration"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -228,7 +228,7 @@
             android:layout_marginTop="@dimen/margin_normal"
             android:background="@color/divider"/>
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/precision"
@@ -241,7 +241,7 @@
             android:layout_marginTop="@dimen/margin_small"
             />
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/textPrecision"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -257,7 +257,7 @@
             android:layout_marginTop="@dimen/margin_normal"
             android:background="@color/divider"/>
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/param_a"
@@ -272,7 +272,7 @@
             android:layout_marginTop="@dimen/margin_small"
             />
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/param_b"
@@ -287,7 +287,7 @@
             android:layout_marginTop="@dimen/margin_small"
             />
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/param_d"
@@ -309,7 +309,7 @@
             android:layout_marginTop="@dimen/margin_normal"
             android:background="@color/divider"/>
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/number_of_cycles"
@@ -325,4 +325,4 @@
             />
 
     </LinearLayout>
-</ScrollView>
+</ScrollView>
diff --git a/sample/src/main/res/layout/toolbar.xml b/sample/src/main/res/layout/toolbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar
+<androidx.appcompat.widget.Toolbar
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/toolbar"
@@ -8,4 +8,4 @@
     android:minHeight="?attr/actionBarSize"
     android:background="?attr/colorPrimary"
     app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-    android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
+    android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>