Implement settings with theming

app/build.gradle.kts

@@ -98,6 +98,8 @@ dependencies {
     implementation("com.android.support", "customtabs", version)
     implementation("com.android.support", "cardview-v7", version)
     implementation("com.android.support", "recyclerview-v7", version)
+    implementation("com.android.support", "preference-v7", version)
+    implementation("com.android.support", "preference-v14", version)
   }
   implementation("com.android.support.constraint", "constraint-layout", "1.0.2")
 

app/src/main/AndroidManifest.xml

@@ -28,6 +28,12 @@
       android:label="@string/app_name"
       android:parentActivityName=".ui.setup.accounts.AccountSelectionActivity"
       android:windowSoftInputMode="adjustResize" />
+    <activity
+      android:name=".ui.settings.SettingsActivity"
+      android:exported="false"
+      android:label="@string/app_name"
+      android:parentActivityName=".ui.chat.ChatActivity"
+      android:windowSoftInputMode="adjustResize" />
     <activity
       android:name=".ui.setup.accounts.AccountSelectionActivity"
       android:exported="true"

app/src/main/java/de/kuschku/quasseldroid_ng/QuasseldroidNG.kt

@@ -27,6 +27,9 @@ class QuasseldroidNG : Application() {
 
     AndroidThreeTenBackport.init(this)
 
+    // Initialize preferences unless already set
+    android.support.v7.preference.PreferenceManager.setDefaultValues(this, R.xml.preferences, false)
+
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
       systemService<ShortcutManager>().dynamicShortcuts = listOf(
         ShortcutInfo.Builder(this, "id1")

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

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.arch.lifecycle.Observer
 import android.arch.lifecycle.ViewModelProviders
 import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import android.support.design.widget.Snackbar
 import android.support.v4.widget.DrawerLayout
@@ -22,6 +23,7 @@ import de.kuschku.quasseldroid_ng.Keys
 import de.kuschku.quasseldroid_ng.R
 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.viewmodel.QuasselViewModel
 import de.kuschku.quasseldroid_ng.util.AndroidHandlerThread
@@ -195,6 +197,10 @@ class ChatActivity : ServiceBoundActivity() {
       }
       true
     }
+    R.id.settings     -> {
+      startActivity(Intent(applicationContext, SettingsActivity::class.java))
+      true
+    }
     R.id.disconnect   -> {
       handler.post {
         getSharedPreferences(Keys.Status.NAME, Context.MODE_PRIVATE).editApply {

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

@@ -11,6 +11,7 @@ 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.viewmodel.QuasselViewModel
 import de.kuschku.quasseldroid_ng.util.AndroidHandlerThread
@@ -27,18 +28,14 @@ class NickListFragment : ServiceBoundFragment() {
   lateinit var nickList: RecyclerView
 
   private var ircFormatDeserializer: IrcFormatDeserializer? = null
-  private val renderingSettings = AppearanceSettings(
-    showPrefix = AppearanceSettings.ShowPrefixMode.FIRST,
-    colorizeNicknames = AppearanceSettings.ColorizeNicknamesMode.ALL_BUT_MINE,
-    colorizeMirc = true,
-    timeFormat = ""
-  )
+  private lateinit var appearanceSettings: AppearanceSettings
 
   override fun onCreate(savedInstanceState: Bundle?) {
     handlerThread.onCreate()
     super.onCreate(savedInstanceState)
 
     viewModel = ViewModelProviders.of(activity!!)[QuasselViewModel::class.java]
+    appearanceSettings = Settings.appearance(activity!!)
 
     if (ircFormatDeserializer == null) {
       ircFormatDeserializer = IrcFormatDeserializer(context!!)
@@ -56,7 +53,7 @@ class NickListFragment : ServiceBoundFragment() {
         it.map {
           it.copy(
             realname = ircFormatDeserializer?.formatString(
-              it.realname.toString(), renderingSettings.colorizeMirc
+              it.realname.toString(), appearanceSettings.colorizeMirc
             ) ?: it.realname
           )
         }

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

@@ -14,6 +14,7 @@ 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.viewmodel.QuasselViewModel
 import de.kuschku.quasseldroid_ng.util.helper.visibleIf
@@ -32,12 +33,7 @@ class ToolbarFragment : ServiceBoundFragment() {
   private lateinit var viewModel: QuasselViewModel
 
   private var ircFormatDeserializer: IrcFormatDeserializer? = null
-  private val appearanceSettings = AppearanceSettings(
-    showPrefix = AppearanceSettings.ShowPrefixMode.FIRST,
-    colorizeNicknames = AppearanceSettings.ColorizeNicknamesMode.ALL_BUT_MINE,
-    colorizeMirc = true,
-    timeFormat = ""
-  )
+  private lateinit var appearanceSettings: AppearanceSettings
 
   var title: CharSequence?
     get() = toolbarTitle.text
@@ -59,6 +55,7 @@ class ToolbarFragment : ServiceBoundFragment() {
     super.onCreate(savedInstanceState)
 
     viewModel = ViewModelProviders.of(activity!!)[QuasselViewModel::class.java]
+    appearanceSettings = Settings.appearance(activity!!)
 
     if (ircFormatDeserializer == null) {
       ircFormatDeserializer = IrcFormatDeserializer(context!!)

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

@@ -11,6 +11,7 @@ import butterknife.BindView
 import butterknife.ButterKnife
 import de.kuschku.libquassel.protocol.BufferId
 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.viewmodel.QuasselViewModel
 import de.kuschku.quasseldroid_ng.util.AndroidHandlerThread
@@ -33,18 +34,14 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
   private lateinit var viewModel: QuasselViewModel
 
   private var ircFormatDeserializer: IrcFormatDeserializer? = null
-  private val renderingSettings = AppearanceSettings(
-    showPrefix = AppearanceSettings.ShowPrefixMode.FIRST,
-    colorizeNicknames = AppearanceSettings.ColorizeNicknamesMode.ALL_BUT_MINE,
-    colorizeMirc = true,
-    timeFormat = ""
-  )
+  private lateinit var appearanceSettings: AppearanceSettings
 
   override fun onCreate(savedInstanceState: Bundle?) {
     handlerThread.onCreate()
     super.onCreate(savedInstanceState)
 
     viewModel = ViewModelProviders.of(activity!!)[QuasselViewModel::class.java]
+    appearanceSettings = Settings.appearance(activity!!)
 
     if (ircFormatDeserializer == null) {
       ircFormatDeserializer = IrcFormatDeserializer(context!!)
@@ -77,7 +74,7 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
         it.map {
           it.copy(
             description = ircFormatDeserializer?.formatString(
-              it.description.toString(), renderingSettings.colorizeMirc
+              it.description.toString(), appearanceSettings.colorizeMirc
             ) ?: it.description
           )
         }

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

@@ -15,6 +15,7 @@ import de.kuschku.quasseldroid_ng.util.helper.getOrPut
 
 class MessageAdapter(
   context: Context,
+  appearanceSettings: AppearanceSettings,
   var markerLinePosition: Pair<MsgId, MsgId>? = null
 ) : PagedListAdapter<QuasselDatabase.DatabaseMessage, QuasselMessageViewHolder>(
   object : DiffCallback<QuasselDatabase.DatabaseMessage>() {
@@ -31,12 +32,7 @@ class MessageAdapter(
 ) {
   private val messageRenderer: MessageRenderer = QuasselMessageRenderer(
     context,
-    AppearanceSettings(
-      showPrefix = AppearanceSettings.ShowPrefixMode.FIRST,
-      colorizeNicknames = AppearanceSettings.ColorizeNicknamesMode.ALL_BUT_MINE,
-      colorizeMirc = true,
-      timeFormat = ""
-    )
+    appearanceSettings
   )
 
   private val messageCache = LruCache<Int, FormattedMessage>(512)

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

@@ -18,6 +18,8 @@ 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.viewmodel.QuasselViewModel
 import de.kuschku.quasseldroid_ng.util.AndroidHandlerThread
@@ -32,6 +34,7 @@ class MessageListFragment : ServiceBoundFragment() {
   lateinit var scrollDown: FloatingActionButton
 
   private lateinit var viewModel: QuasselViewModel
+  private lateinit var appearanceSettings: AppearanceSettings
 
   private val handler = AndroidHandlerThread("Chat")
 
@@ -48,6 +51,7 @@ class MessageListFragment : ServiceBoundFragment() {
     handler.onCreate()
     super.onCreate(savedInstanceState)
     viewModel = ViewModelProviders.of(activity!!)[QuasselViewModel::class.java]
+    appearanceSettings = Settings.appearance(activity!!)
     setHasOptionsMenu(true)
   }
 
@@ -65,7 +69,7 @@ class MessageListFragment : ServiceBoundFragment() {
     linearLayoutManager = LinearLayoutManager(context)
     linearLayoutManager.reverseLayout = true
 
-    adapter = MessageAdapter(context!!)
+    adapter = MessageAdapter(context!!, appearanceSettings)
     messageList.adapter = adapter
     messageList.layoutManager = linearLayoutManager
     messageList.itemAnimator = null

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

@@ -4,7 +4,6 @@ import android.content.Context
 import android.graphics.Typeface
 import android.text.SpannableString
 import android.text.Spanned
-import android.text.format.DateFormat
 import android.text.style.ForegroundColorSpan
 import android.text.style.StyleSpan
 import android.text.style.URLSpan
@@ -26,19 +25,24 @@ import de.kuschku.quasseldroid_ng.util.ui.SpanFormatter
 import org.intellij.lang.annotations.Language
 import org.threeten.bp.ZoneId
 import org.threeten.bp.format.DateTimeFormatter
-import java.text.SimpleDateFormat
 
 class QuasselMessageRenderer(
   private val context: Context,
   private val appearanceSettings: AppearanceSettings
 ) : MessageRenderer {
   private val timeFormatter = DateTimeFormatter.ofPattern(
-    if (appearanceSettings.timeFormat.isNotBlank()) {
-      appearanceSettings.timeFormat
-    } else {
-      (DateFormat.getTimeFormat(context) as SimpleDateFormat).toLocalizedPattern()
-    }
+    timePattern(appearanceSettings.showSeconds, appearanceSettings.use24hClock)
   )
+
+  private fun timePattern(showSeconds: Boolean,
+                          use24hClock: Boolean) = when (use24hClock to showSeconds) {
+    false to true  -> "hh:mm:ss a"
+    false to false -> "hh:mm a"
+
+    true to true   -> "HH:mm:ss"
+    else           -> "HH:mm"
+  }
+
   private lateinit var senderColors: IntArray
 
   private val zoneId = ZoneId.systemDefault()
@@ -325,7 +329,7 @@ class QuasselMessageRenderer(
   private fun formatPrefix(prefix: String,
                            highlight: Boolean) = when (appearanceSettings.showPrefix) {
     ShowPrefixMode.ALL     -> prefix
-    ShowPrefixMode.FIRST -> prefix.substring(0, Math.min(prefix.length, 1))
+    ShowPrefixMode.HIGHEST -> prefix.substring(0, Math.min(prefix.length, 1))
     ShowPrefixMode.NONE    -> ""
   }
 }
\ No newline at end of file

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

 package de.kuschku.quasseldroid_ng.ui.settings
 
 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 {
-  fun appearance(context: Context) = AppearanceSettings()
-  fun backlog(context: Context) = BacklogSettings()
+  private fun <T> settings(context: Context,
+                           f: SharedPreferences.() -> T) = PreferenceManager.getDefaultSharedPreferences(
+    context
+  ).f()
+
+  fun appearance(context: Context) = settings(context) {
+    AppearanceSettings(
+      theme = Theme.valueOf(
+        getString(
+          context.getString(R.string.preference_theme_key),
+          AppearanceSettings.DEFAULT.theme.name
+        )
+      ),
+      showPrefix = ShowPrefixMode.valueOf(
+        getString(
+          context.getString(R.string.preference_show_prefix_key),
+          AppearanceSettings.DEFAULT.showPrefix.name
+        )
+      ),
+      colorizeNicknames = ColorizeNicknamesMode.valueOf(
+        getString(
+          context.getString(R.string.preference_colorize_nicknames_key),
+          AppearanceSettings.DEFAULT.colorizeNicknames.name
+        )
+      ),
+      colorizeMirc = getBoolean(
+        context.getString(R.string.preference_colorize_mirc_key),
+        AppearanceSettings.DEFAULT.colorizeMirc
+      ),
+      showSeconds = getBoolean(
+        context.getString(R.string.preference_show_seconds_key),
+        AppearanceSettings.DEFAULT.showSeconds
+      ),
+      use24hClock = getBoolean(
+        context.getString(R.string.preference_use_24h_clock_key),
+        AppearanceSettings.DEFAULT.use24hClock
+      ),
+      showLag = getBoolean(
+        context.getString(R.string.preference_show_lag_key),
+        AppearanceSettings.DEFAULT.showLag
+      )
+    )
+  }
+
+  fun backlog(context: Context) = settings(context) {
+    BacklogSettings(
+
+    )
+  }
 }
\ No newline at end of file

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

+package de.kuschku.quasseldroid_ng.ui.settings
+
+import android.os.Bundle
+import android.support.v7.widget.Toolbar
+import butterknife.BindView
+import butterknife.ButterKnife
+import de.kuschku.quasseldroid_ng.R
+import de.kuschku.quasseldroid_ng.util.service.ServiceBoundActivity
+
+class SettingsActivity : ServiceBoundActivity() {
+  @BindView(R.id.toolbar)
+  lateinit var toolbar: Toolbar
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.activity_settings)
+    ButterKnife.bind(this)
+
+    setSupportActionBar(toolbar)
+    supportActionBar?.setDisplayHomeAsUpEnabled(true)
+  }
+}
\ No newline at end of file

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

+package de.kuschku.quasseldroid_ng.ui.settings
+
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.support.v7.preference.ListPreference
+import android.support.v7.preference.Preference
+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
+
+class SettingsFragment : PreferenceFragmentCompat(),
+                         SharedPreferences.OnSharedPreferenceChangeListener {
+  var appearanceSettings: AppearanceSettings? = null
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    appearanceSettings = Settings.appearance(context!!)
+  }
+
+  override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+    setPreferencesFromResource(R.xml.preferences, rootKey)
+  }
+
+  override fun onStart() {
+    super.onStart()
+    preferenceScreen.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
+    initSummary(preferenceScreen)
+  }
+
+  override fun onStop() {
+    preferenceScreen.sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)
+    super.onStop()
+  }
+
+  override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
+    updateSummary(findPreference(key))
+    if (appearanceSettings?.theme != null &&
+        appearanceSettings?.theme != Settings.appearance(context!!).theme) {
+      activity?.recreate()
+    }
+  }
+
+  fun updateSummary(preference: Preference) {
+    if (preference is ListPreference) {
+      preference.summary = preference.entry
+    }
+  }
+
+  fun initSummary(preference: Preference) {
+    if (preference is PreferenceGroup) {
+      (0 until preference.preferenceCount).map(preference::getPreference).forEach(::initSummary)
+    } else {
+      updateSummary(preference)
+    }
+  }
+}
\ No newline at end of file

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

@@ -4,10 +4,11 @@ import android.support.annotation.StyleRes
 import de.kuschku.quasseldroid_ng.R
 
 data class AppearanceSettings(
-  val showPrefix: ShowPrefixMode = ShowPrefixMode.FIRST,
+  val showPrefix: ShowPrefixMode = ShowPrefixMode.HIGHEST,
   val colorizeNicknames: ColorizeNicknamesMode = ColorizeNicknamesMode.ALL_BUT_MINE,
   val colorizeMirc: Boolean = true,
-  val timeFormat: String = "",
+  val showSeconds: Boolean = false,
+  val use24hClock: Boolean = true,
   val showLag: Boolean = true,
   val theme: Theme = Theme.QUASSEL_LIGHT
 ) {
@@ -19,15 +20,19 @@ data class AppearanceSettings(
 
   enum class ShowPrefixMode {
     ALL,
-    FIRST,
+    HIGHEST,
     NONE
   }
 
   enum class Theme(@StyleRes val style: Int) {
     QUASSEL_LIGHT(R.style.Theme_ChatTheme_Quassel_Light),
     QUASSEL_DARK(R.style.Theme_ChatTheme_Quassel_Dark),
+    AMOLED(R.style.Theme_ChatTheme_Amoled),
     SOLARIZED_LIGHT(R.style.Theme_ChatTheme_Solarized_Light),
-    SOLARIZED_DARK(R.style.Theme_ChatTheme_Solarized_Dark),
-    AMOLED(R.style.Theme_ChatTheme_Amoled)
+    SOLARIZED_DARK(R.style.Theme_ChatTheme_Solarized_Dark)
+  }
+
+  companion object {
+    val DEFAULT = AppearanceSettings()
   }
 }
\ No newline at end of file

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

@@ -2,4 +2,8 @@ package de.kuschku.quasseldroid_ng.ui.settings.data
 
 data class BacklogSettings(
   val dynamicAmount: Int = 20
-)
+) {
\ No newline at end of file
+  companion object {
+    val DEFAULT = BacklogSettings()
+  }
+}
\ No newline at end of file

app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/SetupActivity.kt

@@ -60,6 +60,7 @@ abstract class SetupActivity : AppCompatActivity() {
     else
       R.drawable.ic_arrow_right
     button.setImageResource(drawable)
+    currentPage.value?.requestFocus()
   }
 
   fun updateRecentsHeader()

app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/SlideFragment.kt

@@ -69,6 +69,10 @@ abstract class SlideFragment : Fragment() {
   abstract fun getData(data: Bundle)
   var initData: Bundle? = null
 
+  fun requestFocus() {
+    this.view?.requestFocus()
+  }
+
   protected abstract fun onCreateContent(inflater: LayoutInflater, container: ViewGroup?,
                                          savedInstanceState: Bundle?): View
 }

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

@@ -24,6 +24,7 @@ abstract class ServiceBoundActivity : AppCompatActivity() {
   protected lateinit var appearanceSettings: AppearanceSettings
 
   override fun onCreate(savedInstanceState: Bundle?) {
+
     connection.context = this
     appearanceSettings = Settings.appearance(this)
     setTheme(appearanceSettings.theme.style)
@@ -41,6 +42,9 @@ abstract class ServiceBoundActivity : AppCompatActivity() {
   }
 
   override fun onStart() {
+    if (Settings.appearance(this) != appearanceSettings) {
+      recreate()
+    }
     connection.bind()
     super.onStart()
   }

app/src/main/res/layout/activity_main.xml

@@ -4,8 +4,7 @@
   android:id="@+id/drawerLayout"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:fitsSystemWindows="true"
-  tools:theme="@style/Theme.ChatTheme.Quassel_Light">
+  android:fitsSystemWindows="true">
 
   <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"

app/src/main/res/layout/activity_settings.xml

+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:fitsSystemWindows="true">
+
+  <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    android:orientation="vertical">
+
+    <android.support.design.widget.AppBarLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:theme="?attr/actionBarTheme">
+
+      <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        app:contentInsetStartWithNavigation="0dp"
+        app:popupTheme="@style/Widget.PopupOverlay" />
+
+    </android.support.design.widget.AppBarLayout>
+
+    <fragment
+      android:id="@+id/settingsFragment"
+      android:name="de.kuschku.quasseldroid_ng.ui.settings.SettingsFragment"
+      android:layout_width="fill_parent"
+      android:layout_height="fill_parent"
+      tools:layout="@xml/preferences" />
+  </LinearLayout>
+
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file