aboutsummaryrefslogtreecommitdiff
path: root/colorpicker/src/main
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-10-16 21:22:42 -0400
committerGitHub <noreply@github.com>2017-10-16 21:22:42 -0400
commit681effece90ff4e892506ee5f5057bee4776c48b (patch)
tree4b98fbca594089a7e90d7c617ebb3b2a230678cf /colorpicker/src/main
parent75132277968b513d4ac0e7b99c59ad0748cbb675 (diff)
downloadkau-681effece90ff4e892506ee5f5057bee4776c48b.tar.gz
kau-681effece90ff4e892506ee5f5057bee4776c48b.tar.bz2
kau-681effece90ff4e892506ee5f5057bee4776c48b.zip
Translations (#89)
* Update strings * Delete extra file * Update strings
Diffstat (limited to 'colorpicker/src/main')
-rw-r--r--colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/ColorPickerDialog.kt2
-rw-r--r--colorpicker/src/main/res/values/strings_colorpicker.xml1
2 files changed, 1 insertions, 2 deletions
diff --git a/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/ColorPickerDialog.kt b/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/ColorPickerDialog.kt
index e987c2c..a3dcc2d 100644
--- a/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/ColorPickerDialog.kt
+++ b/colorpicker/src/main/kotlin/ca/allanwang/kau/colorpicker/ColorPickerDialog.kt
@@ -19,7 +19,7 @@ class ColorBuilder : ColorContract {
override var backText: Int = R.string.kau_back
override var cancelText: Int = R.string.kau_cancel
override var presetText: Int = R.string.kau_md_presets
- override var customText: Int = R.string.kau_md_custom
+ override var customText: Int = R.string.kau_custom
get() = if (allowCustom) field else 0
override var dynamicButtonColors: Boolean = true
override var circleSizeRes: Int = R.dimen.kau_color_circle_size
diff --git a/colorpicker/src/main/res/values/strings_colorpicker.xml b/colorpicker/src/main/res/values/strings_colorpicker.xml
index 5a6f89b..a470390 100644
--- a/colorpicker/src/main/res/values/strings_colorpicker.xml
+++ b/colorpicker/src/main/res/values/strings_colorpicker.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName">
<string name="kau_md_color_palette">Color Palette</string>
- <string name="kau_md_custom">Custom</string>
<string name="kau_md_presets">Presets</string>
</resources>