diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 00000000..7661e847 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,23 @@ +# Workflow for Android CI debug build + +name: Android CI + +on: + push: + branches: [ master, beta ] + pull_request: + branches: [ master, beta ] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Make gradlew executable + run: chmod +x ./gradlew + - name: Android Build + uses: vgaidarji/android-github-actions-build@v1.0.1 + with: + args: "./gradlew assembleDebug" \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index afe7d511..00000000 --- a/.travis.yml +++ /dev/null @@ -1,24 +0,0 @@ -language: android -jdk: oraclejdk8 - -android: - components: - - build-tools-29.0.3 - - android-29 - - extra-android-support - - extra-google-m2repository - - extra-android-m2repository - - extra-google-google_play_services - licenses: - - '.+' - -before_install: - - chmod +x gradlew - -before_script: - - echo yes | android update sdk --no-ui --all --filter platform-tools,tools - - echo yes | android update sdk --no-ui --all --filter build-tools-29.0.3 - - echo yes | android update sdk --no-ui --all --filter android-29 - -script: - - ./gradlew clean test \ No newline at end of file diff --git a/README.md b/README.md index 9cbfb8dc..36905404 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,15 @@ ## Color Converter [![Codacy Badge](https://api.codacy.com/project/badge/Grade/cb98dbe7ca6d46af8b385dadd618c446)](https://app.codacy.com/gh/ChilliBits/color-converter?utm_source=github.com&utm_medium=referral&utm_content=ChilliBits/color-converter&utm_campaign=Badge_Grade_Dashboard) -[![Build Status](https://travis-ci.com/ChilliBits/color-converter.svg?branch=master)](https://travis-ci.com/ChilliBits/color-converter) +![Android CI](https://github.com/chillibits/color-converter/workflows/Android%20CI/badge.svg) ![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/chillibits/color-converter?include_prereleases) Color Converter is an Android app to pick, display and convert colors. Download Color Converter from [Google Play](https://play.google.com/store/apps/details?id=com.mrgames13.jimdo.colorconverter)! -More info on our homepage: [https://chillibits.com/color-converter](https://chillibits.com/colorconverter) +More information on our homepage: [https://chillibits.com/colorconverter](https://chillibits.com/colorconverter) ## Features - - Pick colors - Get name of picked colors - Display picked colors in different formats (ARGB, HEX, HSV) @@ -23,8 +22,7 @@ More info on our homepage: [https://chillibits.com/color-converter](https://chil ## Contribute to this project You can contribute to this project by doing following things: - -- If you want to contribute new features, please fork this repository to your own GitHub account. Then build your awesome feature and post a pull request back to this repo. We will check your changes and merge your contribution asap. +- If you want to contribute new features, please fork this repository to your own GitHub account. Then build your awesome feature and open a pull request back to this repo. We will check your changes and merge your contribution asap. - If you want to add a new translation language or improve an existing translation, please write an email to: [contact@chillibits.com](mailto:contact@chillibits.com&subject=Add%20translation) - If you want to submit a request for a new feature, please also write an email to: [contact@chillibits.com](mailto:contact@chillibits.com&subject=Feature%20request) @@ -38,4 +36,4 @@ Thanks to following people: Thanks to all contributors and translators! -© ChilliBits 2017-2020 (Designed and developed by Marc Auberer) +© ChilliBits 2017-2020 (Designed and developed by Marc Auberer) \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c31e100b..555f29b0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { applicationId "com.mrgames13.jimdo.colorconverter" minSdkVersion 21 targetSdkVersion 29 - versionCode 2200 - versionName "2.2.0" + versionCode 2201 + versionName "2.2.1" vectorDrawables.useSupportLibrary = true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -36,11 +36,11 @@ android { dependencies { // base dependencies implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.2.0-beta01' - implementation 'androidx.core:core-ktx:1.3.0-rc01' - implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta5' + implementation 'androidx.appcompat:appcompat:1.3.0-alpha01' + implementation 'androidx.core:core-ktx:1.4.0-alpha01' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta6' implementation 'com.google.android.instantapps:instantapps:1.1.0' - implementation 'com.google.android.play:core:1.7.2' + implementation 'com.google.android.play:core:1.7.3' implementation 'androidx.palette:palette-ktx:1.0.0' implementation 'com.google.android.material:material:1.2.0-alpha06' @@ -56,8 +56,8 @@ dependencies { // dependencies for testing testImplementation 'junit:junit:4.13' - androidTestImplementation 'androidx.test.ext:junit:1.1.2-beta01' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-beta01' + androidTestImplementation 'androidx.test.ext:junit:1.1.2-beta02' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-beta02' } // Task for downloading all translation files diff --git a/app/src/main/java/com/chillibits/colorconverter/tools/Constants.kt b/app/src/main/java/com/chillibits/colorconverter/tools/Constants.kt index 038fd634..a3cf2475 100644 --- a/app/src/main/java/com/chillibits/colorconverter/tools/Constants.kt +++ b/app/src/main/java/com/chillibits/colorconverter/tools/Constants.kt @@ -16,7 +16,6 @@ object Constants { const val EXTRA_ACTION = "action" const val EXTRA_CHOOSE_COLOR = "ChooseColor" const val EXTRA_IMAGE_URI = "ImageUri" - const val EXTRA_INSTANT_INSTALLED = "InstantInstalled" const val EXTRA_COLOR = "Color" const val EXTRA_SELECTED_COLOR = "SelectedColor" @@ -24,4 +23,7 @@ object Constants { const val COLOR_ANIMATION_DURATION = 500L const val NAME_SELECTED_COLOR = "Selection" const val HSV_FORMAT_STRING = "%.02f" + const val SHARED_PREFERENCES_NAME = "com.mrgames13.jimdo.colorconverter_preferences" + const val ARGB_REMEMBER = "ArgbRemember" + const val ARGB_REMEMBER_SELECTION = "ArgbRememberSelection" } \ No newline at end of file diff --git a/app/src/main/java/com/chillibits/colorconverter/tools/Extensions.kt b/app/src/main/java/com/chillibits/colorconverter/tools/Extensions.kt index e99610c5..368e96c2 100644 --- a/app/src/main/java/com/chillibits/colorconverter/tools/Extensions.kt +++ b/app/src/main/java/com/chillibits/colorconverter/tools/Extensions.kt @@ -4,12 +4,29 @@ package com.chillibits.colorconverter.tools +import android.content.ClipData +import android.content.ClipboardManager +import android.content.Context import android.content.res.ColorStateList import android.content.res.Resources import android.widget.ImageView +import android.widget.Toast import androidx.core.widget.ImageViewCompat +import com.mrgames13.jimdo.colorconverter.R fun ImageView.setTint(color: Int) = ImageViewCompat.setImageTintList(this, ColorStateList.valueOf(color)) -fun dpToPx(dp: Int) = (dp * Resources.getSystem().displayMetrics.density).toInt() \ No newline at end of file +fun dpToPx(dp: Int) = (dp * Resources.getSystem().displayMetrics.density).toInt() + +fun Context.copyTextToClipboard(key: String, value: String) { + val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager + clipboard.setPrimaryClip(ClipData.newPlainText(key, value)) + Toast.makeText(this, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show() +} + +fun Double.round(decimals: Int): Double { + var multiplier = 1.0 + repeat(decimals) { multiplier *= 10 } + return kotlin.math.round(this * multiplier) / multiplier +} \ No newline at end of file diff --git a/app/src/main/java/com/chillibits/colorconverter/tools/StorageTools.kt b/app/src/main/java/com/chillibits/colorconverter/tools/StorageTools.kt index 1c3ca203..fa9d24d2 100644 --- a/app/src/main/java/com/chillibits/colorconverter/tools/StorageTools.kt +++ b/app/src/main/java/com/chillibits/colorconverter/tools/StorageTools.kt @@ -30,12 +30,12 @@ class StorageTools(val context: Context): SQLiteOpenHelper(context, "database.db // ------------------------------------ Shared Preference -------------------------------------- fun putBoolean(name: String, value: Boolean) { - val prefs = context.getSharedPreferences("com.mrgames13.jimdo.colorconverter_preferences", Context.MODE_PRIVATE) + val prefs = context.getSharedPreferences(Constants.SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE) prefs.edit().putBoolean(name, value).apply() } fun getBoolean(name: String, default: Boolean = false): Boolean { - val prefs = context.getSharedPreferences("com.mrgames13.jimdo.colorconverter_preferences", Context.MODE_PRIVATE) + val prefs = context.getSharedPreferences(Constants.SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE) return prefs.getBoolean(name, default) } @@ -44,7 +44,7 @@ class StorageTools(val context: Context): SQLiteOpenHelper(context, "database.db fun addColor(color: Color) { try { val values = ContentValues() - values.put("id", loadColors().size) + values.put("id", color.color) values.put("name", color.name) values.put("alpha", color.alpha) values.put("red", color.red) 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 1de058ab..36d7f8a5 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 @@ -91,7 +91,9 @@ class ImageActivity : AppCompatActivity() { selectedColor.background.colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(color, BlendModeCompat.SRC_IN) if(speakItem != null && speakItem!!.isChecked) speakColor() } - image.flagView = DetailedFlagView(this, R.layout.flag_layout) + image.flagView = DetailedFlagView(this, R.layout.flag_layout).apply { + isFlipAble = false + } selectedColor.setOnClickListener { finishWithResult(valueSelectedColor) } vibrantColor.setOnClickListener { finishWithResult(valueVibrantColor) } 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 41c64df9..52796e14 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 @@ -6,8 +6,6 @@ package com.chillibits.colorconverter.ui.activity import android.animation.ValueAnimator import android.app.Activity -import android.content.ClipData -import android.content.ClipboardManager import android.content.Context import android.content.Intent import android.content.pm.PackageManager @@ -31,10 +29,7 @@ import androidx.core.graphics.* import androidx.core.widget.doAfterTextChanged import com.chillibits.colorconverter.model.Color import com.chillibits.colorconverter.tools.* -import com.chillibits.colorconverter.ui.dialog.showInstantAppInstallDialog -import com.chillibits.colorconverter.ui.dialog.showRatingDialog -import com.chillibits.colorconverter.ui.dialog.showRecommendationDialog -import com.chillibits.colorconverter.ui.dialog.showTransparencyWarning +import com.chillibits.colorconverter.ui.dialog.* import com.google.android.instantapps.InstantApps import com.mrgames13.jimdo.colorconverter.R import kotlinx.android.synthetic.main.activity_main.* @@ -147,7 +142,18 @@ class MainActivity : AppCompatActivity() { copyTextToClipboard(getString(R.string.color_name), displayName.text.toString()) } copyArgb.setOnClickListener { - copyTextToClipboard(getString(R.string.argb_code), String.format(getString(R.string.argb_clipboard), selectedColor.alpha, selectedColor.red, selectedColor.green, selectedColor.blue)) + // Show multiple choice dialog + if(!st.getBoolean(Constants.ARGB_REMEMBER, false)) { + showArgbExportDialog(selectedColor.alpha, selectedColor.red, selectedColor.green, selectedColor.blue) + } else { + if(st.getBoolean(Constants.ARGB_REMEMBER_SELECTION, false)) { + copyTextToClipboard(getString(R.string.argb_code), String.format(getString(R.string.argb_clipboard), + selectedColor.alpha, selectedColor.red, selectedColor.green, selectedColor.blue)) + } else { + copyTextToClipboard(getString(R.string.argb_code), String.format(getString(R.string.rgba_clipboard), + selectedColor.red, selectedColor.green, selectedColor.blue, (selectedColor.alpha / 255.0).round(3))) + } + } } copyHex.setOnClickListener { copyTextToClipboard(getString(R.string.hex_code), "%08X".format(selectedColor.color).toUpperCase()) @@ -204,15 +210,8 @@ class MainActivity : AppCompatActivity() { } // Check if app was installed - if (intent.getBooleanExtra(Constants.EXTRA_INSTANT_INSTALLED, false)) { - AlertDialog.Builder(this) - .setTitle(R.string.instant_installed_t) - .setMessage(R.string.instant_installed_m) - .setPositiveButton(R.string.ok, null) - .show() - } else if (Intent.ACTION_SEND == intent.action && intent.type != null && intent.type!!.startsWith("image/")) { + if (Intent.ACTION_SEND == intent.action && intent.type != null && intent.type!!.startsWith("image/")) pickColorFromImage(intent.getParcelableExtra(Intent.EXTRA_STREAM)) - } } override fun onCreateOptionsMenu(menu: Menu?): Boolean { @@ -416,12 +415,6 @@ class MainActivity : AppCompatActivity() { colorPicker.show() } - private fun copyTextToClipboard(key: String, value: String) { - val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager - clipboard.setPrimaryClip(ClipData.newPlainText(key, value)) - Toast.makeText(this, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show() - } - private fun updateDisplays(color: Color) { // Update all views that are not animated displayAlpha.text = color.alpha.toString() diff --git a/app/src/main/java/com/chillibits/colorconverter/ui/dialog/ArgbExportDialog.kt b/app/src/main/java/com/chillibits/colorconverter/ui/dialog/ArgbExportDialog.kt new file mode 100644 index 00000000..09c1178d --- /dev/null +++ b/app/src/main/java/com/chillibits/colorconverter/ui/dialog/ArgbExportDialog.kt @@ -0,0 +1,40 @@ +/* + * Copyright © Marc Auberer 2020. All rights reserved + */ + +package com.chillibits.colorconverter.ui.dialog + +import android.content.Context +import android.view.LayoutInflater +import androidx.appcompat.app.AlertDialog +import com.chillibits.colorconverter.tools.Constants +import com.chillibits.colorconverter.tools.StorageTools +import com.chillibits.colorconverter.tools.copyTextToClipboard +import com.chillibits.colorconverter.tools.round +import com.mrgames13.jimdo.colorconverter.R +import kotlinx.android.synthetic.main.dialog_export_argb.view.* + +fun Context.showArgbExportDialog(alpha: Int, red: Int, green: Int, blue: Int) { + val st = StorageTools(this) + val view = LayoutInflater.from(this).inflate(R.layout.dialog_export_argb, null) + + val dialog = AlertDialog.Builder(this) + .setView(view) + .show() + + view.formatArgb.setOnClickListener { + if(view.rememberSelection.isChecked) st.putBoolean(Constants.ARGB_REMEMBER_SELECTION, true) + copyTextToClipboard(getString(R.string.argb_code), + String.format(getString(R.string.argb_clipboard), alpha, red, green, blue)) + dialog.dismiss() + } + view.formatRgba.setOnClickListener { + if(view.rememberSelection.isChecked) st.putBoolean(Constants.ARGB_REMEMBER_SELECTION, false) + copyTextToClipboard(getString(R.string.argb_code), + String.format(getString(R.string.rgba_clipboard), red, green, blue, (alpha / 255.0).round(3))) + dialog.dismiss() + } + view.rememberSelection.setOnCheckedChangeListener { _, isChecked -> + st.putBoolean(Constants.ARGB_REMEMBER, isChecked) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/chillibits/colorconverter/ui/dialog/InstallAppDialog.kt b/app/src/main/java/com/chillibits/colorconverter/ui/dialog/InstallAppDialog.kt index 6c7ddaa7..0ffb0820 100644 --- a/app/src/main/java/com/chillibits/colorconverter/ui/dialog/InstallAppDialog.kt +++ b/app/src/main/java/com/chillibits/colorconverter/ui/dialog/InstallAppDialog.kt @@ -33,7 +33,6 @@ fun Activity.showInstantAppInstallDialog(@StringRes message: Int) { .setNegativeText(R.string.cancel) .onPositive { Intent(this, MainActivity::class.java).run { - putExtra(Constants.EXTRA_INSTANT_INSTALLED, true) InstantApps.showInstallPrompt(this@showInstantAppInstallDialog, this, Constants.REQ_INSTANT_INSTALL, "") } } diff --git a/app/src/main/res/drawable/css_logo.xml b/app/src/main/res/drawable/css_logo.xml new file mode 100644 index 00000000..c7fefae8 --- /dev/null +++ b/app/src/main/res/drawable/css_logo.xml @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/app/src/main/res/layout/dialog_export_argb.xml b/app/src/main/res/layout/dialog_export_argb.xml new file mode 100644 index 00000000..b3df10c3 --- /dev/null +++ b/app/src/main/res/layout/dialog_export_argb.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 7b213d94..9029725f 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: Sun, 17 May 2020 19:49:38 +0100 + Exported at: Mon, 25 May 2020 18:30:24 +0100 --> schließen @@ -55,8 +55,6 @@ App installieren Diese Funktion wird nicht in der Instant-Version der App unterstützt. Bitte installieren Sie die App, um diese Funktion zu nutzen. Installieren Sie diese App um alle Funktionen zu genießen, auch Funktionen, die wir in der Instant-Version der App nicht unterstützen. - App installiert - Vielen Dank dass Sie unsere App installiert haben. Tippen Sie auf OK um fortzufahren. Diese Berechtigungen werden benötigt, damit dieses Feature funktioniert. Für Galerie Bilder hochwischen Farbe sprechen @@ -65,4 +63,5 @@ Bitte Lautstärke erhöhen Transparenz-Warnung Sie haben eine transparente oder fast transparente Farbe gewählt. Dies hat den Effekt, dass Farbwechsel nicht mehr sichtbar sind. Um die Kontrolle über die Farbe wiederzuerlangen, bewegen Sie den Transparenz-Regler nach rechts. + Auswahl speichern diff --git a/app/src/main/res/values-de/strings_colors.xml b/app/src/main/res/values-de/strings_colors.xml index aebd3140..9f689534 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, 17 May 2020 13:53:53 +0100 + Exported at: Mon, 25 May 2020 18:30:24 +0100 --> Aliceblau diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 10f682a9..3586a9c7 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: Sun, 17 May 2020 19:49:38 +0100 + Exported at: Mon, 25 May 2020 18:30:24 +0100 --> cerrar @@ -55,8 +55,6 @@ Instalar aplicación 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. 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. - Aplicación instalada - Gracias por instalar nuestra aplicación. Toque Aceptar para continuar. La característica necesita los permisos para funcionar. Arrastra las imágenes hacia arriba para la galería Hablar color @@ -65,4 +63,5 @@ Por favor aumente el volumen Advertencia de transparencia Seleccionó un color transparente o casi transparente. Esto tiene el efecto de que los cambios de color ya no son visibles. Para recuperar el control sobre el color, por favor mueve el deslizador de transparencia a la derecha. + Recuerde la selección diff --git a/app/src/main/res/values-es/strings_colors.xml b/app/src/main/res/values-es/strings_colors.xml index 18a92b56..28d34bc9 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, 17 May 2020 13:53:53 +0100 + Exported at: Mon, 25 May 2020 18:30:24 +0100 --> Azul Alicia diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index ebf69a5e..f8de65d9 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: Sun, 17 May 2020 19:49:37 +0100 + Exported at: Mon, 25 May 2020 18:30:24 +0100 --> fermer @@ -55,8 +55,6 @@ Installer l\'application 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. 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. - Application installée - Merci d\'avoir installé notre application. Appuyez sur OK pour continuer. La fonctionnalité a besoin des autorisations pour fonctionner. Glissez les images en haut pour entrer la galerie Parler couleur @@ -65,4 +63,5 @@ Augmentez le volume, s\'il vous plaît Alerte à la transparence Vous avez choisi une couleur transparente ou presque transparente. Cela a pour effet que les changements de couleur ne sont plus visibles. Pour reprendre le contrôle de la couleur, veuillez déplacer le curseur de transparence vers la droite. + Se souvenir de la sélection diff --git a/app/src/main/res/values-fr/strings_colors.xml b/app/src/main/res/values-fr/strings_colors.xml index c3259c3e..e731e5f6 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, 17 May 2020 13:53:52 +0100 + Exported at: Mon, 25 May 2020 18:30:24 +0100 --> Bleu alice diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c10973db..56769adc 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: Sun, 17 May 2020 19:49:37 +0100 + Exported at: Mon, 25 May 2020 18:30:24 +0100 --> close @@ -55,8 +55,6 @@ Install app This feature is not supported in the instant app version. Please install the app to use this feature. Install this app to enjoy all the features and also the features we cannot support in the instant app version. - App installed - Thank you for installing our app. Tap on OK to continue. The feature needs the permissions to work. Drag images up for gallery Speak color @@ -65,4 +63,5 @@ Please increase volume Transparancy warning 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. + Remember selection diff --git a/app/src/main/res/values/strings_colors.xml b/app/src/main/res/values/strings_colors.xml index 8bd29eac..04359c0d 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, 17 May 2020 13:53:52 +0100 + Exported at: Mon, 25 May 2020 18:30:24 +0100 --> Alice Blue diff --git a/app/src/main/res/values/strings_untranslatable.xml b/app/src/main/res/values/strings_untranslatable.xml index d857d081..36c7f8de 100644 --- a/app/src/main/res/values/strings_untranslatable.xml +++ b/app/src/main/res/values/strings_untranslatable.xml @@ -15,6 +15,9 @@ V ARGB: %1$s, %2$s, %3$s, %4$s argb(%1$s, %2$s, %3$s, %4$s) + argb(0-255, 0-255, 0-255, 0-255) + rgba(%1$s, %2$s, %3$s, %4$s) + rgba(0-255, 0-255, 0-255, 0-1) HEX: #%s HSV: %1$s, %2$s, %3$s hsl(%1$s, %2$s, %3$s) diff --git a/screenshots/1.png b/screenshots/1.png index d4b9dd44..75126cdb 100644 Binary files a/screenshots/1.png and b/screenshots/1.png differ diff --git a/screenshots/2.png b/screenshots/2.png index 5fba936a..c69db57a 100644 Binary files a/screenshots/2.png and b/screenshots/2.png differ diff --git a/screenshots/3.png b/screenshots/3.png index 7959b590..0866cd2e 100644 Binary files a/screenshots/3.png and b/screenshots/3.png differ diff --git a/screenshots/4.png b/screenshots/4.png index 93e2f2e7..a52fe868 100644 Binary files a/screenshots/4.png and b/screenshots/4.png differ diff --git a/screenshots/5.png b/screenshots/5.png index 0efec96f..101decde 100644 Binary files a/screenshots/5.png and b/screenshots/5.png differ diff --git a/screenshots/6.png b/screenshots/6.png index 8b0b97ed..1eb553ed 100644 Binary files a/screenshots/6.png and b/screenshots/6.png differ