Merge branch 'release/v1.0.1'

rubygarage · Mar 2, 2019 · 1118fca · 1118fca
2 parents 217d5a1 + c8fbf91
commit 1118fca
Show file tree

Hide file tree

Showing 16 changed files with 53 additions and 53 deletions.
diff --git a/README.md b/README.md
@@ -31,15 +31,15 @@ allprojects {
 
 ``` gradle
 dependencies {
-    implementation ‘com.github.rubygarage:emotion-rating-view:v1.0.0’
+    implementation ‘com.github.rubygarage:emotion-rating-view:v1.0.1’
 }
 ```
 
 **Add `EmotionRatingView` library to your layout**. 
 You can also use all views separately.
 
 ``` xml
-    <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -83,7 +83,7 @@ You can also use all views separately.
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/emotionView" />
 
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 ```
 
 **Add to your Activity.**

diff --git a/app/build.gradle b/app/build.gradle
@@ -3,13 +3,13 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.dm.emotionrating"
         minSdkVersion 16
-        targetSdkVersion 27
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion 28
+        versionCode 2
+        versionName "1.0.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -23,8 +23,8 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
-    implementation "com.android.support:appcompat-v7:$androidSupportVersion"
-    implementation "com.android.support.constraint:constraint-layout:$constraintLayoutVersion"
+    implementation "androidx.appcompat:appcompat:$appCompatVersion"
+    implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion"
 
     implementation project(':library')
 }
diff --git a/app/src/main/java/com/dm/emotionrating/RatingActivity.kt b/app/src/main/java/com/dm/emotionrating/RatingActivity.kt
@@ -2,8 +2,8 @@ package com.dm.emotionrating
 
 import android.os.Bundle
 import android.preference.PreferenceManager
-import android.support.v7.app.AppCompatActivity
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import com.dm.emotionrating.library.Constant.ZERO_RATING
 import kotlinx.android.synthetic.main.activity_rating.*
 

diff --git a/app/src/main/res/layout-land/activity_rating.xml b/app/src/main/res/layout-land/activity_rating.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -111,4 +111,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_rating.xml b/app/src/main/res/layout/activity_rating.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -120,4 +120,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/ratingView" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -12,7 +12,6 @@
     <color name="thirdGradientColor">#493395</color>
     <color name="fourthGradientColor">#43248B</color>
     <color name="fifthGradientColor">#411F88</color>
-    <color name="colorTranslucentBlack">#0A000000</color>
     <color name="colorTranslucentGray">#C8E5E5E5</color>
     <color name="colorTransparent">#00000000</color>
 

diff --git a/build.gradle b/build.gradle
@@ -3,17 +3,17 @@
 buildscript {
 
     ext {
-        kotlinVersion = '1.2.41'
-        androidSupportVersion = '27.1.1'
-        constraintLayoutVersion = '1.1.1'
+        kotlinVersion = '1.3.21'
+        appCompatVersion = '1.0.2'
+        constraintLayoutVersion = '1.1.3'
     }
 
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }

diff --git a/gradle.properties b/gradle.properties
@@ -11,3 +11,5 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Apr 17 13:06:41 EET 2018
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+#Sat Mar 02 15:33:35 EET 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
diff --git a/library/build.gradle b/library/build.gradle
@@ -6,12 +6,12 @@ apply plugin: 'com.github.dcendents.android-maven'
 group='com.github.rubygarage'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 27
-        versionCode 1
-        versionName "1.0.0"
+        targetSdkVersion 28
+        versionCode 2
+        versionName "1.0.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         vectorDrawables.useSupportLibrary = true
@@ -28,8 +28,8 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
-    implementation "com.android.support:appcompat-v7:$androidSupportVersion"
-    implementation "com.android.support.constraint:constraint-layout:$constraintLayoutVersion"
+    implementation "androidx.appcompat:appcompat:$appCompatVersion"
+    implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion"
 }
 
 // build a jar with source files

diff --git a/library/src/main/java/com/dm/emotionrating/library/BaseLayout.kt b/library/src/main/java/com/dm/emotionrating/library/BaseLayout.kt
@@ -2,9 +2,9 @@ package com.dm.emotionrating.library
 
 import android.content.Context
 import android.graphics.drawable.Drawable
-import android.support.v7.app.AppCompatDelegate
 import android.util.AttributeSet
 import android.widget.FrameLayout
+import androidx.appcompat.app.AppCompatDelegate
 
 open class BaseLayout<T : Drawable> @JvmOverloads constructor(
     context: Context,

diff --git a/library/src/main/java/com/dm/emotionrating/library/EmotionView.kt b/library/src/main/java/com/dm/emotionrating/library/EmotionView.kt
@@ -1,9 +1,9 @@
 package com.dm.emotionrating.library
 
 import android.content.Context
-import android.support.graphics.drawable.Animatable2Compat
-import android.support.graphics.drawable.AnimatedVectorDrawableCompat
 import android.util.AttributeSet
+import androidx.vectordrawable.graphics.drawable.Animatable2Compat
+import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import kotlinx.android.synthetic.main.view_emotion.view.*
 
 class EmotionView @JvmOverloads constructor(
@@ -20,8 +20,8 @@ class EmotionView @JvmOverloads constructor(
         val animation = getRateAnimation(previousRating, newRating)
         animation?.let {
             val animatedVector = getDrawable(
-                it.toString(),
-                { AnimatedVectorDrawableCompat.create(context, it) })
+                it.toString()
+            ) { AnimatedVectorDrawableCompat.create(context, it) }
             mouth.setImageDrawable(animatedVector)
             (animatedVector as Animatable2Compat).start()
         }

diff --git a/library/src/main/java/com/dm/emotionrating/library/GradientBackgroundView.kt b/library/src/main/java/com/dm/emotionrating/library/GradientBackgroundView.kt
@@ -71,13 +71,11 @@ class GradientBackgroundView @JvmOverloads constructor(
         val newGradientColors = getGradientColors(newRating)
 
         val firstGradient = getDrawable(
-            previousRating.toString(),
-            { GradientDrawable(GradientDrawable.Orientation.TOP_BOTTOM, previousGradientColors) }
-        )
+            previousRating.toString()
+        ) { GradientDrawable(GradientDrawable.Orientation.TOP_BOTTOM, previousGradientColors) }
         val secondGradient = getDrawable(
-            newRating.toString(),
-            { GradientDrawable(GradientDrawable.Orientation.TOP_BOTTOM, newGradientColors) }
-        )
+            newRating.toString()
+        ) { GradientDrawable(GradientDrawable.Orientation.TOP_BOTTOM, newGradientColors) }
 
         gradientView.alpha = 0f
         gradientView.animate()

diff --git a/library/src/main/java/com/dm/emotionrating/library/RatingView.kt b/library/src/main/java/com/dm/emotionrating/library/RatingView.kt
@@ -3,14 +3,14 @@ package com.dm.emotionrating.library
 import android.content.Context
 import android.graphics.drawable.Drawable
 import android.os.Build
-import android.support.graphics.drawable.Animatable2Compat
-import android.support.graphics.drawable.AnimatedVectorDrawableCompat
 import android.util.AttributeSet
 import android.view.View
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.LinearLayout.HORIZONTAL
+import androidx.vectordrawable.graphics.drawable.Animatable2Compat
+import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.dm.emotionrating.library.Constant.MAX_RATING
 import com.dm.emotionrating.library.Constant.MIN_RATING
 
@@ -102,12 +102,12 @@ class RatingView @JvmOverloads constructor(
             }
             grade.layoutParams = gradeLayoutParams
             grade.setImageDrawable(
-                getDrawable(getCacheKey(grade, collapseToExpandAnimation), {
+                getDrawable(getCacheKey(grade, collapseToExpandAnimation)) {
                     AnimatedVectorDrawableCompat.create(
                         context,
                         collapseToExpandAnimation
                     )
-                })
+                }
             )
             grade.setOnClickListener(this)
             gradeContainer.addView(grade)
@@ -133,8 +133,8 @@ class RatingView @JvmOverloads constructor(
 
                     if (isResourceChanged && isResourceAnimated) {
                         val animatedVector = getDrawable(
-                            getCacheKey(grade, newVectorResource),
-                            { AnimatedVectorDrawableCompat.create(context, newVectorResource) })
+                            getCacheKey(grade, newVectorResource)
+                        ) { AnimatedVectorDrawableCompat.create(context, newVectorResource) }
                         grade.tag = newVectorResource
                         grade.setImageDrawable(animatedVector)
                         (animatedVector as? Animatable2Compat)?.let {

diff --git a/library/src/main/res/layout/view_emotion.xml b/library/src/main/res/layout/view_emotion.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -42,21 +42,21 @@
         app:layout_constraintTop_toTopOf="@+id/eyeBarrier"
         app:srcCompat="@drawable/ic_mouth_zero" />
 
-    <android.support.constraint.Guideline
+    <androidx.constraintlayout.widget.Guideline
         android:id="@+id/leftGuideline"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         app:layout_constraintGuide_percent="0.25" />
 
-    <android.support.constraint.Guideline
+    <androidx.constraintlayout.widget.Guideline
         android:id="@+id/rightGuideline"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         app:layout_constraintGuide_percent="0.75" />
 
-    <android.support.constraint.Barrier
+    <androidx.constraintlayout.widget.Barrier
         android:id="@+id/eyeBarrier"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -65,4 +65,4 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:layout_editor_absoluteY="511dp" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/library/src/main/res/values/colors.xml b/library/src/main/res/values/colors.xml
@@ -7,5 +7,6 @@
     <color name="colorAmber">#EF9C4E</color>
     <color name="colorOrange">#FB8621</color>
     <color name="colorDeepOrange">#EC5016</color>
+    <color name="colorTranslucentBlack">#0A000000</color>
 
 </resources>