Merge pull request #21 from carlosmuvi/core/update-androidx

Updates to androidX and removes manifest allowBackup.
carlosmuvi · Jun 4, 2019 · 7df42ce · 7df42ce
2 parents f728598 + 141fd44
commit 7df42ce
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/app/src/main/java/com/carlosmuvi/sample/MainActivity.java b/app/src/main/java/com/carlosmuvi/sample/MainActivity.java
@@ -1,9 +1,11 @@
 package com.carlosmuvi.sample;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
+
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.carlosmuvi.segmentedprogressbar.SegmentedProgressBar;
 
 public class MainActivity extends AppCompatActivity {
@@ -20,10 +22,10 @@ public class MainActivity extends AppCompatActivity {
 
         initSegmentedProgressBar();
 
-        startButton = (Button) findViewById(R.id.button);
-        pauseResumeButton = (Button) findViewById(R.id.button3);
-        resetButton = (Button) findViewById(R.id.button2);
-        startWithoutAnimationButton = (Button) findViewById(R.id.button4);
+        startButton = findViewById(R.id.button);
+        pauseResumeButton = findViewById(R.id.button3);
+        resetButton = findViewById(R.id.button2);
+        startWithoutAnimationButton = findViewById(R.id.button4);
 
         startButton.setOnClickListener(new View.OnClickListener() {
             @Override public void onClick(View view) {
@@ -54,7 +56,7 @@ public class MainActivity extends AppCompatActivity {
     }
 
     private void initSegmentedProgressBar() {
-        segmentedProgressBar = (SegmentedProgressBar) findViewById(R.id.segmented_progressbar);
+        segmentedProgressBar = findViewById(R.id.segmented_progressbar);
 
         //set filled segments directly
         segmentedProgressBar.setCompletedSegments(1);

diff --git a/library/build.gradle b/library/build.gradle
@@ -24,6 +24,7 @@ android {
 dependencies {
   implementation fileTree(dir: 'libs', include: ['*.jar'])
   implementation 'com.android.support:appcompat-v7:28.0.0'
+  implementation 'com.android.support:support-annotations:28.0.0'
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
   testImplementation 'junit:junit:4.12'

diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -1,11 +1,5 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.carlosmuvi.segmentedprogressbar">
+<manifest package="com.carlosmuvi.segmentedprogressbar">
 
-  <application android:allowBackup="true"
-      android:label="@string/app_name"
-      android:supportsRtl="true"
-  >
-
-  </application>
+    <application />
 
 </manifest>
diff --git a/library/src/main/java/com/carlosmuvi/segmentedprogressbar/SegmentedProgressBar.kt b/library/src/main/java/com/carlosmuvi/segmentedprogressbar/SegmentedProgressBar.kt
@@ -4,9 +4,9 @@ import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.Path
-import android.support.annotation.ColorInt
 import android.util.AttributeSet
 import android.view.View
+import androidx.annotation.ColorInt
 
 /**
  * Created by carlosmuvi on 02/09/16.