diff --git a/app/build.gradle b/app/build.gradle index 7133212..9996ee5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,30 +3,21 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android' android { - compileSdkVersion 28 - + compileSdkVersion versions.compileSdk defaultConfig { applicationId "com.skydoves.medaldemo" - minSdkVersion 17 - targetSdkVersion 28 - versionCode 1 - versionName "1.0" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } + minSdkVersion versions.minSdk + targetSdkVersion versions.compileSdk + versionCode versions.versionCode + versionName versions.versionName } } dependencies { - implementation "androidx.appcompat:appcompat:1.0.2" - implementation "com.google.android.material:material:1.1.0-alpha03" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin" + implementation "androidx.appcompat:appcompat:$versions.androidxAppcompat" + implementation "com.google.android.material:material:$versions.googleMaterial" implementation project(":medal") - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } apply from: '../spotless.gradle' diff --git a/app/src/main/java/com/skydoves/medaldemo/RankingAdapter.kt b/app/src/main/java/com/skydoves/medaldemo/RankingAdapter.kt index a725329..9ea0b6d 100644 --- a/app/src/main/java/com/skydoves/medaldemo/RankingAdapter.kt +++ b/app/src/main/java/com/skydoves/medaldemo/RankingAdapter.kt @@ -34,7 +34,11 @@ import android.widget.TextView import com.skydoves.medal.MedalAnimation import java.util.ArrayList -class RankingAdapter(private val context: Context, private val layout: Int, private val data: ArrayList) : BaseAdapter() { +class RankingAdapter( + private val context: Context, + private val layout: Int, + private val data: ArrayList +) : BaseAdapter() { override fun getCount(): Int { return data.size diff --git a/app/src/main/java/com/skydoves/medaldemo/RankingItem.kt b/app/src/main/java/com/skydoves/medaldemo/RankingItem.kt index 9147ac5..e666636 100644 --- a/app/src/main/java/com/skydoves/medaldemo/RankingItem.kt +++ b/app/src/main/java/com/skydoves/medaldemo/RankingItem.kt @@ -25,4 +25,4 @@ package com.skydoves.medaldemo import android.graphics.drawable.Drawable -class RankingItem(val medal: Drawable, val profile: Drawable, val name: String, val content: String) +data class RankingItem(val medal: Drawable, val profile: Drawable, val name: String, val content: String) diff --git a/build.gradle b/build.gradle index 95ad4ad..aefeebb 100644 --- a/build.gradle +++ b/build.gradle @@ -1,18 +1,15 @@ buildscript { - ext { - kotlin_version = '1.3.20' - spotless_version = '3.17.0' - bintray_version = '0.9' - } + apply from: './dependencies.gradle' repositories { jcenter() google() } dependencies { - classpath "com.android.tools.build:gradle:3.3.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "com.diffplug.spotless:spotless-plugin-gradle:$spotless_version" - classpath "com.novoda:bintray-release:$bintray_version" + classpath "com.android.tools.build:gradle:$versions.gradleBuildTool" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin" + classpath "com.diffplug.spotless:spotless-plugin-gradle:$versions.spotlessGradle" + classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:$versions.dokkaGradle" + classpath "com.novoda:bintray-release:$versions.bintrayRelease" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 646c917..d5c7475 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Feb 28 23:27:14 KST 2019 +#Mon Aug 12 01:46:19 KST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip diff --git a/medal/build.gradle b/medal/build.gradle index 901b0ce..d7960cf 100644 --- a/medal/build.gradle +++ b/medal/build.gradle @@ -1,37 +1,35 @@ apply plugin: 'com.android.library' -apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android' -apply plugin: 'com.novoda.bintray-release' - -publish { - userOrg = 'devmagician' - groupId = 'com.github.skydoves' - artifactId = 'medal' - publishVersion = '1.0.2' - desc = 'This is Medal by skydoves' - website = 'https://github.com/skydoves/Medal' - issueTracker = "${website}/issues" - repository = "${website}.git" -} +apply plugin: 'kotlin-android-extensions' +apply plugin: 'org.jetbrains.dokka-android' +apply from: '../publish.gradle' +apply from: '../dependencies.gradle' android { - compileSdkVersion 28 - + compileSdkVersion versions.compileSdk defaultConfig { - minSdkVersion 15 - targetSdkVersion 28 - versionCode 1 - versionName "1.0" + minSdkVersion versions.minSdk + targetSdkVersion versions.compileSdk + versionCode versions.versionCode + versionName versions.versionName } } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin" +} + +dokka { + moduleName = 'needs' + outputFormat = 'html' + //noinspection GroovyAccessibility + outputDirectory = "$buildDir/javadoc" } + tasks.withType(Javadoc) { excludes = ['**/*.kt'] options.addBooleanOption('Xdoclint:none', true) } -apply from: '../spotless.gradle' +apply from: '../spotless.gradle' \ No newline at end of file diff --git a/medal/src/main/java/com/skydoves/medal/MedalAnimation.kt b/medal/src/main/java/com/skydoves/medal/MedalAnimation.kt index 4f9613e..4b26a8f 100644 --- a/medal/src/main/java/com/skydoves/medal/MedalAnimation.kt +++ b/medal/src/main/java/com/skydoves/medal/MedalAnimation.kt @@ -29,9 +29,9 @@ import android.view.ViewGroup import android.view.animation.Animation import android.view.animation.Transformation -/** create a [MedalAnimation] by [MedalAnimation.Builder] using dsl. */ +/** creates a [MedalAnimation] by [MedalAnimation.Builder] using dsl. */ fun medalAnimation(block: MedalAnimation.Builder.() -> Unit): MedalAnimation = - MedalAnimation.Builder().apply(block).build() + MedalAnimation.Builder().apply(block).build() /** MedalAnimation implements medal effects for views. */ class MedalAnimation(private val builder: Builder) : Animation() { @@ -55,7 +55,7 @@ class MedalAnimation(private val builder: Builder) : Animation() { this.duration = builder.speed.toLong() if (builder.loop == 0) { - this.repeatCount = Animation.INFINITE + this.repeatCount = INFINITE } else { this.repeatCount = builder.loop - 1 } diff --git a/medal/src/main/java/com/skydoves/medal/MedalLayout.kt b/medal/src/main/java/com/skydoves/medal/MedalLayout.kt index 7f413a5..59f572b 100644 --- a/medal/src/main/java/com/skydoves/medal/MedalLayout.kt +++ b/medal/src/main/java/com/skydoves/medal/MedalLayout.kt @@ -54,20 +54,24 @@ class MedalLayout : FrameLayout { } private fun setTypeArray(typedArray: TypedArray) { - this.medalAnimation = MedalAnimation.Builder() + try { + this.medalAnimation = MedalAnimation.Builder() .setDegreeX( - typedArray.getInt(R.styleable.MedalLayout_degreeX, MedalAnimation.DEFAULT_DEGREE_X)) + typedArray.getInt(R.styleable.MedalLayout_degreeX, MedalAnimation.DEFAULT_DEGREE_X)) .setDegreeZ( - typedArray.getInt(R.styleable.MedalLayout_degreeZ, MedalAnimation.DEFAULT_DEGREE_Z)) + typedArray.getInt(R.styleable.MedalLayout_degreeZ, MedalAnimation.DEFAULT_DEGREE_Z)) .setDirection( - typedArray.getInt( - R.styleable.MedalLayout_direction, MedalAnimation.DEFAULT_DIRECTION)) + typedArray.getInt( + R.styleable.MedalLayout_direction, MedalAnimation.DEFAULT_DIRECTION)) .setSpeed( - typedArray.getInt(R.styleable.MedalLayout_speed, MedalAnimation.DEFAULT_SPEED)) + typedArray.getInt(R.styleable.MedalLayout_speed, MedalAnimation.DEFAULT_SPEED)) .setTurn(typedArray.getInt(R.styleable.MedalLayout_turn, MedalAnimation.DEFAULT_TURN)) .setType(typedArray.getInt(R.styleable.MedalLayout_type, MedalAnimation.DEFAULT_TARGET)) .setLoop(typedArray.getInt(R.styleable.MedalLayout_loop, MedalAnimation.DEFAULT_LOOP)) .build() + } finally { + typedArray.recycle() + } } override fun onFinishInflate() {