From 81518f74fa76b6c2274a0e02ad4169f5d7f61e59 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Mon, 8 Oct 2018 01:06:44 -0400 Subject: Update translations (#169) * New translations strings_about.xml (Polish) * New translations strings_commons.xml (Hebrew) * New translations strings_commons.xml (Tagalog) * New translations strings_commons.xml (Swedish) * New translations strings_commons.xml (Serbian (Cyrillic)) * New translations strings_commons.xml (Russian) * New translations strings_commons.xml (Romanian) * New translations strings_commons.xml (Portuguese, Brazilian) * New translations strings_commons.xml (Portuguese) * New translations strings_commons.xml (Norwegian) * New translations strings_commons.xml (Korean) * New translations strings_commons.xml (Japanese) * New translations strings_commons.xml (Italian) * New translations strings_commons.xml (Hungarian) * New translations strings_commons.xml (Greek) * New translations strings_commons.xml (German) * New translations strings_commons.xml (Galician) * New translations strings_commons.xml (French) * New translations strings_commons.xml (Finnish) * New translations strings_commons.xml (English) * New translations strings_commons.xml (Dutch) * New translations strings_commons.xml (Czech) * New translations strings_commons.xml (Chinese Traditional) * New translations strings_commons.xml (Chinese Simplified) * New translations strings_commons.xml (Catalan) * New translations strings_commons.xml (Arabic) * New translations strings_commons.xml (Afrikaans) * New translations strings_colorpicker.xml (Ukrainian) * New translations strings_commons.xml (Ukrainian) * New translations strings_mediapicker.xml (Ukrainian) * New translations strings_mediapicker.xml (Tagalog) * New translations strings_mediapicker.xml (Swedish) * New translations strings_mediapicker.xml (Serbian (Cyrillic)) * New translations strings_mediapicker.xml (Russian) * New translations strings_mediapicker.xml (Romanian) * New translations strings_mediapicker.xml (Portuguese, Brazilian) * New translations strings_mediapicker.xml (Portuguese) * New translations strings_mediapicker.xml (Norwegian) * New translations strings_mediapicker.xml (Korean) * New translations strings_mediapicker.xml (Japanese) * New translations strings_mediapicker.xml (Italian) * New translations strings_mediapicker.xml (Hungarian) * New translations strings_commons.xml (Vietnamese) * New translations strings_mediapicker.xml (Hebrew) * New translations strings_mediapicker.xml (Greek) * New translations strings_mediapicker.xml (German) * New translations strings_mediapicker.xml (Galician) * New translations strings_mediapicker.xml (French) * New translations strings_mediapicker.xml (Finnish) * New translations strings_mediapicker.xml (English) * New translations strings_mediapicker.xml (Dutch) * New translations strings_mediapicker.xml (Czech) * New translations strings_mediapicker.xml (Chinese Traditional) * New translations strings_mediapicker.xml (Chinese Simplified) * New translations strings_mediapicker.xml (Catalan) * New translations strings_mediapicker.xml (Arabic) * New translations strings_mediapicker.xml (Afrikaans) * New translations strings_colorpicker.xml (Tagalog) * New translations strings_mediapicker.xml (Polish) * New translations strings_about.xml (English) * New translations strings_about.xml (Portuguese, Brazilian) * New translations strings_about.xml (Portuguese) * New translations strings_about.xml (Norwegian) * New translations strings_about.xml (Korean) * New translations strings_about.xml (Japanese) * New translations strings_about.xml (Italian) * New translations strings_about.xml (Hungarian) * New translations strings_about.xml (Hebrew) * New translations strings_about.xml (Greek) * New translations strings_about.xml (German) * New translations strings_about.xml (Galician) * New translations strings_about.xml (French) * New translations strings_about.xml (Finnish) * New translations strings_about.xml (Dutch) * New translations strings_about.xml (Russian) * New translations strings_about.xml (Czech) * New translations strings_about.xml (Chinese Simplified) * New translations strings_about.xml (Catalan) * New translations strings_about.xml (Arabic) * New translations strings_about.xml (Afrikaans) * New translations strings_mediapicker.xml (Danish) * New translations strings_commons.xml (Danish) * New translations strings_colorpicker.xml (Danish) * New translations strings_about.xml (Danish) * New translations strings_mediapicker.xml (Spanish) * New translations strings_commons.xml (Spanish) * New translations strings_about.xml (Spanish) * New translations strings_about.xml (Chinese Traditional) * New translations strings_about.xml (Romanian) * New translations strings_about.xml (Serbian (Cyrillic)) * New translations strings_colorpicker.xml (Swedish) * New translations strings_colorpicker.xml (Serbian (Cyrillic)) * New translations strings_colorpicker.xml (Russian) * New translations strings_colorpicker.xml (Romanian) * New translations strings_colorpicker.xml (Portuguese) * New translations strings_colorpicker.xml (Japanese) * New translations strings_colorpicker.xml (Hebrew) * New translations strings_colorpicker.xml (Greek) * New translations strings_about.xml (Swedish) * New translations strings_colorpicker.xml (Arabic) * New translations strings_about.xml (Tagalog) * New translations strings_about.xml (Ukrainian) * New translations strings_about.xml (Vietnamese) * New translations strings_colorpicker.xml (Afrikaans) * New translations strings_colorpicker.xml (Catalan) * New translations strings_colorpicker.xml (Chinese Traditional) * New translations strings_colorpicker.xml (Czech) * New translations strings_colorpicker.xml (Dutch) * New translations strings_colorpicker.xml (English) * New translations strings_colorpicker.xml (Finnish) * New translations strings_mediapicker.xml (Vietnamese) * New translations strings_commons.xml (Danish) * New translations strings_about.xml (Swedish) * New translations strings_about.xml (Ukrainian) * New translations strings_colorpicker.xml (Swedish) * New translations strings_colorpicker.xml (Ukrainian) * New translations strings_commons.xml (Swedish) * New translations strings_commons.xml (Ukrainian) * New translations strings_mediapicker.xml (Swedish) * New translations strings_mediapicker.xml (Ukrainian) * Delete empty files * Optimize all source files --- .../ca/allanwang/kau/kpref/activity/KPrefBinder.kt | 24 ++++++++-------------- .../kau/kpref/activity/items/KPrefCheckbox.kt | 1 - .../src/main/res-public/values/public.xml | 2 +- 3 files changed, 9 insertions(+), 18 deletions(-) (limited to 'kpref-activity/src') diff --git a/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/KPrefBinder.kt b/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/KPrefBinder.kt index a9e21ff..2cdeae2 100644 --- a/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/KPrefBinder.kt +++ b/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/KPrefBinder.kt @@ -53,60 +53,52 @@ class GlobalOptions(core: CoreAttributeContract, activity: KPrefActivityContract class KPrefAdapterBuilder(val globalOptions: GlobalOptions) { @KPrefMarker - fun header(@StringRes title: Int) - = list.add(KPrefHeader(KPrefItemCore.CoreBuilder(globalOptions, title))) + fun header(@StringRes title: Int) = list.add(KPrefHeader(KPrefItemCore.CoreBuilder(globalOptions, title))) @KPrefMarker fun checkbox(@StringRes title: Int, getter: (() -> Boolean), setter: ((value: Boolean) -> Unit), - builder: KPrefItemBase.BaseContract.() -> Unit = {}) - = list.add(KPrefCheckbox(KPrefItemBase.BaseBuilder(globalOptions, title, getter, setter) + builder: KPrefItemBase.BaseContract.() -> Unit = {}) = list.add(KPrefCheckbox(KPrefItemBase.BaseBuilder(globalOptions, title, getter, setter) .apply { builder() })) @KPrefMarker fun colorPicker(@StringRes title: Int, getter: (() -> Int), setter: ((value: Int) -> Unit), - builder: KPrefColorPicker.KPrefColorContract.() -> Unit = {}) - = list.add(KPrefColorPicker(KPrefColorPicker.KPrefColorBuilder(globalOptions, title, getter, setter) + builder: KPrefColorPicker.KPrefColorContract.() -> Unit = {}) = list.add(KPrefColorPicker(KPrefColorPicker.KPrefColorBuilder(globalOptions, title, getter, setter) .apply { builder() })) @KPrefMarker fun text(@StringRes title: Int, getter: (() -> T), setter: ((value: T) -> Unit), - builder: KPrefText.KPrefTextContract.() -> Unit = {}) - = list.add(KPrefText(KPrefText.KPrefTextBuilder(globalOptions, title, getter, setter) + builder: KPrefText.KPrefTextContract.() -> Unit = {}) = list.add(KPrefText(KPrefText.KPrefTextBuilder(globalOptions, title, getter, setter) .apply { builder() })) @KPrefMarker fun subItems(@StringRes title: Int, itemBuilder: KPrefAdapterBuilder.() -> Unit, - builder: KPrefSubItems.KPrefSubItemsContract.() -> Unit) - = list.add(KPrefSubItems(KPrefSubItems.KPrefSubItemsBuilder(globalOptions, title, itemBuilder) + builder: KPrefSubItems.KPrefSubItemsContract.() -> Unit) = list.add(KPrefSubItems(KPrefSubItems.KPrefSubItemsBuilder(globalOptions, title, itemBuilder) .apply { builder() })) @KPrefMarker fun plainText(@StringRes title: Int, - builder: KPrefItemBase.BaseContract.() -> Unit = {}) - = list.add(KPrefPlainText(KPrefPlainText.KPrefPlainTextBuilder(globalOptions, title) + builder: KPrefItemBase.BaseContract.() -> Unit = {}) = list.add(KPrefPlainText(KPrefPlainText.KPrefPlainTextBuilder(globalOptions, title) .apply { builder() })) @KPrefMarker fun seekbar(@StringRes title: Int, getter: (() -> Int), setter: ((value: Int) -> Unit), - builder: KPrefSeekbar.KPrefSeekbarContract.() -> Unit = {}) - = list.add(KPrefSeekbar(KPrefSeekbar.KPrefSeekbarBuilder(globalOptions, title, getter, setter) + builder: KPrefSeekbar.KPrefSeekbarContract.() -> Unit = {}) = list.add(KPrefSeekbar(KPrefSeekbar.KPrefSeekbarBuilder(globalOptions, title, getter, setter) .apply { builder() })) @KPrefMarker fun timePicker(@StringRes title: Int, getter: (() -> Int), setter: ((value: Int) -> Unit), - builder: KPrefTimePicker.KPrefTimeContract.() -> Unit = {}) - = list.add(KPrefTimePicker(KPrefTimePicker.KPrefTimeBuilder(globalOptions, title, getter, setter) + builder: KPrefTimePicker.KPrefTimeContract.() -> Unit = {}) = list.add(KPrefTimePicker(KPrefTimePicker.KPrefTimeBuilder(globalOptions, title, getter, setter) .apply { builder() })) @KPrefMarker diff --git a/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefCheckbox.kt b/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefCheckbox.kt index 3e06f6a..f391747 100644 --- a/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefCheckbox.kt +++ b/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefCheckbox.kt @@ -4,7 +4,6 @@ import android.support.v7.widget.AppCompatCheckBox import android.widget.CheckBox import ca.allanwang.kau.kpref.activity.KClick import ca.allanwang.kau.kpref.activity.R -import ca.allanwang.kau.logging.KL import ca.allanwang.kau.utils.tint /** diff --git a/kpref-activity/src/main/res-public/values/public.xml b/kpref-activity/src/main/res-public/values/public.xml index b5fb383..bd4f615 100644 --- a/kpref-activity/src/main/res-public/values/public.xml +++ b/kpref-activity/src/main/res-public/values/public.xml @@ -1,5 +1,5 @@ - + -- cgit v1.2.3 From 2ed21b32c9e77da5f957cfbf9d73a0a563b8511c Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Mon, 8 Oct 2018 03:14:40 -0400 Subject: Enhancement/public xml (#171) * Test gitignore with public xml * Fix spacing --- .gitignore | 1 + about/src/main/res-public/values/public.xml | 4 - adapter/src/main/res-public/values/public.xml | 4 - artifacts.gradle | 8 +- colorpicker/src/main/res-public/values/public.xml | 4 - core-ui/src/main/res-public/values/public.xml | 10 -- core/src/main/res-public/values/public.xml | 118 --------------------- .../src/main/res-public/values/public.xml | 19 ---- mediapicker/src/main/res-public/values/public.xml | 7 -- searchview/src/main/res-public/values/public.xml | 4 - 10 files changed, 7 insertions(+), 172 deletions(-) delete mode 100644 about/src/main/res-public/values/public.xml delete mode 100644 adapter/src/main/res-public/values/public.xml delete mode 100644 colorpicker/src/main/res-public/values/public.xml delete mode 100644 core-ui/src/main/res-public/values/public.xml delete mode 100644 core/src/main/res-public/values/public.xml delete mode 100644 kpref-activity/src/main/res-public/values/public.xml delete mode 100644 mediapicker/src/main/res-public/values/public.xml delete mode 100644 searchview/src/main/res-public/values/public.xml (limited to 'kpref-activity/src') diff --git a/.gitignore b/.gitignore index 6f35f6b..d741202 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /build /captures .externalNativeBuild +**/public.xml \ No newline at end of file diff --git a/about/src/main/res-public/values/public.xml b/about/src/main/res-public/values/public.xml deleted file mode 100644 index 3739dd1..0000000 --- a/about/src/main/res-public/values/public.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/adapter/src/main/res-public/values/public.xml b/adapter/src/main/res-public/values/public.xml deleted file mode 100644 index 4d16c2a..0000000 --- a/adapter/src/main/res-public/values/public.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/artifacts.gradle b/artifacts.gradle index 12dd3fa..c0c344a 100644 --- a/artifacts.gradle +++ b/artifacts.gradle @@ -31,6 +31,8 @@ artifacts { // We assume resources within res-public are public task generatepublicxml { + println "Generating public XML" + def resDir = project.projectDir.absolutePath + "/src/main/res-public" def publicFolder = file(resDir + "/values") @@ -64,7 +66,7 @@ task generatepublicxml { ) { // Leave file comment destXmlMkp.yield "\r\n" - destXmlMkp.comment("AUTO-GENERATED FILE. DO NOT MODIFY. public.xml is generated by the generatepublicxml gradle task") + destXmlMkp.comment("AUTO-GENERATED FILE. DO NOT MODIFY. public.xml is generated by the generatepublicxml gradle task") if (tree.isEmpty()) "public"("name": "dummy", "type": "id") @@ -96,4 +98,6 @@ task generatepublicxml { } } } -} \ No newline at end of file +} + +build.dependsOn generatepublicxml \ No newline at end of file diff --git a/colorpicker/src/main/res-public/values/public.xml b/colorpicker/src/main/res-public/values/public.xml deleted file mode 100644 index 4d16c2a..0000000 --- a/colorpicker/src/main/res-public/values/public.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/core-ui/src/main/res-public/values/public.xml b/core-ui/src/main/res-public/values/public.xml deleted file mode 100644 index 3d0b8d2..0000000 --- a/core-ui/src/main/res-public/values/public.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/core/src/main/res-public/values/public.xml b/core/src/main/res-public/values/public.xml deleted file mode 100644 index 485be78..0000000 --- a/core/src/main/res-public/values/public.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/kpref-activity/src/main/res-public/values/public.xml b/kpref-activity/src/main/res-public/values/public.xml deleted file mode 100644 index bd4f615..0000000 --- a/kpref-activity/src/main/res-public/values/public.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/mediapicker/src/main/res-public/values/public.xml b/mediapicker/src/main/res-public/values/public.xml deleted file mode 100644 index cadfa07..0000000 --- a/mediapicker/src/main/res-public/values/public.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/searchview/src/main/res-public/values/public.xml b/searchview/src/main/res-public/values/public.xml deleted file mode 100644 index 4d16c2a..0000000 --- a/searchview/src/main/res-public/values/public.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file -- cgit v1.2.3 From 9dd6249d634c8b70d152907a4cda80da1626cddc Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Thu, 18 Oct 2018 00:30:47 -0400 Subject: Fix/kprefseekbar builder (#174) * Convert seekbar fields to getters * Make getters inline * Add spacing in readme, resolves #173 * Placeholder commit --- .travis.yml | 4 ++-- README.md | 4 ++-- .../src/main/groovy/ca/allanwang/kau/Versions.groovy | 2 +- docs/Changelog.md | 3 ++- .../allanwang/kau/kpref/activity/items/KPrefSeekbar.kt | 16 ++++++++-------- 5 files changed, 15 insertions(+), 14 deletions(-) (limited to 'kpref-activity/src') diff --git a/.travis.yml b/.travis.yml index 22743c3..721eb72 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,9 @@ jdk: - oraclejdk8 env: global: - - ANDROID_API=27 + - ANDROID_API=28 - EMULATOR_API=24 - - ANDROID_BUILD_TOOLS=27.0.3 + - ANDROID_BUILD_TOOLS=28.0.3 android: components: - tools diff --git a/README.md b/README.md index 4c0963c..edf6878 100644 --- a/README.md +++ b/README.md @@ -44,9 +44,9 @@ Note that if you use any particular submodule, it will automatically include all ```gradle dependencies { - //All submodules extend this + // all submodules extend this implementation "ca.allanwang.kau:core:$KAU" - //All submodules with extensive ui extend this + // all submodules with extensive ui extend this implementation "ca.allanwang.kau:core-ui:$KAU" implementation "ca.allanwang.kau:about:$KAU" diff --git a/buildSrc/src/main/groovy/ca/allanwang/kau/Versions.groovy b/buildSrc/src/main/groovy/ca/allanwang/kau/Versions.groovy index e055c46..55fc646 100644 --- a/buildSrc/src/main/groovy/ca/allanwang/kau/Versions.groovy +++ b/buildSrc/src/main/groovy/ca/allanwang/kau/Versions.groovy @@ -46,7 +46,7 @@ class Versions { static def junit = '4.12' static def testRunner = '1.0.1' - static def gradlePlugin = '3.2.0' + static def gradlePlugin = '3.2.1' static def mavenPlugin = '2.1' static def playPublishPlugin = '1.2.2' diff --git a/docs/Changelog.md b/docs/Changelog.md index a93b4c8..a5f24f4 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -4,8 +4,9 @@ * Update everything to Android Studio 3.1 * Fix new lint issues (see Migration for resource related methods) * :adapter: Add more IAdapter functions to help retrieve selections -* :core: Add deprecation warning to bindView for fragment based extensions; use bindViewResettable instead +* :core: Deprecate Kotterknife; use kotlin_android_extensions * :kpref-activity: Fix seekbar increment +* :core: Make KPref use Set vs StringSet ## v3.7.1 * Update appcompat to 27.1.0 diff --git a/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefSeekbar.kt b/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefSeekbar.kt index 78f4f80..ce61e8f 100644 --- a/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefSeekbar.kt +++ b/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefSeekbar.kt @@ -15,14 +15,9 @@ import ca.allanwang.kau.utils.tint */ open class KPrefSeekbar(val builder: KPrefSeekbarContract) : KPrefItemBase(builder) { - protected val min = builder.min - protected val max = builder.max - protected val increment = builder.increments - - init { - if (increment <= 0) - throw IllegalArgumentException("Seekbar must increment by at least 1") - } + protected inline val min get() = builder.min + protected inline val max get() = builder.max + protected inline val increment get() = builder.increments override fun KClick.defaultOnClick() = Unit @@ -83,6 +78,11 @@ open class KPrefSeekbar(val builder: KPrefSeekbarContract) : KPrefItemBase( override var max: Int = 100 override var increments: Int = 1 + set(value) { + if (value <= 0) + throw IllegalArgumentException("Seekbar must increment by at least 1") + field = value + } override var toText: (Int) -> String = Int::toString -- cgit v1.2.3