Improved nick list

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

@@ -29,7 +29,9 @@ class NickListAdapter(
       runInBackground {
         val list = it ?: emptyList()
         val old: List<IrcUserItem> = data
-        val new: List<IrcUserItem> = list.sortedBy { it.lowestMode }
+        val new: List<IrcUserItem> = list
+          .sortedBy { it.nick.toLowerCase() }
+          .sortedBy { it.lowestMode }
         val result = DiffUtil.calculateDiff(
           object : DiffUtil.Callback() {
             override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int)
@@ -86,6 +88,9 @@ class NickListAdapter(
     itemView: View,
     private val clickListener: ((String) -> Unit)? = null
   ) : RecyclerView.ViewHolder(itemView) {
+    @BindView(R.id.modesContainer)
+    lateinit var modesContainer: View
+
     @BindView(R.id.modes)
     lateinit var modes: TextView
 

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

@@ -15,8 +15,11 @@
   tools:theme="@style/Theme.ChatTheme.Quassel_Light">
 
   <FrameLayout
+    android:id="@+id/modesContainer"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
+    android:layout_marginEnd="16dp"
+    android:layout_marginRight="16dp"
     android:minWidth="40dp">
 
     <android.support.v7.widget.AppCompatTextView
@@ -41,8 +44,6 @@
   <LinearLayout
     android:layout_width="0dp"
     android:layout_height="match_parent"
-    android:layout_marginLeft="16dp"
-    android:layout_marginStart="16dp"
     android:layout_weight="1"
     android:gravity="center_vertical|start"
     android:orientation="vertical">

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

@@ -15,8 +15,11 @@
   tools:theme="@style/Theme.ChatTheme.Quassel_Light">
 
   <FrameLayout
+    android:id="@+id/modesContainer"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
+    android:layout_marginEnd="16dp"
+    android:layout_marginRight="16dp"
     android:minWidth="40dp">
 
     <android.support.v7.widget.AppCompatTextView
@@ -41,8 +44,6 @@
   <LinearLayout
     android:layout_width="0dp"
     android:layout_height="match_parent"
-    android:layout_marginLeft="16dp"
-    android:layout_marginStart="16dp"
     android:layout_weight="1"
     android:gravity="center_vertical|start"
     android:orientation="vertical">