From 74294a3172426dd909947b4d63c412b043f15c67 Mon Sep 17 00:00:00 2001
From: Marc Auberer <marc.auberer@chillibits.com>
Date: Thu, 2 Jul 2020 16:05:33 +0200
Subject: [PATCH 01/19] Hide options menu in color picker mode

---
 .../chillibits/colorconverter/ui/activity/MainActivity.kt    | 5 ++++-
 app/src/main/res/values-de/strings.xml                       | 2 +-
 app/src/main/res/values-de/strings_colors.xml                | 2 +-
 app/src/main/res/values-es/strings.xml                       | 2 +-
 app/src/main/res/values-es/strings_colors.xml                | 2 +-
 app/src/main/res/values-fr/strings.xml                       | 2 +-
 app/src/main/res/values-fr/strings_colors.xml                | 2 +-
 app/src/main/res/values-ru/strings.xml                       | 2 +-
 app/src/main/res/values/strings.xml                          | 2 +-
 app/src/main/res/values/strings_colors.xml                   | 2 +-
 10 files changed, 13 insertions(+), 10 deletions(-)

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
index 4d646851..29945e22 100644
--- a/app/src/main/java/com/chillibits/colorconverter/ui/activity/MainActivity.kt
+++ b/app/src/main/java/com/chillibits/colorconverter/ui/activity/MainActivity.kt
@@ -119,7 +119,10 @@ class MainActivity : AppCompatActivity() {
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.menu_activity_main, menu)
         if (InstantApps.isInstantApp(this)) menu?.findItem(R.id.action_install)?.isVisible = true
-        if (intent.hasExtra(Constants.EXTRA_CHOOSE_COLOR)) menu?.findItem(R.id.action_done)?.isVisible = true
+        if (intent.hasExtra(Constants.EXTRA_CHOOSE_COLOR)) {
+            menu?.findItem(R.id.action_done)?.isVisible = true
+            menu?.findItem(R.id.action_disable_alpha)?.isVisible = false
+        }
         menu?.findItem(R.id.action_transparency)?.isVisible = showTransparencyWarning
         disableAlpha = menu?.findItem(R.id.action_disable_alpha)
         disableAlpha?.isChecked = isAlphaDisabled
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 48615e4a..97f99922 100644
--- 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, 30 Jun 2020 20:30:36 +0100
+ Exported at: Thu, 02 Jul 2020 15:04:02 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="close">schließen</string>
diff --git a/app/src/main/res/values-de/strings_colors.xml b/app/src/main/res/values-de/strings_colors.xml
index 38fe9ad5..3a0b8f06 100644
--- 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, 30 Jun 2020 20:30:36 +0100
+ Exported at: Thu, 02 Jul 2020 15:04:02 +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
index 55a8f83a..37365ec7 100644
--- 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, 30 Jun 2020 20:30:36 +0100
+ Exported at: Thu, 02 Jul 2020 15:04:02 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="close">cerrar</string>
diff --git a/app/src/main/res/values-es/strings_colors.xml b/app/src/main/res/values-es/strings_colors.xml
index a9b58ad3..bf82fa34 100644
--- 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, 30 Jun 2020 20:30:36 +0100
+ Exported at: Thu, 02 Jul 2020 15:04:02 +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
index 3e8b04f5..70d9953e 100644
--- 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, 30 Jun 2020 20:30:36 +0100
+ Exported at: Thu, 02 Jul 2020 15:04:02 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="close">fermer</string>
diff --git a/app/src/main/res/values-fr/strings_colors.xml b/app/src/main/res/values-fr/strings_colors.xml
index 0d165f73..a58ad97b 100644
--- 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, 30 Jun 2020 20:30:36 +0100
+ Exported at: Thu, 02 Jul 2020 15:04:02 +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
index 2812aa57..3a23c24b 100644
--- 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, 30 Jun 2020 20:30:36 +0100
+ Exported at: Thu, 02 Jul 2020 15:04:02 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="close">закрыть</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 14eac4e4..61a28f70 100644
--- 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, 30 Jun 2020 20:30:35 +0100
+ Exported at: Thu, 02 Jul 2020 15:04:02 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="close">close</string>
diff --git a/app/src/main/res/values/strings_colors.xml b/app/src/main/res/values/strings_colors.xml
index 8520a364..1d8c0ee3 100644
--- 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, 30 Jun 2020 20:31:19 +0100
+ Exported at: Thu, 02 Jul 2020 15:04:02 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="color_alice_blue">Alice Blue</string>

From 303da7cdba472f0b1a9c85f54f140b623bc9b0a1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 5 Jul 2020 22:10:49 +0000
Subject: [PATCH 02/19] Bump fastadapter from 5.1.0 to 5.2.0

