Merge pull request #176 from chillibits/dev

Release of version 2.6.2
chillibits · Jun 8, 2021 · 2caca23 · 2caca23
2 parents 139e320 + 83ed806
commit 2caca23
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ Color Converter is an Android app to pick, display and convert colors.
 
 Download Color Converter from [Google Play](https://play.google.com/store/apps/details?id=com.mrgames13.jimdo.colorconverter)!
 
-More information on our homepage: [https://chillibits.com/colorconverter](https://chillibits.com/colorconverter)
+More information on the projects website: [https://chillibits.com/colorconverter](https://chillibits.com/colorconverter)
 
 ## Features
 -   Pick colors

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,6 +8,7 @@ plugins {
     id 'kotlin-android-extensions'
     id 'kotlin-kapt'
     id 'dagger.hilt.android.plugin'
+    id 'com.mikepenz.aboutlibraries.plugin'
 }
 
 android {
@@ -44,28 +45,28 @@ android {
 
 dependencies {
     // base dependencies
-    implementation 'androidx.appcompat:appcompat:1.3.0-rc01'
-    implementation 'androidx.core:core-ktx:1.5.0-beta03'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.core:core-ktx:1.6.0-beta02'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'com.google.android.instantapps:instantapps:1.1.0'
     implementation 'com.google.android.play:core:1.10.0'
     implementation 'androidx.palette:palette-ktx:1.0.0'
     implementation 'com.google.android.material:material:1.3.0'
-    implementation 'androidx.fragment:fragment-ktx:1.3.2'
+    implementation 'androidx.fragment:fragment-ktx:1.3.4'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
 
     // External dependencies
     implementation 'net.margaritov.preference.colorpicker.ColorPickerPreference:ColorPickerPreference:1.0.0'
     implementation 'com.fxn769:pix:1.5.6'
-    implementation 'com.github.skydoves:colorpickerview:2.2.2'
+    implementation 'com.github.skydoves:colorpickerview:2.2.3'
     implementation 'com.mikepenz:iconics-core:5.2.8'
     implementation 'com.mikepenz:material-design-iconic-typeface:2.2.0.8-kotlin@aar'
     implementation 'com.github.javiersantos:MaterialStyledDialogs:3.0.2'
 
     // ChilliBits dependencies
-    implementation 'com.chillibits:simplesettings:1.2.0'
-    implementation 'com.chillibits:adobecolortool:1.0.0'
+    implementation 'com.chillibits:simplesettings:1.3.0'
+    implementation 'com.chillibits:adobecolortool:1.0.1'
 
     // Room dependencies
     implementation "androidx.room:room-runtime:$room_version"

diff --git a/app/src/main/java/com/chillibits/colorconverter/storage/dbo/ColorDbo.kt b/app/src/main/java/com/chillibits/colorconverter/storage/dbo/ColorDbo.kt
@@ -11,7 +11,7 @@ import androidx.room.PrimaryKey
 @Entity(tableName = "colors")
 data class ColorDbo(
         @PrimaryKey(autoGenerate = true)
-    @ColumnInfo(name = "id") val id: Int,
+        @ColumnInfo(name = "id") val id: Int,
         @ColumnInfo(name = "name") var name: String,
         @ColumnInfo(name = "alpha") val alpha: Int,
         @ColumnInfo(name = "red") val red: Int,

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -9,7 +9,7 @@
  Release: Working copy
  Locale: de, German
  Exported by: ChilliBits
- Exported at: Tue, 13 Apr 2021 08:22:52 +0100
+ Exported at: Tue, 08 Jun 2021 08:14:01 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="ok">OK</string>

diff --git a/app/src/main/res/values-de/strings_colors.xml b/app/src/main/res/values-de/strings_colors.xml
@@ -9,7 +9,7 @@
  Release: Working copy
  Locale: de, German
  Exported by: ChilliBits
- Exported at: Tue, 13 Apr 2021 08:22:52 +0100
+ Exported at: Tue, 08 Jun 2021 08:14:01 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="color_alice_blue">Aliceblau</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -9,7 +9,7 @@
  Release: Working copy
  Locale: es, Spanish
  Exported by: ChilliBits
- Exported at: Tue, 13 Apr 2021 08:22:52 +0100
+ Exported at: Tue, 08 Jun 2021 08:14:01 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="ok">Aceptar</string>

diff --git a/app/src/main/res/values-es/strings_colors.xml b/app/src/main/res/values-es/strings_colors.xml
@@ -9,7 +9,7 @@
  Release: Working copy
  Locale: es, Spanish
  Exported by: ChilliBits
- Exported at: Tue, 13 Apr 2021 08:22:52 +0100
+ Exported at: Tue, 08 Jun 2021 08:14:01 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="color_alice_blue">Azul Alicia</string>

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -9,7 +9,7 @@
  Release: Working copy
  Locale: fr, French
  Exported by: ChilliBits
- Exported at: Tue, 13 Apr 2021 08:22:52 +0100
+ Exported at: Tue, 08 Jun 2021 08:14:00 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="ok">OK</string>

diff --git a/app/src/main/res/values-fr/strings_colors.xml b/app/src/main/res/values-fr/strings_colors.xml
@@ -9,7 +9,7 @@
  Release: Working copy
  Locale: fr, French
  Exported by: ChilliBits
- Exported at: Tue, 13 Apr 2021 08:22:52 +0100
+ Exported at: Tue, 08 Jun 2021 08:14:01 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="color_alice_blue">Bleu alice</string>

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -9,7 +9,7 @@
  Release: Working copy
  Locale: ru, Russian
  Exported by: ChilliBits
- Exported at: Tue, 13 Apr 2021 08:22:53 +0100
+ Exported at: Tue, 08 Jun 2021 08:14:01 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="ok">ОК</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -9,7 +9,7 @@
  Release: Working copy
  Locale: en, English
  Exported by: ChilliBits
- Exported at: Tue, 13 Apr 2021 08:22:51 +0100
+ Exported at: Tue, 08 Jun 2021 08:14:00 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="ok">OK</string>

diff --git a/app/src/main/res/values/strings_colors.xml b/app/src/main/res/values/strings_colors.xml
@@ -9,7 +9,7 @@
  Release: Working copy
  Locale: en, English
  Exported by: ChilliBits
- Exported at: Tue, 13 Apr 2021 08:22:52 +0100
+ Exported at: Tue, 08 Jun 2021 08:14:00 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="color_alice_blue">Alice Blue</string>

diff --git a/build.gradle b/build.gradle
@@ -4,16 +4,17 @@
 
 buildscript {
     ext.kotlin_version = '1.4.32'
-    ext.room_version = '2.3.0-rc01'
-    ext.hilt_version = '2.34-beta'
+    ext.room_version = '2.3.0'
+    ext.hilt_version = '2.36'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
+        classpath 'com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:8.3.1'
     }
 }
 
@@ -22,7 +23,6 @@ allprojects {
         google()
         jcenter()
         maven { url "https://jitpack.io" }
-        maven { url "https://repo.chillibits.com/artifactory/android" }
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -7,4 +7,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip