From f4e09cb53d700dc6fcfe4f1c1cad56f6237a6c2d Mon Sep 17 00:00:00 2001
From: Miftah Mubarak <mubarakmiftah@gmail.com>
Date: Wed, 22 Jan 2020 20:33:59 +0700
Subject: [PATCH 1/3] Update sdk version

---
 .idea/gradle.xml                              |  3 +
 .idea/misc.xml                                | 27 +++---
 .idea/modules.xml                             |  3 +
 .idea/vcs.xml                                 |  6 ++
 app/build.gradle                              | 16 ++--
 .../ldoublem/ringProgress/Test2Activity.java  | 89 +++++++++----------
 .../ldoublem/ringProgress/TestActivity.java   | 21 ++---
 build.gradle                                  |  4 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 ringprogresslibrary/build.gradle              | 13 ++-
 10 files changed, 92 insertions(+), 92 deletions(-)
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 2b64aa8..92ca094 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,6 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT" />
+        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index cca2cda..89b8ff9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,36 +8,37 @@
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="4">
+        <list size="10">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="4">
+        <list size="9">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 9f7df4e..d513bda 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,8 +3,11 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/RingProgress.iml" filepath="$PROJECT_DIR$/RingProgress.iml" />
+      <module fileurl="file://$PROJECT_DIR$/RingProgress.iml" filepath="$PROJECT_DIR$/RingProgress.iml" />
+      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/ringprogresslibrary/ringprogresslibrary.iml" filepath="$PROJECT_DIR$/ringprogresslibrary/ringprogresslibrary.iml" />
+      <module fileurl="file://$PROJECT_DIR$/ringprogresslibrary/ringprogresslibrary.iml" filepath="$PROJECT_DIR$/ringprogresslibrary/ringprogresslibrary.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 2817ad7..c587837 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.1"
+    compileSdkVersion 29
+
     defaultConfig {
         applicationId "com.ldoublem.ringProgress"
         minSdkVersion 15
-        targetSdkVersion 24
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -20,11 +20,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    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'
     })
-    compile 'com.android.support:appcompat-v7:24.2.0'
-    testCompile 'junit:junit:4.12'
-    compile project(':ringprogresslibrary')
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    testImplementation 'junit:junit:4.12'
+    implementation project(':ringprogresslibrary')
 }
diff --git a/app/src/main/java/com/ldoublem/ringProgress/Test2Activity.java b/app/src/main/java/com/ldoublem/ringProgress/Test2Activity.java
index c40099d..2fe3d91 100644
--- a/app/src/main/java/com/ldoublem/ringProgress/Test2Activity.java
+++ b/app/src/main/java/com/ldoublem/ringProgress/Test2Activity.java
@@ -4,18 +4,12 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.view.WindowManager;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.SeekBar;
 import android.widget.Toast;
-
-import com.ldoublem.ringPregressLibrary.OnSelectRing;
+import androidx.appcompat.app.AppCompatActivity;
 import com.ldoublem.ringPregressLibrary.Ring;
 import com.ldoublem.ringPregressLibrary.RingProgress;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
@@ -32,20 +26,32 @@ public class Test2Activity extends AppCompatActivity {
     Random random = new Random();
     List<Ring> mlistRing = new ArrayList<>();
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                WindowManager.LayoutParams.FLAG_FULLSCREEN);//去掉信息栏
-        setContentView(R.layout.layout_test2);
-        getSupportActionBar().hide();
-
-        mRingProgress = (RingProgress) findViewById(R.id.lv_ringp);
-        mRingProgress.setDrawBg(false);
-        setData(maxTime, maxTime + "'", "Countdown", Color.rgb(86, 171, 228), Color.argb(100, 86, 171, 228));
+    private Handler mHandle = new Handler() {
 
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            //            mLVRingProgress.setProgress(msg.arg1);
+            if (msg.what == 0) {
+                int p = maxTime - msg.arg1;
 
-    }
+                if (p > 60) {
+                    setData(p, p + "'", "Countdown", Color.rgb(86, 171, 228),
+                        Color.argb(100, 86, 171, 228));
+                } else if (p > 30) {
+                    setData(p, p + "'", "Countdown", Color.rgb(17, 205, 110),
+                        Color.argb(100, 17, 205, 110));
+                } else {
+                    setData(p, p + "'", "Countdown", Color.rgb(235, 79, 56),
+                        Color.argb(100, 235, 79, 56));
+                }
+            } else {
+                Toast.makeText(Test2Activity.this, "ok", Toast.LENGTH_SHORT).show();
+                setData(maxTime, maxTime + "'", "Countdown", Color.rgb(86, 171, 228),
+                    Color.argb(100, 86, 171, 228));
+            }
+        }
+    };
 
 
     private void setData(int progress, String value, String title, int startColor,
@@ -108,45 +114,30 @@ private void startProgressAnim() {
         timerTaskLVRingProgress();
     }
 
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+            WindowManager.LayoutParams.FLAG_FULLSCREEN);//去掉信息栏
+        setContentView(R.layout.layout_test2);
+        getSupportActionBar().hide();
+
+        mRingProgress = findViewById(R.id.lv_ringp);
+        mRingProgress.setDrawBg(false);
+        setData(maxTime, maxTime + "'", "Countdown", Color.rgb(86, 171, 228),
+            Color.argb(100, 86, 171, 228));
+    }
+
     private void stopProgressAnim() {
         if (mTimerLVRingProgress != null) {
             mTimerLVRingProgress.cancel();
-            int p = maxTime - (int) (mValueLVRingProgress);
+            int p = maxTime - mValueLVRingProgress;
             setData(p, p + "'", "Pause", Color.rgb(234, 128, 16), Color.argb(100, 234, 128, 16));
 
 
         }
     }
 
