Fix lint issues, correctly sort messages

app/build.gradle.kts

@@ -49,6 +49,8 @@ android {
 
     setProperty("archivesBaseName", "QuasselDroidNG-$versionName")
 
+    multiDexEnabled = false
+
     // Disable test runner analytics
     testInstrumentationRunnerArguments = mapOf(
       "disableAnalytics" to "true"
@@ -80,6 +82,10 @@ android {
       )
     }
   }
+
+  lintOptions {
+    disable("ResourceType")
+  }
 }
 
 dependencies {

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

@@ -81,7 +81,7 @@ class ToolbarFragment : ServiceBoundFragment() {
             this.subtitle = colorizeDescription(data?.description)
           } else {
             val description = colorizeDescription(data?.description)
-            if (description.isNullOrBlank()) {
+            if (description.isBlank()) {
               this.subtitle = "Lag: ${lag}ms"
             } else {
               this.subtitle = SpanFormatter.format(
@@ -101,5 +101,4 @@ class ToolbarFragment : ServiceBoundFragment() {
   private fun colorizeDescription(description: String?) = ircFormatDeserializer.formatString(
     requireContext(), description, appearanceSettings.colorizeMirc
   )
-                                                          ?: description
 }
\ No newline at end of file

app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/FormatHandler.kt

@@ -88,8 +88,8 @@ class FormatHandler(
       return
 
     val exists = editText.text.removeSpans<UnderlineSpan, IrcUnderlineSpan>(range) { span ->
-      when {
-        span is IrcUnderlineSpan -> span
+      when (span) {
+        is IrcUnderlineSpan -> span
         else                -> IrcUnderlineSpan()
       }
     }
@@ -106,8 +106,8 @@ class FormatHandler(
       return
 
     val exists = editText.text.removeSpans<StrikethroughSpan, IrcStrikethroughSpan>(range) { span ->
-      when {
-        span is IrcStrikethroughSpan -> span
+      when (span) {
+        is IrcStrikethroughSpan -> span
         else                    -> IrcStrikethroughSpan()
       }
     }

app/src/main/java/de/kuschku/quasseldroid/ui/chat/nicks/NickListAdapter.kt

@@ -82,7 +82,7 @@ class NickListAdapter(
   }
 
   companion object {
-    val VIEWTYPE_ACTIVE = 0
-    val VIEWTYPE_AWAY = 1
+    const val VIEWTYPE_ACTIVE = 0
+    const val VIEWTYPE_AWAY = 1
   }
 }
\ No newline at end of file

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

@@ -54,7 +54,7 @@ abstract class SetupActivity : DaggerAppCompatActivity() {
     override fun onPageSelected(position: Int) = Unit
   }
 
-  private val pageChangeListener = SetupActivityViewPagerPageChangeListener(this)
+  private lateinit var pageChangeListener: SetupActivityViewPagerPageChangeListener
 
   private fun pageChanged() {
     currentPage.value = adapter.getItem(viewPager.currentItem)
@@ -84,6 +84,8 @@ abstract class SetupActivity : DaggerAppCompatActivity() {
     fragments.forEach(adapter::addFragment)
     viewPager.adapter = adapter
 
+    pageChangeListener = SetupActivityViewPagerPageChangeListener(this)
+
     button.setOnClickListener {
       if (viewPager.currentItem == adapter.totalCount - 1)
         onDoneInternal()

app/src/main/java/de/kuschku/quasseldroid/util/QuasseldroidNotificationManager.kt

@@ -83,7 +83,7 @@ class QuasseldroidNotificationManager(private val context: Context) {
   }
 
   companion object {
-    val BACKGROUND_NOTIFICATION_ID = Int.MAX_VALUE
+    const val BACKGROUND_NOTIFICATION_ID = Int.MAX_VALUE
   }
 
   data class Handle(

app/src/main/java/de/kuschku/quasseldroid/util/backport/ReadableWrappedChannel.kt

@@ -61,6 +61,6 @@ class ReadableWrappedChannel(
   override fun implCloseChannel() = backingStream.close()
 
   companion object {
-    private val PAGE_SIZE = 8192
+    private const val PAGE_SIZE = 8192
   }
 }

app/src/main/java/de/kuschku/quasseldroid/util/backport/WritableWrappedChannel.kt

@@ -48,6 +48,6 @@ class WritableWrappedChannel(
   override fun implCloseChannel() = backingStream.close()
 
   companion object {
-    private val PAGE_SIZE = 8192
+    private const val PAGE_SIZE = 8192
   }
 }

app/src/main/java/de/kuschku/quasseldroid/util/helper/SpannedHelper.kt

@@ -28,7 +28,7 @@ private class DelimitedRangesSequence(
             nextSearchIndex = -1
           } else {
             val (index, length) = match
-            nextItem = currentStartIndex..index - 1
+            nextItem = currentStartIndex until index
             currentStartIndex = index + length
             nextSearchIndex = currentStartIndex + if (length == 0) 1 else 0
           }

app/src/main/java/de/kuschku/quasseldroid/util/irc/format/IrcFormatDeserializer.kt

@@ -96,12 +96,12 @@ class IrcFormatDeserializer @Inject constructor() {
           normalCount = 0
 
           // If there is an element on stack with the same code, close it
-          if (bold != null) {
+          bold = if (bold != null) {
             if (colorize) bold.apply(plainText, plainText.length)
-            bold = null
+            null
             // Otherwise create a new one
           } else {
-            bold = FormatDescription(plainText.length, BoldIrcFormat())
+            FormatDescription(plainText.length, BoldIrcFormat())
           }
         }
         CODE_ITALIC        -> {
@@ -109,12 +109,12 @@ class IrcFormatDeserializer @Inject constructor() {
           normalCount = 0
 
           // If there is an element on stack with the same code, close it
-          if (italic != null) {
+          italic = if (italic != null) {
             if (colorize) italic.apply(plainText, plainText.length)
-            italic = null
+            null
             // Otherwise create a new one
           } else {
-            italic = FormatDescription(plainText.length, ItalicIrcFormat())
+            FormatDescription(plainText.length, ItalicIrcFormat())
           }
         }
         CODE_UNDERLINE     -> {
@@ -122,12 +122,12 @@ class IrcFormatDeserializer @Inject constructor() {
           normalCount = 0
 
           // If there is an element on stack with the same code, close it
-          if (underline != null) {
+          underline = if (underline != null) {
             if (colorize) underline.apply(plainText, plainText.length)
-            underline = null
+            null
             // Otherwise create a new one
           } else {
-            underline = FormatDescription(plainText.length, UnderlineIrcFormat())
+            FormatDescription(plainText.length, UnderlineIrcFormat())
           }
         }
         CODE_STRIKETHROUGH -> {
@@ -135,12 +135,12 @@ class IrcFormatDeserializer @Inject constructor() {
           normalCount = 0
 
           // If there is an element on stack with the same code, close it
-          if (strikethrough != null) {
+          strikethrough = if (strikethrough != null) {
             if (colorize) strikethrough.apply(plainText, plainText.length)
-            strikethrough = null
+            null
             // Otherwise create a new one
           } else {
-            strikethrough = FormatDescription(plainText.length, StrikethroughIrcFormat())
+            FormatDescription(plainText.length, StrikethroughIrcFormat())
           }
         }
         CODE_MONOSPACE     -> {
@@ -148,12 +148,12 @@ class IrcFormatDeserializer @Inject constructor() {
           normalCount = 0
 
           // If there is an element on stack with the same code, close it
-          if (monospace != null) {
+          monospace = if (monospace != null) {
             if (colorize) monospace.apply(plainText, plainText.length)
-            monospace = null
+            null
             // Otherwise create a new one
           } else {
-            monospace = FormatDescription(plainText.length, MonospaceIrcFormat())
+            FormatDescription(plainText.length, MonospaceIrcFormat())
           }
         }
         CODE_COLOR         -> {
@@ -308,7 +308,7 @@ class IrcFormatDeserializer @Inject constructor() {
     fun applyTo(editable: SpannableStringBuilder, from: Int, to: Int)
   }
 
-  private class FormatDescription<U : IrcFormat>(val start: Int, val format: U) {
+  private class FormatDescription<out U : IrcFormat>(val start: Int, val format: U) {
 
     fun apply(editable: SpannableStringBuilder, end: Int) {
       format.applyTo(editable, start, end)
@@ -387,15 +387,15 @@ class IrcFormatDeserializer @Inject constructor() {
   }
 
   companion object {
-    val CODE_BOLD = 0x02.toChar()
-    val CODE_COLOR = 0x03.toChar()
-    val CODE_HEXCOLOR = 0x04.toChar()
-    val CODE_ITALIC = 0x1D.toChar()
-    val CODE_UNDERLINE = 0x1F.toChar()
-    val CODE_STRIKETHROUGH = 0x1E.toChar()
-    val CODE_MONOSPACE = 0x11.toChar()
-    val CODE_SWAP = 0x16.toChar()
-    val CODE_RESET = 0x0F.toChar()
+    private const val CODE_BOLD = 0x02.toChar()
+    private const val CODE_COLOR = 0x03.toChar()
+    private const val CODE_HEXCOLOR = 0x04.toChar()
+    private const val CODE_ITALIC = 0x1D.toChar()
+    private const val CODE_UNDERLINE = 0x1F.toChar()
+    private const val CODE_STRIKETHROUGH = 0x1E.toChar()
+    private const val CODE_MONOSPACE = 0x11.toChar()
+    private const val CODE_SWAP = 0x16.toChar()
+    private const val CODE_RESET = 0x0F.toChar()
 
     /**
      * Try to read a number from a String in specified bounds

app/src/main/java/de/kuschku/quasseldroid/util/irc/format/IrcFormatSerializer.kt

@@ -209,14 +209,14 @@ class IrcFormatSerializer @Inject constructor(private val context: Context) {
   }
 
   companion object {
-    val CODE_BOLD: Char = 0x02.toChar()
-    val CODE_COLOR: Char = 0x03.toChar()
-    val CODE_HEXCOLOR = 0x04.toChar()
-    val CODE_ITALIC: Char = 0x1D.toChar()
-    val CODE_UNDERLINE: Char = 0x1F.toChar()
-    val CODE_STRIKETHROUGH = 0x1E.toChar()
-    val CODE_MONOSPACE = 0x11.toChar()
-    val CODE_SWAP: Char = 0x16.toChar()
-    val CODE_RESET: Char = 0x0F.toChar()
+    private const val CODE_BOLD: Char = 0x02.toChar()
+    private const val CODE_COLOR: Char = 0x03.toChar()
+    private const val CODE_HEXCOLOR = 0x04.toChar()
+    private const val CODE_ITALIC: Char = 0x1D.toChar()
+    private const val CODE_UNDERLINE: Char = 0x1F.toChar()
+    private const val CODE_STRIKETHROUGH = 0x1E.toChar()
+    private const val CODE_MONOSPACE = 0x11.toChar()
+    private const val CODE_SWAP: Char = 0x16.toChar()
+    private const val CODE_RESET: Char = 0x0F.toChar()
   }
 }

app/src/main/java/de/kuschku/quasseldroid/util/quassel/IrcUserUtils.kt

@@ -39,19 +39,19 @@ object IrcUserUtils {
                                 startIndex: Int? = null,
                                 ignoreCase: Boolean = false): Int? {
     val lastIndex = indexOf(char, startIndex ?: 0, ignoreCase)
-    if (lastIndex < 0)
-      return null
+    return if (lastIndex < 0)
+      null
     else
-      return lastIndex
+      lastIndex
   }
 
   private fun String.lastIndex(char: Char,
                                startIndex: Int? = null,
-                               ignoreCase: Boolean = false): Int? {
-    val lastIndex = lastIndexOf(char, startIndex ?: lastIndex, ignoreCase)
+                               ignoreCase: Boolean = false): Int? =
+    lastIndexOf(char, startIndex ?: lastIndex, ignoreCase).let { lastIndex ->
       if (lastIndex < 0)
-      return null
+        null
       else
-      return lastIndex
+        lastIndex
     }
 }
\ No newline at end of file

app/src/main/java/de/kuschku/quasseldroid/util/ui/ContextThemeWrapper.kt

@@ -16,7 +16,7 @@ import de.kuschku.quasseldroid.R
  *
  * @hide
  */
-class ContextThemeWrapper : ContextWrapper {
+open class ContextThemeWrapper : ContextWrapper {
   var themeResId: Int = 0
     private set
   private var mTheme: Resources.Theme? = null
@@ -70,10 +70,6 @@ class ContextThemeWrapper : ContextWrapper {
     mTheme = theme
   }
 
-  override fun attachBaseContext(newBase: Context) {
-    super.attachBaseContext(newBase)
-  }
-
   /**
    * Call to set an "override configuration" on this context -- this is
    * a configuration that replies one or more values of the standard

app/src/main/java/de/kuschku/quasseldroid/util/ui/DrawerRecyclerView.kt

@@ -22,10 +22,10 @@ class DrawerRecyclerView @JvmOverloads constructor(
   init {
     val a = context.obtainStyledAttributes(
       attrs,
-      R.styleable.ScrimInsetsFrameLayout, defStyleAttr,
-      R.style.Widget_Design_ScrimInsetsFrameLayout
+      R.styleable.DrawerRecyclerView, defStyleAttr,
+      R.style.Widget_DrawerRecyclerView
     )
-    mInsetForeground = a.getDrawable(R.styleable.ScrimInsetsFrameLayout_insetForeground)
+    mInsetForeground = a.getDrawable(R.styleable.DrawerRecyclerView_insetBackground)
     a.recycle()
     setWillNotDraw(true) // No need to draw until the insets are adjusted
     ViewCompat.setOnApplyWindowInsetsListener(

app/src/main/java/de/kuschku/quasseldroid/util/ui/MaterialContentLoadingProgressBar.kt

@@ -105,7 +105,7 @@ class MaterialContentLoadingProgressBar @JvmOverloads constructor(context: Conte
   }
 
   companion object {
-    private val MIN_SHOW_TIME = 500 // ms
-    private val MIN_DELAY = 500 // ms
+    private const val MIN_SHOW_TIME = 500 // ms
+    private const val MIN_DELAY = 500 // ms
   }
 }

app/src/main/java/de/kuschku/quasseldroid/util/ui/NavigationDrawerLayout.kt

@@ -37,10 +37,10 @@ class NavigationDrawerLayout @JvmOverloads constructor(
   init {
     val a = context.obtainStyledAttributes(
       attrs,
-      R.styleable.ScrimInsetsFrameLayout, defStyleAttr,
-      R.style.Widget_Design_ScrimInsetsFrameLayout
+      R.styleable.NavigationDrawerLayout, defStyleAttr,
+      R.style.Widget_NavigationDrawerLayout
     )
-    mInsetForeground = a.getDrawable(R.styleable.ScrimInsetsFrameLayout_insetForeground)
+    mInsetForeground = a.getDrawable(R.styleable.NavigationDrawerLayout_insetBackground)
     a.recycle()
     setWillNotDraw(true) // No need to draw until the insets are adjusted
     ViewCompat.setOnApplyWindowInsetsListener(

app/src/main/res/drawable/ic_format_strikethrough.xml

-<!-- drawable/format_strikethrough_variant.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
   android:width="24dp"
   android:height="24dp"

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

@@ -22,7 +22,7 @@
     android:layout_gravity="start"
     android:background="?attr/colorBackground"
     android:fitsSystemWindows="true"
-    app:insetForeground="?attr/colorPrimaryDark">
+    app:insetBackground="?attr/colorPrimaryDark">
 
     <fragment
       android:id="@+id/fragment_chat_list"

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

 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v7.widget.CardView 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:id="@+id/card_panel"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent">
-
-  <android.support.v7.widget.CardView
   style="?attr/cardStyle"
   android:layout_width="fill_parent"
   android:layout_height="fill_parent"
@@ -38,15 +34,15 @@
         android:textColor="?attr/colorForegroundSecondary" />
 
       <android.support.v7.widget.AppCompatImageView
-          android:id="@+id/send"
+        android:id="@+id/close"
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_gravity="top"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="12dp"
         android:scaleType="fitXY"
-          app:tint="?attr/colorForegroundSecondary"
-          app:srcCompat="@drawable/ic_close" />
+        app:srcCompat="@drawable/ic_close"
+        app:tint="?attr/colorForegroundSecondary" />
 
     </LinearLayout>
 
@@ -59,5 +55,3 @@
   </LinearLayout>
 
 </android.support.v7.widget.CardView>
\ No newline at end of file
-
-</FrameLayout>
\ No newline at end of file

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

@@ -26,6 +26,7 @@
   android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
   android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
   android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+  android:baselineAligned="false"
   android:paddingStart="?android:attr/listPreferredItemPaddingLeft">
 
   <FrameLayout
@@ -38,6 +39,8 @@
     android:minWidth="60dp"
     android:orientation="horizontal"
     android:paddingBottom="4dp"
+    android:paddingLeft="0dp"
+    android:paddingStart="0dp"
     android:paddingEnd="12dp"
     android:paddingRight="12dp"
     android:paddingTop="4dp">