diff options
author | Allan Wang <me@allanwang.ca> | 2017-07-09 00:48:59 -0700 |
---|---|---|
committer | Allan Wang <me@allanwang.ca> | 2017-07-09 00:48:59 -0700 |
commit | 0af8b379fc0968c830c8938e1998b5bd3dd7e0aa (patch) | |
tree | a4e70e7d36e923b823614328f8fae9e97d7b2e24 /kpref-activity | |
parent | 2bf5e9efde28cce8186b2cdf75d8fafb6c9125ad (diff) | |
download | kau-0af8b379fc0968c830c8938e1998b5bd3dd7e0aa.tar.gz kau-0af8b379fc0968c830c8938e1998b5bd3dd7e0aa.tar.bz2 kau-0af8b379fc0968c830c8938e1998b5bd3dd7e0aa.zip |
Update resource prefixes
Diffstat (limited to 'kpref-activity')
15 files changed, 9 insertions, 9 deletions
diff --git a/kpref-activity/build.gradle b/kpref-activity/build.gradle index 80be774..963d9c0 100644 --- a/kpref-activity/build.gradle +++ b/kpref-activity/build.gradle @@ -1,7 +1,7 @@ apply from: '../android-lib.gradle' android { - resourcePrefix "kau_" + resourcePrefix "kau_pref_" } dependencies { 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 baefba7..19bdb56 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 @@ -21,7 +21,7 @@ open class KPrefCheckbox(builder: BaseContract<Boolean>) : KPrefItemBase<Boolean override fun onPostBindView(viewHolder: ViewHolder, textColor: Int?, accentColor: Int?) { super.onPostBindView(viewHolder, textColor, accentColor) - val checkbox = viewHolder.bindInnerView<CheckBox>(R.layout.kau_preference_checkbox) + val checkbox = viewHolder.bindInnerView<CheckBox>(R.layout.kau_pref_checkbox) if (accentColor != null) checkbox.tint(accentColor) checkbox.isChecked = pref checkbox.jumpDrawablesToCurrentState() //Cancel the animation diff --git a/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefColorPicker.kt b/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefColorPicker.kt index 83d886d..315d67b 100644 --- a/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefColorPicker.kt +++ b/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefColorPicker.kt @@ -25,7 +25,7 @@ open class KPrefColorPicker(val builder: KPrefColorContract) : KPrefItemBase<Int } } if (builder.showPreview) { - val preview = viewHolder.bindInnerView<CircleView>(R.layout.kau_preference_color_preview) + val preview = viewHolder.bindInnerView<CircleView>(R.layout.kau_pref_color) preview.setBackgroundColor(pref) preview.withBorder = true builder.apply { diff --git a/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefHeader.kt b/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefHeader.kt index e0eb37a..6f565ae 100644 --- a/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefHeader.kt +++ b/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefHeader.kt @@ -11,7 +11,7 @@ import ca.allanwang.kau.kpref.activity.R */ open class KPrefHeader(builder: CoreContract) : KPrefItemCore(builder) { - override fun getLayoutRes(): Int = R.layout.kau_preference_header + override fun getLayoutRes(): Int = R.layout.kau_pref_header override fun onPostBindView(viewHolder: ViewHolder, textColor: Int?, accentColor: Int?) { if (accentColor != null) viewHolder.title.setTextColor(accentColor) diff --git a/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefItemBase.kt b/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefItemBase.kt index e21d483..c3f0290 100644 --- a/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefItemBase.kt +++ b/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefItemBase.kt @@ -53,7 +53,7 @@ abstract class KPrefItemBase<T>(val base: BaseContract<T>) : KPrefItemCore(base) } } - override final fun getLayoutRes(): Int = R.layout.kau_preference + override final fun getLayoutRes(): Int = R.layout.kau_pref_core /** * Extension of the core contract 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 f1429e7..f161382 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 @@ -21,13 +21,13 @@ open class KPrefSeekbar(val builder: KPrefSeekbarContract) : KPrefItemBase<Int>( override fun onPostBindView(viewHolder: ViewHolder, textColor: Int?, accentColor: Int?) { super.onPostBindView(viewHolder, textColor, accentColor) - val text = viewHolder.bindInnerView<TextView>(R.layout.kau_preference_seekbar_text) + val text = viewHolder.bindInnerView<TextView>(R.layout.kau_pref_seekbar_text) if (textColor != null) text.setTextColor(textColor) val tvc = builder.textViewConfigs text.tvc() - val seekbar = viewHolder.bindLowerView<SeekBar>(R.layout.kau_preference_seekbar) { + val seekbar = viewHolder.bindLowerView<SeekBar>(R.layout.kau_pref_seekbar) { it.max = builder.range it.incrementProgressBy(builder.increments) it.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener { diff --git a/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefSubItems.kt b/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefSubItems.kt index 9313a3f..1bf0ffc 100644 --- a/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefSubItems.kt +++ b/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefSubItems.kt @@ -19,7 +19,7 @@ open class KPrefSubItems(val builder: KPrefSubItemsContract) : KPrefItemCore(bui return true } - override fun getLayoutRes(): Int = R.layout.kau_preference + override fun getLayoutRes(): Int = R.layout.kau_pref_core override fun onPostBindView(viewHolder: ViewHolder, textColor: Int?, accentColor: Int?) {} /** diff --git a/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefText.kt b/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefText.kt index 277a842..45c9a5d 100644 --- a/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefText.kt +++ b/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefText.kt @@ -33,7 +33,7 @@ open class KPrefText<T>(val builder: KPrefTextContract<T>) : KPrefItemBase<T>(bu override fun onPostBindView(viewHolder: ViewHolder, textColor: Int?, accentColor: Int?) { super.onPostBindView(viewHolder, textColor, accentColor) - val textview = viewHolder.bindInnerView<TextView>(R.layout.kau_preference_text) + val textview = viewHolder.bindInnerView<TextView>(R.layout.kau_pref_text) if (textColor != null) textview.setTextColor(textColor) textview.text = builder.textGetter.invoke(pref) } diff --git a/kpref-activity/src/main/res/layout/kau_preference_checkbox.xml b/kpref-activity/src/main/res/layout/kau_pref_checkbox.xml index 016394f..016394f 100644 --- a/kpref-activity/src/main/res/layout/kau_preference_checkbox.xml +++ b/kpref-activity/src/main/res/layout/kau_pref_checkbox.xml diff --git a/kpref-activity/src/main/res/layout/kau_preference_color_preview.xml b/kpref-activity/src/main/res/layout/kau_pref_color.xml index fbb049b..fbb049b 100644 --- a/kpref-activity/src/main/res/layout/kau_preference_color_preview.xml +++ b/kpref-activity/src/main/res/layout/kau_pref_color.xml diff --git a/kpref-activity/src/main/res/layout/kau_preference.xml b/kpref-activity/src/main/res/layout/kau_pref_core.xml index 1a53726..1a53726 100644 --- a/kpref-activity/src/main/res/layout/kau_preference.xml +++ b/kpref-activity/src/main/res/layout/kau_pref_core.xml diff --git a/kpref-activity/src/main/res/layout/kau_preference_header.xml b/kpref-activity/src/main/res/layout/kau_pref_header.xml index 5deece3..5deece3 100644 --- a/kpref-activity/src/main/res/layout/kau_preference_header.xml +++ b/kpref-activity/src/main/res/layout/kau_pref_header.xml diff --git a/kpref-activity/src/main/res/layout/kau_preference_seekbar.xml b/kpref-activity/src/main/res/layout/kau_pref_seekbar.xml index 8da4d5d..8da4d5d 100644 --- a/kpref-activity/src/main/res/layout/kau_preference_seekbar.xml +++ b/kpref-activity/src/main/res/layout/kau_pref_seekbar.xml diff --git a/kpref-activity/src/main/res/layout/kau_preference_seekbar_text.xml b/kpref-activity/src/main/res/layout/kau_pref_seekbar_text.xml index 6ba2543..6ba2543 100644 --- a/kpref-activity/src/main/res/layout/kau_preference_seekbar_text.xml +++ b/kpref-activity/src/main/res/layout/kau_pref_seekbar_text.xml diff --git a/kpref-activity/src/main/res/layout/kau_preference_text.xml b/kpref-activity/src/main/res/layout/kau_pref_text.xml index a4d901e..a4d901e 100644 --- a/kpref-activity/src/main/res/layout/kau_preference_text.xml +++ b/kpref-activity/src/main/res/layout/kau_pref_text.xml |