-
-    private Handler mHandle = new Handler() {
-
-        @Override
-        public void handleMessage(Message msg) {
-            super.handleMessage(msg);
-//            mLVRingProgress.setProgress(msg.arg1);
-            if (msg.what == 0) {
-                int p = maxTime - (int) (msg.arg1);
-
-
-                if (p > 60) {
-                    setData(p, p + "'", "Countdown", Color.rgb(86, 171, 228), Color.argb(100, 86, 171, 228));
-
-                } else if (p > 30) {
-                    setData(p, p + "'", "Countdown", Color.rgb(17, 205, 110), Color.argb(100, 17, 205, 110));
-
-                } else {
-                    setData(p, p + "'", "Countdown", Color.rgb(235, 79, 56), Color.argb(100, 235, 79, 56));
-
-                }
-            } else {
-                Toast.makeText(Test2Activity.this, "ok", Toast.LENGTH_SHORT).show();
-                setData(maxTime, maxTime + "'", "Countdown", Color.rgb(86, 171, 228), Color.argb(100, 86, 171, 228));
-
-            }
-        }
-    };
-
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/com/ldoublem/ringProgress/TestActivity.java b/app/src/main/java/com/ldoublem/ringProgress/TestActivity.java
index 32c0fce..754b7e5 100644
--- a/app/src/main/java/com/ldoublem/ringProgress/TestActivity.java
+++ b/app/src/main/java/com/ldoublem/ringProgress/TestActivity.java
@@ -3,21 +3,16 @@
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.SeekBar;
 import android.widget.Toast;
-
-
+import androidx.appcompat.app.AppCompatActivity;
 import com.ldoublem.ringPregressLibrary.OnSelectRing;
 import com.ldoublem.ringPregressLibrary.Ring;
 import com.ldoublem.ringPregressLibrary.RingProgress;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
@@ -47,19 +42,19 @@ protected void onCreate(Bundle savedInstanceState) {
 
         getSupportActionBar().hide();
 
-        mRingProgress = (RingProgress) findViewById(R.id.lv_ringp);
+        mRingProgress = findViewById(R.id.lv_ringp);
         mRingProgress.setOnSelectRing(new OnSelectRing() {
             @Override
             public void Selected(Ring r) {
                 Toast.makeText(TestActivity.this, r.getName(), Toast.LENGTH_SHORT).show();
             }
         });
-        mSeekBar = (SeekBar) findViewById(R.id.sb_with);
-        mSeekBar2 = (SeekBar) findViewById(R.id.sb_rotate);
-        mSeekBar3 = (SeekBar) findViewById(R.id.sb_sweepAngle);
-        mCheckBox = (CheckBox) findViewById(R.id.cb_background);
-        mCheckBox2 = (CheckBox) findViewById(R.id.cb_corner);
-        mCheckBox3 = (CheckBox) findViewById(R.id.cb_shadow);
+        mSeekBar = findViewById(R.id.sb_with);
+        mSeekBar2 = findViewById(R.id.sb_rotate);
+        mSeekBar3 = findViewById(R.id.sb_sweepAngle);
+        mCheckBox = findViewById(R.id.cb_background);
+        mCheckBox2 = findViewById(R.id.cb_corner);
+        mCheckBox3 = findViewById(R.id.cb_shadow);
         setData();
         mSeekBar.setProgress((int) (mRingProgress.getRingWidthScale() * 100));
         mSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
diff --git a/build.gradle b/build.gradle
index b62d50f..6d62c9d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,10 +2,11 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0-beta2'
+        classpath 'com.android.tools.build:gradle:3.4.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -14,6 +15,7 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
         jcenter()
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 04e285f..3e94244 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/ringprogresslibrary/build.gradle b/ringprogresslibrary/build.gradle
index 4814948..5c6bcb9 100644
--- a/ringprogresslibrary/build.gradle
+++ b/ringprogresslibrary/build.gradle
@@ -1,12 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.1"
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 24
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
 
@@ -22,10 +21,10 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:24.2.0'
-    testCompile 'junit:junit:4.12'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    testImplementation 'junit:junit:4.12'
 }

From ea352d9112de5607f0f6d726972ac1e95629ce76 Mon Sep 17 00:00:00 2001
From: Miftah Mubarak <mubarakmiftah@gmail.com>
Date: Wed, 22 Jan 2020 21:07:20 +0700
Subject: [PATCH 2/3] Set up android maven plug in

---
 build.gradle                                  |  3 +++
 ringprogresslibrary/build.gradle              |  5 +++-
 .../main/res/values/ringprogress_style.xml    | 27 +++++++------------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6d62c9d..29b85f8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,9 +4,11 @@ buildscript {
     repositories {
         google()
         jcenter()
+        maven { url "https://jitpack.io" }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.4.2'
+        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
@@ -17,6 +19,7 @@ allprojects {
     repositories {
         google()
         jcenter()
+        maven { url "https://jitpack.io" }
     }
 }
 
diff --git a/ringprogresslibrary/build.gradle b/ringprogresslibrary/build.gradle
index 5c6bcb9..1686fc3 100644
--- a/ringprogresslibrary/build.gradle
+++ b/ringprogresslibrary/build.gradle
@@ -1,4 +1,7 @@
 apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
+
+group ="com.ldoublem.ringProgressLibrary"
 
 android {
     compileSdkVersion 29
@@ -7,7 +10,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 29
         versionCode 1
-        versionName "1.0"
+        versionName "1.0.0"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
diff --git a/ringprogresslibrary/src/main/res/values/ringprogress_style.xml b/ringprogresslibrary/src/main/res/values/ringprogress_style.xml
index 3acfcae..8408472 100644
--- a/ringprogresslibrary/src/main/res/values/ringprogress_style.xml
+++ b/ringprogresslibrary/src/main/res/values/ringprogress_style.xml
@@ -1,19 +1,12 @@
 <resources>
-
-
-    <declare-styleable name="RingProgress">
-        <attr name="bgColor" format="color|reference"></attr>
-        <attr name="bgShadowColor" format="color|reference"></attr>
-        <attr name="rotate" format="integer"></attr>
-        <attr name="showBackground" format="boolean"></attr>
-        <attr name="showBackgroundShadow" format="boolean"></attr>
-        <attr name="showRingCorner" format="boolean"></attr>
-        <attr name="ringWidthScale" format="float"></attr>
-        <attr name="ringSweepAngle" format="integer"></attr>
-
-
-
-    </declare-styleable>
-
-
+  <declare-styleable name="RingProgress">
+    <attr format="color|reference" name="bgColor"/>
+    <attr format="color|reference" name="bgShadowColor"/>
+    <attr format="integer" name="rotate"/>
+    <attr format="boolean" name="showBackground"/>
+    <attr format="boolean" name="showBackgroundShadow"/>
+    <attr format="boolean" name="showRingCorner"/>
+    <attr format="float" name="ringWidthScale"/>
+    <attr format="integer" name="ringSweepAngle"/>
+  </declare-styleable>
 </resources>

From 69ffb09b432e5040c1f0d3aea2072a96d2e5636d Mon Sep 17 00:00:00 2001
From: Miftah Mubarak <miftahmubarak06@gmail.com>
Date: Thu, 23 Jan 2020 10:54:24 +0700
Subject: [PATCH 3/3] Add install section

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index a84445b..34dd19f 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,9 @@ a circle progress bar with effect
 
 ```
 
+## Install
+```implementation 'com.github.immimu:RingProgress:1.0.0'```
+
 ## About me
 
 An android developer in Hangzhou.