From 2891f94e65e5f1b8b972da6fe871ffd439426ed4 Mon Sep 17 00:00:00 2001 From: Marc Auberer Date: Sat, 25 Jan 2020 15:07:48 +0100 Subject: [PATCH] Release to 2.1.0-beta01 --- app/build.gradle | 6 +++--- app/src/main/AndroidManifest.xml | 2 +- .../com/chillibits/colorconverter/tools/ColorNameTools.kt | 2 +- .../java/com/chillibits/colorconverter/tools/ColorTools.kt | 2 +- .../colorconverter/ui/activity/ColorSelectionActivity.kt | 2 +- .../chillibits/colorconverter/ui/activity/ImageActivity.kt | 2 +- .../chillibits/colorconverter/ui/activity/MainActivity.kt | 2 +- .../chillibits/colorconverter/ui/adapter/ColorsAdapter.kt | 2 +- .../chillibits/colorconverter/viewmodel/DetailedFlagView.kt | 4 ++-- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 4 ++-- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bfc01c92..ae6e2a12 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,11 +10,11 @@ android { compileSdkVersion 29 buildToolsVersion "29.0.2" defaultConfig { - applicationId "com.chillibits.colorconverter" + applicationId "com.mrgames13.jimdo.colorconverter" minSdkVersion 19 targetSdkVersion 29 - versionCode 207 - versionName "2.0.7" + versionCode 208 + versionName "2.1.0-beta01" vectorDrawables.useSupportLibrary = true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fa1318cb..17f53e15 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,7 +6,7 @@ diff --git a/app/src/main/java/com/chillibits/colorconverter/tools/ColorNameTools.kt b/app/src/main/java/com/chillibits/colorconverter/tools/ColorNameTools.kt index ea8841c5..772b2925 100644 --- a/app/src/main/java/com/chillibits/colorconverter/tools/ColorNameTools.kt +++ b/app/src/main/java/com/chillibits/colorconverter/tools/ColorNameTools.kt @@ -5,8 +5,8 @@ package com.chillibits.colorconverter.tools import android.content.Context -import com.chillibits.colorconverter.R import com.chillibits.colorconverter.model.Color +import com.mrgames13.jimdo.colorconverter.R class ColorNameTools(private val context: Context) { diff --git a/app/src/main/java/com/chillibits/colorconverter/tools/ColorTools.kt b/app/src/main/java/com/chillibits/colorconverter/tools/ColorTools.kt index 045550ef..001e0a76 100644 --- a/app/src/main/java/com/chillibits/colorconverter/tools/ColorTools.kt +++ b/app/src/main/java/com/chillibits/colorconverter/tools/ColorTools.kt @@ -9,7 +9,7 @@ import android.graphics.Bitmap import android.graphics.Color import androidx.core.content.ContextCompat import androidx.palette.graphics.Palette -import com.chillibits.colorconverter.R +import com.mrgames13.jimdo.colorconverter.R class ColorTools(private var context: Context) { 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 e3c29d72..44f297db 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 @@ -17,11 +17,11 @@ import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.recyclerview.widget.LinearLayoutManager -import com.chillibits.colorconverter.R import com.chillibits.colorconverter.model.Color import com.chillibits.colorconverter.tools.SimpleTextWatcher import com.chillibits.colorconverter.tools.StorageTools import com.chillibits.colorconverter.ui.adapter.ColorsAdapter +import com.mrgames13.jimdo.colorconverter.R import kotlinx.android.synthetic.main.activity_color_selection.* import kotlinx.android.synthetic.main.dialog_color_rename.view.* 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 085294cb..4b85ecce 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 @@ -26,13 +26,13 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.graphics.BlendModeColorFilterCompat import androidx.core.graphics.BlendModeCompat import androidx.exifinterface.media.ExifInterface -import com.chillibits.colorconverter.R import com.chillibits.colorconverter.tools.ColorNameTools import com.chillibits.colorconverter.tools.ColorTools import com.chillibits.colorconverter.viewmodel.DetailedFlagView import com.fxn.pix.Options import com.fxn.pix.Pix import com.fxn.utility.PermUtil +import com.mrgames13.jimdo.colorconverter.R import com.skydoves.colorpickerview.listeners.ColorListener import kotlinx.android.synthetic.main.activity_image.* import java.util.* 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 1a8b744d..d2d4048e 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 @@ -26,13 +26,13 @@ import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.core.graphics.* -import com.chillibits.colorconverter.R import com.chillibits.colorconverter.model.Color import com.chillibits.colorconverter.tools.ColorNameTools import com.chillibits.colorconverter.tools.ColorTools import com.chillibits.colorconverter.tools.SimpleTextWatcher import com.chillibits.colorconverter.tools.StorageTools import com.google.android.instantapps.InstantApps +import com.mrgames13.jimdo.colorconverter.R import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.dialog_edit_hex.view.* import kotlinx.android.synthetic.main.dialog_edit_hsv.view.* 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 e9c357f4..a59db9a5 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 @@ -8,10 +8,10 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.chillibits.colorconverter.R import com.chillibits.colorconverter.model.Color 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.* class ColorsAdapter(private val activity: ColorSelectionActivity, private val colors: ArrayList) : RecyclerView.Adapter() { 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 5b09ed19..1507d2f0 100644 --- a/app/src/main/java/com/chillibits/colorconverter/viewmodel/DetailedFlagView.kt +++ b/app/src/main/java/com/chillibits/colorconverter/viewmodel/DetailedFlagView.kt @@ -7,7 +7,7 @@ package com.chillibits.colorconverter.viewmodel import android.annotation.SuppressLint import android.content.Context import androidx.core.graphics.* -import com.chillibits.colorconverter.R +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.* @@ -20,6 +20,6 @@ class DetailedFlagView(context: Context, layout: Int) : FlagView(context, layout flag_color_hex.text = String.format(context.getString(R.string.hex_), String.format("#%06X", 0xFFFFFF and colorEnvelope.color)) val hsv = FloatArray(3) android.graphics.Color.RGBToHSV(colorEnvelope.color.red, colorEnvelope.color.green, colorEnvelope.color.blue, hsv) - flag_color_hsv.text = String.format(context.getString(com.chillibits.colorconverter.R.string.hsv_), String.format("%.02f", hsv[0]), String.format("%.02f", hsv[1]), String.format("%.02f", hsv[2])) + flag_color_hsv.text = String.format(context.getString(R.string.hsv_), String.format("%.02f", hsv[0]), String.format("%.02f", hsv[1]), String.format("%.02f", hsv[2])) } } \ 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 4a8c36b7..24e1f4cf 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: Sat, 25 Jan 2020 13:30:53 +0000 + Exported at: Sat, 25 Jan 2020 13:47:54 +0000 --> schließen diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 4f03431b..0ba84f6c 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: Sat, 25 Jan 2020 13:30:54 +0000 + Exported at: Sat, 25 Jan 2020 13:47:54 +0000 --> cerrar @@ -59,7 +59,7 @@ 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 diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 9c0d3221..efead501 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: Sat, 25 Jan 2020 13:30:53 +0000 + Exported at: Sat, 25 Jan 2020 13:47:54 +0000 --> fermer diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2a7f88c2..061d9d0b 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: Sat, 25 Jan 2020 13:30:53 +0000 + Exported at: Sat, 25 Jan 2020 13:47:53 +0000 --> close