From d3f88ec6c5b4ea634a1212dea93bb8cce98b4dfb Mon Sep 17 00:00:00 2001 From: Janne Koschinski <janne@kuschku.de> Date: Tue, 1 May 2018 21:38:46 +0200 Subject: [PATCH] Fixes #45 Signed-off-by: Janne Koschinski <janne@kuschku.de> --- app/src/main/res/layout/settings_chatlist.xml | 6 ++++++ .../libquassel/quassel/syncables/BufferViewConfig.kt | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/settings_chatlist.xml b/app/src/main/res/layout/settings_chatlist.xml index 796d1362a..11a0634f1 100644 --- a/app/src/main/res/layout/settings_chatlist.xml +++ b/app/src/main/res/layout/settings_chatlist.xml @@ -60,16 +60,19 @@ <android.support.v7.widget.SwitchCompat android:id="@+id/show_search" style="@style/Widget.CoreSettings.PrimaryItemSwitch" + android:checked="true" android:text="@string/settings_chatlist_show_search" /> <android.support.v7.widget.SwitchCompat android:id="@+id/sort_alphabetically" style="@style/Widget.CoreSettings.PrimaryItemSwitch" + android:checked="true" android:text="@string/settings_chatlist_sort_alphabetically" /> <android.support.v7.widget.SwitchCompat android:id="@+id/add_new_buffers_automatically" style="@style/Widget.CoreSettings.PrimaryItemSwitch" + android:checked="true" android:text="@string/settings_chatlist_add_new_buffers_automatically" /> </LinearLayout> @@ -99,6 +102,7 @@ <android.support.v7.widget.SwitchCompat android:id="@+id/show_status_buffer" style="@style/Widget.CoreSettings.PrimaryItemSwitch" + android:checked="true" android:text="@string/settings_chatlist_show_status_buffer" /> </LinearLayout> @@ -123,11 +127,13 @@ <android.support.v7.widget.SwitchCompat android:id="@+id/show_channels" style="@style/Widget.CoreSettings.PrimaryItemSwitch" + android:checked="true" android:text="@string/settings_chatlist_show_channels" /> <android.support.v7.widget.SwitchCompat android:id="@+id/show_queries" style="@style/Widget.CoreSettings.PrimaryItemSwitch" + android:checked="true" android:text="@string/settings_chatlist_show_queries" /> </LinearLayout> diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferViewConfig.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferViewConfig.kt index a0a212528..af19a760e 100644 --- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferViewConfig.kt +++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferViewConfig.kt @@ -101,8 +101,8 @@ class BufferViewConfig constructor( _hideInactiveBuffers = properties["hideInactiveBuffers"].valueOr(this::hideInactiveBuffers) _hideInactiveNetworks = properties["hideInactiveNetworks"].valueOr(this::hideInactiveNetworks) _disableDecoration = properties["disableDecoration"].valueOr(this::disableDecoration) - _allowedBufferTypes = properties["allowedBufferTypes"].valueOr(this::allowedBufferTypes) - _minimumActivity = properties["minimumActivity"].valueOr(this::minimumActivity) + _allowedBufferTypes = Buffer_Type.of(properties["allowedBufferTypes"].value(_allowedBufferTypes.value.toInt()).toShort()) + _minimumActivity = Buffer_Activity.of(properties["minimumActivity"].value(_minimumActivity.value)) _showSearch = properties["showSearch"].valueOr(this::showSearch) } -- GitLab