diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ad14d8e..4e47fc4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -22,4 +22,5 @@ jobs: env: bintrayUser: ${{ secrets.BINTRAY_USER }} bintrayApiKey: ${{ secrets.BINTRAY_API_KEY }} + mavenCentralPwd: ${{ secrets.OSS_PASSWORD }} run: ./gradlew bintrayUpload \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..683a953 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,13 @@ +# Contributing + +In an effort to keep the library small and stable, please keep contributions limited to bug fixes, documentation improvements, and test improvements. + +If you have a new feature idea, please [create an enhancement request](https://github.com/GuilhE/android-circular-progress-view/issues/new?assignees=&labels=enhancement&template=feature_request.md&title=) so it can be discussed or build it in an external library. + +If you’ve found a bug, please [create a bug report](https://github.com/GuilhE/android-circular-progress-view/issues/new?assignees=GuilhE&labels=bug&template=bug_report.md&title=) and contribute with a failing test case so we can study and fix it. + +If you would like to contribute code you can do so through GitHub by forking the repository and sending a pull request. + +When submitting code, please make every effort to follow existing conventions and style in order to keep the code as readable as possible. + +*Modified from OkHttp's [Contributing](https://square.github.io/okhttp/contributing/) section.* diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. diff --git a/README.md b/README.md index 55ff49d..1b7a231 100644 --- a/README.md +++ b/README.md @@ -6,14 +6,15 @@ A fancy CircularProgressView. -## Getting started -Include it into your project, for example, as a Gradle dependency: +## Installation + +CircularProgressView is distributed through [Maven Central](https://search.maven.org/artifact/com.github.guilhe/circular-progress-view), [Jcenter](https://bintray.com/gdelgado/android/circular-progress-view) and [Jitpack](https://jitpack.io/#GuilhE/circular-progress-view). ```groovy implementation 'com.github.guilhe:circular-progress-view:${LATEST_VERSION}' ``` -[![Maven Central](https://img.shields.io/maven-central/v/com.github.guilhe/circular-progress-view.svg)](https://search.maven.org/search?q=g:com.github.guilhe%20AND%20circular-progress-view) [![Download](https://api.bintray.com/packages/gdelgado/android/circular-progress-view/images/download.svg)](https://bintray.com/gdelgado/android/circular-progress-view/_latestVersion) -![Bintray](https://img.shields.io/bintray/dt/gdelgado/android/circular-progress-view) +[![Maven Central](https://img.shields.io/maven-central/v/com.github.guilhe/circular-progress-view.svg)](https://search.maven.org/search?q=g:com.github.guilhe%20AND%20circular-progress-view) [![Download](https://api.bintray.com/packages/gdelgado/android/circular-progress-view/images/download.svg)](https://bintray.com/gdelgado/android/circular-progress-view/_latestVersion) ![Bintray](https://img.shields.io/bintray/dt/gdelgado/android/circular-progress-view) + ## Usage Check out the __sample__ module where you can find a few examples of how to create it by `xml` or `java`. @@ -107,7 +108,6 @@ setProgress(@NonNull List progressList, @NonNull List progressCo ``` This mode can be used to display a simple pie chart. It will disable the progress thumb, the background color and the progress will not be round. - ## Sample Sample @@ -115,18 +115,12 @@ _Animation last update on April, 2019_ Get it on Google Play -## Binaries -Binaries and dependency information for Gradle, Maven, Ivy and others can be found [here](https://search.maven.org/artifact/com.github.guilhe/circular-progress-view). - - - ## Dependencies - [com.android.support:support-annotations](https://developer.android.com/topic/libraries/support-library/packages.html#annotations) ## Bugs and Feedback For bugs, questions and discussions please use the [Github Issues](https://github.com/GuilhE/android-circular-progress-view/issues). - ## LICENSE Copyright (c) 2017-present, GuilhE. diff --git a/build.gradle.kts b/build.gradle.kts index a2910a7..dc0f107 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,6 +8,7 @@ buildscript { classpath(Libs.com_android_tools_build_gradle) classpath(Libs.org_jetbrains_kotlin_kotlin_gradle_plugin) classpath(Libs.com_jfrog_bintray_gradle_bintray_plugin) + classpath(Libs.dokka_gradle_plugin) } } @@ -33,7 +34,6 @@ tasks.withType { this as StandardJavadocDocletOptions addStringOption("Xdoclint:none", "-quiet") addStringOption("encoding", "UTF-8") - exclude("**/*.kt") } } diff --git a/buildSrc/src/main/java/Constants.kt b/buildSrc/src/main/java/Constants.kt index cf4b4a1..a70a619 100644 --- a/buildSrc/src/main/java/Constants.kt +++ b/buildSrc/src/main/java/Constants.kt @@ -5,7 +5,7 @@ object AndroidConstants { const val minSdkVersion = 23 const val targetSdkVersion = 30 const val compileSdkVersions = 30 - const val buildToolsVersion = "30.0.1" + const val buildToolsVersion = "30.0.2" } object Versions { @@ -14,7 +14,7 @@ object Versions { const val bintray_plugin_version = "1.8.5" const val bintray = "1.8.5" - const val dokka_version = "0.10.1" + const val dokka_version = "1.4.0" const val android_support = "28.0.0" } diff --git a/circular-progress-view/build.gradle.kts b/circular-progress-view/build.gradle.kts index 25da283..a713674 100644 --- a/circular-progress-view/build.gradle.kts +++ b/circular-progress-view/build.gradle.kts @@ -2,7 +2,6 @@ plugins { id("com.android.library") kotlin("android") } -//apply(from = rootProject.file("deploy-bintray.gradle.kts")) android { compileSdkVersion(AndroidConstants.compileSdkVersions) @@ -19,4 +18,24 @@ android { dependencies { implementation(Libs.android_annotations) -} \ No newline at end of file +} + +val sourcesJar by tasks.registering(Jar::class) { + archiveClassifier.set("sources") + from(android.sourceSets.getByName("main").java.srcDirs) +} +val dokkaDoc by tasks.registering(org.jetbrains.dokka.gradle.DokkaTask::class) { + outputDirectory.set(buildDir.resolve("javadoc")) + dokkaSourceSets { + named("main") { + noAndroidSdkLink.set(false) + } + } +} +val dokkaJar by tasks.registering(Jar::class) { + group = JavaBasePlugin.DOCUMENTATION_GROUP + description = "Assembles Kotlin docs with Dokka" + archiveClassifier.set("javadoc") + from(dokkaDoc) +} +apply(from = rootProject.file("deploy-bintray.gradle.kts")) \ No newline at end of file diff --git a/deploy-bintray.gradle.kts b/deploy-bintray.gradle.kts index 48c7a79..2290d44 100644 --- a/deploy-bintray.gradle.kts +++ b/deploy-bintray.gradle.kts @@ -1,6 +1,5 @@ import com.jfrog.bintray.gradle.BintrayExtension import com.jfrog.bintray.gradle.BintrayPlugin -import org.jetbrains.dokka.gradle.DokkaTask import java.io.FileInputStream import java.util.* @@ -11,12 +10,10 @@ buildscript { dependencies { classpath(Libs.com_jfrog_bintray_gradle_bintray_plugin) - classpath(Libs.dokka_gradle_plugin) } } apply(plugin = Libs.maven_publish) -apply(plugin = Libs.org_jetbrains_dokka) plugins.apply(BintrayPlugin::class.java) //https://github.com/bintray/gradle-bintray-plugin/issues/301 val bintrayRepo = properties["bintrayRepo"].toString() @@ -27,18 +24,22 @@ val siteUrl = properties["siteUrl"].toString() val gitUrl = properties["gitUrl"].toString() configure { + var ossPwd = "" if (project.rootProject.file("local.properties").exists()) { val fis = FileInputStream(project.rootProject.file("local.properties")) val prop = Properties() prop.load(fis) user = prop.getProperty("bintray.user", "") key = prop.getProperty("bintray.apiKey", "") + ossPwd = prop.getProperty("bintray.ossPwd", "") } else { user = System.getenv("bintrayUser") key = System.getenv("bintrayApiKey") + ossPwd = System.getenv("mavenCentralPwd") } setPublications(bintrayRepo) + override = true pkg.apply { repo = bintrayRepo @@ -55,6 +56,9 @@ configure { vcsTag = libraryVersion desc = libraryDescription released = Date().toString() + mavenCentralSync.sync = true + mavenCentralSync.user = user + mavenCentralSync.password = ossPwd } } } @@ -67,30 +71,15 @@ configure { val developerName = properties["developerName"].toString() val developerEmail = properties["developerEmail"].toString() - val sourcesJar by tasks.registering(Jar::class) { - archiveClassifier.set("sources") - from(project.the()["main"].allSource) - } - - val dokkaJar by tasks.registering(Jar::class) { - group = JavaBasePlugin.DOCUMENTATION_GROUP - description = "Assembles Kotlin docs with Dokka" - archiveClassifier.set("javadoc") - from(tasks.getting(DokkaTask::class) { - outputFormat = "html" - outputDirectory = "$buildDir/dokka" - }) - } - publications { create(bintrayRepo) { groupId = publishedGroupId artifactId = artifact version = libraryVersion - from(components["java"]) - artifact(sourcesJar.get()) - artifact(dokkaJar.get()) + artifact(tasks.named("sourcesJar")) + artifact(tasks.named("dokkaJar")) + artifact("$buildDir/outputs/aar/${artifactId}-release.aar") pom { packaging = "aar" @@ -116,6 +105,17 @@ configure { email.set(developerEmail) } } + withXml { + val dependenciesNode = asNode().appendNode("dependencies") + configurations.getByName("implementation") { + dependencies.forEach { + val dependencyNode = dependenciesNode.appendNode("dependency") + dependencyNode.appendNode("groupId", it.group) + dependencyNode.appendNode("artifactId", it.name) + dependencyNode.appendNode("version", it.version) + } + } + } } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 11f57fd..cbfa320 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Aug 24 13:26:38 WEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +zipStorePath=wrapper/dists \ No newline at end of file diff --git a/sample/build.gradle b/sample/build.gradle index 0d332aa..43a5ce0 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -14,9 +14,7 @@ android { versionName "2.0.0" } - dataBinding { - enabled = true - } + android.buildFeatures.dataBinding = true compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -39,9 +37,6 @@ dependencies { implementation project(':circular-progress-view') implementation "com.android.support:appcompat-v7:28.0.0" implementation "com.android.support:design:28.0.0" - implementation 'com.android.support.constraint:constraint-layout:2.0.0' + implementation 'com.android.support.constraint:constraint-layout:2.0.1' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.0" -} -repositories { - mavenCentral() } \ No newline at end of file diff --git a/sample/src/main/res/layout/activity_sample_editor.xml b/sample/src/main/res/layout/activity_sample_editor.xml index 741420d..4628ef6 100644 --- a/sample/src/main/res/layout/activity_sample_editor.xml +++ b/sample/src/main/res/layout/activity_sample_editor.xml @@ -1,345 +1,250 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + tools:ignore="HardcodedText,RtlSymmetry"> - - - - - - + android:layout_width="match_parent" + android:layout_height="match_parent"> + android:id="@+id/const_ScrollView" + android:layout_width="0dp" + android:layout_height="0dp" + android:clipToPadding="false" + android:fadeScrollbars="false" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/sample_CircularProgressView"> + + + android:gravity="center_vertical" + android:orientation="horizontal"> - + android:layout_marginStart="5dp" + android:checked="false" /> - + android:layout_marginStart="5dp" + android:checked="true" /> - + android:text="@string/symbol_closing" /> - + android:paddingStart="10dp" + android:text="@string/hint_for_progress_rounded" /> - + + - + android:gravity="center_vertical" + android:orientation="horizontal"> - + android:checked="true" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingStart="10dp" + android:text="@string/hint_for_shadow" /> - - + - + - - - + android:checked="false" /> - - - - - - - - - - - + android:text="@string/hint_for_reverse" /> - - + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="20dp" + android:gravity="center_vertical" + android:orientation="horizontal" + android:paddingStart="10dp"> - - - + android:layout_marginStart="5dp" + android:checked="true" /> - - + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/hint_for_color" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/symbol_closing" /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:weightSum="3"> + android:id="@+id/color_r_SeekBar" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:max="255" + android:progress="204" /> + android:id="@+id/color_g_SeekBar" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:max="255" + android:progress="0" /> + android:id="@+id/color_b_SeekBar" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:max="255" + android:progress="0" /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="10dp" + android:gravity="center_vertical" + android:orientation="horizontal" + android:paddingStart="10dp"> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/hint_for_background_color" /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:orientation="horizontal" + android:paddingStart="10dp"> - + + android:id="@+id/alpha_Switch" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="5dp" + android:checked="true" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/hint_for_alpha" /> - + + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/symbol_closing" /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:weightSum="3"> + android:id="@+id/bg_r_SeekBar" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:max="255" + android:progress="204" /> + android:id="@+id/bg_g_SeekBar" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:max="255" + android:progress="0" /> + android:id="@+id/bg_b_SeekBar" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:max="255" + android:progress="0" /> @@ -349,18 +254,19 @@ android:layout_marginTop="20dp" android:gravity="center_vertical" android:orientation="horizontal"> - - + + + + + android:enabled="false" + android:text="AUTO" /> + + android:text="POINT" /> + + android:text="RATE" /> + + + + + + + + + + + + + + + + + + + + + + + +