diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
new file mode 100644
index 0000000..5abd9dc
--- /dev/null
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,29 @@
+name: Publish
+
+on:
+ release:
+ types: [released]
+
+jobs:
+ publish:
+ name: Release build and publish
+ runs-on: ubuntu-latest
+ steps:
+ - name: Check out code
+ uses: actions/checkout@v3.1.0
+ - name: Set up JDK 11
+ uses: actions/setup-java@v3.5.1
+ with:
+ distribution: adopt
+ java-version: 11
+ - name: Release build
+ run: ./gradlew assemble --scan
+ - name: Publish to MavenCentral
+ run: ./gradlew publishLoadingButtonPublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository --scan
+ env:
+ SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
+ SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
+ SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
+ SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
+ SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+ SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
\ No newline at end of file
diff --git a/app/.gitignore b/app/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/app/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/app/build.gradle b/app/build.gradle
deleted file mode 100644
index 08b1389..0000000
--- a/app/build.gradle
+++ /dev/null
@@ -1,46 +0,0 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'org.jmailen.kotlinter'
-
-android {
- compileSdkVersion 30
-
- defaultConfig {
- applicationId "br.com.simplepass.loadingbutton"
- minSdkVersion 16
- targetSdkVersion 30
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- versionCode 1
- versionName "1.0"
-
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
- }
-
- lintOptions {
- abortOnError false
- }
-}
-
-dependencies {
- implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-
- implementation 'androidx.legacy:legacy-support-v4:1.0.0'
- implementation 'androidx.appcompat:appcompat:1.2.0'
- implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-
- implementation project(path: ":loading-button-android")
-
- implementation "io.reactivex.rxjava2:rxjava:2.2.5"
-
- testImplementation 'junit:junit:4.13.2'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
- androidTestImplementation 'androidx.test:rules:1.3.0'
- androidTestImplementation 'androidx.test:runner:1.3.0'
-}
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
deleted file mode 100644
index 9675b26..0000000
--- a/app/proguard-rules.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /Users/hinovamobile/Library/Android/sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
diff --git a/app/src/androidTest/java/br/com/simplepass/loadingbutton/CircularProgressButtonTest.kt b/app/src/androidTest/java/br/com/simplepass/loadingbutton/CircularProgressButtonTest.kt
deleted file mode 100644
index 8525e91..0000000
--- a/app/src/androidTest/java/br/com/simplepass/loadingbutton/CircularProgressButtonTest.kt
+++ /dev/null
@@ -1,112 +0,0 @@
-package br.com.simplepass.loadingbutton
-
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.IdlingRegistry
-import androidx.test.espresso.action.ViewActions.click
-import androidx.test.espresso.action.ViewActions.scrollTo
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers.isClickable
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.isEnabled
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.rule.ActivityTestRule
-import br.com.simplepass.loadingbutton.customViews.CircularProgressButton
-import br.com.simplepass.loadingbuttonsample.MainActivity
-import br.com.simplepass.loadingbuttonsample.R
-import org.hamcrest.Matchers.not
-import org.hamcrest.core.AllOf.allOf
-import org.junit.Rule
-import org.junit.Test
-import androidx.test.espresso.matcher.RootMatchers.withDecorView
-import org.hamcrest.Matchers.`is`
-
-/**
- * [Testing Fundamentals](http://d.android.com/tools/testing/testing_android.html)
- */
-class CircularProgressButtonTest {
-
- @JvmField
- @Rule
- val activityTestRule = ActivityTestRule(MainActivity::class.java, true, true)
-
- // Buttons that doesn't revert the animation very fast
- private val slowProgressButtons = arrayOf(
- R.id.buttonTest1,
- R.id.buttonTest2,
- R.id.buttonTest6,
- R.id.buttonTest7,
- R.id.buttonTest8,
- R.id.buttonTest9
- )
-
- private val allProgressButtons = arrayOf(
- R.id.buttonTest1,
- R.id.buttonTest2,
- R.id.buttonTest3,
- R.id.buttonTest4,
- R.id.buttonTest5,
- R.id.buttonTest6,
- R.id.buttonTest7,
- R.id.buttonTest8,
- R.id.buttonTest9
- )
-
- private fun testButtonTextVisibilityBeforeAnimation(id: Int) {
- onView(withId(id))
- .perform(scrollTo())
- .check(matches(allOf(isDisplayed(), isEnabled(), isClickable(), withText(R.string.send))))
- .perform(click())
- .check(matches(not(withText(R.string.send))))
- }
-
- private fun testButtonTextVisibilityBeforeAndAfterAnimation(id: Int) {
- val progressButton: CircularProgressButton = activityTestRule.activity.findViewById(id)
-
- onView(withId(id))
- .perform(scrollTo())
- .check(matches(allOf(isDisplayed(), isEnabled(), isClickable(), withText(R.string.send))))
- .perform(click())
-
- val progressButtonIdlingResource = ProgressButtonStateIdlingResource(progressButton)
- IdlingRegistry.getInstance().register(progressButtonIdlingResource)
-
- onView(withId(id)).check(matches(withText(R.string.send)))
- IdlingRegistry.getInstance().unregister(progressButtonIdlingResource)
- }
-
- @Test
- fun testTextVisibleBeforeSpinnerAnimation() {
- slowProgressButtons.forEach(::testButtonTextVisibilityBeforeAnimation)
- }
-
- @Test
- fun testTextVisibleBeforeAndAfterSpinnerAnimation() {
- allProgressButtons.forEach(::testButtonTextVisibilityBeforeAndAfterAnimation)
- }
-
- @Test
- fun testTextReShownImmediatelyAfterClick() {
- onView(withId(R.id.buttonTest3))
- .check(matches(allOf(isDisplayed(), isEnabled(), isClickable(), withText(R.string.send))))
- .perform(click())
- .check(matches(withText(R.string.send)))
- }
-
- @Test
- fun testToastShowAfterStartAnimationFinished() {
- val id = R.id.buttonTest9
- val progressButton: CircularProgressButton = activityTestRule.activity.findViewById(id)
- val progressButtonIdlingResource = ProgressButtonStateIdlingResource(progressButton).apply {
- IdlingRegistry.getInstance().register(this)
- }
-
- onView(withId(id))
- .perform(scrollTo())
- .check(matches(allOf(isDisplayed(), isEnabled(), isClickable(), withText(R.string.send))))
- .perform(click())
-
- onView(withText(R.string.start_done)).inRoot(withDecorView(not(`is`(activityTestRule.activity.window.decorView)))).check(matches(isDisplayed()))
- IdlingRegistry.getInstance().unregister(progressButtonIdlingResource)
- }
-}
diff --git a/app/src/androidTest/java/br/com/simplepass/loadingbutton/ProgressButtonStateIdlingResource.kt b/app/src/androidTest/java/br/com/simplepass/loadingbutton/ProgressButtonStateIdlingResource.kt
deleted file mode 100644
index 5ab99bc..0000000
--- a/app/src/androidTest/java/br/com/simplepass/loadingbutton/ProgressButtonStateIdlingResource.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package br.com.simplepass.loadingbutton
-
-import androidx.test.espresso.IdlingResource
-import br.com.simplepass.loadingbutton.customViews.ProgressButton
-import br.com.simplepass.loadingbutton.presentation.State
-
-class ProgressButtonStateIdlingResource(private val progressButton: ProgressButton, private val expectedState: State = State.IDLE) : IdlingResource {
-
- private var idle: Boolean = false
- private var resourceCallback: IdlingResource.ResourceCallback? = null
-
- override fun getName(): String = progressButton::class.java.simpleName
-
- override fun isIdleNow(): Boolean {
- idle = idle || progressButton.getState() == expectedState
-
- if (idle) {
- if (resourceCallback != null) {
- resourceCallback!!.onTransitionToIdle()
- }
- }
-
- return idle
- }
-
- override fun registerIdleTransitionCallback(resourceCallback: IdlingResource.ResourceCallback) {
- this.resourceCallback = resourceCallback
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/br/com/simplepass/loadingbuttonsample/MainActivity.kt b/app/src/main/java/br/com/simplepass/loadingbuttonsample/MainActivity.kt
deleted file mode 100644
index d69deb6..0000000
--- a/app/src/main/java/br/com/simplepass/loadingbuttonsample/MainActivity.kt
+++ /dev/null
@@ -1,115 +0,0 @@
-package br.com.simplepass.loadingbuttonsample
-
-import android.animation.ValueAnimator
-import android.content.Context
-import android.content.res.Resources
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.os.Bundle
-import android.os.Handler
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.ContextCompat
-import br.com.simplepass.loadingbutton.animatedDrawables.ProgressType
-import br.com.simplepass.loadingbutton.customViews.ProgressButton
-import kotlinx.android.synthetic.main.activity_main.*
-import android.widget.Toast
-
-class MainActivity : AppCompatActivity() {
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- setContentView(R.layout.activity_main)
-
- imgBtnTest0.run { setOnClickListener { morphDoneAndRevert(this@MainActivity) } }
-
- imgBtnTest1.run { setOnClickListener { morphDoneAndRevert(this@MainActivity) } }
- buttonTest1.run { setOnClickListener { morphDoneAndRevert(this@MainActivity) } }
-
- buttonTest2.run { setOnClickListener { morphAndRevert() } }
-
- buttonTest3.run { setOnClickListener { morphAndRevert(100) } }
-
- buttonTest4.run {
- setOnClickListener {
- morphDoneAndRevert(this@MainActivity, doneTime = 100)
- }
- }
-
- buttonTest5.run {
- setOnClickListener {
- morphDoneAndRevert(this@MainActivity, doneTime = 100, revertTime = 200)
- }
- }
-
- buttonTest6.run {
- setOnClickListener {
- progressType = ProgressType.INDETERMINATE
- startAnimation()
- progressAnimator(this).start()
- Handler().run {
- postDelayed({
- doneLoadingAnimation(defaultColor(context), defaultDoneImage(context.resources))
- }, 2500)
- postDelayed({ revertAnimation() }, 3500)
- }
- }
- }
-
- buttonTest7.run { setOnClickListener { morphStopRevert() } }
- buttonTest8.run { setOnClickListener { morphStopRevert(100, 1000) } }
-
- buttonTest9.run {
- setOnClickListener {
- morphAndRevert {
- Toast.makeText(this@MainActivity, getString(R.string.start_done),
- Toast.LENGTH_SHORT).show()
- }
- }
- }
-
- buttonTest10.run {
- setOnClickListener {
- morphDoneAndRevert(this@MainActivity)
- }
- }
- }
-}
-
-private fun defaultColor(context: Context) = ContextCompat.getColor(context, android.R.color.black)
-
-private fun defaultDoneImage(resources: Resources) =
- BitmapFactory.decodeResource(resources, R.drawable.ic_pregnant_woman_white_48dp)
-
-private fun ProgressButton.morphDoneAndRevert(
- context: Context,
- fillColor: Int = defaultColor(context),
- bitmap: Bitmap = defaultDoneImage(context.resources),
- doneTime: Long = 3000,
- revertTime: Long = 4000
-) {
- progressType = ProgressType.INDETERMINATE
- startAnimation()
- Handler().run {
- postDelayed({ doneLoadingAnimation(fillColor, bitmap) }, doneTime)
- postDelayed(::revertAnimation, revertTime)
- }
-}
-
-private fun ProgressButton.morphAndRevert(revertTime: Long = 3000, startAnimationCallback: () -> Unit = {}) {
- startAnimation(startAnimationCallback)
- Handler().postDelayed(::revertAnimation, revertTime)
-}
-
-private fun ProgressButton.morphStopRevert(stopTime: Long = 1000, revertTime: Long = 2000) {
- startAnimation()
- Handler().postDelayed(::stopAnimation, stopTime)
- Handler().postDelayed(::revertAnimation, revertTime)
-}
-
-private fun progressAnimator(progressButton: ProgressButton) = ValueAnimator.ofFloat(0F, 100F).apply {
- duration = 1500
- startDelay = 500
- addUpdateListener { animation ->
- progressButton.setProgress(animation.animatedValue as Float)
- }
-}
diff --git a/app/src/main/java/br/com/simplepass/loadingbuttonsample/SecondActivity.kt b/app/src/main/java/br/com/simplepass/loadingbuttonsample/SecondActivity.kt
deleted file mode 100644
index 6864b17..0000000
--- a/app/src/main/java/br/com/simplepass/loadingbuttonsample/SecondActivity.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package br.com.simplepass.loadingbuttonsample
-
-import android.animation.ObjectAnimator
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import kotlinx.android.synthetic.main.activity_second.*
-
-class SecondActivity : AppCompatActivity() {
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- setContentView(R.layout.activity_second)
-
- val animator = ObjectAnimator.ofFloat(mask, "alpha", 0f).setDuration(600)
-
- animator.startDelay = 400
- animator.start()
-
-// button.setOnClickListener {
-// startActivity(Intent(this, MainActivity::class.java))
-// }
- }
-}
diff --git a/app/src/main/res/drawable/button_shape_default.xml b/app/src/main/res/drawable/button_shape_default.xml
deleted file mode 100644
index 2251c22..0000000
--- a/app/src/main/res/drawable/button_shape_default.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
diff --git a/app/src/main/res/drawable/button_shape_default_rounded.xml b/app/src/main/res/drawable/button_shape_default_rounded.xml
deleted file mode 100644
index 7d9081c..0000000
--- a/app/src/main/res/drawable/button_shape_default_rounded.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
--
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_alarm_on_white_48dp.png b/app/src/main/res/drawable/ic_alarm_on_white_48dp.png
deleted file mode 100644
index ee97617..0000000
Binary files a/app/src/main/res/drawable/ic_alarm_on_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_cloud_upload_white_24dp.png b/app/src/main/res/drawable/ic_cloud_upload_white_24dp.png
deleted file mode 100644
index 3ff57ad..0000000
Binary files a/app/src/main/res/drawable/ic_cloud_upload_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_done_white_48dp.png b/app/src/main/res/drawable/ic_done_white_48dp.png
deleted file mode 100644
index d670618..0000000
Binary files a/app/src/main/res/drawable/ic_done_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_pregnant_woman_white_48dp.png b/app/src/main/res/drawable/ic_pregnant_woman_white_48dp.png
deleted file mode 100644
index f20f377..0000000
Binary files a/app/src/main/res/drawable/ic_pregnant_woman_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable/problem_shape.xml b/app/src/main/res/drawable/problem_shape.xml
deleted file mode 100644
index 25735cc..0000000
--- a/app/src/main/res/drawable/problem_shape.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
diff --git a/app/src/main/res/drawable/rounded_corners_yellow.xml b/app/src/main/res/drawable/rounded_corners_yellow.xml
deleted file mode 100644
index 460400d..0000000
--- a/app/src/main/res/drawable/rounded_corners_yellow.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
diff --git a/app/src/main/res/font/aclonica.xml b/app/src/main/res/font/aclonica.xml
deleted file mode 100644
index a88a968..0000000
--- a/app/src/main/res/font/aclonica.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
deleted file mode 100644
index a654929..0000000
--- a/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,287 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/activity_second.xml b/app/src/main/res/layout/activity_second.xml
deleted file mode 100644
index d70b4bc..0000000
--- a/app/src/main/res/layout/activity_second.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index cde69bc..0000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index c133a0c..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index bfa42f0..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 324e72c..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index aee44e1..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
deleted file mode 100644
index 63fc816..0000000
--- a/app/src/main/res/values-w820dp/dimens.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
- 64dp
-
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
deleted file mode 100644
index d034f02..0000000
--- a/app/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- #3F51B5
- #303F9F
- #FF4081
- #FFA000
- #3F51B5
- #FF9800
-
- @android:color/transparent
-
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
deleted file mode 100644
index 47c8224..0000000
--- a/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- 16dp
- 16dp
-
diff --git a/app/src/main/res/values/font_certs.xml b/app/src/main/res/values/font_certs.xml
deleted file mode 100644
index d2226ac..0000000
--- a/app/src/main/res/values/font_certs.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- - @array/com_google_android_gms_fonts_certs_dev
- - @array/com_google_android_gms_fonts_certs_prod
-
-
- -
- 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
-
-
-
diff --git a/app/src/main/res/values/preloaded_fonts.xml b/app/src/main/res/values/preloaded_fonts.xml
deleted file mode 100644
index 45c8c66..0000000
--- a/app/src/main/res/values/preloaded_fonts.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
- - @font/aclonica
-
-
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
deleted file mode 100644
index abf9ac4..0000000
--- a/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
- LoadingButton
- Send
- Start Animation Done
-
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
deleted file mode 100644
index a3bff40..0000000
--- a/app/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/build.gradle b/build.gradle
index c82edd9..33ea2ff 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,34 +1,32 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.kotlin_version = '1.4.31'
+ ext.kotlin_version = '1.8.21'
repositories {
- mavenLocal()
+ maven { url "https://plugins.gradle.org/m2/" }
google()
- jcenter()
+ mavenLocal()
mavenCentral()
- maven {
- url = uri("https://plugins.gradle.org/m2/")
- }
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.1.3'
- classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
- classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+ classpath 'com.android.tools.build:gradle:8.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- classpath 'org.ajoberstar:grgit:1.5.0'
classpath 'org.jmailen.gradle:kotlinter-gradle:1.20.1'
-
+ classpath 'io.github.gradle-nexus:publish-plugin:1.3.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}
+apply plugin: 'io.github.gradle-nexus.publish-plugin'
+apply from: "${rootDir}/scripts/publish-root.gradle"
+
allprojects {
repositories {
- mavenLocal()
+ maven { url "https://plugins.gradle.org/m2/" }
google()
- jcenter()
+ mavenLocal()
+ mavenCentral()
}
subprojects {
@@ -36,19 +34,6 @@ allprojects {
}
}
-import org.ajoberstar.grgit.Grgit
-
-ext {
- git = Grgit.open(currentDir: projectDir)
- gitVersionName = git.describe()
- gitVersionCode = git.tag.list().size()
-}
-
task clean(type: Delete) {
delete rootProject.buildDir
}
-
-task printVersion() {
- println("Version Name: $gitVersionName")
- println("Version Code: $gitVersionCode")
-}
diff --git a/gradle.properties b/gradle.properties
index fc9e9e1..8cb9665 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,6 +14,9 @@
org.gradle.jvmargs=-Xmx2048m
android.enableJetifier=true
android.useAndroidX=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 41265d2..c48d551 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Mar 23 13:52:00 BRT 2021
+#Fri May 19 14:11:12 CEST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
diff --git a/loading-button-android/build.gradle b/loading-button-android/build.gradle
deleted file mode 100644
index 2eb5906..0000000
--- a/loading-button-android/build.gradle
+++ /dev/null
@@ -1,141 +0,0 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'com.jfrog.bintray'
-apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'org.jmailen.kotlinter'
-
-// Bintray depends on this global variable to set the library version!
-version = "2.2.0"
-group = 'br.com.simplepass'
-
-android {
- compileSdkVersion 30
-
- testOptions {
- unitTests {
- includeAndroidResources = true
- }
- }
-
- defaultConfig {
- minSdkVersion 16
- targetSdkVersion 30
- versionCode 21
- versionName version
- }
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
- }
-
- lintOptions{
- abortOnError false
- }
- sourceSets {
- main.java.srcDirs += 'src/main/java'
- }
-}
-
-if (project.hasProperty("android")) { // Android libraries
- task sourcesJar(type: Jar) {
- classifier = 'sources'
- from android.sourceSets.main.java.srcDirs
- }
-
- task javadoc(type: Javadoc) {
- source = android.sourceSets.main.java.srcDirs
- classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
- }
-} else { // Java libraries
- task sourcesJar(type: Jar, dependsOn: classes) {
- classifier = 'sources'
- from sourceSets.main.allSource
- }
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
- classifier = 'javadoc'
- from javadoc.destinationDir
-}
-
-artifacts {
- archives javadocJar
- archives sourcesJar
-}
-
-install {
- repositories.mavenInstaller {
- pom.project {
- name 'LoadingButtonAndroid'
- description 'A button to substitute the ProgressDialog'
- url 'https://github.com/leandroBorgesFerreira/LoadingButtonAndroid'
- inceptionYear '2017'
-
- packaging 'aar'
- groupId 'br.com.simplepass'
- artifactId 'loading-button-android'
- version version
-
- licenses {
- license {
- name 'The Apache Software License, Version 2.0'
- url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
- distribution 'repo'
- }
- }
- scm {
- connection 'https://github.com/leandroBorgesFerreira/LoadingButtonAndroid.git'
- url 'https://github.com/leandroBorgesFerreira/LoadingButtonAndroid'
-
- }
- developers {
- developer {
- name 'Leandro Borges Ferreira'
- }
- }
- }
- }
-}
-
-// Configure gradle-bintray-plugin (for publishing releases)
-bintray {
- configurations = ['archives']
-
- publish = true
-
- pkg {
- repo = 'maven'
- name = 'loading-button'
- userOrg = 'lehen01'
- licenses = ['Apache-2.0']
- labels = ['customview', 'fragment', 'map']
- websiteUrl = 'https://github.com/leandroBorgesFerreira/LoadingButtonAndroid'
- issueTrackerUrl = 'https://github.com/leandroBorgesFerreira/LoadingButtonAndroid/issues'
- vcsUrl = 'https://github.com/leandroBorgesFerreira/LoadingButtonAndroid.git'
- publicDownloadNumbers = true
- }
-
-}
-
-if (project.hasProperty('bintrayUser') && project.hasProperty('bintrayKey')) {
- bintray.user = project.bintrayUser
- bintray.key = project.bintrayKey
-}
-
-dependencies {
- implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
- implementation 'androidx.appcompat:appcompat:1.1.0'
-
- testImplementation 'org.mockito:mockito-core:2.23.4'
- testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.0.0"
- testImplementation 'org.robolectric:robolectric:4.1'
- testImplementation 'androidx.test:core:1.1.0'
- testImplementation 'junit:junit:4.12'
-
-}
-repositories {
- mavenLocal()
- mavenCentral()
-}
diff --git a/loading-button-android/build.gradle.kts b/loading-button-android/build.gradle.kts
new file mode 100644
index 0000000..9385ba6
--- /dev/null
+++ b/loading-button-android/build.gradle.kts
@@ -0,0 +1,115 @@
+import org.jetbrains.kotlin.konan.properties.Properties
+import java.io.FileInputStream
+
+plugins {
+ id("com.android.library")
+ id("org.jetbrains.kotlin.android")
+ signing
+ `maven-publish`
+}
+
+
+val artifactIdVal = "loading-button-android"
+val versionVal = "2.3.0"
+val publicationName = "loadingButton"
+
+group = "io.github.leandroborgesferreira"
+version = versionVal
+
+publishing {
+ publications {
+ create(publicationName) {
+ groupId = group.toString()
+ artifactId = artifactIdVal
+ version = versionVal
+
+ pom {
+ name.set("loading-button-android")
+ description.set("A button that animates into a loading spinner")
+ url.set("https://https://github.com/leandroBorgesFerreira/LoadingButtonAndroid")
+ packaging = "jar"
+ licenses {
+ license {
+ name.set("The Apache License, Version 2.0")
+ url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+ }
+ }
+ developers {
+ developer {
+ id.set("leandroBorgesFerreira")
+ name.set("Leandro Borges Ferreira")
+ email.set("lehen01@gmail.com")
+ }
+ }
+ scm {
+ connection.set("scm:git:git://github.com/leandroBorgesFerreira/LoadingButtonAndroid.git")
+ developerConnection.set("scm:git:ssh://github.com/leandroBorgesFerreira/LoadingButtonAndroid.git")
+ url.set("https://github.com/leandroBorgesFerreira/LoadingButtonAndroid")
+ }
+ }
+ }
+ }
+}
+
+signing {
+ val secretPropsFile: File = project.rootProject.file("local.properties")
+
+ if (secretPropsFile.exists()) {
+ val prop = Properties().apply {
+ load(FileInputStream(secretPropsFile))
+ }
+ useInMemoryPgpKeys(
+ prop.getProperty("signing.keyId"),
+ prop.getProperty("signing.key"),
+ prop.getProperty("signing.password"),
+ )
+ } else {
+ useInMemoryPgpKeys(
+ System.getenv("SIGNING_KEY_ID"),
+ System.getenv("SIGNING_KEY"),
+ System.getenv("SIGNING_PASSWORD"),
+ )
+ }
+
+ sign(publishing.publications[publicationName])
+}
+
+android {
+ namespace = "io.github.leandroborgesferreira.loadingbutton"
+ compileSdk = 33
+
+ defaultConfig {
+ minSdk = 21
+
+ testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+ consumerProguardFiles("consumer-rules.pro")
+ }
+
+ buildTypes {
+ release {
+ isMinifyEnabled = false
+ proguardFiles(
+ getDefaultProguardFile("proguard-android-optimize.txt"),
+ "proguard-rules.pro"
+ )
+ }
+ }
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
+ }
+ kotlinOptions {
+ jvmTarget = "11"
+ }
+}
+
+dependencies {
+ implementation("androidx.core:core-ktx:1.10.1")
+ implementation("androidx.appcompat:appcompat:1.6.1")
+
+ testImplementation("org.mockito:mockito-core:5.3.1")
+ testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
+ testImplementation("org.robolectric:robolectric:4.10")
+ testImplementation("androidx.test:core:1.5.0")
+ testImplementation("junit:junit:4.13.2")
+}
diff --git a/loading-button-android/src/main/AndroidManifest.xml b/loading-button-android/src/main/AndroidManifest.xml
index 8d53dd0..cc947c5 100644
--- a/loading-button-android/src/main/AndroidManifest.xml
+++ b/loading-button-android/src/main/AndroidManifest.xml
@@ -1 +1 @@
-
+
diff --git a/loading-button-android/src/main/java/br/com/simplepass/loadingbutton/animatedDrawables/ProgressType.kt b/loading-button-android/src/main/java/br/com/simplepass/loadingbutton/animatedDrawables/ProgressType.kt
deleted file mode 100644
index fbe54d7..0000000
--- a/loading-button-android/src/main/java/br/com/simplepass/loadingbutton/animatedDrawables/ProgressType.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package br.com.simplepass.loadingbutton.animatedDrawables
-
-enum class ProgressType {
- DETERMINATE, INDETERMINATE
-}
diff --git a/loading-button-android/src/main/java/br/com/simplepass/loadingbutton/Extensions.kt b/loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/Extensions.kt
similarity index 89%
rename from loading-button-android/src/main/java/br/com/simplepass/loadingbutton/Extensions.kt
rename to loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/Extensions.kt
index d5d0dee..a1a6682 100644
--- a/loading-button-android/src/main/java/br/com/simplepass/loadingbutton/Extensions.kt
+++ b/loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/Extensions.kt
@@ -1,4 +1,4 @@
-package br.com.simplepass.loadingbutton
+package io.github.leandroborgesferreira.loadingbutton
import android.animation.Animator
import android.view.View
diff --git a/loading-button-android/src/main/java/br/com/simplepass/loadingbutton/animatedDrawables/CircularProgressAnimatedDrawable.kt b/loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/animatedDrawables/CircularProgressAnimatedDrawable.kt
similarity index 96%
rename from loading-button-android/src/main/java/br/com/simplepass/loadingbutton/animatedDrawables/CircularProgressAnimatedDrawable.kt
rename to loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/animatedDrawables/CircularProgressAnimatedDrawable.kt
index e3932e8..ae3fcea 100644
--- a/loading-button-android/src/main/java/br/com/simplepass/loadingbutton/animatedDrawables/CircularProgressAnimatedDrawable.kt
+++ b/loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/animatedDrawables/CircularProgressAnimatedDrawable.kt
@@ -1,4 +1,4 @@
-package br.com.simplepass.loadingbutton.animatedDrawables
+package io.github.leandroborgesferreira.loadingbutton.animatedDrawables
import android.animation.Animator
import android.animation.AnimatorListenerAdapter
@@ -14,8 +14,8 @@ import android.graphics.drawable.Animatable
import android.graphics.drawable.Drawable
import android.view.animation.AccelerateDecelerateInterpolator
import android.view.animation.LinearInterpolator
-import br.com.simplepass.loadingbutton.customViews.ProgressButton
-import br.com.simplepass.loadingbutton.disposeAnimator
+import io.github.leandroborgesferreira.loadingbutton.customViews.ProgressButton
+import io.github.leandroborgesferreira.loadingbutton.disposeAnimator
const val MIN_PROGRESS = 0F
const val MAX_PROGRESS = 100F
diff --git a/loading-button-android/src/main/java/br/com/simplepass/loadingbutton/animatedDrawables/CircularRevealAnimatedDrawable.kt b/loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/animatedDrawables/CircularRevealAnimatedDrawable.kt
similarity index 93%
rename from loading-button-android/src/main/java/br/com/simplepass/loadingbutton/animatedDrawables/CircularRevealAnimatedDrawable.kt
rename to loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/animatedDrawables/CircularRevealAnimatedDrawable.kt
index 2a2a03d..a709454 100644
--- a/loading-button-android/src/main/java/br/com/simplepass/loadingbutton/animatedDrawables/CircularRevealAnimatedDrawable.kt
+++ b/loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/animatedDrawables/CircularRevealAnimatedDrawable.kt
@@ -1,4 +1,4 @@
-package br.com.simplepass.loadingbutton.animatedDrawables
+package io.github.leandroborgesferreira.loadingbutton.animatedDrawables
import android.animation.Animator
import android.animation.AnimatorListenerAdapter
@@ -14,8 +14,8 @@ import android.graphics.PixelFormat
import android.graphics.drawable.Animatable
import android.graphics.drawable.Drawable
import android.view.animation.DecelerateInterpolator
-import br.com.simplepass.loadingbutton.customViews.ProgressButton
-import br.com.simplepass.loadingbutton.disposeAnimator
+import io.github.leandroborgesferreira.loadingbutton.customViews.ProgressButton
+import io.github.leandroborgesferreira.loadingbutton.disposeAnimator
private const val REVEAL_DURATION = 120L
private const val ALPHA_ANIMATION_DURATION = 80L
@@ -82,7 +82,7 @@ internal class CircularRevealAnimatedDrawable(
}
addListener(object : AnimatorListenerAdapter() {
- override fun onAnimationEnd(animation: Animator?) {
+ override fun onAnimationEnd(animation: Animator) {
super.onAnimationEnd(animation)
isFilled = true
}
diff --git a/loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/animatedDrawables/ProgressType.kt b/loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/animatedDrawables/ProgressType.kt
new file mode 100644
index 0000000..64c7b19
--- /dev/null
+++ b/loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/animatedDrawables/ProgressType.kt
@@ -0,0 +1,5 @@
+package io.github.leandroborgesferreira.loadingbutton.animatedDrawables
+
+enum class ProgressType {
+ DETERMINATE, INDETERMINATE
+}
diff --git a/loading-button-android/src/main/java/br/com/simplepass/loadingbutton/customViews/CircularProgressButton.kt b/loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/customViews/CircularProgressButton.kt
similarity index 90%
rename from loading-button-android/src/main/java/br/com/simplepass/loadingbutton/customViews/CircularProgressButton.kt
rename to loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/customViews/CircularProgressButton.kt
index 7ce6035..dcd7df0 100644
--- a/loading-button-android/src/main/java/br/com/simplepass/loadingbutton/customViews/CircularProgressButton.kt
+++ b/loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/customViews/CircularProgressButton.kt
@@ -1,4 +1,4 @@
-package br.com.simplepass.loadingbutton.customViews
+package io.github.leandroborgesferreira.loadingbutton.customViews
import android.animation.AnimatorSet
import android.content.Context
@@ -11,12 +11,12 @@ import androidx.appcompat.widget.AppCompatButton
import androidx.core.content.ContextCompat
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.OnLifecycleEvent
-import br.com.simplepass.loadingbutton.animatedDrawables.CircularProgressAnimatedDrawable
-import br.com.simplepass.loadingbutton.animatedDrawables.CircularRevealAnimatedDrawable
-import br.com.simplepass.loadingbutton.animatedDrawables.ProgressType
-import br.com.simplepass.loadingbutton.disposeAnimator
-import br.com.simplepass.loadingbutton.presentation.ProgressButtonPresenter
-import br.com.simplepass.loadingbutton.presentation.State
+import io.github.leandroborgesferreira.loadingbutton.animatedDrawables.CircularProgressAnimatedDrawable
+import io.github.leandroborgesferreira.loadingbutton.animatedDrawables.CircularRevealAnimatedDrawable
+import io.github.leandroborgesferreira.loadingbutton.animatedDrawables.ProgressType
+import io.github.leandroborgesferreira.loadingbutton.disposeAnimator
+import io.github.leandroborgesferreira.loadingbutton.presentation.ProgressButtonPresenter
+import io.github.leandroborgesferreira.loadingbutton.presentation.State
open class CircularProgressButton : AppCompatButton, ProgressButton {
diff --git a/loading-button-android/src/main/java/br/com/simplepass/loadingbutton/customViews/CircularProgressImageButton.kt b/loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/customViews/CircularProgressImageButton.kt
similarity index 90%
rename from loading-button-android/src/main/java/br/com/simplepass/loadingbutton/customViews/CircularProgressImageButton.kt
rename to loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/customViews/CircularProgressImageButton.kt
index 881513d..f9b882e 100644
--- a/loading-button-android/src/main/java/br/com/simplepass/loadingbutton/customViews/CircularProgressImageButton.kt
+++ b/loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/customViews/CircularProgressImageButton.kt
@@ -1,4 +1,4 @@
-package br.com.simplepass.loadingbutton.customViews
+package io.github.leandroborgesferreira.loadingbutton.customViews
import android.animation.AnimatorSet
import android.content.Context
@@ -11,12 +11,12 @@ import androidx.appcompat.widget.AppCompatImageButton
import androidx.core.content.ContextCompat
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.OnLifecycleEvent
-import br.com.simplepass.loadingbutton.animatedDrawables.CircularProgressAnimatedDrawable
-import br.com.simplepass.loadingbutton.animatedDrawables.CircularRevealAnimatedDrawable
-import br.com.simplepass.loadingbutton.animatedDrawables.ProgressType
-import br.com.simplepass.loadingbutton.disposeAnimator
-import br.com.simplepass.loadingbutton.presentation.ProgressButtonPresenter
-import br.com.simplepass.loadingbutton.presentation.State
+import io.github.leandroborgesferreira.loadingbutton.animatedDrawables.CircularProgressAnimatedDrawable
+import io.github.leandroborgesferreira.loadingbutton.animatedDrawables.CircularRevealAnimatedDrawable
+import io.github.leandroborgesferreira.loadingbutton.animatedDrawables.ProgressType
+import io.github.leandroborgesferreira.loadingbutton.disposeAnimator
+import io.github.leandroborgesferreira.loadingbutton.presentation.ProgressButtonPresenter
+import io.github.leandroborgesferreira.loadingbutton.presentation.State
open class CircularProgressImageButton : AppCompatImageButton, ProgressButton {
diff --git a/loading-button-android/src/main/java/br/com/simplepass/loadingbutton/customViews/OnAnimationEndListener.java b/loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/customViews/OnAnimationEndListener.java
similarity index 58%
rename from loading-button-android/src/main/java/br/com/simplepass/loadingbutton/customViews/OnAnimationEndListener.java
rename to loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/customViews/OnAnimationEndListener.java
index 85de9f2..7df29ec 100644
--- a/loading-button-android/src/main/java/br/com/simplepass/loadingbutton/customViews/OnAnimationEndListener.java
+++ b/loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/customViews/OnAnimationEndListener.java
@@ -1,4 +1,4 @@
-package br.com.simplepass.loadingbutton.customViews;
+package io.github.leandroborgesferreira.loadingbutton.customViews;
@FunctionalInterface
public interface OnAnimationEndListener {
diff --git a/loading-button-android/src/main/java/br/com/simplepass/loadingbutton/customViews/ProgressButton.kt b/loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/customViews/ProgressButton.kt
similarity index 85%
rename from loading-button-android/src/main/java/br/com/simplepass/loadingbutton/customViews/ProgressButton.kt
rename to loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/customViews/ProgressButton.kt
index 4546554..4300d42 100644
--- a/loading-button-android/src/main/java/br/com/simplepass/loadingbutton/customViews/ProgressButton.kt
+++ b/loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/customViews/ProgressButton.kt
@@ -1,4 +1,4 @@
-package br.com.simplepass.loadingbutton.customViews
+package io.github.leandroborgesferreira.loadingbutton.customViews
import android.animation.Animator
import android.animation.AnimatorListenerAdapter
@@ -16,15 +16,16 @@ import android.util.AttributeSet
import android.view.View
import androidx.core.content.ContextCompat
import androidx.lifecycle.LifecycleObserver
-import br.com.simplepass.loadingbutton.R
-import br.com.simplepass.loadingbutton.animatedDrawables.CircularProgressAnimatedDrawable
-import br.com.simplepass.loadingbutton.animatedDrawables.CircularRevealAnimatedDrawable
-import br.com.simplepass.loadingbutton.animatedDrawables.ProgressType
-import br.com.simplepass.loadingbutton.presentation.State
-import br.com.simplepass.loadingbutton.updateHeight
-import br.com.simplepass.loadingbutton.updateWidth
-import br.com.simplepass.loadingbutton.utils.addLifecycleObserver
-import br.com.simplepass.loadingbutton.utils.parseGradientDrawable
+import io.github.leandroborgesferreira.loadingbutton.R
+import io.github.leandroborgesferreira.loadingbutton.animatedDrawables.CircularProgressAnimatedDrawable
+import io.github.leandroborgesferreira.loadingbutton.animatedDrawables.CircularRevealAnimatedDrawable
+import io.github.leandroborgesferreira.loadingbutton.animatedDrawables.ProgressType
+import io.github.leandroborgesferreira.loadingbutton.presentation.State
+import io.github.leandroborgesferreira.loadingbutton.updateHeight
+import io.github.leandroborgesferreira.loadingbutton.updateWidth
+import io.github.leandroborgesferreira.loadingbutton.utils.addLifecycleObserver
+import io.github.leandroborgesferreira.loadingbutton.utils.parseGradientDrawable
+import kotlin.math.abs
interface ProgressButton : Drawable.Callback, LifecycleObserver {
var paddingProgress: Float
@@ -156,14 +157,14 @@ internal fun ProgressButton.createRevealAnimatedDrawable(
CircularRevealAnimatedDrawable(this, fillColor, bitmap).apply {
val padding = Rect()
drawableBackground.getPadding(padding)
- val paddingSides = (Math.abs(padding.top - padding.left))
+ val paddingSides = (abs(padding.top - padding.left))
setBounds(paddingSides, padding.top, finalWidth - paddingSides, finalHeight - padding.bottom)
callback = this@createRevealAnimatedDrawable
}
internal fun cornerAnimator(drawable: Drawable, initial: Float, final: Float) =
when (drawable) {
- is GradientDrawable -> ObjectAnimator.ofFloat(drawable, "cornerRadius", initial, final)
+// is GradientDrawable -> ObjectAnimator.ofFloat(drawable, "cornerRadius", initial, final)
else -> ObjectAnimator.ofFloat(parseGradientDrawable(drawable), "cornerRadius", initial, final)
}
@@ -183,11 +184,11 @@ internal fun heightAnimator(view: View, initial: Int, final: Int) =
internal fun morphListener(morphStartFn: () -> Unit, morphEndFn: () -> Unit) =
object : AnimatorListenerAdapter() {
- override fun onAnimationEnd(animation: Animator?) {
+ override fun onAnimationEnd(animation: Animator) {
morphEndFn()
}
- override fun onAnimationStart(animation: Animator?) {
+ override fun onAnimationStart(animation: Animator) {
morphStartFn()
}
}
@@ -202,7 +203,7 @@ internal fun CircularProgressAnimatedDrawable.drawProgress(canvas: Canvas) {
internal fun applyAnimationEndListener(animator: Animator, onAnimationEndListener: () -> Unit) =
animator.addListener(object : AnimatorListenerAdapter() {
- override fun onAnimationEnd(animation: Animator?) {
+ override fun onAnimationEnd(animation: Animator) {
onAnimationEndListener()
animator.removeListener(this)
}
diff --git a/loading-button-android/src/main/java/br/com/simplepass/loadingbutton/presentation/ProgressButtonPresenter.kt b/loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/presentation/ProgressButtonPresenter.kt
similarity index 95%
rename from loading-button-android/src/main/java/br/com/simplepass/loadingbutton/presentation/ProgressButtonPresenter.kt
rename to loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/presentation/ProgressButtonPresenter.kt
index 124582e..e3648c7 100644
--- a/loading-button-android/src/main/java/br/com/simplepass/loadingbutton/presentation/ProgressButtonPresenter.kt
+++ b/loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/presentation/ProgressButtonPresenter.kt
@@ -1,9 +1,9 @@
-package br.com.simplepass.loadingbutton.presentation
+package io.github.leandroborgesferreira.loadingbutton.presentation
import android.graphics.Bitmap
import android.graphics.Canvas
import android.os.Handler
-import br.com.simplepass.loadingbutton.customViews.ProgressButton
+import io.github.leandroborgesferreira.loadingbutton.customViews.ProgressButton
enum class State {
BEFORE_DRAW,
diff --git a/loading-button-android/src/main/java/br/com/simplepass/loadingbutton/utils/Utils.kt b/loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/utils/Utils.kt
similarity index 53%
rename from loading-button-android/src/main/java/br/com/simplepass/loadingbutton/utils/Utils.kt
rename to loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/utils/Utils.kt
index aafd467..2ae7d5f 100644
--- a/loading-button-android/src/main/java/br/com/simplepass/loadingbutton/utils/Utils.kt
+++ b/loading-button-android/src/main/java/io/github/leandroborgesferreira/loadingbutton/utils/Utils.kt
@@ -1,4 +1,4 @@
-package br.com.simplepass.loadingbutton.utils
+package io.github.leandroborgesferreira.loadingbutton.utils
import android.content.Context
import android.graphics.drawable.ColorDrawable
@@ -8,7 +8,6 @@ import android.graphics.drawable.InsetDrawable
import android.graphics.drawable.LayerDrawable
import android.graphics.drawable.RippleDrawable
import android.graphics.drawable.StateListDrawable
-import android.os.Build
import android.view.ContextThemeWrapper
import androidx.lifecycle.LifecycleObserver
import androidx.lifecycle.LifecycleOwner
@@ -18,23 +17,15 @@ internal fun parseGradientDrawable(drawable: Drawable): GradientDrawable =
is GradientDrawable -> drawable
is ColorDrawable -> GradientDrawable().apply { setColor(drawable.color) }
is InsetDrawable -> {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
- drawable.drawable?.let { innerDrawable ->
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
- when (innerDrawable) {
- is RippleDrawable -> {
- parseGradientDrawable(innerDrawable.getDrawable(0))
- }
- else -> parseGradientDrawable(innerDrawable)
- }
- } else {
- parseGradientDrawable(innerDrawable)
+ drawable.drawable?.let { innerDrawable ->
+ when (innerDrawable) {
+ is RippleDrawable -> {
+ parseGradientDrawable(innerDrawable.getDrawable(0))
}
+ else -> parseGradientDrawable(innerDrawable)
}
- ?: throw RuntimeException("Error reading background... Use a shape or a color in xml!")
- } else {
- throw RuntimeException("Error reading background... Use a shape or a color in xml!")
}
+ ?: throw RuntimeException("Error reading background... Use a shape or a color in xml!")
}
is StateListDrawable -> {
if (drawable.current is GradientDrawable) {
@@ -50,9 +41,9 @@ internal fun parseGradientDrawable(drawable: Drawable): GradientDrawable =
}
internal fun Context.addLifecycleObserver(observer: LifecycleObserver) {
- when {
- this is LifecycleOwner -> this.lifecycle.addObserver(observer)
- this is ContextThemeWrapper -> this.baseContext.addLifecycleObserver(observer)
- this is androidx.appcompat.view.ContextThemeWrapper -> this.baseContext.addLifecycleObserver(observer)
+ when (this) {
+ is LifecycleOwner -> this.lifecycle.addObserver(observer)
+ is ContextThemeWrapper -> this.baseContext.addLifecycleObserver(observer)
+// is androidx.appcompat.view.ContextThemeWrapper -> this.baseContext.addLifecycleObserver(observer)
}
-}
\ No newline at end of file
+}
diff --git a/loading-button-android/src/test/java/br/com/simplepass/loadingbutton/animatedDrawables/CircularProgressAnimatedDrawableTest.kt b/loading-button-android/src/test/java/io/github/leandroborgesferreira/loadingbutton/animatedDrawables/CircularProgressAnimatedDrawableTest.kt
similarity index 95%
rename from loading-button-android/src/test/java/br/com/simplepass/loadingbutton/animatedDrawables/CircularProgressAnimatedDrawableTest.kt
rename to loading-button-android/src/test/java/io/github/leandroborgesferreira/loadingbutton/animatedDrawables/CircularProgressAnimatedDrawableTest.kt
index a5b8446..3c302f2 100644
--- a/loading-button-android/src/test/java/br/com/simplepass/loadingbutton/animatedDrawables/CircularProgressAnimatedDrawableTest.kt
+++ b/loading-button-android/src/test/java/io/github/leandroborgesferreira/loadingbutton/animatedDrawables/CircularProgressAnimatedDrawableTest.kt
@@ -1,4 +1,4 @@
-package br.com.simplepass.loadingbutton.animatedDrawables
+package io.github.leandroborgesferreira.loadingbutton.animatedDrawables
import com.nhaarman.mockitokotlin2.mock
import org.junit.Assert.assertEquals
diff --git a/loading-button-android/src/test/java/br/com/simplepass/loadingbutton/animatedDrawables/CircularRevealAnimatedDrawableTest.kt b/loading-button-android/src/test/java/io/github/leandroborgesferreira/loadingbutton/animatedDrawables/CircularRevealAnimatedDrawableTest.kt
similarity index 91%
rename from loading-button-android/src/test/java/br/com/simplepass/loadingbutton/animatedDrawables/CircularRevealAnimatedDrawableTest.kt
rename to loading-button-android/src/test/java/io/github/leandroborgesferreira/loadingbutton/animatedDrawables/CircularRevealAnimatedDrawableTest.kt
index 46ca388..a962209 100644
--- a/loading-button-android/src/test/java/br/com/simplepass/loadingbutton/animatedDrawables/CircularRevealAnimatedDrawableTest.kt
+++ b/loading-button-android/src/test/java/io/github/leandroborgesferreira/loadingbutton/animatedDrawables/CircularRevealAnimatedDrawableTest.kt
@@ -1,9 +1,9 @@
-package br.com.simplepass.loadingbutton.animatedDrawables
+package io.github.leandroborgesferreira.loadingbutton.animatedDrawables
import android.content.Context
import android.graphics.BitmapFactory
import androidx.test.core.app.ApplicationProvider
-import br.com.simplepass.loadingbutton.R
+import io.github.leandroborgesferreira.loadingbutton.R
import com.nhaarman.mockitokotlin2.mock
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
diff --git a/loading-button-android/src/test/java/br/com/simplepass/loadingbutton/presentation/ProgressButtonPresenterTest.kt b/loading-button-android/src/test/java/io/github/leandroborgesferreira/loadingbutton/presentation/ProgressButtonPresenterTest.kt
similarity index 98%
rename from loading-button-android/src/test/java/br/com/simplepass/loadingbutton/presentation/ProgressButtonPresenterTest.kt
rename to loading-button-android/src/test/java/io/github/leandroborgesferreira/loadingbutton/presentation/ProgressButtonPresenterTest.kt
index 405fe4d..890ca82 100644
--- a/loading-button-android/src/test/java/br/com/simplepass/loadingbutton/presentation/ProgressButtonPresenterTest.kt
+++ b/loading-button-android/src/test/java/io/github/leandroborgesferreira/loadingbutton/presentation/ProgressButtonPresenterTest.kt
@@ -1,8 +1,8 @@
-package br.com.simplepass.loadingbutton.presentation
+package io.github.leandroborgesferreira.loadingbutton.presentation
import android.graphics.Bitmap
import android.graphics.Canvas
-import br.com.simplepass.loadingbutton.customViews.ProgressButton
+import io.github.leandroborgesferreira.loadingbutton.customViews.ProgressButton
import com.nhaarman.mockitokotlin2.any
import com.nhaarman.mockitokotlin2.mock
import com.nhaarman.mockitokotlin2.never
diff --git a/sample/.gitignore b/sample/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/sample/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
new file mode 100644
index 0000000..91cc3d9
--- /dev/null
+++ b/sample/build.gradle.kts
@@ -0,0 +1,73 @@
+plugins {
+ id("com.android.application")
+ id("org.jetbrains.kotlin.android")
+}
+
+android {
+ namespace = "io.github.leandroborgesferreira.sample"
+ compileSdk = 33
+
+ defaultConfig {
+ applicationId = "io.github.leandroborgesferreira.sample"
+ minSdk = 21
+ targetSdk = 33
+ versionCode = 1
+ versionName = "1.0"
+
+ testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+ vectorDrawables {
+ useSupportLibrary = true
+ }
+ }
+
+ buildTypes {
+ release {
+ isMinifyEnabled = false
+ proguardFiles(
+ getDefaultProguardFile("proguard-android-optimize.txt"),
+ "proguard-rules.pro"
+ )
+ }
+ }
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
+ }
+ kotlinOptions {
+ jvmTarget = "11"
+ }
+ buildFeatures {
+ compose = true
+ }
+ composeOptions {
+ kotlinCompilerExtensionVersion = "1.4.7"
+ }
+ packagingOptions {
+ resources {
+ excludes += "/META-INF/{AL2.0,LGPL2.1}"
+ }
+ }
+}
+
+dependencies {
+ implementation(project(":loading-button-android"))
+
+ implementation("androidx.core:core-ktx:1.10.1")
+ implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
+ implementation("androidx.activity:activity-compose:1.7.1")
+ implementation(platform("androidx.compose:compose-bom:2023.03.00"))
+ implementation("androidx.compose.ui:ui")
+ implementation("androidx.compose.ui:ui-graphics")
+ implementation("androidx.compose.ui:ui-tooling-preview")
+ implementation("androidx.compose.material3:material3")
+ implementation("androidx.appcompat:appcompat:1.6.1")
+ implementation("com.google.android.material:material:1.9.0")
+ implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+ testImplementation("junit:junit:4.13.2")
+ androidTestImplementation("androidx.test.ext:junit:1.1.5")
+ androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+ androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00"))
+ androidTestImplementation("androidx.compose.ui:ui-test-junit4")
+ debugImplementation("androidx.compose.ui:ui-tooling")
+ debugImplementation("androidx.compose.ui:ui-test-manifest")
+}
diff --git a/sample/proguard-rules.pro b/sample/proguard-rules.pro
new file mode 100644
index 0000000..481bb43
--- /dev/null
+++ b/sample/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/sample/src/androidTest/java/io/github/leandroborgesferreira/sample/ExampleInstrumentedTest.kt b/sample/src/androidTest/java/io/github/leandroborgesferreira/sample/ExampleInstrumentedTest.kt
new file mode 100644
index 0000000..4c806c4
--- /dev/null
+++ b/sample/src/androidTest/java/io/github/leandroborgesferreira/sample/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package io.github.leandroborgesferreira.sample
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+ @Test
+ fun useAppContext() {
+ // Context of the app under test.
+ val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+ assertEquals("io.github.leandroborgesferreira.sample", appContext.packageName)
+ }
+}
diff --git a/app/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
similarity index 53%
rename from app/src/main/AndroidManifest.xml
rename to sample/src/main/AndroidManifest.xml
index 836163d..7cffd8c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -1,25 +1,24 @@
-
+
-
+ android:theme="@style/Theme.LoadingButtonAndroid">
+
-
-
-
diff --git a/sample/src/main/java/io/github/leandroborgesferreira/sample/SampleActivity.kt b/sample/src/main/java/io/github/leandroborgesferreira/sample/SampleActivity.kt
new file mode 100644
index 0000000..cbda246
--- /dev/null
+++ b/sample/src/main/java/io/github/leandroborgesferreira/sample/SampleActivity.kt
@@ -0,0 +1,45 @@
+package io.github.leandroborgesferreira.sample
+
+import android.content.Context
+import android.content.res.Resources
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import android.os.Handler
+import androidx.core.content.ContextCompat
+import io.github.leandroborgesferreira.loadingbutton.animatedDrawables.ProgressType
+import io.github.leandroborgesferreira.loadingbutton.customViews.CircularProgressButton
+import io.github.leandroborgesferreira.loadingbutton.customViews.ProgressButton
+
+class SampleActivity : AppCompatActivity() {
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(R.layout.activity_sample)
+ val button = findViewById(R.id.buttonTest)
+
+ button.setOnClickListener {
+ button.morphDoneAndRevert(this)
+ }
+ }
+}
+
+private fun defaultColor(context: Context) = ContextCompat.getColor(context, android.R.color.black)
+
+private fun defaultDoneImage(resources: Resources) =
+ BitmapFactory.decodeResource(resources, R.drawable.ic_done_white_48dp)
+
+private fun ProgressButton.morphDoneAndRevert(
+ context: Context,
+ fillColor: Int = defaultColor(context),
+ bitmap: Bitmap = defaultDoneImage(context.resources),
+ doneTime: Long = 3000,
+ revertTime: Long = 4000
+) {
+ progressType = ProgressType.INDETERMINATE
+ startAnimation()
+ Handler().run {
+ postDelayed({ doneLoadingAnimation(fillColor, bitmap) }, doneTime)
+ postDelayed(::revertAnimation, revertTime)
+ }
+}
diff --git a/sample/src/main/java/io/github/leandroborgesferreira/sample/ui/theme/Color.kt b/sample/src/main/java/io/github/leandroborgesferreira/sample/ui/theme/Color.kt
new file mode 100644
index 0000000..f02cab6
--- /dev/null
+++ b/sample/src/main/java/io/github/leandroborgesferreira/sample/ui/theme/Color.kt
@@ -0,0 +1,11 @@
+package io.github.leandroborgesferreira.sample.ui.theme
+
+import androidx.compose.ui.graphics.Color
+
+val Purple80 = Color(0xFFD0BCFF)
+val PurpleGrey80 = Color(0xFFCCC2DC)
+val Pink80 = Color(0xFFEFB8C8)
+
+val Purple40 = Color(0xFF6650a4)
+val PurpleGrey40 = Color(0xFF625b71)
+val Pink40 = Color(0xFF7D5260)
\ No newline at end of file
diff --git a/sample/src/main/java/io/github/leandroborgesferreira/sample/ui/theme/Theme.kt b/sample/src/main/java/io/github/leandroborgesferreira/sample/ui/theme/Theme.kt
new file mode 100644
index 0000000..e2cf023
--- /dev/null
+++ b/sample/src/main/java/io/github/leandroborgesferreira/sample/ui/theme/Theme.kt
@@ -0,0 +1,70 @@
+package io.github.leandroborgesferreira.sample.ui.theme
+
+import android.app.Activity
+import android.os.Build
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.core.view.WindowCompat
+
+private val DarkColorScheme = darkColorScheme(
+ primary = Purple80,
+ secondary = PurpleGrey80,
+ tertiary = Pink80
+)
+
+private val LightColorScheme = lightColorScheme(
+ primary = Purple40,
+ secondary = PurpleGrey40,
+ tertiary = Pink40
+
+ /* Other default colors to override
+ background = Color(0xFFFFFBFE),
+ surface = Color(0xFFFFFBFE),
+ onPrimary = Color.White,
+ onSecondary = Color.White,
+ onTertiary = Color.White,
+ onBackground = Color(0xFF1C1B1F),
+ onSurface = Color(0xFF1C1B1F),
+ */
+)
+
+@Composable
+fun LoadingButtonAndroidTheme(
+ darkTheme: Boolean = isSystemInDarkTheme(),
+ // Dynamic color is available on Android 12+
+ dynamicColor: Boolean = true,
+ content: @Composable () -> Unit
+) {
+ val colorScheme = when {
+ dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
+ val context = LocalContext.current
+ if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
+ }
+
+ darkTheme -> DarkColorScheme
+ else -> LightColorScheme
+ }
+ val view = LocalView.current
+ if (!view.isInEditMode) {
+ SideEffect {
+ val window = (view.context as Activity).window
+ window.statusBarColor = colorScheme.primary.toArgb()
+ WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
+ }
+ }
+
+ MaterialTheme(
+ colorScheme = colorScheme,
+ typography = Typography,
+ content = content
+ )
+}
diff --git a/sample/src/main/java/io/github/leandroborgesferreira/sample/ui/theme/Type.kt b/sample/src/main/java/io/github/leandroborgesferreira/sample/ui/theme/Type.kt
new file mode 100644
index 0000000..b4af911
--- /dev/null
+++ b/sample/src/main/java/io/github/leandroborgesferreira/sample/ui/theme/Type.kt
@@ -0,0 +1,34 @@
+package io.github.leandroborgesferreira.sample.ui.theme
+
+import androidx.compose.material3.Typography
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
+
+// Set of Material typography styles to start with
+val Typography = Typography(
+ bodyLarge = TextStyle(
+ fontFamily = FontFamily.Default,
+ fontWeight = FontWeight.Normal,
+ fontSize = 16.sp,
+ lineHeight = 24.sp,
+ letterSpacing = 0.5.sp
+ )
+ /* Other default text styles to override
+ titleLarge = TextStyle(
+ fontFamily = FontFamily.Default,
+ fontWeight = FontWeight.Normal,
+ fontSize = 22.sp,
+ lineHeight = 28.sp,
+ letterSpacing = 0.sp
+ ),
+ labelSmall = TextStyle(
+ fontFamily = FontFamily.Default,
+ fontWeight = FontWeight.Medium,
+ fontSize = 11.sp,
+ lineHeight = 16.sp,
+ letterSpacing = 0.5.sp
+ )
+ */
+)
\ No newline at end of file
diff --git a/sample/src/main/res/drawable-v24/ic_launcher_foreground.xml b/sample/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 0000000..7706ab9
--- /dev/null
+++ b/sample/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/button_shape_no_fill.xml b/sample/src/main/res/drawable/button_shape_no_fill.xml
similarity index 100%
rename from app/src/main/res/drawable/button_shape_no_fill.xml
rename to sample/src/main/res/drawable/button_shape_no_fill.xml
diff --git a/sample/src/main/res/drawable/ic_launcher_background.xml b/sample/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 0000000..07d5da9
--- /dev/null
+++ b/sample/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sample/src/main/res/layout/activity_sample.xml b/sample/src/main/res/layout/activity_sample.xml
new file mode 100644
index 0000000..c34a08f
--- /dev/null
+++ b/sample/src/main/res/layout/activity_sample.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000..b3e26b4
--- /dev/null
+++ b/sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000..b3e26b4
--- /dev/null
+++ b/sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/sample/src/main/res/mipmap-hdpi/ic_launcher.webp b/sample/src/main/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 0000000..c209e78
Binary files /dev/null and b/sample/src/main/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/sample/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/sample/src/main/res/mipmap-hdpi/ic_launcher_round.webp
new file mode 100644
index 0000000..b2dfe3d
Binary files /dev/null and b/sample/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ
diff --git a/sample/src/main/res/mipmap-mdpi/ic_launcher.webp b/sample/src/main/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 0000000..4f0f1d6
Binary files /dev/null and b/sample/src/main/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/sample/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/sample/src/main/res/mipmap-mdpi/ic_launcher_round.webp
new file mode 100644
index 0000000..62b611d
Binary files /dev/null and b/sample/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ
diff --git a/sample/src/main/res/mipmap-xhdpi/ic_launcher.webp b/sample/src/main/res/mipmap-xhdpi/ic_launcher.webp
new file mode 100644
index 0000000..948a307
Binary files /dev/null and b/sample/src/main/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/sample/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/sample/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
new file mode 100644
index 0000000..1b9a695
Binary files /dev/null and b/sample/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ
diff --git a/sample/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/sample/src/main/res/mipmap-xxhdpi/ic_launcher.webp
new file mode 100644
index 0000000..28d4b77
Binary files /dev/null and b/sample/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
new file mode 100644
index 0000000..9287f50
Binary files /dev/null and b/sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ
diff --git a/sample/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/sample/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
new file mode 100644
index 0000000..aa7d642
Binary files /dev/null and b/sample/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
new file mode 100644
index 0000000..9126ae3
Binary files /dev/null and b/sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ
diff --git a/sample/src/main/res/values/colors.xml b/sample/src/main/res/values/colors.xml
new file mode 100644
index 0000000..ca1931b
--- /dev/null
+++ b/sample/src/main/res/values/colors.xml
@@ -0,0 +1,10 @@
+
+
+ #FFBB86FC
+ #FF6200EE
+ #FF3700B3
+ #FF03DAC5
+ #FF018786
+ #FF000000
+ #FFFFFFFF
+
diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml
new file mode 100644
index 0000000..82aa71e
--- /dev/null
+++ b/sample/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+
+ sample
+
\ No newline at end of file
diff --git a/sample/src/main/res/values/themes.xml b/sample/src/main/res/values/themes.xml
new file mode 100644
index 0000000..339cc27
--- /dev/null
+++ b/sample/src/main/res/values/themes.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/sample/src/test/java/io/github/leandroborgesferreira/sample/ExampleUnitTest.kt b/sample/src/test/java/io/github/leandroborgesferreira/sample/ExampleUnitTest.kt
new file mode 100644
index 0000000..6bf7da4
--- /dev/null
+++ b/sample/src/test/java/io/github/leandroborgesferreira/sample/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package io.github.leandroborgesferreira.sample
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+ @Test
+ fun addition_isCorrect() {
+ assertEquals(4, 2 + 2)
+ }
+}
diff --git a/scripts/pre-commit.sh b/scripts/pre-commit.sh
deleted file mode 100755
index 36459dc..0000000
--- a/scripts/pre-commit.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-abort()
-{
- echo >&2 '
-***************
-*** ABORTED ***
-***************
-'
- echo "An error occurred. Exiting..." >&2
- exit 1
-}
-
-trap 'abort' 0
-
-set -e
-set -o pipefail
-
-# Add your script below....
-# If an error occurs, the abort() function will be called.
-#----------------------------------------------------------
-# ===> Your script goes here
-
-# pre-commit.sh
-STASH_NAME="pre-commit-$(date +%s)"
-git stash save -q --keep-index $STASH_NAME
-
-# Run lintKotlin task
-./gradlew lintKotlin
-
-STASHES=$(git stash list)
-if [[ $STASHES == "$STASH_NAME" ]]; then
- git stash pop -q
-fi
-
-# Done!
-trap : 0
-
-echo >&2 '
-************
-*** DONE ***
-************
-'
-
diff --git a/scripts/publish-root.gradle b/scripts/publish-root.gradle
new file mode 100644
index 0000000..b40357a
--- /dev/null
+++ b/scripts/publish-root.gradle
@@ -0,0 +1,26 @@
+ext["ossrhUsername"] = ''
+ext["ossrhPassword"] = ''
+ext["sonatypeStagingProfileId"] = ''
+
+File secretPropsFile = project.rootProject.file('local.properties')
+if (secretPropsFile.exists()) {
+ // Read local.properties file first if it exists
+ Properties p = new Properties()
+ new FileInputStream(secretPropsFile).withCloseable { is -> p.load(is) }
+ p.each { name, value -> ext[name] = value }
+} else {
+ // Use system environment variables
+ ext["ossrhUsername"] = System.getenv('SONATYPE_NEXUS_USERNAME')
+ ext["ossrhPassword"] = System.getenv('SONATYPE_NEXUS_PASSWORD')
+ ext["sonatypeStagingProfileId"] = System.getenv('SONATYPE_STAGING_PROFILE_ID')
+}
+
+nexusPublishing {
+ repositories {
+ sonatype {
+ stagingProfileId = sonatypeStagingProfileId
+ username = ossrhUsername
+ password = ossrhPassword
+ }
+ }
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index b02d054..b0c7fd9 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,2 @@
-include ':app', ':loading-button-android'
+include ':loading-button-android'
+include ':sample'