mirror/florisboard
0
0
Fork 0
mirror of https://github.com/florisboard/florisboard.git synced 2024-09-20 03:52:18 +02:00
Code

Change used color picker pref / Fix bugs

Browse Source
This commit is contained in:
Patrick Goldinger 2020-09-13 19:15:04 +02:00
parent 7256c597c2
commit c061e15263
11 changed files with 102 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -69,7 +69,7 @@ timeline for this, but I aim for the 0.2.0 or 0.3.0 release.
* [x] Preferences screen
* [x] Customize look and behaviour of keyboard (currently only
light/dark theme)
* [ ] Theme customization
* [x] Theme customization
* [ ] Theme import/export (?)
* [x] Subtype selection (language/layout)
* [x] Keyboard behaviour preferences
@ -97,13 +97,15 @@ timeline for this, but I aim for the 0.2.0 or 0.3.0 release.
Note: (?) = not sure if it will be implemented
## Used libraries and icons
## Used libraries, components and icons
* [Google Flexbox Layout for Android](https://github.com/google/flexbox-layout)
by [google](https://github.com/google)
* [Google Material icons](https://github.com/google/material-design-icons) by
[google](https://github.com/google)
* [Moshi JSON library](https://github.com/square/moshi) by
[square](https://github.com/square)
* [ColorPicker preference](https://github.com/jaredrummler/ColorPicker) by
[Jared Rummler](https://github.com/jaredrummler)
## License
```

2
app/build.gradle
View File

@ -47,5 +47,5 @@ dependencies {
implementation 'com.google.android.material:material:1.2.0'
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.7"
implementation "com.github.skydoves:colorpickerpreference:2.0.3"
implementation 'com.jaredrummler:colorpicker:1.1.0'
}

2
app/src/main/assets/ime/theme/floris_day.json
View File

@ -45,8 +45,6 @@
"bgColor": "#E8F5E9"
},
"oneHandedButton": {
"bgColor": "transparent",
"bgColorPressed": "@window/semiTransparentColor",
"fgColor": "#424242"
},
"smartbar": {

4
app/src/main/assets/ime/theme/floris_night.json
View File

@ -2,7 +2,7 @@
"name": "floris_night",
"displayName": "Floris Night",
"author": "patrickgold",
"isNightTheme": false,
"isNightTheme": true,
"attributes": {
"window": {
"colorPrimary": "#4CAF50",
@ -45,8 +45,6 @@
"bgColor": "#1B5E20"
},
"oneHandedButton": {
"bgColor": "transparent",
"bgColorPressed": "@window/semiTransparentColor",
"fgColor": "#EEEEEE"
},
"smartbar": {

18
app/src/main/assets/license/open_source_licenses.html
View File

@ -34,6 +34,24 @@ You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
</pre>
<hr>
<h3>ColorPicker preference</h3>
<span>Copyright 2016 Jared Rummler / Copyright 2015 Daniel Nilsson</span>
<pre>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

31
app/src/main/java/dev/patrickgold/florisboard/ime/core/FlorisBoard.kt
View File

@ -20,6 +20,7 @@ import android.annotation.SuppressLint
import android.content.ClipboardManager
import android.content.Context
import android.content.Intent
import android.content.res.ColorStateList
import android.content.res.Configuration
import android.inputmethodservice.InputMethodService
import android.media.AudioManager
@ -160,7 +161,7 @@ class FlorisBoard : InputMethodService() {
AppVersionUtils.updateVersionOnInstallAndLastUse(this, prefs)
super.onCreate()
eventListeners.forEach { it.onCreate() }
eventListeners.toList().forEach { it.onCreate() }
}
@SuppressLint("InflateParams")
@ -171,7 +172,7 @@ class FlorisBoard : InputMethodService() {
inputView = layoutInflater.inflate(R.layout.florisboard, null) as InputView
eventListeners.forEach { it.onCreateInputView() }
eventListeners.toList().forEach { it.onCreateInputView() }
return inputView
}
@ -185,7 +186,7 @@ class FlorisBoard : InputMethodService() {
updateSoftInputWindowLayoutParameters()
updateOneHandedPanelVisibility()
eventListeners.forEach { it.onRegisterInputView(inputView) }
eventListeners.toList().forEach { it.onRegisterInputView(inputView) }
}
override fun onDestroy() {
@ -194,7 +195,7 @@ class FlorisBoard : InputMethodService() {
osHandler.removeCallbacksAndMessages(null)
florisboardInstance = null
eventListeners.forEach { it.onDestroy() }
eventListeners.toList().forEach { it.onDestroy() }
eventListeners.clear()
super.onDestroy()
}
@ -203,14 +204,14 @@ class FlorisBoard : InputMethodService() {
currentInputConnection?.requestCursorUpdates(InputConnection.CURSOR_UPDATE_MONITOR)
super.onStartInputView(info, restarting)
eventListeners.forEach { it.onStartInputView(info, restarting) }
eventListeners.toList().forEach { it.onStartInputView(info, restarting) }
}
override fun onFinishInputView(finishingInput: Boolean) {
currentInputConnection?.requestCursorUpdates(0)
super.onFinishInputView(finishingInput)
eventListeners.forEach { it.onFinishInputView(finishingInput) }
eventListeners.toList().forEach { it.onFinishInputView(finishingInput) }
}
override fun onWindowShown() {
@ -224,14 +225,14 @@ class FlorisBoard : InputMethodService() {
setActiveInput(R.id.text_input)
super.onWindowShown()
eventListeners.forEach { it.onWindowShown() }
eventListeners.toList().forEach { it.onWindowShown() }
}
override fun onWindowHidden() {
if (BuildConfig.DEBUG) Log.i(this::class.simpleName, "onWindowHidden()")
super.onWindowHidden()
eventListeners.forEach { it.onWindowHidden() }
eventListeners.toList().forEach { it.onWindowHidden() }
}
override fun onConfigurationChanged(newConfig: Configuration) {
@ -244,7 +245,7 @@ class FlorisBoard : InputMethodService() {
override fun onUpdateCursorAnchorInfo(cursorAnchorInfo: CursorAnchorInfo?) {
super.onUpdateCursorAnchorInfo(cursorAnchorInfo)
eventListeners.forEach { it.onUpdateCursorAnchorInfo(cursorAnchorInfo) }
eventListeners.toList().forEach { it.onUpdateCursorAnchorInfo(cursorAnchorInfo) }
}
override fun onUpdateSelection(
@ -263,7 +264,7 @@ class FlorisBoard : InputMethodService() {
candidatesStart,
candidatesEnd
)
eventListeners.forEach {
eventListeners.toList().forEach {
it.onUpdateSelection(
oldSelStart,
oldSelEnd,
@ -299,7 +300,15 @@ class FlorisBoard : InputMethodService() {
}
inputView?.oneHandedCtrlPanelStart?.setBackgroundColor(prefs.theme.oneHandedBgColor)
inputView?.oneHandedCtrlPanelEnd?.setBackgroundColor(prefs.theme.oneHandedBgColor)
eventListeners.forEach { it.onApplyThemeAttributes() }
inputView?.findViewById<ImageButton>(R.id.one_handed_ctrl_move_start)
?.imageTintList = ColorStateList.valueOf(prefs.theme.oneHandedButtonFgColor)
inputView?.findViewById<ImageButton>(R.id.one_handed_ctrl_move_end)
?.imageTintList = ColorStateList.valueOf(prefs.theme.oneHandedButtonFgColor)
inputView?.findViewById<ImageButton>(R.id.one_handed_ctrl_close_start)
?.imageTintList = ColorStateList.valueOf(prefs.theme.oneHandedButtonFgColor)
inputView?.findViewById<ImageButton>(R.id.one_handed_ctrl_close_end)
?.imageTintList = ColorStateList.valueOf(prefs.theme.oneHandedButtonFgColor)
eventListeners.toList().forEach { it.onApplyThemeAttributes() }
}
override fun onComputeInsets(outInsets: Insets?) {

12
app/src/main/java/dev/patrickgold/florisboard/ime/core/PrefHelper.kt
View File

@ -307,7 +307,6 @@ class PrefHelper(
*/
class Theme(private val prefHelper: PrefHelper) {
companion object {
const val PRESET = "theme__preset"
const val COLOR_PRIMARY = "theme__colorPrimary"
const val COLOR_PRIMARY_DARK = "theme__colorPrimaryDark"
const val COLOR_ACCENT = "theme__colorAccent"
@ -330,8 +329,6 @@ class PrefHelper(
const val MEDIA_FG_COLOR = "theme__media_fgColor"
const val MEDIA_FG_COLOR_ALT = "theme__media_fgColorAlt"
const val ONE_HANDED_BG_COLOR = "theme__oneHanded_bgColor"
const val ONE_HANDED_BUTTON_BG_COLOR = "theme__oneHandedButton_bgColor"
const val ONE_HANDED_BUTTON_BG_COLOR_PRESSED = "theme__oneHandedButton_bgColorPressed"
const val ONE_HANDED_BUTTON_FG_COLOR = "theme__oneHandedButton_fgColor"
const val SMARTBAR_BG_COLOR = "theme__smartbar_bgColor"
const val SMARTBAR_FG_COLOR = "theme__smartbar_fgColor"
@ -340,9 +337,6 @@ class PrefHelper(
const val SMARTBAR_BUTTON_FG_COLOR = "theme__smartbarButton_fgColor"
}
var preset: Int
get() = prefHelper.getPref(PRESET, 0)
set(v) = prefHelper.setPref(PRESET, v)
var colorPrimary: Int
get() = prefHelper.getPref(COLOR_PRIMARY, 0)
set(v) = prefHelper.setPref(COLOR_PRIMARY, v)
@ -409,12 +403,6 @@ class PrefHelper(
var oneHandedBgColor: Int
get() = prefHelper.getPref(ONE_HANDED_BG_COLOR, 0)
set(v) = prefHelper.setPref(ONE_HANDED_BG_COLOR, v)
var oneHandedButtonBgColor: Int
get() = prefHelper.getPref(ONE_HANDED_BUTTON_BG_COLOR, 0)
set(v) = prefHelper.setPref(ONE_HANDED_BUTTON_BG_COLOR, v)
var oneHandedButtonBgColorPressed: Int
get() = prefHelper.getPref(ONE_HANDED_BUTTON_BG_COLOR_PRESSED, 0)
set(v) = prefHelper.setPref(ONE_HANDED_BUTTON_BG_COLOR_PRESSED, v)
var oneHandedButtonFgColor: Int
get() = prefHelper.getPref(ONE_HANDED_BUTTON_FG_COLOR, 0)
set(v) = prefHelper.setPref(ONE_HANDED_BUTTON_FG_COLOR, v)

3
app/src/main/java/dev/patrickgold/florisboard/ime/theme/Theme.kt
View File

@ -160,8 +160,6 @@ data class Theme(
prefs.theme.oneHandedBgColor = theme.getAttr("oneHanded/bgColor", "#E8F5E9")
prefs.theme.oneHandedButtonBgColor = theme.getAttr("oneHandedButton/bgColor", "#00000000")
prefs.theme.oneHandedButtonBgColorPressed = theme.getAttr("oneHandedButton/bgColorPressed", "#20000000")
prefs.theme.oneHandedButtonFgColor = theme.getAttr("oneHandedButton/fgColor", "#424242")
prefs.theme.smartbarBgColor = theme.getAttr("smartbar/bgColor", "#E0E0E0")
@ -219,7 +217,6 @@ data class Theme(
throw IllegalArgumentException("The specified attr '${attrToReevaluate.second}' = '${attrToReevaluate.third}' is not valid!")
}
}
android.util.Log.i("TEST", parsedAttrs.toString())
}
fun getAttr(key: String, defaultColor: String): Int {

4
app/src/main/java/dev/patrickgold/florisboard/settings/fragments/ThemeFragment.kt
View File

@ -23,7 +23,6 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.LinearLayout
import com.skydoves.colorpickerpreference.ColorPickerPreference
import dev.patrickgold.florisboard.R
import dev.patrickgold.florisboard.databinding.SettingsFragmentThemeBinding
import dev.patrickgold.florisboard.ime.core.FlorisBoard
@ -88,7 +87,8 @@ class ThemeFragment : SettingsMainActivity.SettingsFragment(), CoroutineScope by
override fun onSharedPreferenceChanged(sp: SharedPreferences?, key: String?) {
prefs.sync()
key ?: return
if (key == PrefHelper.Internal.THEME_CURRENT_BASED_ON) {
if (key == PrefHelper.Internal.THEME_CURRENT_BASED_ON ||
key == PrefHelper.Internal.THEME_CURRENT_IS_MODIFIED && !prefs.internal.themeCurrentIsModified) {
loadThemePrefFragment()
}
if (key.startsWith("theme__")) {

11
app/src/main/res/values/styles.xml
View File

@ -98,15 +98,4 @@
<item name="cardBackgroundColor">?colorError</item>
</style>
<style name="ColorPreferenceDefaultAttrs">
<item name="iconSpaceReserved">false</item>
<item name="preference_attachBrightnessSlideBar">true</item>
<item name="preference_colorBox_radius">26dp</item>
<item name="preference_dialog_negative">@android:string/cancel</item>
<item name="preference_dialog_positive">@android:string/ok</item>
<item name="preference_dialog_title">@string/settings__theme__dialog_title</item>
<item name="preference_palette">@drawable/palette</item>
<item name="preference_selector">@drawable/wheel</item>
</style>
</resources>

152
app/src/main/res/xml/prefs_theme.xml
View File

@ -1,38 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!--suppress AndroidUnknownAttribute -->
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<dev.patrickgold.florisboard.settings.components.ThemePresetSelectorPreference
app:key="theme__preset"
app:iconSpaceReserved="false"
app:title="@string/settings__theme__preset_title"/>
app:title="@string/settings__theme__preset_title"
app:iconSpaceReserved="false"/>
<PreferenceCategory
app:title="@string/settings__theme__group_window"
app:iconSpaceReserved="false">
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
app:key="theme__colorPrimary"
app:title="@string/pref__theme__colorPrimary_title"
app:summary="@string/pref__theme__colorPrimary_summary"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
app:key="theme__colorPrimaryDark"
app:title="@string/pref__theme__colorPrimaryDark_title"
app:summary="@string/pref__theme__colorPrimaryDark_summary"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
app:key="theme__colorAccent"
app:title="@string/pref__theme__colorAccent_title"
app:summary="@string/pref__theme__colorAccent_summary"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
<SwitchPreferenceCompat
app:key="theme__navBarIsLight"
@ -40,12 +36,11 @@
app:summary="@string/pref__theme__navBarIsLight_summary"
app:iconSpaceReserved="false"/>
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="theme__navBarColor"
android:title="@string/pref__theme__navBarColor_title"
android:summary="@string/pref__theme__navBarColor_summary"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
</PreferenceCategory>
@ -53,11 +48,10 @@
app:title="@string/settings__theme__group_keyboard"
app:iconSpaceReserved="false">
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="theme__keyboard_bgColor"
android:title="@string/settings__theme__background"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
</PreferenceCategory>
@ -65,23 +59,20 @@
app:title="@string/settings__theme__group_key"
app:iconSpaceReserved="false">
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="theme__key_bgColor"
android:title="@string/settings__theme__background"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="theme__key_bgColorPressed"
android:title="@string/settings__theme__background_pressed"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="theme__key_fgColor"
android:title="@string/settings__theme__foreground"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
</PreferenceCategory>
@ -89,23 +80,20 @@
app:title="@string/settings__theme__group_key_enter"
app:iconSpaceReserved="false">
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="theme__keyEnter_bgColor"
android:title="@string/settings__theme__background"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="theme__keyEnter_bgColorPressed"
android:title="@string/settings__theme__background_pressed"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="theme__keyEnter_fgColor"
android:title="@string/settings__theme__foreground"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
</PreferenceCategory>
@ -113,29 +101,25 @@
app:title="@string/settings__theme__group_key_shift"
app:iconSpaceReserved="false">
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="theme__keyShift_bgColor"
android:title="@string/settings__theme__background"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="theme__keyShift_bgColorPressed"
android:title="@string/settings__theme__background_pressed"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="theme__keyShift_fgColor"
android:title="@string/settings__theme__foreground"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="theme__keyShift_fgColorCapsLock"
android:title="@string/settings__theme__foreground_capslock"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
</PreferenceCategory>
@ -143,23 +127,20 @@
app:title="@string/settings__theme__group_key_popup"
app:iconSpaceReserved="false">
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="theme__keyPopup_bgColor"
android:title="@string/settings__theme__background"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="theme__keyPopup_bgColorActive"
android:title="@string/settings__theme__background_active"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="theme__keyPopup_fgColor"
android:title="@string/settings__theme__foreground"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
</PreferenceCategory>
@ -167,17 +148,15 @@
app:title="@string/settings__theme__group_media"
app:iconSpaceReserved="false">
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="theme__media_fgColor"
android:title="@string/settings__theme__foreground"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="theme__media_fgColorAlt"
android:title="@string/settings__theme__foreground_alt"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
</PreferenceCategory>
@ -185,11 +164,10 @@
app:title="@string/settings__theme__group_one_handed"
app:iconSpaceReserved="false">
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="theme__oneHanded_bgColor"
android:title="@string/settings__theme__background"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
</PreferenceCategory>
@ -197,23 +175,10 @@
app:title="@string/settings__theme__group_one_handed_button"
app:iconSpaceReserved="false">
<com.skydoves.colorpickerpreference.ColorPickerPreference
android:key="theme__oneHandedButton_bgColor"
android:title="@string/settings__theme__background"
app:preference_attachAlphaSlideBar="true"
style="@style/ColorPreferenceDefaultAttrs"/>
<com.skydoves.colorpickerpreference.ColorPickerPreference
android:key="theme__oneHandedButton_bgColorPressed"
android:title="@string/settings__theme__background_pressed"
app:preference_attachAlphaSlideBar="true"
style="@style/ColorPreferenceDefaultAttrs"/>
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="theme__oneHandedButton_fgColor"
android:title="@string/settings__theme__foreground"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
</PreferenceCategory>
@ -221,23 +186,20 @@
app:title="@string/settings__theme__group_smartbar"
app:iconSpaceReserved="false">
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="theme__smartbar_bgColor"
android:title="@string/settings__theme__background"
app:preference_attachAlphaSlideBar="true"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="theme__smartbar_fgColor"
android:title="@string/settings__theme__foreground"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="theme__smartbar_fgColorAlt"
android:title="@string/settings__theme__foreground_alt"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
</PreferenceCategory>
@ -245,17 +207,15 @@
app:title="@string/settings__theme__group_smartbar_button"
app:iconSpaceReserved="false">
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="theme__smartbarButton_bgColor"
android:title="@string/settings__theme__background"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
<com.skydoves.colorpickerpreference.ColorPickerPreference
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="theme__smartbarButton_fgColor"
android:title="@string/settings__theme__foreground"
app:preference_attachAlphaSlideBar="false"
style="@style/ColorPreferenceDefaultAttrs"/>
app:iconSpaceReserved="false"/>
</PreferenceCategory>