Bumps [fastadapter](https://github.com/mikepenz/FastAdapter) from 5.1.0 to 5.2.0.
- [Release notes](https://github.com/mikepenz/FastAdapter/releases)
- [Changelog](https://github.com/mikepenz/FastAdapter/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/mikepenz/FastAdapter/compare/v5.1.0...v5.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1e34644b..700696be 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -51,7 +51,7 @@ dependencies {
     implementation 'com.github.skydoves:colorpickerview:2.1.6'
     implementation 'com.mikepenz:iconics-core:5.0.3'
     implementation 'com.mikepenz:material-design-iconic-typeface:2.2.0.6-kotlin@aar'
-    implementation 'com.mikepenz:fastadapter:5.1.0'
+    implementation 'com.mikepenz:fastadapter:5.2.0'
     implementation 'com.github.javiersantos:MaterialStyledDialogs:3.0.1'
 
     // dependencies for testing

From 1b96fc605378150bbfaef193d9bea5dba6cb6249 Mon Sep 17 00:00:00 2001
From: Marc Auberer <marc.auberer@chillibits.com>
Date: Mon, 6 Jul 2020 13:08:32 +0200
Subject: [PATCH 03/19] Add Russian color string file

---
 .idea/misc.xml                                |   2 +-
 app/build.gradle                              |   6 +-
 app/src/main/res/values-de/strings.xml        |   2 +-
 app/src/main/res/values-de/strings_colors.xml |   2 +-
 app/src/main/res/values-es/strings.xml        |   2 +-
 app/src/main/res/values-es/strings_colors.xml |   2 +-
 app/src/main/res/values-fr/strings.xml        |   2 +-
 app/src/main/res/values-fr/strings_colors.xml |   2 +-
 app/src/main/res/values-ru/strings.xml        |   6 +-
 app/src/main/res/values-ru/strings_colors.xml | 155 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |   2 +-
 app/src/main/res/values/strings_colors.xml    |   2 +-
 local.properties                              |   4 +-
 13 files changed, 172 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/res/values-ru/strings_colors.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 707ee6e6..2dc54c48 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 700696be..d7efc3f7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -109,9 +109,9 @@ task downloadTranslations {
         // Main string file
         def f = new File("${project.projectDir}/src/main/res/values-ru/strings.xml")
         new URL("https://localise.biz/api/export/locale/ru.xml?format=android&key=${apiKey}").withInputStream{ i -> f.withOutputStream{ it << i }}
-        // Color file (not translated to Russian yet)
-        //f = new File("${project.projectDir}/src/main/res/values-ru/strings_colors.xml")
-        //new URL("https://localise.biz/api/export/locale/ru.xml?format=android&key=${apiKeyColors}").withInputStream{ i -> f.withOutputStream{ it << i }}
+        // Color file
+        f = new File("${project.projectDir}/src/main/res/values-ru/strings_colors.xml")
+        new URL("https://localise.biz/api/export/locale/ru.xml?format=android&key=${apiKeyColors}").withInputStream{ i -> f.withOutputStream{ it << i }}
     }
 }
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 97f99922..1d466859 100644
--- 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: Thu, 02 Jul 2020 15:04:02 +0100
+ Exported at: Mon, 06 Jul 2020 12:07:02 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="close">schließen</string>
diff --git a/app/src/main/res/values-de/strings_colors.xml b/app/src/main/res/values-de/strings_colors.xml
index 3a0b8f06..0679de9f 100644
--- 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: Thu, 02 Jul 2020 15:04:02 +0100
+ Exported at: Sun, 05 Jul 2020 23:13:46 +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
index 37365ec7..2e68a108 100644
--- 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: Thu, 02 Jul 2020 15:04:02 +0100
+ Exported at: Mon, 06 Jul 2020 12:07:02 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="close">cerrar</string>
diff --git a/app/src/main/res/values-es/strings_colors.xml b/app/src/main/res/values-es/strings_colors.xml
index bf82fa34..f9cf07a9 100644
--- 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: Thu, 02 Jul 2020 15:04:02 +0100
+ Exported at: Sun, 05 Jul 2020 23:13:46 +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
index 70d9953e..d3aec68b 100644
--- 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: Thu, 02 Jul 2020 15:04:02 +0100
+ Exported at: Mon, 06 Jul 2020 12:07:02 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="close">fermer</string>
diff --git a/app/src/main/res/values-fr/strings_colors.xml b/app/src/main/res/values-fr/strings_colors.xml
index a58ad97b..50dca49a 100644
--- 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: Thu, 02 Jul 2020 15:04:02 +0100
+ Exported at: Sun, 05 Jul 2020 23:13:45 +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
index 3a23c24b..0d5d4141 100644
--- 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: Thu, 02 Jul 2020 15:04:02 +0100
+ Exported at: Mon, 06 Jul 2020 12:07:02 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="close">закрыть</string>
@@ -30,7 +30,7 @@
     <string name="rate_m">Если Вам нравится наше приложение, пожалуйста, потратьте минуту и ​​оцените Color Converter на 5 звезд в Google Play!</string>
     <string name="share_app">Рекомендовать приложение</string>
     <string name="share">Рекомендовать</string>
-    <string name="share_m">Порекомендовать Color Converter друзьям!</string>
+    <string name="share_m">Порекомендуйте Color Converter друзьям!</string>
     <string name="recommend_string">Color Converter: Преобразование цветов, выбор цвета с изображения и многое другое! Легкий инструмент для программистов и дизайнеров.\u0020\u0020Скачать в Google Play: \nhttps://play.google.com/store/apps/details?id=com.mrgames13.jimdo.colorconverter</string>
     <string name="press_color_to_apply">Коснитесь цвета, чтобы применить</string>
     <string name="rate">Оценить</string>
@@ -52,7 +52,7 @@
     <string name="shortcut_disabled">Действие отключено</string>
     <string name="shortcut_photo_long">Выбрать цвет с фото</string>
     <!-- InstantApp -->
-    <string name="install_app">Установите приложение</string>
+    <string name="install_app">Установить приложение</string>
     <string name="instant_install_m">Эта функция не поддерживается в мгновенной версии приложения.\u0020\u0020Пожалуйста, установите приложение, чтобы использовать эту функцию.</string>
     <string name="install_app_download">Установите это приложение, чтобы использовать все функции, а также функции, которые мы не можем поддерживать в мгновенной версии приложения.</string>
     <string name="approve_permissions">Для работы функции требуются разрешения.</string>
diff --git a/app/src/main/res/values-ru/strings_colors.xml b/app/src/main/res/values-ru/strings_colors.xml
new file mode 100644
index 00000000..8b7bfd1c
--- /dev/null
+++ b/app/src/main/res/values-ru/strings_colors.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright © Marc Auberer 2020. All rights reserved
+  -->
+
+<!--
+ Loco xml export: Android string resources
+ Project: Color Converter Colors
+ Release: Working copy
+ Locale: ru, Russian
+ Exported by: ChilliBits
+ Exported at: Mon, 06 Jul 2020 12:07:02 +0100
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="color_alice_blue"></string>
+    <string name="color_antique_white">Античный Белый</string>
+    <string name="color_aqua"></string>
+    <string name="color_aquamarine">Аквамарин</string>
+    <string name="color_azure">Лазурный</string>
+    <string name="color_beige">Бежевый</string>
+    <string name="color_bisque"></string>
+    <string name="color_black">Черный</string>
+    <string name="color_blanched_almond">Миндальный</string>
+    <string name="color_blue">Синий</string>
+    <string name="color_blue_violet">Сине-фиолетовый</string>
+    <string name="color_brown">Коричневый</string>
+    <string name="color_burly_wood"></string>
+    <string name="color_cadet_blue">Кадетский синий</string>
+    <string name="color_chartreuse">Шартрез</string>
+    <string name="color_chocolate">Шоколадный</string>
+    <string name="color_coral">Коралловый</string>
+    <string name="color_cornflower_blue">Васильковый</string>
+    <string name="color_cornsilk">Кукурузный шелк</string>
+    <string name="color_crimson">Малиновый</string>
+    <string name="color_cyan">Зеленовато-синий</string>
+    <string name="color_dark_blue"></string>
+    <string name="color_dark_cyan"></string>
+    <string name="color_dark_golden_rod"></string>
+    <string name="color_dark_gray"></string>
+    <string name="color_dark_green"></string>
+    <string name="color_dark_khaki"></string>
+    <string name="color_dark_magenta"></string>
+    <string name="color_dark_olive_green"></string>
+    <string name="color_dark_orange"></string>
+    <string name="color_dark_orchid"></string>
+    <string name="color_dark_red"></string>
+    <string name="color_dark_salmon"></string>
+    <string name="color_dark_sea_green"></string>
+    <string name="color_dark_slate_blue"></string>
+    <string name="color_dark_late_gray"></string>
+    <string name="color_dark_turquoise"></string>
+    <string name="color_dark_violet"></string>
+    <string name="color_deep_pink"></string>
+    <string name="color_deep_sky_blue"></string>
+    <string name="color_dim_gray"></string>
+    <string name="color_dodger_blue"></string>
+    <string name="color_fire_brick"></string>
+    <string name="color_floral_white"></string>
+    <string name="color_forest_green"></string>
+    <string name="color_fuchsia"></string>
+    <string name="color_gainsboro"></string>
+    <string name="color_ghost_white"></string>
+    <string name="color_gold"></string>
+    <string name="color_golden_rod"></string>
+    <string name="color_gray"></string>
+    <string name="color_green"></string>
+    <string name="color_green_yellow"></string>
+    <string name="color_honey_dew"></string>
+    <string name="color_hot_pink"></string>
+    <string name="color_indian_red"></string>
+    <string name="color_indigo"></string>
+    <string name="color_ivory"></string>
+    <string name="color_khaki"></string>
+    <string name="color_lavender"></string>
+    <string name="color_lavender_blush"></string>
+    <string name="color_lawn_green"></string>
+    <string name="color_lemon_chiffon"></string>
+    <string name="color_light_blue"></string>
+    <string name="color_light_coral"></string>
+    <string name="color_light_cyan"></string>
+    <string name="color_light_golden_rod_yellow"></string>
+    <string name="color_light_gray"></string>
+    <string name="color_light_green"></string>
+    <string name="color_light_pink"></string>
+    <string name="color_light_salmon"></string>
+    <string name="color_light_sea_green"></string>
+    <string name="color_light_sky_blue"></string>
+    <string name="color_light_slate_gray"></string>
+    <string name="color_light_steel_blue"></string>
+    <string name="color_light_yellow"></string>
+    <string name="color_lime"></string>
+    <string name="color_lime_green"></string>
+    <string name="color_linen"></string>
+    <string name="color_magenta"></string>
+    <string name="color_maroon"></string>
+    <string name="color_medium_aqua_marine"></string>
+    <string name="color_medium_blue"></string>
+    <string name="color_medium_orchid"></string>
+    <string name="color_medium_purple"></string>
+    <string name="color_medium_sea_green"></string>
+    <string name="color_medium_slate_blue"></string>
+    <string name="color_medium_spring_green"></string>
+    <string name="color_medium_turquoise"></string>
+    <string name="color_medium_violet_red"></string>
+    <string name="color_midnight_blue"></string>
+    <string name="color_mint_cream"></string>
+    <string name="color_misty_rose"></string>
+    <string name="color_moccasin"></string>
+    <string name="color_navajo_white"></string>
+    <string name="color_navy"></string>
+    <string name="color_old_lace"></string>
+    <string name="color_olive"></string>
+    <string name="color_olive_drab"></string>
+    <string name="color_orange"></string>
+    <string name="color_orange_red"></string>
+    <string name="color_orchid"></string>
+    <string name="color_pale_golden_rod"></string>
+    <string name="color_pale_green"></string>
+    <string name="color_pale_turquoise"></string>
+    <string name="color_pale_violet_red"></string>
+    <string name="color_papaya_whip"></string>
+    <string name="color_peach_puff"></string>
+    <string name="color_peru"></string>
+    <string name="color_pink"></string>
+    <string name="color_plum"></string>
+    <string name="color_powder_blue"></string>
+    <string name="color_purple"></string>
+    <string name="color_red"></string>
+    <string name="color_rosy_brown"></string>
+    <string name="color_royal_blue"></string>
+    <string name="color_saddle_brown"></string>
+    <string name="color_salmon"></string>
+    <string name="color_sandy_brown"></string>
+    <string name="color_sea_green"></string>
+    <string name="color_sea_shell"></string>
+    <string name="color_sienna"></string>
+    <string name="color_silver"></string>
+    <string name="color_sky_blue"></string>
+    <string name="color_slate_blue"></string>
+    <string name="color_slate_gray"></string>
+    <string name="color_snow"></string>
+    <string name="color_spring_green"></string>
+    <string name="color_steel_blue"></string>
+    <string name="color_tan"></string>
+    <string name="color_teal"></string>
+    <string name="color_thistle"></string>
+    <string name="color_tomato"></string>
+    <string name="color_turquoise"></string>
+    <string name="color_violet"></string>
+    <string name="color_wheat"></string>
+    <string name="color_white"></string>
+    <string name="color_white_smoke"></string>
+    <string name="color_yellow"></string>
+    <string name="color_yellow_green"></string>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 61a28f70..b93335cc 100644
--- 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: Thu, 02 Jul 2020 15:04:02 +0100
+ Exported at: Mon, 06 Jul 2020 12:07:01 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="close">close</string>
diff --git a/app/src/main/res/values/strings_colors.xml b/app/src/main/res/values/strings_colors.xml
index 1d8c0ee3..8d0db925 100644
--- 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: Thu, 02 Jul 2020 15:04:02 +0100
+ Exported at: Sun, 05 Jul 2020 23:13:45 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="color_alice_blue">Alice Blue</string>
diff --git a/local.properties b/local.properties
index b8520d04..0ff9baf6 100644
--- a/local.properties
+++ b/local.properties
@@ -8,5 +8,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Fri Jun 26 16:37:25 CEST 2020
-sdk.dir=C\:\\Users\\i516467\\AppData\\Local\\Android\\Sdk
+#Mon Jul 06 13:06:40 CEST 2020
+sdk.dir=C\:\\Users\\Marc\\AppData\\Local\\AndroidSDK

From b2691e739b8603283214ecac6d8344597c7ba4a2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 8 Jul 2020 02:37:38 +0000
Subject: [PATCH 04/19] Bump constraintlayout from 2.0.0-beta7 to 2.0.0-beta8

Bumps constraintlayout from 2.0.0-beta7 to 2.0.0-beta8.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index d7efc3f7..2d55e9c0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,7 +38,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.3.0-alpha01'
     implementation 'androidx.core:core-ktx:1.5.0-alpha01'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta7'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta8'
     implementation 'com.google.android.instantapps:instantapps:1.1.0'
     implementation 'com.google.android.play:core:1.7.3'
     implementation 'androidx.palette:palette-ktx:1.0.0'

From 1cb51ed74e6b133be3320c70a9f9c6a9f3a2cb0c Mon Sep 17 00:00:00 2001
From: Marc Auberer <marc.auberer@chillibits.com>
Date: Wed, 8 Jul 2020 23:47:38 +0200
Subject: [PATCH 05/19] Upgrade to targetApiVersion 30

---
 app/build.gradle                                              | 4 ++--
 .../chillibits/colorconverter/ui/activity/ImageActivity.kt    | 2 +-
 app/src/main/res/values-de/strings.xml                        | 2 +-
 app/src/main/res/values-de/strings_colors.xml                 | 2 +-
 app/src/main/res/values-es/strings.xml                        | 2 +-
 app/src/main/res/values-es/strings_colors.xml                 | 2 +-
 app/src/main/res/values-fr/strings.xml                        | 2 +-
 app/src/main/res/values-fr/strings_colors.xml                 | 2 +-
 app/src/main/res/values-ru/strings.xml                        | 2 +-
 app/src/main/res/values-ru/strings_colors.xml                 | 2 +-
 app/src/main/res/values/strings.xml                           | 2 +-
 app/src/main/res/values/strings_colors.xml                    | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d7efc3f7..1675025d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,12 +7,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     buildToolsVersion "29.0.3"
     defaultConfig {
         applicationId "com.mrgames13.jimdo.colorconverter"
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 2300
         versionName "2.3.0"
         vectorDrawables.useSupportLibrary = true
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 edf331b9..74f49911 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
@@ -116,7 +116,7 @@ class ImageActivity : AppCompatActivity() {
 
         if(intent.hasExtra(Constants.EXTRA_IMAGE_URI)) {
             // Load default image
-            val defaultImageUri = intent.getParcelableExtra(Constants.EXTRA_IMAGE_URI) as Uri
+            val defaultImageUri = intent.getParcelableExtra<Uri>(Constants.EXTRA_IMAGE_URI)
             val bitmap = MediaStore.Images.Media.getBitmap(contentResolver, defaultImageUri)
             applyImage(bitmap)
         } else if(savedInstanceState == null) {
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1d466859..b28cd293 100644
--- 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: Mon, 06 Jul 2020 12:07:02 +0100
+ Exported at: Wed, 08 Jul 2020 03:41:17 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="close">schließen</string>
diff --git a/app/src/main/res/values-de/strings_colors.xml b/app/src/main/res/values-de/strings_colors.xml
index 0679de9f..c70997ac 100644
--- 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: Sun, 05 Jul 2020 23:13:46 +0100
+ Exported at: Wed, 08 Jul 2020 10:29:07 +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
index 2e68a108..a0636d6b 100644
--- 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: Mon, 06 Jul 2020 12:07:02 +0100
+ Exported at: Wed, 08 Jul 2020 03:41:17 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="close">cerrar</string>
diff --git a/app/src/main/res/values-es/strings_colors.xml b/app/src/main/res/values-es/strings_colors.xml
index f9cf07a9..e8a50f32 100644
--- 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: Sun, 05 Jul 2020 23:13:46 +0100
+ Exported at: Wed, 08 Jul 2020 10:29:07 +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
index d3aec68b..fd7479c2 100644
--- 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: Mon, 06 Jul 2020 12:07:02 +0100
+ Exported at: Wed, 08 Jul 2020 03:41:16 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="close">fermer</string>
diff --git a/app/src/main/res/values-fr/strings_colors.xml b/app/src/main/res/values-fr/strings_colors.xml
index 50dca49a..c502aec0 100644
--- 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: Sun, 05 Jul 2020 23:13:45 +0100
+ Exported at: Wed, 08 Jul 2020 10:29:07 +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
index 0d5d4141..d6753a94 100644
--- 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: Mon, 06 Jul 2020 12:07:02 +0100
+ Exported at: Wed, 08 Jul 2020 03:41:17 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="close">закрыть</string>
diff --git a/app/src/main/res/values-ru/strings_colors.xml b/app/src/main/res/values-ru/strings_colors.xml
index 8b7bfd1c..b2b3d354 100644
--- a/app/src/main/res/values-ru/strings_colors.xml
+++ b/app/src/main/res/values-ru/strings_colors.xml
@@ -9,7 +9,7 @@
  Release: Working copy
  Locale: ru, Russian
  Exported by: ChilliBits
- Exported at: Mon, 06 Jul 2020 12:07:02 +0100
+ Exported at: Wed, 08 Jul 2020 10:29:07 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="color_alice_blue"></string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b93335cc..51a608df 100644
--- 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: Mon, 06 Jul 2020 12:07:01 +0100
+ Exported at: Wed, 08 Jul 2020 03:41:16 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="close">close</string>
diff --git a/app/src/main/res/values/strings_colors.xml b/app/src/main/res/values/strings_colors.xml
index 8d0db925..bb8de675 100644
--- 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: Sun, 05 Jul 2020 23:13:45 +0100
+ Exported at: Wed, 08 Jul 2020 10:29:06 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="color_alice_blue">Alice Blue</string>

From bc8af1c7e7bc56f0d0dc27cdfc0cbe5a02d435a6 Mon Sep 17 00:00:00 2001
From: Marc Auberer <marc.auberer@chillibits.com>
Date: Mon, 13 Jul 2020 11:18:18 +0200
Subject: [PATCH 06/19] Apply compatibility changes due to the upgrade to
 targetApiVersion 30

---
 .../ui/activity/ColorSelectionActivity.kt     | 45 +++++++-------
 .../ui/activity/ImageActivity.kt              | 41 +++++++------
 .../ui/activity/MainActivity.kt               | 58 ++++++++++---------
 app/src/main/res/values-de/strings.xml        |  2 +-
 app/src/main/res/values-de/strings_colors.xml |  2 +-
 app/src/main/res/values-es/strings.xml        |  2 +-
 app/src/main/res/values-es/strings_colors.xml |  2 +-
 app/src/main/res/values-fr/strings.xml        |  2 +-
 app/src/main/res/values-fr/strings_colors.xml |  2 +-
 app/src/main/res/values-ru/strings.xml        |  2 +-
 app/src/main/res/values-ru/strings_colors.xml |  2 +-
 app/src/main/res/values/strings.xml           |  2 +-
 app/src/main/res/values/strings_colors.xml    |  2 +-
 13 files changed, 87 insertions(+), 77 deletions(-)

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
index 01929030..4d9eca21 100644
--- a/app/src/main/java/com/chillibits/colorconverter/ui/activity/ColorSelectionActivity.kt
+++ b/app/src/main/java/com/chillibits/colorconverter/ui/activity/ColorSelectionActivity.kt
@@ -39,16 +39,20 @@ class ColorSelectionActivity : AppCompatActivity() {
         setContentView(R.layout.activity_color_selection)
 
         window.run {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
-                decorView.setOnApplyWindowInsetsListener { _, insets ->
-                    toolbar?.setPadding(0, insets.systemWindowInsetTop, 0, 0)
-                    savedColors.setPadding(0, 0, 0, insets.systemWindowInsetBottom)
-                    insets
+            when {
+                Build.VERSION.SDK_INT >= Build.VERSION_CODES.R -> setDecorFitsSystemWindows(false)
+                Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q -> {
+                    decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
+                    decorView.setOnApplyWindowInsetsListener { _, insets ->
+                        toolbar?.setPadding(0, insets.systemWindowInsetTop, 0, 0)
+                        savedColors.setPadding(0, 0, 0, insets.systemWindowInsetBottom)
+                        insets
+                    }
+                }
+                else -> {
+                    addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
+                    statusBarColor = ContextCompat.getColor(context, R.color.colorPrimaryDark)
                 }
-            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
-                statusBarColor = ContextCompat.getColor(context, R.color.colorPrimaryDark)
             }
         }
 
@@ -137,19 +141,14 @@ class ColorSelectionActivity : AppCompatActivity() {
     }
 
     private fun animateAppAndStatusBar(toColor: Int) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            val animator = ViewAnimationUtils.createCircularReveal(reveal, toolbar.width / 2, toolbar.height / 2, 0f, toolbar.width / 2.0f + 50)
-            animator.addListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationStart(animation: Animator) { reveal.setBackgroundColor(toColor) }
-                override fun onAnimationEnd(animation: Animator) { revealBackground.setBackgroundColor(toColor) }
-            })
-
-            animator.duration = 480
-            animator.start()
-            reveal.visibility = View.VISIBLE
-        } else {
-            reveal.setBackgroundColor(toColor)
-            revealBackground.setBackgroundColor(toColor)
-        }
+        val animator = ViewAnimationUtils.createCircularReveal(reveal, toolbar.width / 2, toolbar.height / 2, 0f, toolbar.width / 2.0f + 50)
+        animator.addListener(object : AnimatorListenerAdapter() {
+            override fun onAnimationStart(animation: Animator) { reveal.setBackgroundColor(toColor) }
+            override fun onAnimationEnd(animation: Animator) { revealBackground.setBackgroundColor(toColor) }
+        })
+
+        animator.duration = 480
+        animator.start()
+        reveal.visibility = View.VISIBLE
     }
 }
\ No newline at end of file
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 74f49911..1100bf07 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
@@ -68,19 +68,7 @@ class ImageActivity : AppCompatActivity() {
         setContentView(R.layout.activity_image)
 
         // Apply window insets
-        window.run {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
-                decorView.setOnApplyWindowInsetsListener { _, insets ->
-                    toolbar?.setPadding(0, insets.systemWindowInsetTop, 0, 0)
-                    colorButtonContainer.setPadding(dpToPx(3), dpToPx(3), dpToPx(3), insets.systemWindowInsetBottom + dpToPx(3))
-                    insets
-                }
-            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
-                statusBarColor = ContextCompat.getColor(context, R.color.colorPrimaryDark)
-            }
-        }
+        applyWindowInsets()
 
         // Initialize toolbar
         setSupportActionBar(toolbar)
@@ -170,6 +158,27 @@ class ImageActivity : AppCompatActivity() {
         }
     }
 
+    private fun applyWindowInsets() {
+        window.run {
+            when {
+                Build.VERSION.SDK_INT >= Build.VERSION_CODES.R -> setDecorFitsSystemWindows(false)
+                Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q -> {
+                    decorView.systemUiVisibility =
+                        View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
+                    decorView.setOnApplyWindowInsetsListener { _, insets ->
+                        toolbar?.setPadding(0, insets.systemWindowInsetTop, 0, 0)
+                        colorButtonContainer.setPadding(dpToPx(3), dpToPx(3), dpToPx(3), insets.systemWindowInsetBottom + dpToPx(3))
+                        insets
+                    }
+                }
+                else -> {
+                    addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
+                    statusBarColor = ContextCompat.getColor(context, R.color.colorPrimaryDark)
+                }
+            }
+        }
+    }
+
     private fun applyRotation(source: Bitmap, path: String) = when (ExifInterface(path).getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_UNDEFINED)) {
         ExifInterface.ORIENTATION_ROTATE_90 -> rotateImage(source, 90F)
         ExifInterface.ORIENTATION_ROTATE_180 -> rotateImage(source, 180F)
@@ -218,11 +227,7 @@ class ImageActivity : AppCompatActivity() {
         } else {
             if(initialized) {
                 val colorName = cnt.getColorNameFromColor(com.chillibits.colorconverter.model.Color(0, "", valueSelectedColor, 0))
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                    tts.speak(colorName, TextToSpeech.QUEUE_FLUSH, null, null)
-                } else {
-                    tts.speak(colorName, TextToSpeech.QUEUE_FLUSH, null)
-                }
+                tts.speak(colorName, TextToSpeech.QUEUE_FLUSH, null, null)
             } else {
                 Toast.makeText(this, R.string.initialization_failed, Toast.LENGTH_SHORT).show()
             }
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
index 29945e22..a7b05dcb 100644
--- a/app/src/main/java/com/chillibits/colorconverter/ui/activity/MainActivity.kt
+++ b/app/src/main/java/com/chillibits/colorconverter/ui/activity/MainActivity.kt
@@ -61,20 +61,7 @@ class MainActivity : AppCompatActivity() {
         setContentView(R.layout.activity_main)
 
         // Apply window insets
-        window.run {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
-                decorView.setOnApplyWindowInsetsListener { _, insets ->
-                    toolbar?.setPadding(0, insets.systemWindowInsetTop, 0, 0)
-                    scrollContainer.setPadding(0, 0, 0, insets.systemWindowInsetBottom)
-                    finishWithColorWrapper.setPadding(0, 0, 0, insets.systemWindowInsetBottom)
-                    insets
-                }
-            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
-                statusBarColor = ContextCompat.getColor(context, R.color.colorPrimaryDark)
-            }
-        }
+        applyWindowInsets()
 
         // Initialize toolbar
         setSupportActionBar(toolbar)
@@ -180,6 +167,28 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    private fun applyWindowInsets() {
+        window.run {
+            when {
+                Build.VERSION.SDK_INT >= Build.VERSION_CODES.R -> setDecorFitsSystemWindows(false)
+                Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q -> {
+                    decorView.systemUiVisibility =
+                        View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
+                    decorView.setOnApplyWindowInsetsListener { _, insets ->
+                        toolbar?.setPadding(0, insets.systemWindowInsetTop, 0, 0)
+                        scrollContainer.setPadding(0, 0, 0, insets.systemWindowInsetBottom)
+                        finishWithColorWrapper.setPadding(0, 0, 0, insets.systemWindowInsetBottom)
+                        insets
+                    }
+                }
+                else -> {
+                    addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
+                    statusBarColor = ContextCompat.getColor(context, R.color.colorPrimaryDark)
+                }
+            }
+        }
+    }
+
     private fun pickColorFromImage(defaultImageUri: Uri? = null) {
         if (InstantApps.isInstantApp(this@MainActivity)) {
             showInstantAppInstallDialog(R.string.instant_install_m)
@@ -364,13 +373,14 @@ class MainActivity : AppCompatActivity() {
         displayHex.setTextColor(textColor)
         displayHsv.setTextColor(textColor)
         displayCmyk.setTextColor(textColor)
-        copyName.colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(textColor, BlendModeCompat.SRC_ATOP)
-        copyArgb.colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(textColor, BlendModeCompat.SRC_ATOP)
-        copyHex.colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(textColor, BlendModeCompat.SRC_ATOP)
-        copyHsv.colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(textColor, BlendModeCompat.SRC_ATOP)
-        copyCmyk.colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(textColor, BlendModeCompat.SRC_ATOP)
-        saveColor.colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(textColor, BlendModeCompat.SRC_ATOP)
-        loadColor.colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(textColor, BlendModeCompat.SRC_ATOP)
+        val colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(textColor, BlendModeCompat.SRC_ATOP)
+        copyName.colorFilter = colorFilter
+        copyArgb.colorFilter = colorFilter
+        copyHex.colorFilter = colorFilter
+        copyHsv.colorFilter = colorFilter
+        copyCmyk.colorFilter = colorFilter
+        saveColor.colorFilter = colorFilter
+        loadColor.colorFilter = colorFilter
 
         // Update animated views
         ValueAnimator.ofInt(colorAlpha.progress, color.alpha).apply {
@@ -405,11 +415,7 @@ class MainActivity : AppCompatActivity() {
         } else {
             if(initialized) {
                 val colorName = cnt.getColorNameFromColor(selectedColor)
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                    tts.speak(colorName, TextToSpeech.QUEUE_FLUSH, null, null)
-                } else {
-                    tts.speak(colorName, TextToSpeech.QUEUE_FLUSH, null)
-                }
+                tts.speak(colorName, TextToSpeech.QUEUE_FLUSH, null, null)
             } else {
                 Toast.makeText(this, R.string.initialization_failed, Toast.LENGTH_SHORT).show()
             }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index b28cd293..81682eac 100644
--- 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: Wed, 08 Jul 2020 03:41:17 +0100
+ Exported at: Mon, 13 Jul 2020 08:36:53 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="close">schließen</string>
diff --git a/app/src/main/res/values-de/strings_colors.xml b/app/src/main/res/values-de/strings_colors.xml
index c70997ac..e4d438fe 100644
--- 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: Wed, 08 Jul 2020 10:29:07 +0100
+ Exported at: Mon, 13 Jul 2020 08:36:53 +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
index a0636d6b..d019e4ee 100644
--- 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: Wed, 08 Jul 2020 03:41:17 +0100
+ Exported at: Mon, 13 Jul 2020 08:36:53 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="close">cerrar</string>
diff --git a/app/src/main/res/values-es/strings_colors.xml b/app/src/main/res/values-es/strings_colors.xml
index e8a50f32..81048642 100644
--- 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: Wed, 08 Jul 2020 10:29:07 +0100
+ Exported at: Mon, 13 Jul 2020 08:36:53 +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
index fd7479c2..9a5ce0e4 100644
--- 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: Wed, 08 Jul 2020 03:41:16 +0100
+ Exported at: Mon, 13 Jul 2020 08:36:53 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="close">fermer</string>
diff --git a/app/src/main/res/values-fr/strings_colors.xml b/app/src/main/res/values-fr/strings_colors.xml
index c502aec0..6a6cb085 100644
--- 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: Wed, 08 Jul 2020 10:29:07 +0100
+ Exported at: Mon, 13 Jul 2020 08:36:53 +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
index d6753a94..678f3fe4 100644
--- 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: Wed, 08 Jul 2020 03:41:17 +0100
+ Exported at: Mon, 13 Jul 2020 08:36:53 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="close">закрыть</string>
diff --git a/app/src/main/res/values-ru/strings_colors.xml b/app/src/main/res/values-ru/strings_colors.xml
index b2b3d354..7bc3008e 100644
--- a/app/src/main/res/values-ru/strings_colors.xml
+++ b/app/src/main/res/values-ru/strings_colors.xml
@@ -9,7 +9,7 @@
  Release: Working copy
  Locale: ru, Russian
  Exported by: ChilliBits
- Exported at: Wed, 08 Jul 2020 10:29:07 +0100
+ Exported at: Mon, 13 Jul 2020 08:36:53 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="color_alice_blue"></string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 51a608df..9f6d9b97 100644
--- 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: Wed, 08 Jul 2020 03:41:16 +0100
+ Exported at: Mon, 13 Jul 2020 08:36:52 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="close">close</string>
diff --git a/app/src/main/res/values/strings_colors.xml b/app/src/main/res/values/strings_colors.xml
index bb8de675..3a50c79d 100644
--- 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: Wed, 08 Jul 2020 10:29:06 +0100
+ Exported at: Mon, 13 Jul 2020 08:36:53 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="color_alice_blue">Alice Blue</string>

From 14b0590be38dbb3ead136b699fc58f3a887d4a72 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 14 Jul 2020 07:09:36 +0000
Subject: [PATCH 07/19] Bump fastadapter from 5.2.0 to 5.2.1

Bumps [fastadapter](https://github.com/mikepenz/FastAdapter) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/mikepenz/FastAdapter/releases)
- [Changelog](https://github.com/mikepenz/FastAdapter/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/mikepenz/FastAdapter/compare/v5.2.0...v5.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index d349744f..43b76606 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -51,7 +51,7 @@ dependencies {
     implementation 'com.github.skydoves:colorpickerview:2.1.6'
     implementation 'com.mikepenz:iconics-core:5.0.3'
     implementation 'com.mikepenz:material-design-iconic-typeface:2.2.0.6-kotlin@aar'
-    implementation 'com.mikepenz:fastadapter:5.2.0'
+    implementation 'com.mikepenz:fastadapter:5.2.1'
     implementation 'com.github.javiersantos:MaterialStyledDialogs:3.0.1'
 
     // dependencies for testing

From 646dde6913b0ab54e7c8f70e0a43452728a3ea97 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 14 Jul 2020 19:29:16 +0000
Subject: [PATCH 08/19] Bump gradle from 4.0.0 to 4.0.1

Bumps gradle from 4.0.0 to 4.0.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 41e20875..d17304cb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

From 9c3a0ff057a568b9448cea7c5d6d94dfb4de30bc Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 18 Jul 2020 19:30:38 +0000
Subject: [PATCH 09/19] Bump fastadapter from 5.2.1 to 5.2.2

Bumps [fastadapter](https://github.com/mikepenz/FastAdapter) from 5.2.1 to 5.2.2.
- [Release notes](https://github.com/mikepenz/FastAdapter/releases)
- [Changelog](https://github.com/mikepenz/FastAdapter/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/mikepenz/FastAdapter/compare/v5.2.1...v5.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 43b76606..78f12fae 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -51,7 +51,7 @@ dependencies {
     implementation 'com.github.skydoves:colorpickerview:2.1.6'
     implementation 'com.mikepenz:iconics-core:5.0.3'
     implementation 'com.mikepenz:material-design-iconic-typeface:2.2.0.6-kotlin@aar'
-    implementation 'com.mikepenz:fastadapter:5.2.1'
+    implementation 'com.mikepenz:fastadapter:5.2.2'
     implementation 'com.github.javiersantos:MaterialStyledDialogs:3.0.1'
 
     // dependencies for testing

From f4230e33d8b24324beef1fb3977ea62b06fc6893 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 23 Jul 2020 23:07:26 +0000
Subject: [PATCH 10/19] Bump material from 1.3.0-alpha01 to 1.3.0-alpha02

Bumps [material](https://github.com/material-components/material-components-android) from 1.3.0-alpha01 to 1.3.0-alpha02.
- [Release notes](https://github.com/material-components/material-components-android/releases)
- [Commits](https://github.com/material-components/material-components-android/compare/1.3.0-alpha01...1.3.0-alpha02)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 78f12fae..439169aa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,7 +42,7 @@ dependencies {
     implementation 'com.google.android.instantapps:instantapps:1.1.0'
     implementation 'com.google.android.play:core:1.7.3'
     implementation 'androidx.palette:palette-ktx:1.0.0'
-    implementation 'com.google.android.material:material:1.3.0-alpha01'
+    implementation 'com.google.android.material:material:1.3.0-alpha02'
 
     // External dependencies
     implementation 'net.margaritov.preference.colorpicker.ColorPickerPreference:ColorPickerPreference:1.0.0'

From d044845e879b767dd8f8e72455dc329e30506d66 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 28 Jul 2020 18:07:09 +0000
Subject: [PATCH 11/19] Bump core from 1.7.3 to 1.8.0

Bumps core from 1.7.3 to 1.8.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 439169aa..d48961af 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,7 +40,7 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.5.0-alpha01'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta8'
     implementation 'com.google.android.instantapps:instantapps:1.1.0'
-    implementation 'com.google.android.play:core:1.7.3'
+    implementation 'com.google.android.play:core:1.8.0'
     implementation 'androidx.palette:palette-ktx:1.0.0'
     implementation 'com.google.android.material:material:1.3.0-alpha02'
 

From 23a2658e2b64d5d2bb1c43f8fdd37d00597cd71a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 28 Jul 2020 23:12:22 +0000
Subject: [PATCH 12/19] Bump junit from 1.1.2-rc01 to 1.1.2-rc02

Bumps junit from 1.1.2-rc01 to 1.1.2-rc02.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index d48961af..6fef1dea 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,7 +56,7 @@ dependencies {
 
     // dependencies for testing
     testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2-rc01'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2-rc02'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-rc01'
 }
 

From 3ab61cadf5c832905f5da2e2c5bb9e6cfec1b185 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 28 Jul 2020 23:20:21 +0000
Subject: [PATCH 13/19] Bump espresso-core from 3.3.0-rc01 to 3.3.0-rc02

Bumps espresso-core from 3.3.0-rc01 to 3.3.0-rc02.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6fef1dea..deb47872 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,7 +57,7 @@ dependencies {
     // dependencies for testing
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2-rc02'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-rc01'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-rc02'
 }
 
 // Task for downloading all translation files

From c15f4292742268862e8607f5742df6ff0308b543 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 30 Jul 2020 10:14:11 +0000
Subject: [PATCH 14/19] Bump constraintlayout from 2.0.0-beta8 to 2.0.0-rc1

Bumps constraintlayout from 2.0.0-beta8 to 2.0.0-rc1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index deb47872..7ad28676 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,7 +38,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.3.0-alpha01'
     implementation 'androidx.core:core-ktx:1.5.0-alpha01'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta8'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-rc1'
     implementation 'com.google.android.instantapps:instantapps:1.1.0'
     implementation 'com.google.android.play:core:1.8.0'
     implementation 'androidx.palette:palette-ktx:1.0.0'

From 708abb03489e8d9ed2d94f104b352198e25b4714 Mon Sep 17 00:00:00 2001
From: Marc Auberer <marc.auberer@chillibits.com>
Date: Thu, 30 Jul 2020 16:04:14 +0200
Subject: [PATCH 15/19] Fix #45

---
 .../colorconverter/ui/activity/MainActivity.kt   | 16 ++++++++++++----
 app/src/main/res/values-de/strings.xml           |  2 +-
 app/src/main/res/values-de/strings_colors.xml    |  2 +-
 app/src/main/res/values-es/strings.xml           |  2 +-
 app/src/main/res/values-es/strings_colors.xml    |  2 +-
 app/src/main/res/values-fr/strings.xml           |  2 +-
 app/src/main/res/values-fr/strings_colors.xml    |  2 +-
 app/src/main/res/values-ru/strings.xml           |  2 +-
 app/src/main/res/values-ru/strings_colors.xml    |  2 +-
 app/src/main/res/values/strings.xml              |  2 +-
 app/src/main/res/values/strings_colors.xml       |  2 +-
 11 files changed, 22 insertions(+), 14 deletions(-)

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
index a7b05dcb..140d08be 100644
--- a/app/src/main/java/com/chillibits/colorconverter/ui/activity/MainActivity.kt
+++ b/app/src/main/java/com/chillibits/colorconverter/ui/activity/MainActivity.kt
@@ -238,7 +238,10 @@ class MainActivity : AppCompatActivity() {
         // Initialize views
         val dialogView = LayoutInflater.from(this).inflate(R.layout.dialog_edit_hex, container, false)
         val hexValue = dialogView.dialogHex
-        hexValue.setText(String.format(getString(R.string.hex_format), "%08X".format(selectedColor.color).toUpperCase()))
+        if(isAlphaDisabled)
+            hexValue.setText(String.format(getString(R.string.hex_format, "%06X".format((0xFFFFFF and selectedColor.color)).toUpperCase())))
+        else
+            hexValue.setText(String.format(getString(R.string.hex_format), "%08X".format(selectedColor.color).toUpperCase()))
         Selection.setSelection(hexValue.text, hexValue.text.length)
 
         // Create dialog
@@ -248,7 +251,8 @@ class MainActivity : AppCompatActivity() {
             .setNegativeButton(R.string.cancel, null)
             .setPositiveButton(R.string.choose_color) { _, _ ->
                 var hex = hexValue.text.toString()
-                if(hex.length == 5) hex = hex.replace(Regex("#([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])"), "#$1$1$2$2$3$3$4$4")
+                if(isAlphaDisabled && hex.length == 4) hex = hex.replace(Regex("#([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])"), "#$1$1$2$2$3$3")
+                if(!isAlphaDisabled && hex.length == 5) hex = hex.replace(Regex("#([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])"), "#$1$1$2$2$3$3$4$4")
                 val tmp = selectedColor
                 tmp.color = android.graphics.Color.parseColor(hex)
                 tmp.alpha = tmp.color.alpha
@@ -267,10 +271,14 @@ class MainActivity : AppCompatActivity() {
                 Selection.setSelection(hexValue.text, hexValue.text.length)
             } else {
                 if(value.length > 1 && !value.matches("#[a-fA-F0-9]+".toRegex())) s?.delete(value.length -1, value.length)
-                dialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = s.toString().length == 9 || s.toString().length == 5
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = if(isAlphaDisabled) {
+                    s.toString().length == 7 || s.toString().length == 4
+                } else {
+                    s.toString().length == 9 || s.toString().length == 5
+                }
             }
         }
-        hexValue.setSelection(1, 9)
+        hexValue.setSelection(1, if(isAlphaDisabled) 7 else 9)
         hexValue.requestFocus()
         dialog.window?.clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM)
         dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 81682eac..a094b6e9 100644
--- 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: Mon, 13 Jul 2020 08:36:53 +0100
+ Exported at: Thu, 30 Jul 2020 14:47:30 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="close">schließen</string>
diff --git a/app/src/main/res/values-de/strings_colors.xml b/app/src/main/res/values-de/strings_colors.xml
index e4d438fe..92b2ec5f 100644
--- 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: Mon, 13 Jul 2020 08:36:53 +0100
+ Exported at: Thu, 30 Jul 2020 14:47:30 +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
index d019e4ee..36f44f84 100644
--- 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: Mon, 13 Jul 2020 08:36:53 +0100
+ Exported at: Thu, 30 Jul 2020 14:47:30 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="close">cerrar</string>
diff --git a/app/src/main/res/values-es/strings_colors.xml b/app/src/main/res/values-es/strings_colors.xml
index 81048642..0311e983 100644
--- 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: Mon, 13 Jul 2020 08:36:53 +0100
+ Exported at: Thu, 30 Jul 2020 14:47:30 +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
index 9a5ce0e4..3db6d2ca 100644
--- 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: Mon, 13 Jul 2020 08:36:53 +0100
+ Exported at: Thu, 30 Jul 2020 14:47:30 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="close">fermer</string>
diff --git a/app/src/main/res/values-fr/strings_colors.xml b/app/src/main/res/values-fr/strings_colors.xml
index 6a6cb085..548e9c87 100644
--- 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: Mon, 13 Jul 2020 08:36:53 +0100
+ Exported at: Thu, 30 Jul 2020 14:47:30 +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
index 678f3fe4..adf25cc0 100644
--- 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: Mon, 13 Jul 2020 08:36:53 +0100
+ Exported at: Thu, 30 Jul 2020 14:47:30 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="close">закрыть</string>
diff --git a/app/src/main/res/values-ru/strings_colors.xml b/app/src/main/res/values-ru/strings_colors.xml
index 7bc3008e..883c185b 100644
--- a/app/src/main/res/values-ru/strings_colors.xml
+++ b/app/src/main/res/values-ru/strings_colors.xml
@@ -9,7 +9,7 @@
  Release: Working copy
  Locale: ru, Russian
  Exported by: ChilliBits
- Exported at: Mon, 13 Jul 2020 08:36:53 +0100
+ Exported at: Thu, 30 Jul 2020 14:47:30 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="color_alice_blue"></string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9f6d9b97..8da396b2 100644
--- 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: Mon, 13 Jul 2020 08:36:52 +0100
+ Exported at: Thu, 30 Jul 2020 14:47:29 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="close">close</string>
diff --git a/app/src/main/res/values/strings_colors.xml b/app/src/main/res/values/strings_colors.xml
index 3a50c79d..85b49c2b 100644
--- 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: Mon, 13 Jul 2020 08:36:53 +0100
+ Exported at: Thu, 30 Jul 2020 14:47:30 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="color_alice_blue">Alice Blue</string>

From 291543c253be471f227f150d48a357604e1150dd Mon Sep 17 00:00:00 2001
From: Marc Auberer <marc.auberer@chillibits.com>
Date: Thu, 30 Jul 2020 16:08:11 +0200
Subject: [PATCH 16/19] Fix fix options menu color in dark mode

---
 app/src/main/res/values/styles.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 85b3409a..4a7cc68b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -19,7 +19,7 @@
     </style>
 
     <style name="toolbarStyle" parent="Theme.AppCompat">
-        <item name="popupTheme">@style/Theme.AppCompat.Light</item>
+        <item name="popupTheme">@style/Theme.AppCompat.DayNight</item>
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@android:color/white</item>

From 50c7b854ce200b8c732eb2d20332fbc52141f48f Mon Sep 17 00:00:00 2001
From: Marc Auberer <marc.auberer@chillibits.com>
Date: Fri, 31 Jul 2020 22:45:37 +0200
Subject: [PATCH 17/19] Code cleanup & minor text fixes

---
 .../ui/activity/MainActivity.kt               |  17 +++++----
 .../ui/adapter/ColorsAdapter.kt               |   5 ++-
 .../viewmodel/DetailedFlagView.kt             |   5 ++-
 app/src/main/res/drawable-night/splash.xml    |   2 +-
 .../main/res/drawable-v21/button_outline.xml  |  30 ---------------
 .../drawable-v21/button_outline_rounded.xml   |  30 ---------------
 app/src/main/res/drawable/button_outline.xml  |  36 ++++++++++--------
 .../res/drawable/button_outline_rounded.xml   |  36 ++++++++++--------
 app/src/main/res/drawable/css_logo.xml        |   2 +-
 app/src/main/res/drawable/flag.9.png          | Bin 0 -> 641 bytes
 app/src/main/res/drawable/flag.png            | Bin 620 -> 0 bytes
 app/src/main/res/drawable/splash.xml          |   2 +-
 .../menu/menu_activity_color_selection.xml    |   6 +--
 app/src/main/res/values-de/strings.xml        |   5 +--
 app/src/main/res/values-de/strings_colors.xml |   2 +-
 app/src/main/res/values-es/strings.xml        |   5 +--
 app/src/main/res/values-es/strings_colors.xml |   2 +-
 app/src/main/res/values-fr/strings.xml        |   5 +--
 app/src/main/res/values-fr/strings_colors.xml |   2 +-
 app/src/main/res/values-ru/strings.xml        |   5 +--
 app/src/main/res/values-ru/strings_colors.xml |   2 +-
 app/src/main/res/values/strings.xml           |   7 ++--
 app/src/main/res/values/strings_colors.xml    |   2 +-
 .../res/values/strings_untranslatable.xml     |   1 -
 24 files changed, 77 insertions(+), 132 deletions(-)
 delete mode 100644 app/src/main/res/drawable-v21/button_outline.xml
 delete mode 100644 app/src/main/res/drawable-v21/button_outline_rounded.xml
 create mode 100644 app/src/main/res/drawable/flag.9.png
 delete mode 100644 app/src/main/res/drawable/flag.png

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
index 140d08be..c2a608ea 100644
--- a/app/src/main/java/com/chillibits/colorconverter/ui/activity/MainActivity.kt
+++ b/app/src/main/java/com/chillibits/colorconverter/ui/activity/MainActivity.kt
@@ -239,9 +239,9 @@ class MainActivity : AppCompatActivity() {
         val dialogView = LayoutInflater.from(this).inflate(R.layout.dialog_edit_hex, container, false)
         val hexValue = dialogView.dialogHex
         if(isAlphaDisabled)
-            hexValue.setText(String.format(getString(R.string.hex_format, "%06X".format((0xFFFFFF and selectedColor.color)).toUpperCase())))
+            hexValue.setText(String.format(getString(R.string.hex_format, "%06X".format((0xFFFFFF and selectedColor.color)).toUpperCase(Locale.getDefault()))))
         else
-            hexValue.setText(String.format(getString(R.string.hex_format), "%08X".format(selectedColor.color).toUpperCase()))
+            hexValue.setText(String.format(getString(R.string.hex_format), "%08X".format(selectedColor.color).toUpperCase(Locale.getDefault())))
         Selection.setSelection(hexValue.text, hexValue.text.length)
 
         // Create dialog
@@ -361,9 +361,9 @@ class MainActivity : AppCompatActivity() {
         }
         // Update HEX TextView
         displayHex.text = if(isAlphaDisabled) {
-            String.format(getString(R.string.hex_), "%06X".format((0xFFFFFF and color.color)).toUpperCase())
+            String.format(getString(R.string.hex_), "%06X".format((0xFFFFFF and color.color)).toUpperCase(Locale.getDefault()))
         } else {
-            String.format(getString(R.string.hex_), "%08X".format(color.color).toUpperCase())
+            String.format(getString(R.string.hex_), "%08X".format(color.color).toUpperCase(Locale.getDefault()))
         }
         // Update HSV TextView
         val hsv = FloatArray(3)
@@ -452,7 +452,8 @@ class MainActivity : AppCompatActivity() {
             selectedColor.green,
             selectedColor.blue
         )
-        displayHex.text = String.format(getString(R.string.hex_), "%08X".format(selectedColor.color).toUpperCase())
+        displayHex.text = String.format(getString(R.string.hex_), "%08X".format(selectedColor.color).toUpperCase(
+            Locale.getDefault()))
         val hsv = FloatArray(3)
         android.graphics.Color.RGBToHSV(
             selectedColor.red,
@@ -560,13 +561,13 @@ class MainActivity : AppCompatActivity() {
         copyTextToClipboard(
             getString(R.string.hex_code),
             if (isAlphaDisabled)
-                "#%06X".format(0xFFFFFF and selectedColor.color).toUpperCase()
+                "#%06X".format(0xFFFFFF and selectedColor.color).toUpperCase(Locale.getDefault())
             else
-                "#%08X".format(selectedColor.color).toUpperCase()
+                "#%08X".format(selectedColor.color).toUpperCase(Locale.getDefault())
         )
     }
 
-    private fun copyHsvToClipboard() = copyTextToClipboard(getString(R.string.hsv_code), displayHsv.text.toString())
+    private fun copyHsvToClipboard() = copyTextToClipboard(getString(R.string.hsv_clipboard), displayHsv.text.toString())
 
     private fun copyCmykToClipboard() {
         // Show multiple choice dialog
diff --git a/app/src/main/java/com/chillibits/colorconverter/ui/adapter/ColorsAdapter.kt b/app/src/main/java/com/chillibits/colorconverter/ui/adapter/ColorsAdapter.kt
index efa1e9ca..0c50db51 100644
--- a/app/src/main/java/com/chillibits/colorconverter/ui/adapter/ColorsAdapter.kt
+++ b/app/src/main/java/com/chillibits/colorconverter/ui/adapter/ColorsAdapter.kt
@@ -16,6 +16,7 @@ import com.chillibits.colorconverter.tools.setTint
 import com.chillibits.colorconverter.ui.activity.ColorSelectionActivity
 import com.mrgames13.jimdo.colorconverter.R
 import kotlinx.android.synthetic.main.item_color.view.*
+import java.util.*
 
 class ColorsAdapter(
     private val activity: ColorSelectionActivity,
@@ -48,7 +49,7 @@ class ColorsAdapter(
                 String.format(
                     activity.getString(R.string.color_summary_alpha_disabled),
                     color.red, color.green, color.blue,
-                    "%06X".format(0xFFFFFF and color.color).toUpperCase(),
+                    "%06X".format(0xFFFFFF and color.color).toUpperCase(Locale.getDefault()),
                     String.format(Constants.HSV_FORMAT_STRING, hsv[0]),
                     String.format(Constants.HSV_FORMAT_STRING, hsv[1]),
                     String.format(Constants.HSV_FORMAT_STRING, hsv[2]),
@@ -58,7 +59,7 @@ class ColorsAdapter(
                 String.format(
                     activity.getString(R.string.color_summary),
                     color.alpha, color.red, color.green, color.blue,
-                    "%08X".format(color.color).toUpperCase(),
+                    "%08X".format(color.color).toUpperCase(Locale.getDefault()),
                     String.format(Constants.HSV_FORMAT_STRING, hsv[0]),
                     String.format(Constants.HSV_FORMAT_STRING, hsv[1]),
                     String.format(Constants.HSV_FORMAT_STRING, hsv[2]),
diff --git a/app/src/main/java/com/chillibits/colorconverter/viewmodel/DetailedFlagView.kt b/app/src/main/java/com/chillibits/colorconverter/viewmodel/DetailedFlagView.kt
index f7ca4826..9dfcdb70 100644
--- a/app/src/main/java/com/chillibits/colorconverter/viewmodel/DetailedFlagView.kt
+++ b/app/src/main/java/com/chillibits/colorconverter/viewmodel/DetailedFlagView.kt
@@ -13,6 +13,7 @@ import com.mrgames13.jimdo.colorconverter.R
 import com.skydoves.colorpickerview.ColorEnvelope
 import com.skydoves.colorpickerview.flag.FlagView
 import kotlinx.android.synthetic.main.flag_layout.view.*
+import java.util.*
 
 @SuppressLint("ViewConstructor")
 class DetailedFlagView(context: Context, layout: Int) : FlagView(context, layout) {
@@ -28,9 +29,9 @@ class DetailedFlagView(context: Context, layout: Int) : FlagView(context, layout
             String.format(context.getString(R.string.argb_), envelope.color.alpha, envelope.color.red, envelope.color.green, envelope.color.blue)
         }
         flagColorHex.text = if(isAlphaDisabled)
-            String.format(context.getString(R.string.hex_), "%06X".format(0xFFFFFF and envelope.color).toUpperCase())
+            String.format(context.getString(R.string.hex_), "%06X".format(0xFFFFFF and envelope.color).toUpperCase(Locale.getDefault()))
         else
-            String.format(context.getString(R.string.hex_), "%08X".format(envelope.color).toUpperCase())
+            String.format(context.getString(R.string.hex_), "%08X".format(envelope.color).toUpperCase(Locale.getDefault()))
         val hsv = FloatArray(3)
         android.graphics.Color.RGBToHSV(envelope.color.red, envelope.color.green, envelope.color.blue, hsv)
         flagColorHsv.text = String.format(context.getString(R.string.hsv_), String.format(Constants.HSV_FORMAT_STRING, hsv[0]), String.format(Constants.HSV_FORMAT_STRING, hsv[1]), String.format(Constants.HSV_FORMAT_STRING, hsv[2]))
diff --git a/app/src/main/res/drawable-night/splash.xml b/app/src/main/res/drawable-night/splash.xml
index da5ecc6c..ebd39376 100644
--- a/app/src/main/res/drawable-night/splash.xml
+++ b/app/src/main/res/drawable-night/splash.xml
@@ -5,5 +5,5 @@
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@color/windowBackgroundColor" />
-    <item android:width="200dp" android:height="200dp" android:drawable="@drawable/app_icon" android:gravity="center"/>
+    <item android:width="200dp" android:height="200dp" android:drawable="@drawable/app_icon" android:gravity="center" />
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/button_outline.xml b/app/src/main/res/drawable-v21/button_outline.xml
deleted file mode 100644
index 8c92d1d0..00000000
--- a/app/src/main/res/drawable-v21/button_outline.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright © Marc Auberer 2020. All rights reserved
-  -->
-
-<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/buttonColorTransparent">
-    <item android:id="@android:id/mask">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/buttonColorTransparent" />
-            <corners android:radius="3dp" />
-        </shape>
-    </item>
-
-    <item android:id="@android:id/background">
-        <selector>
-            <item android:state_enabled="false">
-                <shape>
-                    <corners android:radius="3dp" />
-                    <stroke android:color="@color/disabled" android:width="1.5dp" />
-                </shape>
-            </item>
-            <item>
-                <shape>
-                    <corners android:radius="3dp" />
-                    <stroke android:color="@color/buttonColor" android:width="1.5dp" />
-                </shape>
-            </item>
-        </selector>
-    </item>
-</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/button_outline_rounded.xml b/app/src/main/res/drawable-v21/button_outline_rounded.xml
deleted file mode 100644
index 654adf3b..00000000
--- a/app/src/main/res/drawable-v21/button_outline_rounded.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright © Marc Auberer 2020. All rights reserved
-  -->
-
-<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/buttonColorTransparent">
-    <item android:id="@android:id/mask">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/buttonColorTransparent" />
-            <corners android:radius="150dp" />
-        </shape>
-    </item>
-
-    <item android:id="@android:id/background">
-        <selector>
-            <item android:state_enabled="false">
-                <shape>
-                    <corners android:radius="150dp" />
-                    <stroke android:color="@color/disabled" android:width="1.5dp" />
-                </shape>
-            </item>
-            <item>
-                <shape>
-                    <corners android:radius="150dp" />
-                    <stroke android:color="@color/buttonColor" android:width="1.5dp" />
-                </shape>
-            </item>
-        </selector>
-    </item>
-</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_outline.xml b/app/src/main/res/drawable/button_outline.xml
index e798dcfb..8c92d1d0 100644
--- a/app/src/main/res/drawable/button_outline.xml
+++ b/app/src/main/res/drawable/button_outline.xml
@@ -3,24 +3,28 @@
   ~ Copyright © Marc Auberer 2020. All rights reserved
   -->
 
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false">
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/buttonColorTransparent">
+    <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
+            <solid android:color="@color/buttonColorTransparent" />
             <corners android:radius="3dp" />
-            <stroke android:color="@color/grayLight" android:width="1.5dp" />
         </shape>
     </item>
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="3dp" />
-            <solid android:color="@color/colorPrimaryTransparent" />
-            <stroke android:color="@color/colorPrimary" android:width="1.5dp" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <corners android:radius="3dp" />
-            <stroke android:color="@color/colorPrimary" android:width="1.5dp" />
-        </shape>
+
+    <item android:id="@android:id/background">
+        <selector>
+            <item android:state_enabled="false">
+                <shape>
+                    <corners android:radius="3dp" />
+                    <stroke android:color="@color/disabled" android:width="1.5dp" />
+                </shape>
+            </item>
+            <item>
+                <shape>
+                    <corners android:radius="3dp" />
+                    <stroke android:color="@color/buttonColor" android:width="1.5dp" />
+                </shape>
+            </item>
+        </selector>
     </item>
-</selector>
\ No newline at end of file
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_outline_rounded.xml b/app/src/main/res/drawable/button_outline_rounded.xml
index ba93f4b1..654adf3b 100644
--- a/app/src/main/res/drawable/button_outline_rounded.xml
+++ b/app/src/main/res/drawable/button_outline_rounded.xml
@@ -3,24 +3,28 @@
   ~ Copyright © Marc Auberer 2020. All rights reserved
   -->
 
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false">
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/buttonColorTransparent">
+    <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
+            <solid android:color="@color/buttonColorTransparent" />
             <corners android:radius="150dp" />
-            <stroke android:color="@color/grayLight" android:width="1.5dp" />
         </shape>
     </item>
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="150dp" />
-            <solid android:color="@color/colorPrimaryTransparent" />
-            <stroke android:color="@color/colorPrimary" android:width="1.5dp" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <corners android:radius="150dp" />
-            <stroke android:color="@color/colorPrimary" android:width="1.5dp" />
-        </shape>
+
+    <item android:id="@android:id/background">
+        <selector>
+            <item android:state_enabled="false">
+                <shape>
+                    <corners android:radius="150dp" />
+                    <stroke android:color="@color/disabled" android:width="1.5dp" />
+                </shape>
+            </item>
+            <item>
+                <shape>
+                    <corners android:radius="150dp" />
+                    <stroke android:color="@color/buttonColor" android:width="1.5dp" />
+                </shape>
+            </item>
+        </selector>
     </item>
-</selector>
\ No newline at end of file
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/css_logo.xml b/app/src/main/res/drawable/css_logo.xml
index c7fefae8..645765c9 100644
--- a/app/src/main/res/drawable/css_logo.xml
+++ b/app/src/main/res/drawable/css_logo.xml
@@ -2,7 +2,7 @@
   ~ Copyright © Marc Auberer 2020. All rights reserved
   -->
 
-<vector android:height="212dp" android:viewportHeight="1024"
+<vector android:height="200dp" android:viewportHeight="1024"
     android:viewportWidth="726" android:width="150.30469dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#000000"
         android:pathData="M170,69l0,69 55.5,-0 55.5,-0 0,-23 0,-23 -32,-0 -32,-0 0,-23 0,-23 32,-0 32,-0 0,-23 0,-23 -55.5,-0 -55.5,-0 0,69z" android:strokeColor="#00000000"/>
diff --git a/app/src/main/res/drawable/flag.9.png b/app/src/main/res/drawable/flag.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..380521d8f685a671122988c845c56c26fc80c5a0
GIT binary patch
literal 641
zcmeAS@N?(olHy`uVBq!ia0vp^+kiNggAGVNh>~n&U|{m_ba4!+xb^n7ZFX>?%&~_H
zx-B|5l=S?Xx{_tPy64K?X`0<VdGiaIBL`0^cJsEh2yrN?=c^w%>$*!^Ch8-z#ShI#
z#a-Usi`TxbtUOeDc&pW)-_3TNQLE?fQFS?T=FFKjo4hZV7|uV>uV5CrTl?_7>iS~N
zjaDzECmc?FYAs-R>XxY4A-2Tk4URVya$0nAT6m#6j_4a4(omkD8I-A<lc<~{0O7ga
zIOGP@1LpN^Xzc}?0OCOn6EHg@hQsLF6OqjjD7;~sxcOQl&^6JL-*U`u^F6J9w!*~s
z`>8*Tt@BUw+qdsOeQWK_ndK|j>?psaZ@>HQyHb0m)2W9aeu$Gy^k05i_xko2@w&UV
z`bMulL_g|X9UWL$uc7hk$kw$NT3_sY_UG!=?`fMW&n{j2;`_I`Hi!A@|FvmHNBU1%
zZdn^q^Kw_%x5-cLvew7nEe&1mb*G#A*M=R}v$n3=wIVd>Z{7cE%WuA0|GCXps#k8;
zvd}EgNj7%=S0<la@~$iFWGjE|`v0F}|6csM=GFVRPkP?Jx?8ok?&i}qmrnl+Qa!S(
z{?>--z4vm%H*1L5vDjJpUU~fS$IR@=ocC|T|5t?XFIVmUy7z9>$8~W#`doLrEiP1b
z`SbQiz0`{mEA!ani|!>DR201V{YrgZQuf9V^Xfi6mp9*A${W2}-BYY|_uYLDrP4rP
gTVAwNO5YoEX$koN)g#mH0h1Pkr>mdKI;Vst06AkdvH$=8

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/flag.png b/app/src/main/res/drawable/flag.png
deleted file mode 100644
index f51c1dc4c4e645978d48a0b509b3018ee016c3b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 620
zcmeAS@N?(olHy`uVBq!ia0vp^TYxy3gAGU;ebZXXz`$he>EaktaqI0Z+w9;(nPU$Z
zcozx?y6m#x)atVm5ua;a!kwq*cP{9<Lt(+I2}^lfSU6iIOx`a1=$X=8ZrN2o7-fEG
zezAOTCBQfL+-c?Oyw_iSIL}{mX<L{v5NPLR&eD7K`Db{C@3nV97rx8q{cVZRWt}_q
zoxu@}?C=X5QY^epY>vtqKqO!S<n=CK?Oot_K>^5XDw6?AHZKqa$w1VB74bH?fmMLj
zLluje0L^IzYUPN+W~wX)SW+PaY9vq{&`42^TZtVvgDz~o`NqKavcHa{-sfhn`KQb0
zADo~1_FB%<SZ(cB{V$)(-_83zt^dHaT@MR>Ea+LV{PIig>)T_*{zX?ueh5y!epUDV
z3VRX3;)+Kq>vCIlj(k&nF7H^IZ8qCH_EuMw|NYa(FFw4tFHF_`^>X9f%hL~BUzeTg
zx_A3C{l?hvt()#&?l!IEw8`5VWgc_ID|Y|={nZB6R=cw<EWY?+V|JA4G?kN^S0AyN
z>GNt`#?+`EM&G~5-#`0%U3zG(zxwnVbNQ>UzrNN>pBnS+^aO#IFIPE!uiEPyzS&E^
zW@q&-uQQK7Rvh1|Gwu7A+57j*zQ22t>sEo>*G=W050&cdGL`D>6?lL0r~S3}C06Az
z#~0m6FsLYb_x$Yn*rQ4HReOH@b$5RsbNFBPa(A)f-FNrBl}ZDFu%myOY=m3HgKaLF
Q15*)$r>mdKI;Vst0JDY`h5!Hn

diff --git a/app/src/main/res/drawable/splash.xml b/app/src/main/res/drawable/splash.xml
index da5ecc6c..ebd39376 100644
--- a/app/src/main/res/drawable/splash.xml
+++ b/app/src/main/res/drawable/splash.xml
@@ -5,5 +5,5 @@
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@color/windowBackgroundColor" />
-    <item android:width="200dp" android:height="200dp" android:drawable="@drawable/app_icon" android:gravity="center"/>
+    <item android:width="200dp" android:height="200dp" android:drawable="@drawable/app_icon" android:gravity="center" />
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_activity_color_selection.xml b/app/src/main/res/menu/menu_activity_color_selection.xml
index bc1a2b00..ca8a9d98 100644
--- a/app/src/main/res/menu/menu_activity_color_selection.xml
+++ b/app/src/main/res/menu/menu_activity_color_selection.xml
@@ -10,17 +10,17 @@
         android:id="@+id/action_edit"
         android:title="@string/rename"
         android:icon="@drawable/edit"
-        app:showAsAction="always" />
+        app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_delete"
         android:title="@string/delete"
         android:icon="@drawable/delete"
-        app:showAsAction="always"/>
+        app:showAsAction="ifRoom"/>
 
     <item
         android:id="@+id/action_done"
         android:title="@string/done"
         android:icon="@drawable/done"
-        app:showAsAction="always"/>
+        app:showAsAction="ifRoom"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index a094b6e9..f4aa60fb 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -9,10 +9,9 @@
  Release: Working copy
  Locale: de, German
  Exported by: ChilliBits
- Exported at: Thu, 30 Jul 2020 14:47:30 +0100
+ Exported at: Fri, 31 Jul 2020 21:23:19 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="close">schließen</string>
     <string name="ok">OK</string>
     <string name="cancel">Abbrechen</string>
     <!-- MainActivity -->
@@ -56,7 +55,7 @@
     <string name="instant_install_m">Diese Funktion wird nicht in der Instant-Version der App unterstützt. Bitte installieren Sie die App, um diese Funktion zu nutzen.</string>
     <string name="install_app_download">Installieren Sie diese App um alle Funktionen zu genießen, auch Funktionen, die wir in der Instant-Version der App nicht unterstützen.</string>
     <string name="approve_permissions">Diese Berechtigungen werden benötigt, damit dieses Feature funktioniert.</string>
-    <string name="message_to_drag_up">Für Galerie Bilder hochwischen</string>
+    <string name="pix_bottom_message_without_video">Für Galerie Bilder hochwischen</string>
     <string name="speak_color">Farbe sprechen</string>
     <string name="language_not_available">Sprache nicht verfügbar</string>
     <string name="initialization_failed">Initialisierung fehlgeschlagen</string>
diff --git a/app/src/main/res/values-de/strings_colors.xml b/app/src/main/res/values-de/strings_colors.xml
index 92b2ec5f..68070ff1 100644
--- 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: Thu, 30 Jul 2020 14:47:30 +0100
+ Exported at: Fri, 31 Jul 2020 21:14:48 +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
index 36f44f84..aba5d062 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -9,10 +9,9 @@
  Release: Working copy
  Locale: es, Spanish
  Exported by: ChilliBits
- Exported at: Thu, 30 Jul 2020 14:47:30 +0100
+ Exported at: Fri, 31 Jul 2020 21:23:20 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="close">cerrar</string>
     <string name="ok">Aceptar</string>
     <string name="cancel">Cancelar</string>
     <!-- MainActivity -->
@@ -56,7 +55,7 @@
     <string name="instant_install_m">Esta característica no es compatible con la versión de la aplicación instantánea. Instala la aplicación para usar esta función.</string>
     <string name="install_app_download">Instale esta aplicación para disfrutar de todas las funciones y también las funciones que no podemos admitir en la versión de la aplicación instantánea.</string>
     <string name="approve_permissions">La característica necesita los permisos para funcionar.</string>
-    <string name="message_to_drag_up">Arrastra las imágenes hacia arriba para la galería</string>
+    <string name="pix_bottom_message_without_video">Arrastra las imágenes hacia arriba para la galería</string>
     <string name="speak_color">Hablar color</string>
     <string name="language_not_available">Idioma no disponible</string>
     <string name="initialization_failed">Inicialización falló</string>
diff --git a/app/src/main/res/values-es/strings_colors.xml b/app/src/main/res/values-es/strings_colors.xml
index 0311e983..8c188331 100644
--- 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: Thu, 30 Jul 2020 14:47:30 +0100
+ Exported at: Fri, 31 Jul 2020 21:14:48 +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
index 3db6d2ca..0ded1c26 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -9,10 +9,9 @@
  Release: Working copy
  Locale: fr, French
  Exported by: ChilliBits
- Exported at: Thu, 30 Jul 2020 14:47:30 +0100
+ Exported at: Fri, 31 Jul 2020 21:23:19 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="close">fermer</string>
     <string name="ok">OK</string>
     <string name="cancel">Annuler</string>
     <!-- MainActivity -->
@@ -56,7 +55,7 @@
     <string name="instant_install_m">Cette fonctionnalité n\'est pas prise en charge dans la version de l\'application instantanée. Installez l\'application pour utiliser cette fonctionnalité, s\'il vous plaît.</string>
     <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="message_to_drag_up">Glissez les images en haut pour entrer la galerie</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="language_not_available">Langue n\'est pas disponible</string>
     <string name="initialization_failed">Initialisation échouée</string>
diff --git a/app/src/main/res/values-fr/strings_colors.xml b/app/src/main/res/values-fr/strings_colors.xml
index 548e9c87..6d6cfc4c 100644
--- 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: Thu, 30 Jul 2020 14:47:30 +0100
+ Exported at: Fri, 31 Jul 2020 21:14:48 +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
index adf25cc0..e27b5dcc 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -9,10 +9,9 @@
  Release: Working copy
  Locale: ru, Russian
  Exported by: ChilliBits
- Exported at: Thu, 30 Jul 2020 14:47:30 +0100
+ Exported at: Fri, 31 Jul 2020 21:23:20 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="close">закрыть</string>
     <string name="ok">ОК</string>
     <string name="cancel">Отмена</string>
     <!-- MainActivity -->
@@ -56,7 +55,7 @@
     <string name="instant_install_m">Эта функция не поддерживается в мгновенной версии приложения.\u0020\u0020Пожалуйста, установите приложение, чтобы использовать эту функцию.</string>
     <string name="install_app_download">Установите это приложение, чтобы использовать все функции, а также функции, которые мы не можем поддерживать в мгновенной версии приложения.</string>
     <string name="approve_permissions">Для работы функции требуются разрешения.</string>
-    <string name="message_to_drag_up">Потяните вверх для просмотра галереи</string>
+    <string name="pix_bottom_message_without_video">Потяните вверх для просмотра галереи</string>
     <string name="speak_color">Произнести название цвета</string>
     <string name="language_not_available">Язык не доступен</string>
     <string name="initialization_failed">Ошибка инициализации</string>
diff --git a/app/src/main/res/values-ru/strings_colors.xml b/app/src/main/res/values-ru/strings_colors.xml
index 883c185b..2bd04317 100644
--- a/app/src/main/res/values-ru/strings_colors.xml
+++ b/app/src/main/res/values-ru/strings_colors.xml
@@ -9,7 +9,7 @@
  Release: Working copy
  Locale: ru, Russian
  Exported by: ChilliBits
- Exported at: Thu, 30 Jul 2020 14:47:30 +0100
+ Exported at: Fri, 31 Jul 2020 21:14:48 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="color_alice_blue"></string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8da396b2..157ec2b6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,10 +9,9 @@
  Release: Working copy
  Locale: en, English
  Exported by: ChilliBits
- Exported at: Thu, 30 Jul 2020 14:47:29 +0100
+ Exported at: Fri, 31 Jul 2020 21:23:19 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="close">close</string>
     <string name="ok">OK</string>
     <string name="cancel">Cancel</string>
     <!-- MainActivity -->
@@ -56,12 +55,12 @@
     <string name="instant_install_m">This feature is not supported in the instant app version. Please install the app to use this feature.</string>
     <string name="install_app_download">Install this app to enjoy all the features and also the features we cannot support in the instant app version.</string>
     <string name="approve_permissions">The feature needs the permissions to work.</string>
-    <string name="message_to_drag_up">Drag images up for gallery</string>
+    <string name="pix_bottom_message_without_video">Drag images up for gallery</string>
     <string name="speak_color">Speak color</string>
     <string name="language_not_available">Language not available</string>
     <string name="initialization_failed">Initialization failed</string>
     <string name="audio_muted">Please increase volume</string>
-    <string name="transparency_warning_t">Transparancy warning</string>
+    <string name="transparency_warning_t">Transparency warning</string>
     <string name="transparency_warning_m">You selected a transparent or almost transparent color. This has the effect, that color changes are not visible any more. To regain control over the color, please move the transparency slider to the right.</string>
     <string name="remember_selection">Remember selection</string>
     <string name="cmyk_code">CMYK code</string>
diff --git a/app/src/main/res/values/strings_colors.xml b/app/src/main/res/values/strings_colors.xml
index 85b49c2b..e0d4b284 100644
--- 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: Thu, 30 Jul 2020 14:47:30 +0100
+ Exported at: Fri, 31 Jul 2020 21:15:29 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="color_alice_blue">Alice Blue</string>
diff --git a/app/src/main/res/values/strings_untranslatable.xml b/app/src/main/res/values/strings_untranslatable.xml
index 0ca8167e..27bf339e 100644
--- a/app/src/main/res/values/strings_untranslatable.xml
+++ b/app/src/main/res/values/strings_untranslatable.xml
@@ -5,7 +5,6 @@
 
 <resources>
     <string name="app_name" translatable="false">Color Converter</string>
-    <string name="title_image" translatable="false">Color Converter Image Picker</string>
     <string name="a" translatable="false">A</string>
     <string name="r" translatable="false">R</string>
     <string name="g" translatable="false">G</string>

From 8a18135e3db369c1ca41950ebe26cd48f98ff909 Mon Sep 17 00:00:00 2001
From: Marc Auberer <marc.auberer@chillibits.com>
Date: Sun, 2 Aug 2020 01:31:36 +0200
Subject: [PATCH 18/19] Fix dialog theme in dark mode

---
 app/build.gradle                              |   8 +-
 app/src/main/res/values-de/strings.xml        |   2 +-
 app/src/main/res/values-de/strings_colors.xml |   2 +-
 app/src/main/res/values-es/strings.xml        |   2 +-
 app/src/main/res/values-es/strings_colors.xml |   2 +-
 app/src/main/res/values-fr/strings.xml        |   2 +-
 app/src/main/res/values-fr/strings_colors.xml |   2 +-
 app/src/main/res/values-ru/strings.xml        |   2 +-
 app/src/main/res/values-ru/strings_colors.xml | 155 ------------------
 app/src/main/res/values/strings.xml           |   2 +-
 app/src/main/res/values/strings_colors.xml    |   2 +-
 11 files changed, 13 insertions(+), 168 deletions(-)
 delete mode 100644 app/src/main/res/values-ru/strings_colors.xml

diff --git a/app/build.gradle b/app/build.gradle
index 7ad28676..351fe131 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -52,7 +52,7 @@ dependencies {
     implementation 'com.mikepenz:iconics-core:5.0.3'
     implementation 'com.mikepenz:material-design-iconic-typeface:2.2.0.6-kotlin@aar'
     implementation 'com.mikepenz:fastadapter:5.2.2'
-    implementation 'com.github.javiersantos:MaterialStyledDialogs:3.0.1'
+    implementation 'com.github.javiersantos:MaterialStyledDialogs:3.0.2'
 
     // dependencies for testing
     testImplementation 'junit:junit:4.13'
@@ -109,9 +109,9 @@ task downloadTranslations {
         // Main string file
         def f = new File("${project.projectDir}/src/main/res/values-ru/strings.xml")
         new URL("https://localise.biz/api/export/locale/ru.xml?format=android&key=${apiKey}").withInputStream{ i -> f.withOutputStream{ it << i }}
-        // Color file
-        f = new File("${project.projectDir}/src/main/res/values-ru/strings_colors.xml")
-        new URL("https://localise.biz/api/export/locale/ru.xml?format=android&key=${apiKeyColors}").withInputStream{ i -> f.withOutputStream{ it << i }}
+        // Color file (will be added again, when the translation is complete)
+        //f = new File("${project.projectDir}/src/main/res/values-ru/strings_colors.xml")
+        //new URL("https://localise.biz/api/export/locale/ru.xml?format=android&key=${apiKeyColors}").withInputStream{ i -> f.withOutputStream{ it << i }}
     }
 }
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f4aa60fb..dae9fcc1 100644
--- 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, 31 Jul 2020 21:23:19 +0100
+ Exported at: Sun, 02 Aug 2020 00:22:26 +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
index 68070ff1..292dd3a5 100644
--- 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, 31 Jul 2020 21:14:48 +0100
+ Exported at: Sun, 02 Aug 2020 00:22:26 +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
index aba5d062..7a210f97 100644
--- 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, 31 Jul 2020 21:23:20 +0100
+ Exported at: Sun, 02 Aug 2020 00:22:26 +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
index 8c188331..aae6b662 100644
--- 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, 31 Jul 2020 21:14:48 +0100
+ Exported at: Sun, 02 Aug 2020 00:22:26 +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
index 0ded1c26..9becb5d6 100644
--- 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, 31 Jul 2020 21:23:19 +0100
+ Exported at: Sun, 02 Aug 2020 00:22:26 +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
index 6d6cfc4c..6ae4ddb4 100644
--- 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, 31 Jul 2020 21:14:48 +0100
+ Exported at: Sun, 02 Aug 2020 00:22:26 +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
index e27b5dcc..4de60608 100644
--- 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, 31 Jul 2020 21:23:20 +0100
+ Exported at: Sun, 02 Aug 2020 00:22:26 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="ok">ОК</string>
diff --git a/app/src/main/res/values-ru/strings_colors.xml b/app/src/main/res/values-ru/strings_colors.xml
deleted file mode 100644
index 2bd04317..00000000
--- a/app/src/main/res/values-ru/strings_colors.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright © Marc Auberer 2020. All rights reserved
-  -->
-
-<!--
- Loco xml export: Android string resources
- Project: Color Converter Colors
- Release: Working copy
- Locale: ru, Russian
- Exported by: ChilliBits
- Exported at: Fri, 31 Jul 2020 21:14:48 +0100
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="color_alice_blue"></string>
-    <string name="color_antique_white">Античный Белый</string>
-    <string name="color_aqua"></string>
-    <string name="color_aquamarine">Аквамарин</string>
-    <string name="color_azure">Лазурный</string>
-    <string name="color_beige">Бежевый</string>
-    <string name="color_bisque"></string>
-    <string name="color_black">Черный</string>
-    <string name="color_blanched_almond">Миндальный</string>
-    <string name="color_blue">Синий</string>
-    <string name="color_blue_violet">Сине-фиолетовый</string>
-    <string name="color_brown">Коричневый</string>
-    <string name="color_burly_wood"></string>
-    <string name="color_cadet_blue">Кадетский синий</string>
-    <string name="color_chartreuse">Шартрез</string>
-    <string name="color_chocolate">Шоколадный</string>
-    <string name="color_coral">Коралловый</string>
-    <string name="color_cornflower_blue">Васильковый</string>
-    <string name="color_cornsilk">Кукурузный шелк</string>
-    <string name="color_crimson">Малиновый</string>
-    <string name="color_cyan">Зеленовато-синий</string>
-    <string name="color_dark_blue"></string>
-    <string name="color_dark_cyan"></string>
-    <string name="color_dark_golden_rod"></string>
-    <string name="color_dark_gray"></string>
-    <string name="color_dark_green"></string>
-    <string name="color_dark_khaki"></string>
-    <string name="color_dark_magenta"></string>
-    <string name="color_dark_olive_green"></string>
-    <string name="color_dark_orange"></string>
-    <string name="color_dark_orchid"></string>
-    <string name="color_dark_red"></string>
-    <string name="color_dark_salmon"></string>
-    <string name="color_dark_sea_green"></string>
-    <string name="color_dark_slate_blue"></string>
-    <string name="color_dark_late_gray"></string>
-    <string name="color_dark_turquoise"></string>
-    <string name="color_dark_violet"></string>
-    <string name="color_deep_pink"></string>
-    <string name="color_deep_sky_blue"></string>
-    <string name="color_dim_gray"></string>
-    <string name="color_dodger_blue"></string>
-    <string name="color_fire_brick"></string>
-    <string name="color_floral_white"></string>
-    <string name="color_forest_green"></string>
-    <string name="color_fuchsia"></string>
-    <string name="color_gainsboro"></string>
-    <string name="color_ghost_white"></string>
-    <string name="color_gold"></string>
-    <string name="color_golden_rod"></string>
-    <string name="color_gray"></string>
-    <string name="color_green"></string>
-    <string name="color_green_yellow"></string>
-    <string name="color_honey_dew"></string>
-    <string name="color_hot_pink"></string>
-    <string name="color_indian_red"></string>
-    <string name="color_indigo"></string>
-    <string name="color_ivory"></string>
-    <string name="color_khaki"></string>
-    <string name="color_lavender"></string>
-    <string name="color_lavender_blush"></string>
-    <string name="color_lawn_green"></string>
-    <string name="color_lemon_chiffon"></string>
-    <string name="color_light_blue"></string>
-    <string name="color_light_coral"></string>
-    <string name="color_light_cyan"></string>
-    <string name="color_light_golden_rod_yellow"></string>
-    <string name="color_light_gray"></string>
-    <string name="color_light_green"></string>
-    <string name="color_light_pink"></string>
-    <string name="color_light_salmon"></string>
-    <string name="color_light_sea_green"></string>
-    <string name="color_light_sky_blue"></string>
-    <string name="color_light_slate_gray"></string>
-    <string name="color_light_steel_blue"></string>
-    <string name="color_light_yellow"></string>
-    <string name="color_lime"></string>
-    <string name="color_lime_green"></string>
-    <string name="color_linen"></string>
-    <string name="color_magenta"></string>
-    <string name="color_maroon"></string>
-    <string name="color_medium_aqua_marine"></string>
-    <string name="color_medium_blue"></string>
-    <string name="color_medium_orchid"></string>
-    <string name="color_medium_purple"></string>
-    <string name="color_medium_sea_green"></string>
-    <string name="color_medium_slate_blue"></string>
-    <string name="color_medium_spring_green"></string>
-    <string name="color_medium_turquoise"></string>
-    <string name="color_medium_violet_red"></string>
-    <string name="color_midnight_blue"></string>
-    <string name="color_mint_cream"></string>
-    <string name="color_misty_rose"></string>
-    <string name="color_moccasin"></string>
-    <string name="color_navajo_white"></string>
-    <string name="color_navy"></string>
-    <string name="color_old_lace"></string>
-    <string name="color_olive"></string>
-    <string name="color_olive_drab"></string>
-    <string name="color_orange"></string>
-    <string name="color_orange_red"></string>
-    <string name="color_orchid"></string>
-    <string name="color_pale_golden_rod"></string>
-    <string name="color_pale_green"></string>
-    <string name="color_pale_turquoise"></string>
-    <string name="color_pale_violet_red"></string>
-    <string name="color_papaya_whip"></string>
-    <string name="color_peach_puff"></string>
-    <string name="color_peru"></string>
-    <string name="color_pink"></string>
-    <string name="color_plum"></string>
-    <string name="color_powder_blue"></string>
-    <string name="color_purple"></string>
-    <string name="color_red"></string>
-    <string name="color_rosy_brown"></string>
-    <string name="color_royal_blue"></string>
-    <string name="color_saddle_brown"></string>
-    <string name="color_salmon"></string>
-    <string name="color_sandy_brown"></string>
-    <string name="color_sea_green"></string>
-    <string name="color_sea_shell"></string>
-    <string name="color_sienna"></string>
-    <string name="color_silver"></string>
-    <string name="color_sky_blue"></string>
-    <string name="color_slate_blue"></string>
-    <string name="color_slate_gray"></string>
-    <string name="color_snow"></string>
-    <string name="color_spring_green"></string>
-    <string name="color_steel_blue"></string>
-    <string name="color_tan"></string>
-    <string name="color_teal"></string>
-    <string name="color_thistle"></string>
-    <string name="color_tomato"></string>
-    <string name="color_turquoise"></string>
-    <string name="color_violet"></string>
-    <string name="color_wheat"></string>
-    <string name="color_white"></string>
-    <string name="color_white_smoke"></string>
-    <string name="color_yellow"></string>
-    <string name="color_yellow_green"></string>
-</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 157ec2b6..985b90c1 100644
--- 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, 31 Jul 2020 21:23:19 +0100
+ Exported at: Sun, 02 Aug 2020 00:26:25 +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
index e0d4b284..f26e80e6 100644
--- 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, 31 Jul 2020 21:15:29 +0100
+ Exported at: Sun, 02 Aug 2020 00:22:26 +0100
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="color_alice_blue">Alice Blue</string>

From 8dea04fe8d5d6fc50293ef81d186b6596b20bed3 Mon Sep 17 00:00:00 2001
From: Marc Auberer <marc.auberer@chillibits.com>
Date: Sun, 2 Aug 2020 01:35:19 +0200
Subject: [PATCH 19/19] Bump to new app version

---
 app/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 351fe131..1d474fd3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,13 +8,13 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
-    buildToolsVersion "29.0.3"
+    buildToolsVersion "30.0.1"
     defaultConfig {
         applicationId "com.mrgames13.jimdo.colorconverter"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 2300
-        versionName "2.3.0"
+        versionCode 2301
+        versionName "2.3.1"
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }