From 6897e7688f9719e4ce5a2f0f16c88c4fae1e35f1 Mon Sep 17 00:00:00 2001 From: Nishant Srivastava Date: Fri, 20 Jan 2017 23:57:00 -0800 Subject: [PATCH 01/49] [*] extra space --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 37d53a2..79f919c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -# StackedHorizontalProgressBar - +# StackedHorizontalProgressBar ### Specs [ ![Download](https://api.bintray.com/packages/nisrulz/maven/com.github.nisrulz%3Astackedhorizontalprogressbar/images/download.svg) ](https://bintray.com/nisrulz/maven/com.github.nisrulz%3Astackedhorizontalprogressbar/_latestVersion) From b802079a77e31b5406a409ef23b7eb1ab98d1729 Mon Sep 17 00:00:00 2001 From: Nishant Srivastava Date: Thu, 2 Feb 2017 00:30:03 -0800 Subject: [PATCH 02/49] [*] added buy me a coffee link to readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 79f919c..e4b7485 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,8 @@ I welcome and encourage all pull requests. It usually will take me within 24-48 ### Created & Maintained By [Nishant Srivastava](https://github.com/nisrulz) ([@nisrulz](https://www.twitter.com/nisrulz)) +> If you found this library helpful or you learned something from the source code and want to thank me, consider [buying me a cup of](https://www.paypal.me/nisrulz) :coffee: + License ======= From 463f2ddad4881efaee340d450c205f5202a0b964 Mon Sep 17 00:00:00 2001 From: Nishant Srivastava Date: Sun, 12 Mar 2017 23:55:35 -0700 Subject: [PATCH 03/49] updated versions --- build.gradle | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- sample/build.gradle | 2 +- stackedhorizontalprogressbar/build.gradle | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 115c6dd..4c97a5e 100644 --- a/build.gradle +++ b/build.gradle @@ -21,13 +21,13 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.2' + classpath 'com.android.tools.build:gradle:2.3.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files // Required plugins added to classpath to facilitate pushing to Jcenter/Bintray - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' } } @@ -44,11 +44,11 @@ task clean(type: Delete) { ext { //Other - supportLibVersion = '25.0.0' + supportLibVersion = '25.2.0' // Lib info - libVersionCode = 4 - libVersionName = '1.0.3' + libVersionCode = 5 + libVersionName = '1.0.4' libPomUrl = 'https://github.com/nisrulz/stackedhorizontalprogressbar' libGithubRepo = 'nisrulz/stackedhorizontalprogressbar' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 36eec40..0d4f130 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-3.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-all.zip diff --git a/sample/build.gradle b/sample/build.gradle index cec4abc..489765a 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -18,7 +18,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 25 - buildToolsVersion "25.0.0" + buildToolsVersion "25.0.2" defaultConfig { applicationId "github.nisrulz.stackedhorizontalprogressbarproject" diff --git a/stackedhorizontalprogressbar/build.gradle b/stackedhorizontalprogressbar/build.gradle index e4f7581..a95efc8 100644 --- a/stackedhorizontalprogressbar/build.gradle +++ b/stackedhorizontalprogressbar/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 25 - buildToolsVersion "25.0.0" + buildToolsVersion "25.0.2" defaultConfig { minSdkVersion 9 From 55f3d7cd78ca0791421f85893c16d73cf4a5159b Mon Sep 17 00:00:00 2001 From: Nishant Srivastava Date: Fri, 24 Mar 2017 23:11:39 -0700 Subject: [PATCH 04/49] updated support lib to v25.3.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4c97a5e..a500391 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ task clean(type: Delete) { ext { //Other - supportLibVersion = '25.2.0' + supportLibVersion = '25.3.0' // Lib info libVersionCode = 5 From f626a9c56703f9c11e445f80d739bdcbe23c932c Mon Sep 17 00:00:00 2001 From: Nishant Srivastava Date: Sat, 1 Apr 2017 22:47:33 -0700 Subject: [PATCH 05/49] added github issue and pr templates --- .github/ISSUE_TEMPLATE.md | 35 ++++++++++++++++++++++++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 33 ++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000..5ccd5c4 --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,35 @@ +Please fill out the blanks below describing your issue + +What are the steps to reproduce this issue? +------------------------------------------- +1. … +2. … +3. … +… + +What happens? +------------- +… + +What were you expecting to happen? +---------------------------------- +… + +Any logs, error output, bugreport etc? +---------------------------- +(If it’s long, please paste to https://ghostbin.com/ and insert the link here.) + + +Any other comments? +------------------- +… + +What versions of software are you using? +---------------------------------------- +**Device Information:** … + +**Android Version:** … + +**Configuration Information:** … + +[More related information if you have can provide] \ No newline at end of file diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..eb85382 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,33 @@ +Please fill out the blanks below describing your PR + +What does this implement/fix? Explain your changes. +--------------------------------------------------- +… + +Does this close any currently open issues? +------------------------------------------ +… + + +Any relevant logs, error output, bugreport etc? +------------------------------------- +(If it’s long, please paste to https://ghostbin.com/ and insert the link here.) + +Any other comments? +------------------- +… + +Where has this been tested? +--------------------------- +**Device Information:** … + +**Android Version:** … + +**Target Platform:** … + +**SDK Version:** … + +**Configuration Information:** … + +[More related information if you have can provide] + From f0705f885ec8d303c371b55b06059098856b33d1 Mon Sep 17 00:00:00 2001 From: Nishant Srivastava Date: Sun, 23 Apr 2017 21:06:12 -0700 Subject: [PATCH 06/49] updated build.gradle --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index a500391..18ec267 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0' + classpath 'com.android.tools.build:gradle:2.3.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -44,7 +44,7 @@ task clean(type: Delete) { ext { //Other - supportLibVersion = '25.3.0' + supportLibVersion = '25.3.1' // Lib info libVersionCode = 5 From f1d03e7637ddd9fa81b35e375c8b38713612daa6 Mon Sep 17 00:00:00 2001 From: Nishant Srivastava Date: Sun, 23 Apr 2017 21:09:27 -0700 Subject: [PATCH 07/49] updated copyright --- gradle/wrapper/gradle-wrapper.properties | 16 ++++++++++++++++ stackedhorizontalprogressbar/build.gradle | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0d4f130..e422b9c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,3 +1,19 @@ +# +# Copyright (C) 2016 Nishant Srivastava +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + #Wed Sep 14 00:22:33 IST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists diff --git a/stackedhorizontalprogressbar/build.gradle b/stackedhorizontalprogressbar/build.gradle index a95efc8..01d07ea 100644 --- a/stackedhorizontalprogressbar/build.gradle +++ b/stackedhorizontalprogressbar/build.gradle @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2016 Nishant Srivastava + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + apply plugin: 'com.android.library' android { From 7e0293fc7f4a79fb7ffac4df3529cf278f1f84b9 Mon Sep 17 00:00:00 2001 From: Nishant Srivastava Date: Sun, 23 Apr 2017 21:11:28 -0700 Subject: [PATCH 08/49] reformatted code --- gradle/wrapper/gradle-wrapper.properties | 1 - sample/src/main/AndroidManifest.xml | 30 ++++++------ .../MainActivity.java | 46 +++++++++---------- sample/src/main/res/layout/activity_main.xml | 6 +-- sample/src/main/res/values-w820dp/dimens.xml | 8 ++-- sample/src/main/res/values/colors.xml | 12 ++--- sample/src/main/res/values/dimens.xml | 6 +-- sample/src/main/res/values/strings.xml | 2 +- sample/src/main/res/values/styles.xml | 14 +++--- .../src/main/AndroidManifest.xml | 4 +- .../StackedHorizontalProgressBar.java | 29 ++++++------ .../drawable/stacked_horizontal_progress.xml | 44 +++++++++--------- .../src/main/res/values/colors.xml | 14 +++--- 13 files changed, 108 insertions(+), 108 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e422b9c..00701b2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # - #Wed Sep 14 00:22:33 IST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index 4812539..430c894 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -15,22 +15,22 @@ ~ limitations under the License. --> - + - - - - + + + + - - - - + + + + diff --git a/sample/src/main/java/github/nisrulz/stackedhorizontalprogressbarproject/MainActivity.java b/sample/src/main/java/github/nisrulz/stackedhorizontalprogressbarproject/MainActivity.java index 3b5730e..4c276a0 100644 --- a/sample/src/main/java/github/nisrulz/stackedhorizontalprogressbarproject/MainActivity.java +++ b/sample/src/main/java/github/nisrulz/stackedhorizontalprogressbarproject/MainActivity.java @@ -37,6 +37,28 @@ public class MainActivity extends AppCompatActivity { TextView txt_primary, txt_secondary; Button btn_reload; + Runnable runnablePrimary = new Runnable() { + @Override + public void run() { + if (countPrimary <= primary_pts) { + stackedHorizontalProgressBar.setProgress(countPrimary); + txt_primary.setText("Primary Value : " + countPrimary + "%"); + handlerPrimaryProgress.postDelayed(runnablePrimary, 50); + countPrimary++; + } + } + }; + Runnable runnableSecondary = new Runnable() { + @Override + public void run() { + if (countSecondary <= secondary_pts) { + stackedHorizontalProgressBar.setSecondaryProgress(countSecondary); + txt_secondary.setText("Secondary Value : " + countSecondary + "%"); + handlerSecondaryProgress.postDelayed(runnableSecondary, 50); + countSecondary++; + } + } + }; @Override protected void onCreate(Bundle savedInstanceState) { @@ -77,28 +99,4 @@ public void onClick(View view) { handlerPrimaryProgress.post(runnablePrimary); handlerSecondaryProgress.post(runnableSecondary); } - - Runnable runnablePrimary = new Runnable() { - @Override - public void run() { - if (countPrimary <= primary_pts) { - stackedHorizontalProgressBar.setProgress(countPrimary); - txt_primary.setText("Primary Value : " + countPrimary + "%"); - handlerPrimaryProgress.postDelayed(runnablePrimary, 50); - countPrimary++; - } - } - }; - - Runnable runnableSecondary = new Runnable() { - @Override - public void run() { - if (countSecondary <= secondary_pts) { - stackedHorizontalProgressBar.setSecondaryProgress(countSecondary); - txt_secondary.setText("Secondary Value : " + countSecondary + "%"); - handlerSecondaryProgress.postDelayed(runnableSecondary, 50); - countSecondary++; - } - } - }; } diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml index d274f74..a8cbd47 100644 --- a/sample/src/main/res/layout/activity_main.xml +++ b/sample/src/main/res/layout/activity_main.xml @@ -38,28 +38,28 @@