Implement monospace settings, fix tablet UI

app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt

@@ -28,6 +28,7 @@ import de.kuschku.quasseldroid_ng.persistence.AccountDatabase
 import de.kuschku.quasseldroid_ng.persistence.QuasselDatabase
 import de.kuschku.quasseldroid_ng.ui.settings.SettingsActivity
 import de.kuschku.quasseldroid_ng.ui.settings.data.BacklogSettings
+import de.kuschku.quasseldroid_ng.ui.settings.data.Settings
 import de.kuschku.quasseldroid_ng.ui.viewmodel.QuasselViewModel
 import de.kuschku.quasseldroid_ng.util.AndroidHandlerThread
 import de.kuschku.quasseldroid_ng.util.helper.*
@@ -54,7 +55,7 @@ class ChatActivity : ServiceBoundActivity() {
 
   private lateinit var database: QuasselDatabase
 
-  private var backlogSettings = BacklogSettings()
+  private lateinit var backlogSettings: BacklogSettings
 
   override fun onCreate(savedInstanceState: Bundle?) {
     handler.onCreate()
@@ -64,6 +65,7 @@ class ChatActivity : ServiceBoundActivity() {
 
     viewModel = ViewModelProviders.of(this)[QuasselViewModel::class.java]
     viewModel.setBackend(this.backend)
+    backlogSettings = Settings.backlog(this)
 
     database = QuasselDatabase.Creator.init(application)
 

app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/EditorFragment.kt

@@ -11,8 +11,8 @@ import android.widget.ImageButton
 import butterknife.BindView
 import butterknife.ButterKnife
 import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.ui.settings.Settings
 import de.kuschku.quasseldroid_ng.ui.settings.data.AppearanceSettings
+import de.kuschku.quasseldroid_ng.ui.settings.data.Settings
 import de.kuschku.quasseldroid_ng.ui.viewmodel.QuasselViewModel
 import de.kuschku.quasseldroid_ng.util.helper.invoke
 import de.kuschku.quasseldroid_ng.util.helper.let

app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/NickListFragment.kt

@@ -11,8 +11,8 @@ import android.view.ViewGroup
 import butterknife.BindView
 import butterknife.ButterKnife
 import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.ui.settings.Settings
 import de.kuschku.quasseldroid_ng.ui.settings.data.AppearanceSettings
+import de.kuschku.quasseldroid_ng.ui.settings.data.Settings
 import de.kuschku.quasseldroid_ng.ui.viewmodel.QuasselViewModel
 import de.kuschku.quasseldroid_ng.util.AndroidHandlerThread
 import de.kuschku.quasseldroid_ng.util.helper.map

app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ToolbarFragment.kt

@@ -14,8 +14,8 @@ import de.kuschku.libquassel.quassel.BufferInfo
 import de.kuschku.libquassel.quassel.syncables.interfaces.INetwork
 import de.kuschku.libquassel.util.hasFlag
 import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.ui.settings.Settings
 import de.kuschku.quasseldroid_ng.ui.settings.data.AppearanceSettings
+import de.kuschku.quasseldroid_ng.ui.settings.data.Settings
 import de.kuschku.quasseldroid_ng.ui.viewmodel.QuasselViewModel
 import de.kuschku.quasseldroid_ng.util.helper.visibleIf
 import de.kuschku.quasseldroid_ng.util.helper.zip

app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/buffers/BufferViewConfigFragment.kt

@@ -17,8 +17,8 @@ import de.kuschku.libquassel.util.hasFlag
 import de.kuschku.libquassel.util.minus
 import de.kuschku.quasseldroid_ng.R
 import de.kuschku.quasseldroid_ng.persistence.QuasselDatabase
-import de.kuschku.quasseldroid_ng.ui.settings.Settings
 import de.kuschku.quasseldroid_ng.ui.settings.data.AppearanceSettings
+import de.kuschku.quasseldroid_ng.ui.settings.data.Settings
 import de.kuschku.quasseldroid_ng.ui.viewmodel.QuasselViewModel
 import de.kuschku.quasseldroid_ng.util.AndroidHandlerThread
 import de.kuschku.quasseldroid_ng.util.helper.map

app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/MessageListFragment.kt

@@ -18,9 +18,9 @@ import de.kuschku.libquassel.protocol.MsgId
 import de.kuschku.libquassel.quassel.syncables.BufferSyncer
 import de.kuschku.quasseldroid_ng.R
 import de.kuschku.quasseldroid_ng.persistence.QuasselDatabase
-import de.kuschku.quasseldroid_ng.ui.settings.Settings
 import de.kuschku.quasseldroid_ng.ui.settings.data.AppearanceSettings
 import de.kuschku.quasseldroid_ng.ui.settings.data.BacklogSettings
+import de.kuschku.quasseldroid_ng.ui.settings.data.Settings
 import de.kuschku.quasseldroid_ng.ui.viewmodel.QuasselViewModel
 import de.kuschku.quasseldroid_ng.util.AndroidHandlerThread
 import de.kuschku.quasseldroid_ng.util.helper.*
@@ -45,13 +45,14 @@ class MessageListFragment : ServiceBoundFragment() {
 
   private var lastBuffer: BufferId? = null
 
-  private var backlogSettings = BacklogSettings()
+  private lateinit var backlogSettings: BacklogSettings
 
   override fun onCreate(savedInstanceState: Bundle?) {
     handler.onCreate()
     super.onCreate(savedInstanceState)
     viewModel = ViewModelProviders.of(activity!!)[QuasselViewModel::class.java]
     appearanceSettings = Settings.appearance(activity!!)
+    backlogSettings = Settings.backlog(activity!!)
   }
 
   private val boundaryCallback = object :

app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/QuasselMessageRenderer.kt

@@ -86,6 +86,9 @@ class QuasselMessageRenderer(
         viewHolder.itemView.setBackgroundColor(getColor(1, 0))
       }
     }
+    if (appearanceSettings.useMonospace) {
+      viewHolder.content.typeface = Typeface.MONOSPACE
+    }
   }
 
   override fun bind(holder: QuasselMessageViewHolder, message: FormattedMessage) {

app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/SettingsFragment.kt

@@ -8,6 +8,7 @@ import android.support.v7.preference.PreferenceFragmentCompat
 import android.support.v7.preference.PreferenceGroup
 import de.kuschku.quasseldroid_ng.R
 import de.kuschku.quasseldroid_ng.ui.settings.data.AppearanceSettings
+import de.kuschku.quasseldroid_ng.ui.settings.data.Settings
 
 class SettingsFragment : PreferenceFragmentCompat(),
                          SharedPreferences.OnSharedPreferenceChangeListener {

app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/data/AppearanceSettings.kt

@@ -7,6 +7,7 @@ data class AppearanceSettings(
   val showPrefix: ShowPrefixMode = ShowPrefixMode.HIGHEST,
   val colorizeNicknames: ColorizeNicknamesMode = ColorizeNicknamesMode.ALL_BUT_MINE,
   val colorizeMirc: Boolean = true,
+  val useMonospace: Boolean = false,
   val showSeconds: Boolean = false,
   val use24hClock: Boolean = true,
   val showLag: Boolean = true,

app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/Settings.kt → app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/data/Settings.kt

-package de.kuschku.quasseldroid_ng.ui.settings
+package de.kuschku.quasseldroid_ng.ui.settings.data
 
 import android.content.Context
 import android.content.SharedPreferences
 import android.preference.PreferenceManager
 import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.ui.settings.data.AppearanceSettings
 import de.kuschku.quasseldroid_ng.ui.settings.data.AppearanceSettings.*
-import de.kuschku.quasseldroid_ng.ui.settings.data.BacklogSettings
 
 object Settings {
   private fun <T> settings(context: Context,
@@ -14,7 +12,9 @@ object Settings {
     context
   ).f()
 
-  fun appearance(context: Context) = settings(context) {
+  fun appearance(context: Context) = settings(
+    context
+  ) {
     AppearanceSettings(
       theme = Theme.valueOf(
         getString(
@@ -38,6 +38,10 @@ object Settings {
         context.getString(R.string.preference_colorize_mirc_key),
         AppearanceSettings.DEFAULT.colorizeMirc
       ),
+      useMonospace = getBoolean(
+        context.getString(R.string.preference_monospace_key),
+        AppearanceSettings.DEFAULT.useMonospace
+      ),
       showSeconds = getBoolean(
         context.getString(R.string.preference_show_seconds_key),
         AppearanceSettings.DEFAULT.showSeconds
@@ -53,9 +57,14 @@ object Settings {
     )
   }
 
-  fun backlog(context: Context) = settings(context) {
+  fun backlog(context: Context) = settings(
+    context
+  ) {
     BacklogSettings(
-
+      dynamicAmount = getString(
+        context.getString(R.string.preference_dynamic_fetch_key),
+        BacklogSettings.DEFAULT.dynamicAmount.toString()
+      ).toIntOrNull() ?: BacklogSettings.DEFAULT.dynamicAmount
     )
   }
 }
\ No newline at end of file

app/src/main/java/de/kuschku/quasseldroid_ng/util/service/ServiceBoundActivity.kt

@@ -9,8 +9,8 @@ import android.support.v7.app.AppCompatActivity
 import de.kuschku.libquassel.session.Backend
 import de.kuschku.quasseldroid_ng.Keys
 import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.ui.settings.Settings
 import de.kuschku.quasseldroid_ng.ui.settings.data.AppearanceSettings
+import de.kuschku.quasseldroid_ng.ui.settings.data.Settings
 import de.kuschku.quasseldroid_ng.util.helper.updateRecentsHeaderIfExisting
 
 abstract class ServiceBoundActivity : AppCompatActivity() {

app/src/main/res/layout-sw720dp-land/activity_main.xml

@@ -17,6 +17,11 @@
       android:layout_height="match_parent"
       tools:layout="@layout/fragment_chat_list" />
 
+    <View
+      android:layout_width="1dp"
+      android:layout_height="match_parent"
+      android:background="?colorDivider" />
+
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto"
       android:layout_width="match_parent"

app/src/main/res/values/strings_preferences.xml

@@ -61,6 +61,9 @@
     <item>NONE</item>
   </string-array>
 
+  <string name="preference_monospace_key" translatable="false">monospace</string>
+  <string name="preference_monospace_title">Use Monospace Font</string>
+
   <string name="preference_show_seconds_key" translatable="false">show_seconds</string>
   <string name="preference_show_seconds_title">Show Seconds</string>
 

app/src/main/res/xml/preferences.xml

@@ -29,6 +29,11 @@
       android:key="@string/preference_show_prefix_key"
       android:title="@string/preference_show_prefix_title" />
 
+    <SwitchPreference
+      android:defaultValue="false"
+      android:key="@string/preference_monospace_key"
+      android:title="@string/preference_monospace_title" />
+
     <SwitchPreference
       android:defaultValue="false"
       android:key="@string/preference_show_seconds_key"