From 88e9d6bdbf1fc27dfaf7d6003e5ec803ce4d6561 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Feb 2021 05:14:57 +0100 Subject: [PATCH 01/20] Bump core-ktx from 1.5.0-beta01 to 1.5.0-beta02 (#140) Bumps core-ktx from 1.5.0-beta01 to 1.5.0-beta02. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index a7a71da1..90ad3254 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,7 +44,7 @@ dependencies { // base dependencies implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.appcompat:appcompat:1.3.0-beta01' - implementation 'androidx.core:core-ktx:1.5.0-beta01' + implementation 'androidx.core:core-ktx:1.5.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.9.1' From 56f7ace1f3361618a920cec55315a4c6be48e090 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Feb 2021 04:18:13 +0100 Subject: [PATCH 02/20] Bump hilt_version from 2.32-alpha to 2.33-beta (#141) Bumps `hilt_version` from 2.32-alpha to 2.33-beta. Updates `hilt-android-gradle-plugin` from 2.32-alpha to 2.33-beta - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/commits) Updates `hilt-android` from 2.32-alpha to 2.33-beta - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/commits) Updates `hilt-android-compiler` from 2.32-alpha to 2.33-beta - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/commits) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0e6b4d9d..49a5f05b 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { ext.kotlin_version = '1.4.30' ext.room_version = '2.3.0-beta02' - ext.hilt_version = '2.32-alpha' + ext.hilt_version = '2.33-beta' ext.hilt_viewmodel_version = '1.0.0-alpha03' repositories { google() From 45aa438e7d908e4a7aaed7761d55868708daf9af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Mar 2021 04:24:49 +0100 Subject: [PATCH 03/20] Bump kotlin_version from 1.4.30 to 1.4.31 (#142) Bumps `kotlin_version` from 1.4.30 to 1.4.31. Updates `kotlin-gradle-plugin` from 1.4.30 to 1.4.31 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.4.31/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.4.30...v1.4.31) Updates `kotlin-stdlib-jdk7` from 1.4.30 to 1.4.31 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.4.31/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.4.30...v1.4.31) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 49a5f05b..34da28f6 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ */ buildscript { - ext.kotlin_version = '1.4.30' + ext.kotlin_version = '1.4.31' ext.room_version = '2.3.0-beta02' ext.hilt_version = '2.33-beta' ext.hilt_viewmodel_version = '1.0.0-alpha03' From 60f5a3a67dcdc67b1f6b48da9ed5f3ac89a670b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Mar 2021 07:55:15 +0100 Subject: [PATCH 04/20] Bump core from 1.9.1 to 1.10.0 (#143) Bumps core from 1.9.1 to 1.10.0. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 90ad3254..364bd445 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,7 +47,7 @@ dependencies { implementation 'androidx.core:core-ktx:1.5.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.9.1' + 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.0' From c9c1da29defc56af4a037dfe08e95dd466a99baa Mon Sep 17 00:00:00 2001 From: Marc Auberer Date: Wed, 10 Mar 2021 11:05:09 +0100 Subject: [PATCH 05/20] Minor text fixes & enable hardware acceleration --- app/src/main/AndroidManifest.xml | 1 + .../chillibits/colorconverter/ui/activity/ImageActivity.kt | 3 ++- app/src/main/res/values-de/strings.xml | 6 +----- app/src/main/res/values-de/strings_colors.xml | 6 +----- app/src/main/res/values-es/strings.xml | 6 +----- app/src/main/res/values-es/strings_colors.xml | 6 +----- app/src/main/res/values-fr/strings.xml | 6 +----- app/src/main/res/values-fr/strings_colors.xml | 6 +----- app/src/main/res/values-ru/strings.xml | 6 +----- app/src/main/res/values/strings.xml | 6 +----- app/src/main/res/values/strings_colors.xml | 6 +----- 11 files changed, 12 insertions(+), 46 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ca99767a..445c1339 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,6 +26,7 @@ android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:requestLegacyExternalStorage="true" + android:hardwareAccelerated="true" android:supportsRtl="true" android:theme="@style/AppTheme" tools:targetApi="q"> 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 index 67e0104f..035f3c5f 100644 --- a/app/src/main/java/com/chillibits/colorconverter/ui/activity/ImageActivity.kt +++ b/app/src/main/java/com/chillibits/colorconverter/ui/activity/ImageActivity.kt @@ -63,6 +63,7 @@ class ImageActivity : AppCompatActivity() { applyWindowInsets() // Initialize toolbar + toolbar.setTitle(R.string.pick_color_from_image) setSupportActionBar(toolbar) supportActionBar?.setDisplayHomeAsUpEnabled(true) @@ -197,7 +198,7 @@ class ImageActivity : AppCompatActivity() { private fun chooseImage() { val options = Options.init() - .setExcludeVideos(true) + .setMode(Options.Mode.Picture) .setRequestCode(Constants.REQ_IMAGE_PICKER) Pix.start(this, options) } diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 5e15ae2e..7e67d8d4 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,15 +1,11 @@ - - OK diff --git a/app/src/main/res/values-de/strings_colors.xml b/app/src/main/res/values-de/strings_colors.xml index 2ec7233d..b9ce21e2 100644 --- a/app/src/main/res/values-de/strings_colors.xml +++ b/app/src/main/res/values-de/strings_colors.xml @@ -1,15 +1,11 @@ - - Aliceblau diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 8fca63a1..84921c59 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,15 +1,11 @@ - - Aceptar diff --git a/app/src/main/res/values-es/strings_colors.xml b/app/src/main/res/values-es/strings_colors.xml index 117ee4d0..40ee2f46 100644 --- a/app/src/main/res/values-es/strings_colors.xml +++ b/app/src/main/res/values-es/strings_colors.xml @@ -1,15 +1,11 @@ - - Azul Alicia diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 012bafcb..a2e5f869 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,15 +1,11 @@ - - OK diff --git a/app/src/main/res/values-fr/strings_colors.xml b/app/src/main/res/values-fr/strings_colors.xml index 108da7ec..bd651e77 100644 --- a/app/src/main/res/values-fr/strings_colors.xml +++ b/app/src/main/res/values-fr/strings_colors.xml @@ -1,15 +1,11 @@ - - Bleu alice diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 6c61ca8e..dfa40c64 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1,15 +1,11 @@ - - ОК diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 277e42e0..e6abefe5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,15 +1,11 @@ - - OK diff --git a/app/src/main/res/values/strings_colors.xml b/app/src/main/res/values/strings_colors.xml index df37afe2..1f55a9f5 100644 --- a/app/src/main/res/values/strings_colors.xml +++ b/app/src/main/res/values/strings_colors.xml @@ -1,15 +1,11 @@ - - Alice Blue From 1aad47c4fa4d46e897b01bfa1c937362d78ea28f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Mar 2021 12:31:16 +0100 Subject: [PATCH 06/20] Bump room_version from 2.3.0-beta02 to 2.3.0-beta03 (#144) Bumps `room_version` from 2.3.0-beta02 to 2.3.0-beta03. Updates `room-runtime` from 2.3.0-beta02 to 2.3.0-beta03 Updates `room-ktx` from 2.3.0-beta02 to 2.3.0-beta03 Updates `room-compiler` from 2.3.0-beta02 to 2.3.0-beta03 Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 34da28f6..215650e6 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { ext.kotlin_version = '1.4.31' - ext.room_version = '2.3.0-beta02' + ext.room_version = '2.3.0-beta03' ext.hilt_version = '2.33-beta' ext.hilt_viewmodel_version = '1.0.0-alpha03' repositories { From 4a4c9a890da0bbd0b3e60c0144f8e8353f724720 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Mar 2021 12:37:55 +0100 Subject: [PATCH 07/20] Bump fragment-ktx from 1.3.0 to 1.3.1 (#146) Bumps fragment-ktx from 1.3.0 to 1.3.1. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 364bd445..87bab460 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -50,7 +50,7 @@ dependencies { 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.0' + implementation 'androidx.fragment:fragment-ktx:1.3.1' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' From 3efa8cee92123c11fc54a322a976a2d865bce801 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Mar 2021 12:43:52 +0100 Subject: [PATCH 08/20] Bump core-ktx from 1.5.0-beta02 to 1.5.0-beta03 (#145) Bumps core-ktx from 1.5.0-beta02 to 1.5.0-beta03. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 87bab460..891d0813 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,7 +44,7 @@ dependencies { // base dependencies implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.appcompat:appcompat:1.3.0-beta01' - implementation 'androidx.core:core-ktx:1.5.0-beta02' + implementation 'androidx.core:core-ktx:1.5.0-beta03' 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' From abe5cfe87d011be63d44454d4d1bcd9b25dc3c31 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Mar 2021 09:37:32 +0100 Subject: [PATCH 09/20] Bump gradle from 4.1.2 to 4.1.3 (#147) Bumps gradle from 4.1.2 to 4.1.3. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 215650e6..72471b15 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.2' + classpath 'com.android.tools.build:gradle:4.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version" } From 39c97d1038eb500398df4284132446187b87d829 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Mar 2021 12:52:30 +0100 Subject: [PATCH 10/20] Bump kotlin_version from 1.4.31 to 1.4.32 (#148) Bumps `kotlin_version` from 1.4.31 to 1.4.32. Updates `kotlin-gradle-plugin` from 1.4.31 to 1.4.32 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Updates `kotlin-stdlib-jdk7` from 1.4.31 to 1.4.32 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 72471b15..1b6dcabb 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ */ buildscript { - ext.kotlin_version = '1.4.31' + ext.kotlin_version = '1.4.32' ext.room_version = '2.3.0-beta03' ext.hilt_version = '2.33-beta' ext.hilt_viewmodel_version = '1.0.0-alpha03' From 1faae53ae42c72894ec0e178f1991b187f3e9614 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Mar 2021 14:04:58 +0100 Subject: [PATCH 11/20] Bump room_version from 2.3.0-beta03 to 2.3.0-rc01 (#149) Bumps `room_version` from 2.3.0-beta03 to 2.3.0-rc01. Updates `room-runtime` from 2.3.0-beta03 to 2.3.0-rc01 Updates `room-ktx` from 2.3.0-beta03 to 2.3.0-rc01 Updates `room-compiler` from 2.3.0-beta03 to 2.3.0-rc01 Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1b6dcabb..34aaccd1 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { ext.kotlin_version = '1.4.32' - ext.room_version = '2.3.0-beta03' + ext.room_version = '2.3.0-rc01' ext.hilt_version = '2.33-beta' ext.hilt_viewmodel_version = '1.0.0-alpha03' repositories { From 85fed93d900b905b688b742d5deddb7129059117 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Mar 2021 14:06:54 +0100 Subject: [PATCH 12/20] Bump fragment-ktx from 1.3.1 to 1.3.2 (#151) Bumps fragment-ktx from 1.3.1 to 1.3.2. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 891d0813..ea207573 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -50,7 +50,7 @@ dependencies { 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.1' + implementation 'androidx.fragment:fragment-ktx:1.3.2' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' From 8138f970d8be7c6a609536740171b1477275eb73 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Mar 2021 14:08:48 +0100 Subject: [PATCH 13/20] Bump appcompat from 1.3.0-beta01 to 1.3.0-rc01 (#153) Bumps appcompat from 1.3.0-beta01 to 1.3.0-rc01. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index ea207573..8673ff30 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -43,7 +43,7 @@ android { dependencies { // base dependencies implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.3.0-beta01' + implementation 'androidx.appcompat:appcompat:1.3.0-rc01' implementation 'androidx.core:core-ktx:1.5.0-beta03' implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation 'com.google.android.instantapps:instantapps:1.1.0' From 0819408b13bd0afc527fbbd3f38e8a57a45699f0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Mar 2021 14:16:37 +0100 Subject: [PATCH 14/20] Bump lifecycle-viewmodel-ktx from 2.3.0 to 2.3.1 (#152) Bumps lifecycle-viewmodel-ktx from 2.3.0 to 2.3.1. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 8673ff30..012ea034 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -51,7 +51,7 @@ dependencies { 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.lifecycle:lifecycle-viewmodel-ktx:2.3.0' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' // External dependencies From 720c39991ed0af5b0a75b86845e1b658858d8454 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Mar 2021 08:23:56 +0200 Subject: [PATCH 15/20] Bump iconics-core from 5.2.4 to 5.2.8 (#154) Bumps [iconics-core](https://github.com/mikepenz/Android-Iconics) from 5.2.4 to 5.2.8. - [Release notes](https://github.com/mikepenz/Android-Iconics/releases) - [Changelog](https://github.com/mikepenz/Android-Iconics/blob/develop/gradle-release.gradle) - [Commits](https://github.com/mikepenz/Android-Iconics/compare/v5.2.4...v5.2.8) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 012ea034..6f3a2aaf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -58,7 +58,7 @@ 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.mikepenz:iconics-core:5.2.4' + 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' From cf1b32f815f9d60cb017ba6ad495d64402d565aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Apr 2021 09:45:37 +0200 Subject: [PATCH 16/20] Bump hilt_version from 2.33-beta to 2.34-beta (#155) Bumps `hilt_version` from 2.33-beta to 2.34-beta. Updates `hilt-android-gradle-plugin` from 2.33-beta to 2.34-beta - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/commits) Updates `hilt-android` from 2.33-beta to 2.34-beta - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/commits) Updates `hilt-android-compiler` from 2.33-beta to 2.34-beta - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/commits) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 34aaccd1..9976df2f 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { ext.kotlin_version = '1.4.32' ext.room_version = '2.3.0-rc01' - ext.hilt_version = '2.33-beta' + ext.hilt_version = '2.34-beta' ext.hilt_viewmodel_version = '1.0.0-alpha03' repositories { google() From c186ed8c68eafe496ca3ba4b0baf0ed2522e7fbb Mon Sep 17 00:00:00 2001 From: Marc Auberer Date: Tue, 13 Apr 2021 09:40:36 +0200 Subject: [PATCH 17/20] Gradle optimizations --- app/build.gradle | 15 ++++++++------- app/src/main/res/values-de/strings.xml | 6 +++++- app/src/main/res/values-de/strings_colors.xml | 6 +++++- app/src/main/res/values-es/strings.xml | 6 +++++- app/src/main/res/values-es/strings_colors.xml | 6 +++++- app/src/main/res/values-fr/strings.xml | 6 +++++- app/src/main/res/values-fr/strings_colors.xml | 6 +++++- app/src/main/res/values-ru/strings.xml | 6 +++++- app/src/main/res/values/strings.xml | 6 +++++- app/src/main/res/values/strings_colors.xml | 6 +++++- build.gradle | 2 +- 11 files changed, 54 insertions(+), 17 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6f3a2aaf..bfb0f340 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,15 +2,17 @@ * Copyright © Marc Auberer 2017-2021. All rights reserved */ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' -apply plugin: 'kotlin-kapt' -apply plugin: 'dagger.hilt.android.plugin' +plugins { + id 'com.android.application' + id 'kotlin-android' + id 'kotlin-android-extensions' + id 'kotlin-kapt' + id 'dagger.hilt.android.plugin' +} android { compileSdkVersion 30 - buildToolsVersion "30.0.2" + buildToolsVersion "30.0.3" defaultConfig { applicationId "com.mrgames13.jimdo.colorconverter" minSdkVersion 21 @@ -42,7 +44,6 @@ android { dependencies { // base dependencies - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.appcompat:appcompat:1.3.0-rc01' implementation 'androidx.core:core-ktx:1.5.0-beta03' implementation 'androidx.constraintlayout:constraintlayout:2.0.4' diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7e67d8d4..d608e689 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,11 +1,15 @@ + + OK diff --git a/app/src/main/res/values-de/strings_colors.xml b/app/src/main/res/values-de/strings_colors.xml index b9ce21e2..8e4a5691 100644 --- a/app/src/main/res/values-de/strings_colors.xml +++ b/app/src/main/res/values-de/strings_colors.xml @@ -1,11 +1,15 @@ + + Aliceblau diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 84921c59..a68e340d 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,11 +1,15 @@ + + Aceptar diff --git a/app/src/main/res/values-es/strings_colors.xml b/app/src/main/res/values-es/strings_colors.xml index 40ee2f46..0c6d0972 100644 --- a/app/src/main/res/values-es/strings_colors.xml +++ b/app/src/main/res/values-es/strings_colors.xml @@ -1,11 +1,15 @@ + + Azul Alicia diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index a2e5f869..af469d1b 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,11 +1,15 @@ + + OK diff --git a/app/src/main/res/values-fr/strings_colors.xml b/app/src/main/res/values-fr/strings_colors.xml index bd651e77..a9e98e0b 100644 --- a/app/src/main/res/values-fr/strings_colors.xml +++ b/app/src/main/res/values-fr/strings_colors.xml @@ -1,11 +1,15 @@ + + Bleu alice diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index dfa40c64..7e623591 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1,11 +1,15 @@ + + ОК diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e6abefe5..9b022261 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,11 +1,15 @@ + + OK diff --git a/app/src/main/res/values/strings_colors.xml b/app/src/main/res/values/strings_colors.xml index 1f55a9f5..05b11d9f 100644 --- a/app/src/main/res/values/strings_colors.xml +++ b/app/src/main/res/values/strings_colors.xml @@ -1,11 +1,15 @@ + + Alice Blue diff --git a/build.gradle b/build.gradle index 9976df2f..34aaccd1 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { ext.kotlin_version = '1.4.32' ext.room_version = '2.3.0-rc01' - ext.hilt_version = '2.34-beta' + ext.hilt_version = '2.33-beta' ext.hilt_viewmodel_version = '1.0.0-alpha03' repositories { google() From 9b6ce1c652daf0d57663660281cc8e7389f2ee08 Mon Sep 17 00:00:00 2001 From: Marc Auberer Date: Tue, 13 Apr 2021 11:43:20 +0200 Subject: [PATCH 18/20] Switch from ViewModelInject to HiltViewModel with Inject --- app/build.gradle | 2 -- .../shared/HiltInstanceProviders.kt | 19 ++++++++++++++++++- .../viewmodel/ColorSelectionViewModel.kt | 6 ++++-- .../viewmodel/ImageViewModel.kt | 6 ++++-- .../colorconverter/viewmodel/MainViewModel.kt | 6 ++++-- build.gradle | 3 +-- 6 files changed, 31 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bfb0f340..69f79aba 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -75,8 +75,6 @@ dependencies { // Hilt implementation "com.google.dagger:hilt-android:$hilt_version" kapt "com.google.dagger:hilt-android-compiler:$hilt_version" - implementation "androidx.hilt:hilt-lifecycle-viewmodel:$hilt_viewmodel_version" - kapt "androidx.hilt:hilt-compiler:$hilt_viewmodel_version" // dependencies for testing testImplementation 'junit:junit:4.13.2' diff --git a/app/src/main/java/com/chillibits/colorconverter/shared/HiltInstanceProviders.kt b/app/src/main/java/com/chillibits/colorconverter/shared/HiltInstanceProviders.kt index ccaa4a55..86f0ab79 100644 --- a/app/src/main/java/com/chillibits/colorconverter/shared/HiltInstanceProviders.kt +++ b/app/src/main/java/com/chillibits/colorconverter/shared/HiltInstanceProviders.kt @@ -16,11 +16,13 @@ import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.components.ActivityComponent +import dagger.hilt.android.components.ViewModelComponent import dagger.hilt.android.qualifiers.ActivityContext +import dagger.hilt.android.qualifiers.ApplicationContext @InstallIn(ActivityComponent::class) @Module -class HiltInstanceProviders { +object HiltInstanceProvidersActivity { @Provides fun provideDatabase(@ActivityContext context: Context) = Room.databaseBuilder(context, AppDatabase::class.java, Constants.DB_NAME) @@ -38,4 +40,19 @@ class HiltInstanceProviders { @Provides fun provideClipboardTools(@ActivityContext context: Context, st: StorageTools, ct: ColorTools) = ClipboardTools(context, st, ct) +} + +@InstallIn(ViewModelComponent::class) +@Module +object HiltInstanceProvidersViewModel { + @Provides + fun provideDatabase(@ApplicationContext context: Context) = + Room.databaseBuilder(context, AppDatabase::class.java, Constants.DB_NAME) + .addMigrations(MIGRATION_2_3).build() + + @Provides + fun provideColorTools(@ApplicationContext context: Context) = ColorTools(context) + + @Provides + fun provideColorNameTools(@ApplicationContext context: Context) = ColorNameTools(context) } \ No newline at end of file diff --git a/app/src/main/java/com/chillibits/colorconverter/viewmodel/ColorSelectionViewModel.kt b/app/src/main/java/com/chillibits/colorconverter/viewmodel/ColorSelectionViewModel.kt index 035fb005..5fd8d155 100644 --- a/app/src/main/java/com/chillibits/colorconverter/viewmodel/ColorSelectionViewModel.kt +++ b/app/src/main/java/com/chillibits/colorconverter/viewmodel/ColorSelectionViewModel.kt @@ -5,7 +5,6 @@ package com.chillibits.colorconverter.viewmodel import android.app.Application -import androidx.hilt.lifecycle.ViewModelInject import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData import androidx.lifecycle.Transformations @@ -15,8 +14,11 @@ import com.chillibits.colorconverter.shared.toDbo import com.chillibits.colorconverter.shared.toObj import com.chillibits.colorconverter.storage.dbo.ColorDbo import com.chillibits.colorconverter.tools.ColorNameTools +import dagger.hilt.android.lifecycle.HiltViewModel +import javax.inject.Inject -class ColorSelectionViewModel@ViewModelInject constructor( +@HiltViewModel +class ColorSelectionViewModel @Inject constructor( application: Application, private val cnt: ColorNameTools, private val repository: ColorRepository diff --git a/app/src/main/java/com/chillibits/colorconverter/viewmodel/ImageViewModel.kt b/app/src/main/java/com/chillibits/colorconverter/viewmodel/ImageViewModel.kt index 23f83a05..c8b45361 100644 --- a/app/src/main/java/com/chillibits/colorconverter/viewmodel/ImageViewModel.kt +++ b/app/src/main/java/com/chillibits/colorconverter/viewmodel/ImageViewModel.kt @@ -9,13 +9,15 @@ import android.graphics.Bitmap import android.graphics.Color import android.speech.tts.TextToSpeech import android.widget.Toast -import androidx.hilt.lifecycle.ViewModelInject import androidx.lifecycle.AndroidViewModel import com.chillibits.colorconverter.tools.ColorTools import com.mrgames13.jimdo.colorconverter.R +import dagger.hilt.android.lifecycle.HiltViewModel import java.util.* +import javax.inject.Inject -class ImageViewModel @ViewModelInject constructor( +@HiltViewModel +class ImageViewModel @Inject constructor( application: Application, private val ct: ColorTools ): AndroidViewModel(application) { diff --git a/app/src/main/java/com/chillibits/colorconverter/viewmodel/MainViewModel.kt b/app/src/main/java/com/chillibits/colorconverter/viewmodel/MainViewModel.kt index 4356f8fd..ed10d2fc 100644 --- a/app/src/main/java/com/chillibits/colorconverter/viewmodel/MainViewModel.kt +++ b/app/src/main/java/com/chillibits/colorconverter/viewmodel/MainViewModel.kt @@ -9,7 +9,6 @@ import android.content.Context import android.media.AudioManager import android.speech.tts.TextToSpeech import android.widget.Toast -import androidx.hilt.lifecycle.ViewModelInject import androidx.lifecycle.AndroidViewModel import com.chillibits.colorconverter.model.Color import com.chillibits.colorconverter.repository.ColorRepository @@ -18,9 +17,12 @@ import com.chillibits.colorconverter.shared.toDbo import com.chillibits.colorconverter.tools.ColorNameTools import com.google.android.instantapps.InstantApps import com.mrgames13.jimdo.colorconverter.R +import dagger.hilt.android.lifecycle.HiltViewModel import java.util.* +import javax.inject.Inject -class MainViewModel @ViewModelInject constructor( +@HiltViewModel +class MainViewModel @Inject constructor( application: Application, private val repository: ColorRepository, private val cnt: ColorNameTools diff --git a/build.gradle b/build.gradle index 34aaccd1..9a5d49fd 100644 --- a/build.gradle +++ b/build.gradle @@ -5,8 +5,7 @@ buildscript { ext.kotlin_version = '1.4.32' ext.room_version = '2.3.0-rc01' - ext.hilt_version = '2.33-beta' - ext.hilt_viewmodel_version = '1.0.0-alpha03' + ext.hilt_version = '2.34-beta' repositories { google() jcenter() From 1b1ad13d8d3315c07f65c9ab54bd1e8f0ed7f40a Mon Sep 17 00:00:00 2001 From: Marc Auberer Date: Tue, 13 Apr 2021 13:45:12 +0200 Subject: [PATCH 19/20] Fix crash on large image sizes --- app/src/main/AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 445c1339..aec23fcc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -92,6 +92,7 @@ android:name="com.chillibits.colorconverter.ui.activity.ImageActivity" android:theme="@style/AppTheme.NoActionBar" android:screenOrientation="portrait" + android:hardwareAccelerated="false" android:windowSoftInputMode="adjustPan"> From cc4d5adf323567cce80862920e7d9675e0d732ee Mon Sep 17 00:00:00 2001 From: Marc Auberer Date: Tue, 13 Apr 2021 13:48:34 +0200 Subject: [PATCH 20/20] Bump version to 2.6.1 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 69f79aba..048a2726 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ android { applicationId "com.mrgames13.jimdo.colorconverter" minSdkVersion 21 targetSdkVersion 30 - versionCode 2600 - versionName "2.6.0" + versionCode 2601 + versionName "2.6.1" vectorDrawables.useSupportLibrary = true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" }