Merge pull request #266 from chillibits/dev

Release of version 2.7.4
chillibits · Aug 11, 2022 · 1daeab9 · 1daeab9
2 parents 3e0cf6c + 24a3d80
commit 1daeab9
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 34 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -17,9 +17,9 @@ android {
     defaultConfig {
         applicationId "com.mrgames13.jimdo.colorconverter"
         minSdkVersion 21
-        targetSdkVersion 31
-        versionCode 2703
-        versionName "2.7.3"
+        targetSdkVersion 32
+        versionCode 2704
+        versionName "2.7.4"
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -31,11 +31,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_11.toString()
     }
     packagingOptions {
         resources {
@@ -46,29 +46,29 @@ android {
 
 dependencies {
     // base dependencies
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.appcompat:appcompat:1.5.0'
+    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.google.android.instantapps:instantapps:1.1.0'
     implementation 'com.google.android.play:core:1.10.3'
     implementation 'androidx.palette:palette-ktx:1.0.0'
-    implementation 'com.google.android.material:material:1.5.0'
-    implementation 'androidx.fragment:fragment-ktx:1.4.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.fragment:fragment-ktx:1.5.2'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.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.4'
-    implementation 'com.mikepenz:iconics-core:5.3.3'
+    implementation 'com.mikepenz:iconics-core:5.3.4'
     implementation 'com.mikepenz:material-design-iconic-typeface:2.2.0.8-kotlin@aar'
     implementation 'com.github.javiersantos:MaterialStyledDialogs:3.0.2'
     implementation 'com.github.numerative:Five-Star-Me:2.1.2'
 
     // ChilliBits dependencies
-    implementation 'com.chillibits:simplesettings:1.3.2'
-    implementation 'com.chillibits:adobecolortool:1.0.3'
+    implementation 'com.chillibits:simplesettings:1.3.4'
+    implementation 'com.chillibits:adobecolortool:1.0.4'
 
     // Room dependencies
     implementation "androidx.room:room-runtime:$room_version"

diff --git a/app/src/main/java/com/chillibits/colorconverter/ui/activity/ColorSelectionActivity.kt b/app/src/main/java/com/chillibits/colorconverter/ui/activity/ColorSelectionActivity.kt
@@ -69,11 +69,11 @@ class ColorSelectionActivity : AppCompatActivity(), ColorsAdapter.ColorSelection
         savedColors.adapter = adapter
 
         // Setup data observer
-        vm.colors.observe(this, { data ->
+        vm.colors.observe(this) { data ->
             adapter.updateData(data.map { it.toObj() })
             noItems.visibility = if (data.isNotEmpty()) View.GONE else View.VISIBLE
             loading.visibility = View.GONE
-        })
+        }
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {

diff --git a/app/src/main/java/com/chillibits/colorconverter/ui/activity/ImageActivity.kt b/app/src/main/java/com/chillibits/colorconverter/ui/activity/ImageActivity.kt
@@ -118,6 +118,7 @@ class ImageActivity : AppCompatActivity() {
         return super.onOptionsItemSelected(item)
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if(requestCode == Constants.REQ_IMAGE_PICKER) {

diff --git a/app/src/main/java/com/chillibits/colorconverter/ui/activity/MainActivity.kt b/app/src/main/java/com/chillibits/colorconverter/ui/activity/MainActivity.kt
@@ -137,6 +137,7 @@ class MainActivity : AppCompatActivity(), ColorsAdapter.ColorSelectionListener,
         return super.onOptionsItemSelected(item)
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         when(requestCode) {

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: Fri, 04 Mar 2022 13:10:23 +0000
+ Exported at: Thu, 11 Aug 2022 20:11:41 +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: Fri, 04 Mar 2022 13:43:33 +0000
+ Exported at: Thu, 11 Aug 2022 20:11:41 +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: Fri, 04 Mar 2022 13:10:24 +0000
+ Exported at: Thu, 11 Aug 2022 20:11:41 +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: Fri, 04 Mar 2022 13:43:33 +0000
+ Exported at: Thu, 11 Aug 2022 20:11:41 +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: Fri, 04 Mar 2022 13:10:23 +0000
+ Exported at: Thu, 11 Aug 2022 20:11:41 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="ok">OK</string>
@@ -30,7 +30,7 @@
     <string name="share">Recommander</string>
     <string name="share_m">Recommander Color Converter à vos amis!</string>
     <string name="recommend_string">Color Converter: Convertir les couleurs, déterminer des couleurs des images et bien plus encore! Un outil efficace pour les programmeurs et les concepteurs. Télécharger de Google Play: https://play.google.com/store/apps/details?id=com.mrgames13.jimdo.colorconverter</string>
-    <string name="press_color_to_apply">Appuyez sur la couleur pour appliquer</string>
+    <string name="press_color_to_apply">Sélectionnez la couleur</string>
     <string name="rate">Évaluer</string>
     <string name="name">Prénom</string>
     <string name="argb_code">Code ARGB</string>
@@ -55,7 +55,7 @@
     <string name="install_app_download">Installez cette application pour profiter de toutes les fonctionnalités et des fonctionnalités que nous ne pouvons pas prendre en charge dans la version de l\'application instantanée.</string>
     <string name="approve_permissions">La fonctionnalité a besoin des autorisations pour fonctionner.</string>
     <string name="pix_bottom_message_without_video">Glissez les images en haut pour entrer la galerie</string>
-    <string name="speak_color">Parler couleur</string>
+    <string name="speak_color">Couleur via audio</string>
     <string name="language_not_available">Langue n\'est pas disponible</string>
     <string name="initialization_failed">Initialisation échouée</string>
     <string name="audio_muted">Augmentez le volume, s\'il vous plaît</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: Fri, 04 Mar 2022 13:43:33 +0000
+ Exported at: Thu, 11 Aug 2022 20:11:41 +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: Fri, 04 Mar 2022 13:10:24 +0000
+ Exported at: Thu, 11 Aug 2022 20:11:41 +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: Fri, 04 Mar 2022 13:10:23 +0000
+ Exported at: Thu, 11 Aug 2022 20:11:40 +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: Fri, 04 Mar 2022 13:43:32 +0000
+ Exported at: Thu, 11 Aug 2022 20:11:40 +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
@@ -3,26 +3,30 @@
  */
 
 buildscript {
-    ext.kotlin_version = '1.6.10'
-    ext.room_version = '2.4.2'
-    ext.hilt_version = '2.41'
+    ext.kotlin_version = '1.7.10'
+    ext.room_version = '2.4.3'
+    ext.hilt_version = '2.43.2'
     repositories {
         google()
+        mavenCentral()
         jcenter()
+        maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.2.2'
         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'
+        classpath 'com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:10.4.0'
     }
 }
 
 allprojects {
     repositories {
         google()
+        mavenCentral()
         jcenter()
         maven { url "https://jitpack.io" }
+        maven { url "https://plugins.gradle.org/m2/" }
     }
 }
 

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-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip