Skip to content

Commit

Permalink
Release to 2.1.0-beta01
Browse files Browse the repository at this point in the history
  • Loading branch information
marcauberer committed Jan 25, 2020
1 parent 313f36c commit 2891f94
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:dist="http://schemas.android.com/apk/distribution"
xmlns:tools="http://schemas.android.com/tools"
package="com.chillibits.colorconverter"
package="com.mrgames13.jimdo.colorconverter"
android:installLocation="auto">

<dist:module dist:instant="true" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Color>) : RecyclerView.Adapter<ColorsAdapter.ViewHolder>() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand All @@ -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]))
}
}
2 changes: 1 addition & 1 deletion app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="close">schließen</string>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="close">cerrar</string>
Expand Down Expand Up @@ -59,7 +59,7 @@
<string name="instant_installed_m">Gracias por instalar nuestra aplicación. Toque Aceptar para continuar.</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="speak_color"></string>
<string name="speak_color">Hablar color</string>
<string name="language_not_available"></string>
<string name="initialization_failed"></string>
<string name="audio_muted"></string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="close">fermer</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="close">close</string>
Expand Down

0 comments on commit 2891f94

Please sign in to comment.