Fix multiple crashes

app/src/main/res/layout-land/layout_main.xml

@@ -52,11 +52,12 @@
       android:layout_height="match_parent"
       app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-      <androidx.fragment.app.FragmentContainerView
+      <fragment
         android:id="@+id/fragment_messages"
         android:name="de.kuschku.quasseldroid.ui.chat.messages.MessageListFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        tools:ignore="FragmentTagUsage"
         tools:layout="@layout/chat_messages" />
 
       <de.kuschku.quasseldroid.util.ui.view.WarningBarView

app/src/main/res/layout-sw600dp-land/layout_main.xml

@@ -58,11 +58,12 @@
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <androidx.fragment.app.FragmentContainerView
+        <fragment
           android:id="@+id/fragment_messages"
           android:name="de.kuschku.quasseldroid.ui.chat.messages.MessageListFragment"
           android:layout_width="match_parent"
           android:layout_height="match_parent"
+          tools:ignore="FragmentTagUsage"
           tools:layout="@layout/chat_messages" />
 
         <de.kuschku.quasseldroid.util.ui.view.WarningBarView

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

@@ -55,21 +55,23 @@
       </com.google.android.material.appbar.AppBarLayout>
     </LinearLayout>
 
-    <androidx.fragment.app.FragmentContainerView
+    <fragment
       android:id="@+id/fragment_chat_list"
       android:name="de.kuschku.quasseldroid.ui.chat.buffers.BufferViewConfigFragment"
       android:layout_width="320dp"
       android:layout_height="match_parent"
+      tools:ignore="FragmentTagUsage"
       tools:layout="@layout/chat_chatlist" />
 
     <include android:id="@+id/layout_main" layout="@layout/layout_main" />
   </LinearLayout>
 
-  <androidx.fragment.app.FragmentContainerView
+  <fragment
     android:id="@+id/fragment_nick_list"
     android:name="de.kuschku.quasseldroid.ui.chat.nicks.NickListFragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="end"
+    tools:ignore="FragmentTagUsage"
     tools:layout="@layout/chat_nicklist" />
 </androidx.drawerlayout.widget.DrawerLayout>

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

@@ -31,13 +31,6 @@
     android:fitsSystemWindows="true"
     android:orientation="vertical">
 
-    <androidx.appcompat.widget.AppCompatImageView
-      android:id="@+id/imageView"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:layout_gravity="center"
-      android:scaleType="fitCenter" />
-
     <com.google.android.material.appbar.AppBarLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -51,6 +44,13 @@
         app:popupTheme="?attr/actionBarPopupTheme" />
 
     </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.appcompat.widget.AppCompatImageView
+      android:id="@+id/imageView"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:layout_gravity="center"
+      android:scaleType="fitCenter" />
   </LinearLayout>
 
   <de.kuschku.quasseldroid.util.ui.view.NavigationDrawerLayout

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

@@ -25,14 +25,6 @@
   android:layout_height="match_parent"
   android:fitsSystemWindows="true">
 
-  <androidx.fragment.app.FragmentContainerView
-    android:id="@+id/fragment_nick_list"
-    android:name="de.kuschku.quasseldroid.ui.chat.nicks.NickListFragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_gravity="end"
-    tools:layout="@layout/chat_nicklist" />
-
   <de.kuschku.quasseldroid.util.ui.view.NavigationDrawerLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -41,13 +33,23 @@
     android:fitsSystemWindows="true"
     app:insetBackground="?attr/colorPrimaryDark">
 
-    <androidx.fragment.app.FragmentContainerView
+    <fragment
       android:id="@+id/fragment_chat_list"
       android:name="de.kuschku.quasseldroid.ui.chat.buffers.BufferViewConfigFragment"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
+      tools:ignore="FragmentTagUsage"
       tools:layout="@layout/chat_chatlist" />
   </de.kuschku.quasseldroid.util.ui.view.NavigationDrawerLayout>
 
+  <fragment
+    android:id="@+id/fragment_nick_list"
+    android:name="de.kuschku.quasseldroid.ui.chat.nicks.NickListFragment"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="end"
+    tools:ignore="FragmentTagUsage"
+    tools:layout="@layout/chat_nicklist" />
+
   <include android:id="@+id/layout_main" layout="@layout/layout_main" />
 </androidx.drawerlayout.widget.DrawerLayout>

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

@@ -29,11 +29,6 @@
     android:fitsSystemWindows="true"
     android:orientation="vertical">
 
-    <FrameLayout
-      android:id="@+id/fragment_container"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent" />
-
     <com.google.android.material.appbar.AppBarLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -47,6 +42,11 @@
         app:popupTheme="?attr/actionBarPopupTheme" />
 
     </com.google.android.material.appbar.AppBarLayout>
+
+    <FrameLayout
+      android:id="@+id/fragment_container"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent" />
   </LinearLayout>
 
 </androidx.drawerlayout.widget.DrawerLayout>

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

@@ -23,6 +23,11 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent">
 
+  <androidx.viewpager.widget.ViewPager
+    android:id="@+id/view_pager"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
+
   <androidx.appcompat.widget.ActionMenuView
     android:id="@+id/menu_view"
     android:layout_width="56dp"
@@ -30,11 +35,6 @@
     android:layout_gravity="end|top"
     android:theme="?attr/actionBarPopupTheme" />
 
-  <androidx.viewpager.widget.ViewPager
-    android:id="@+id/view_pager"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
-
   <com.google.android.material.floatingactionbutton.FloatingActionButton
     android:id="@+id/next_button"
     style="@style/Widget.MaterialComponents.FloatingActionButton"

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

@@ -37,6 +37,32 @@
 
       <LinearLayout style="@style/Widget.CoreSettings.Wrapper">
 
+        <com.google.android.material.textfield.TextInputLayout
+          style="@style/Widget.CustomTextInput"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:hint="@string/label_channel_name">
+
+          <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/name"
+            style="@style/Widget.CoreSettings.EditText"
+            tools:text="#trees" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <de.kuschku.ui.spinner.MaterialSpinnerLayout
+          style="@style/Widget.CustomSpinnerLayout"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:hint="@string/label_network">
+
+          <androidx.appcompat.widget.AppCompatSpinner
+            android:id="@+id/network"
+            style="@style/Widget.MaterialSpinner"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:listitem="@layout/widget_spinner_item_material" />
+        </de.kuschku.ui.spinner.MaterialSpinnerLayout>
+
         <LinearLayout
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
@@ -101,32 +127,6 @@
               tools:text="NickServ" />
           </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
-
-        <com.google.android.material.textfield.TextInputLayout
-          style="@style/Widget.CustomTextInput"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:hint="@string/label_channel_name">
-
-          <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/name"
-            style="@style/Widget.CoreSettings.EditText"
-            tools:text="#trees" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <de.kuschku.ui.spinner.MaterialSpinnerLayout
-          style="@style/Widget.CustomSpinnerLayout"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:hint="@string/label_network">
-
-          <androidx.appcompat.widget.AppCompatSpinner
-            android:id="@+id/network"
-            style="@style/Widget.MaterialSpinner"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:listitem="@layout/widget_spinner_item_material" />
-        </de.kuschku.ui.spinner.MaterialSpinnerLayout>
       </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 

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

@@ -32,18 +32,6 @@
 
     <LinearLayout style="@style/Widget.CoreSettings.Wrapper">
 
-      <com.google.android.material.textfield.TextInputLayout
-        style="@style/Widget.CustomTextInput"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/label_channel_name">
-
-        <com.google.android.material.textfield.TextInputEditText
-          android:id="@+id/name"
-          style="@style/Widget.CoreSettings.EditText"
-          tools:text="#trees" />
-      </com.google.android.material.textfield.TextInputLayout>
-
       <de.kuschku.ui.spinner.MaterialSpinnerLayout
         style="@style/Widget.CustomSpinnerLayout"
         android:layout_width="match_parent"
@@ -57,6 +45,18 @@
           android:layout_height="wrap_content"
           tools:listitem="@layout/widget_spinner_item_material" />
       </de.kuschku.ui.spinner.MaterialSpinnerLayout>
+
+      <com.google.android.material.textfield.TextInputLayout
+        style="@style/Widget.CustomTextInput"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/label_channel_name">
+
+        <com.google.android.material.textfield.TextInputEditText
+          android:id="@+id/name"
+          style="@style/Widget.CoreSettings.EditText"
+          tools:text="#trees" />
+      </com.google.android.material.textfield.TextInputLayout>
     </LinearLayout>
 
     <de.kuschku.quasseldroid.util.ui.view.ShadowView

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

@@ -35,18 +35,6 @@
 
       <LinearLayout style="@style/Widget.CoreSettings.Wrapper">
 
-        <com.google.android.material.textfield.TextInputLayout
-          style="@style/Widget.CustomTextInput"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:hint="@string/label_nick">
-
-          <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/name"
-            style="@style/Widget.CoreSettings.EditText"
-            tools:text="justJanne" />
-        </com.google.android.material.textfield.TextInputLayout>
-
         <de.kuschku.ui.spinner.MaterialSpinnerLayout
           style="@style/Widget.CustomSpinnerLayout"
           android:layout_width="match_parent"
@@ -60,6 +48,18 @@
             android:layout_height="wrap_content"
             tools:listitem="@layout/widget_spinner_item_material" />
         </de.kuschku.ui.spinner.MaterialSpinnerLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+          style="@style/Widget.CustomTextInput"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:hint="@string/label_nick">
+
+          <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/name"
+            style="@style/Widget.CoreSettings.EditText"
+            tools:text="justJanne" />
+        </com.google.android.material.textfield.TextInputLayout>
       </LinearLayout>
 
       <de.kuschku.quasseldroid.util.ui.fastscroll.views.FastScrollRecyclerView

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

@@ -24,6 +24,13 @@
   android:layout_height="match_parent"
   android:orientation="vertical">
 
+  <de.kuschku.quasseldroid.util.ui.fastscroll.views.FastScrollRecyclerView
+    android:id="@+id/search_results"
+    style="@style/Widget.FastScroller"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:listitem="@layout/widget_channel_search" />
+
   <androidx.cardview.widget.CardView
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -86,13 +93,6 @@
 
   </androidx.cardview.widget.CardView>
 
-  <de.kuschku.quasseldroid.util.ui.fastscroll.views.FastScrollRecyclerView
-    android:id="@+id/search_results"
-    style="@style/Widget.FastScroller"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:listitem="@layout/widget_channel_search" />
-
   <de.kuschku.quasseldroid.util.ui.view.WarningBarView
     android:id="@+id/error"
     android:layout_width="match_parent"

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

@@ -28,22 +28,6 @@
     android:layout_height="wrap_content"
     android:theme="?attr/actionBarTheme">
 
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:orientation="vertical"
-      app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-      <de.kuschku.quasseldroid.util.ui.view.WarningBarView
-        android:id="@+id/feature_context_bufferactivitysync"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:icon="@drawable/ic_alert"
-        app:text="@string/label_feature_context_bufferactivitysync" />
-
-      <include layout="@layout/widget_search" />
-    </LinearLayout>
-
     <androidx.appcompat.widget.Toolbar
       android:id="@+id/chatListToolbar"
       android:layout_width="match_parent"
@@ -63,8 +47,32 @@
 
     </androidx.appcompat.widget.Toolbar>
 
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:orientation="vertical"
+      app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+      <de.kuschku.quasseldroid.util.ui.view.WarningBarView
+        android:id="@+id/feature_context_bufferactivitysync"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:icon="@drawable/ic_alert"
+        app:text="@string/label_feature_context_bufferactivitysync" />
+
+      <include layout="@layout/widget_search" />
+    </LinearLayout>
+
   </com.google.android.material.appbar.AppBarLayout>
 
+  <de.kuschku.quasseldroid.util.ui.fastscroll.views.FastScrollRecyclerView
+    android:id="@+id/chatList"
+    style="@style/Widget.FastScroller"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:listitem="@layout/widget_buffer" />
+
   <com.leinardi.android.speeddial.SpeedDialOverlayLayout
     android:id="@+id/fab_chatlist_overlay"
     android:layout_width="match_parent"
@@ -81,12 +89,4 @@
     app:sdMainFabClosedSrc="@drawable/ic_add"
     app:sdOverlayLayout="@id/fab_chatlist_overlay" />
 
-  <de.kuschku.quasseldroid.util.ui.fastscroll.views.FastScrollRecyclerView
-    android:id="@+id/chatList"
-    style="@style/Widget.FastScroller"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:listitem="@layout/widget_buffer" />
-
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -32,6 +32,16 @@
   android:theme="?attr/actionBarTheme"
   tools:showIn="@layout/activity_main">
 
+  <androidx.appcompat.widget.AppCompatImageView
+    android:id="@+id/toolbar_icon"
+    android:layout_width="@dimen/avatar_size_buffer"
+    android:layout_height="@dimen/avatar_size_buffer"
+    android:layout_gravity="center_vertical"
+    android:layout_marginEnd="8dp"
+    android:visibility="gone"
+    tools:src="@tools:sample/avatars"
+    tools:visibility="visible" />
+
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -71,14 +81,4 @@
       android:visibility="gone" />
 
   </LinearLayout>
-
-  <androidx.appcompat.widget.AppCompatImageView
-    android:id="@+id/toolbar_icon"
-    android:layout_width="@dimen/avatar_size_buffer"
-    android:layout_height="@dimen/avatar_size_buffer"
-    android:layout_gravity="center_vertical"
-    android:layout_marginEnd="8dp"
-    android:visibility="gone"
-    tools:src="@tools:sample/avatars"
-    tools:visibility="visible" />
 </LinearLayout>

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

@@ -34,6 +34,16 @@
     android:layout_marginTop="@dimen/md_title_frame_margin_bottom"
     android:gravity="center">
 
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginEnd="2dp"
+      android:digits="0123456789abcdefABCDEF"
+      android:text="#"
+      android:textColor="?colorTextPrimary"
+      android:textSize="@dimen/md_title_textsize"
+      tools:ignore="HardcodedText,TextViewEdits" />
+
     <EditText
       android:id="@+id/md_hexInput"
       android:layout_width="wrap_content"
@@ -47,16 +57,6 @@
       android:textSize="@dimen/md_title_textsize"
       tools:ignore="HardcodedText" />
 
-    <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginEnd="2dp"
-      android:digits="0123456789abcdefABCDEF"
-      android:text="#"
-      android:textColor="?colorTextPrimary"
-      android:textSize="@dimen/md_title_textsize"
-      tools:ignore="HardcodedText,TextViewEdits" />
-
   </LinearLayout>
 
   <RelativeLayout
@@ -68,39 +68,6 @@
 
     <!-- Alpha -->
 
-    <SeekBar
-      android:id="@+id/md_colorA"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="@dimen/md_title_frame_margin_bottom"
-      android:layout_toStartOf="@+id/md_colorAValue"
-      android:layout_toEndOf="@+id/md_colorALabel"
-      android:focusable="true"
-      android:max="255" />
-
-    <SeekBar
-      android:id="@+id/md_colorG"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_below="@+id/md_colorR"
-      android:layout_marginTop="@dimen/md_title_frame_margin_bottom"
-      android:layout_toStartOf="@+id/md_colorGValue"
-      android:layout_toEndOf="@+id/md_colorGLabel"
-      android:focusable="true"
-      android:max="255" />
-
-    <SeekBar
-      android:id="@+id/md_colorB"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_below="@+id/md_colorG"
-      android:layout_marginTop="@dimen/md_title_frame_margin_bottom"
-      android:layout_toStartOf="@+id/md_colorBValue"
-      android:layout_toEndOf="@+id/md_colorBLabel"
-      android:max="255" />
-
-    <!-- Red -->
-
     <TextView
       android:id="@+id/md_colorALabel"
       android:layout_width="wrap_content"
@@ -113,6 +80,16 @@
       android:textSize="@dimen/md_content_textsize"
       tools:ignore="HardcodedText" />
 
+    <SeekBar
+      android:id="@+id/md_colorA"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/md_title_frame_margin_bottom"
+      android:layout_toStartOf="@+id/md_colorAValue"
+      android:layout_toEndOf="@+id/md_colorALabel"
+      android:focusable="true"
+      android:max="255" />
+
     <TextView
       android:id="@+id/md_colorAValue"
       android:layout_width="wrap_content"
@@ -128,6 +105,8 @@
       android:textSize="@dimen/md_content_textsize"
       tools:ignore="HardcodedText" />
 
+    <!-- Red -->
+
     <TextView
       android:id="@+id/md_colorRLabel"
       android:layout_width="wrap_content"
@@ -140,7 +119,16 @@
       android:textSize="@dimen/md_content_textsize"
       tools:ignore="HardcodedText" />
 
-    <!-- Green -->
+    <SeekBar
+      android:id="@+id/md_colorG"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_below="@+id/md_colorR"
+      android:layout_marginTop="@dimen/md_title_frame_margin_bottom"
+      android:layout_toStartOf="@+id/md_colorGValue"
+      android:layout_toEndOf="@+id/md_colorGLabel"
+      android:focusable="true"
+      android:max="255" />
 
     <TextView
       android:id="@+id/md_colorRValue"
@@ -157,6 +145,8 @@
       android:textSize="@dimen/md_content_textsize"
       tools:ignore="HardcodedText" />
 
+    <!-- Green -->
+
     <TextView
       android:id="@+id/md_colorGLabel"
       android:layout_width="wrap_content"
@@ -169,6 +159,16 @@
       android:textSize="@dimen/md_content_textsize"
       tools:ignore="HardcodedText" />
 
+    <SeekBar
+      android:id="@+id/md_colorB"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_below="@+id/md_colorG"
+      android:layout_marginTop="@dimen/md_title_frame_margin_bottom"
+      android:layout_toStartOf="@+id/md_colorBValue"
+      android:layout_toEndOf="@+id/md_colorBLabel"
+      android:max="255" />
+
     <TextView
       android:id="@+id/md_colorGValue"
       android:layout_width="wrap_content"
@@ -198,6 +198,17 @@
       android:textSize="@dimen/md_content_textsize"
       tools:ignore="HardcodedText" />
 
+    <androidx.appcompat.widget.AppCompatSeekBar
+      android:id="@+id/md_colorR"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_below="@+id/md_colorA"
+      android:layout_marginTop="@dimen/md_title_frame_margin_bottom"
+      android:layout_toStartOf="@+id/md_colorRValue"
+      android:layout_toEndOf="@+id/md_colorRLabel"
+      android:focusable="true"
+      android:max="255" />
+
     <TextView
       android:id="@+id/md_colorBValue"
       android:layout_width="wrap_content"
@@ -213,17 +224,6 @@
       android:textSize="@dimen/md_content_textsize"
       tools:ignore="HardcodedText" />
 
-    <androidx.appcompat.widget.AppCompatSeekBar
-      android:id="@+id/md_colorR"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_below="@+id/md_colorA"
-      android:layout_marginTop="@dimen/md_title_frame_margin_bottom"
-      android:layout_toStartOf="@+id/md_colorRValue"
-      android:layout_toEndOf="@+id/md_colorRLabel"
-      android:focusable="true"
-      android:max="255" />
-
   </RelativeLayout>
 
   <View

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

@@ -52,13 +52,13 @@
 
       <LinearLayout style="@style/Widget.CoreSettings.PrimaryItemGroupHeader">
 
-        <TextView
-          style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-          android:text="@string/certificate_subject" />
-
         <androidx.appcompat.widget.AppCompatImageView
           style="@style/Widget.CoreSettings.PrimaryItemIcon"
           app:srcCompat="@drawable/ic_account" />
+
+        <TextView
+          style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+          android:text="@string/certificate_subject" />
       </LinearLayout>
 
       <LinearLayout
@@ -119,13 +119,13 @@
 
       <LinearLayout style="@style/Widget.CoreSettings.PrimaryItemGroupHeader">
 
-        <TextView
-          style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-          android:text="@string/certificate_issuer" />
-
         <androidx.appcompat.widget.AppCompatImageView
           style="@style/Widget.CoreSettings.PrimaryItemIcon"
           app:srcCompat="@drawable/ic_domain" />
+
+        <TextView
+          style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+          android:text="@string/certificate_issuer" />
       </LinearLayout>
 
       <LinearLayout
@@ -172,13 +172,13 @@
 
       <LinearLayout style="@style/Widget.CoreSettings.PrimaryItemGroupHeader">
 
-        <TextView
-          style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-          android:text="@string/certificate_validity" />
-
         <androidx.appcompat.widget.AppCompatImageView
           style="@style/Widget.CoreSettings.PrimaryItemIcon"
           app:srcCompat="@drawable/ic_clock" />
+
+        <TextView
+          style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+          android:text="@string/certificate_validity" />
       </LinearLayout>
 
       <LinearLayout style="@style/Widget.CoreSettings.PrimaryItemGroup">
@@ -207,13 +207,13 @@
 
       <LinearLayout style="@style/Widget.CoreSettings.PrimaryItemGroupHeader">
 
-        <TextView
-          style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-          android:text="@string/certificate_fingerprints" />
-
         <androidx.appcompat.widget.AppCompatImageView
           style="@style/Widget.CoreSettings.PrimaryItemIcon"
           app:srcCompat="@drawable/ic_fingerprint" />
+
+        <TextView
+          style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+          android:text="@string/certificate_fingerprints" />
       </LinearLayout>
 
       <LinearLayout style="@style/Widget.CoreSettings.PrimaryItemGroup">

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

@@ -29,6 +29,26 @@
     android:animateLayoutChanges="true"
     android:orientation="vertical">
 
+    <LinearLayout style="@style/Widget.Info.Header">
+
+      <TextView
+        android:id="@+id/name"
+        style="@style/Widget.Info.Header.Name"
+        android:textIsSelectable="true"
+        tools:text="#quassel" />
+
+      <TextView
+        android:id="@+id/topic"
+        style="@style/Widget.Info.Header.Description"
+        android:textIsSelectable="true"
+        tools:text="Quassel IRC - https://quassel-irc.org || Latest: 0.12.4 || Mailing Lists: https://lists.quassel-irc.org || Tracker: https://bugs.quassel-irc.org || Activity RSS: #quassel-announce || German: #quassel.de || Quassel on Android: #quasseldroid; on iOS: #woboquassel || Server migration complete; new IPs may still need some time to propagate" />
+    </LinearLayout>
+
+    <View
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:background="?colorDivider" />
+
     <HorizontalScrollView
       android:layout_width="match_parent"
       android:layout_height="wrap_content">
@@ -83,26 +103,6 @@
       </LinearLayout>
     </HorizontalScrollView>
 
-    <LinearLayout style="@style/Widget.Info.Header">
-
-      <TextView
-        android:id="@+id/name"
-        style="@style/Widget.Info.Header.Name"
-        android:textIsSelectable="true"
-        tools:text="#quassel" />
-
-      <TextView
-        android:id="@+id/topic"
-        style="@style/Widget.Info.Header.Description"
-        android:textIsSelectable="true"
-        tools:text="Quassel IRC - https://quassel-irc.org || Latest: 0.12.4 || Mailing Lists: https://lists.quassel-irc.org || Tracker: https://bugs.quassel-irc.org || Activity RSS: #quassel-announce || German: #quassel.de || Quassel on Android: #quasseldroid; on iOS: #woboquassel || Server migration complete; new IPs may still need some time to propagate" />
-    </LinearLayout>
-
-    <View
-      android:layout_width="match_parent"
-      android:layout_height="1dp"
-      android:background="?colorDivider" />
-
     <View
       android:layout_width="match_parent"
       android:layout_height="1dp"

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

@@ -86,13 +86,6 @@
 
   </androidx.cardview.widget.CardView>
 
-  <de.kuschku.quasseldroid.util.ui.fastscroll.views.FastScrollRecyclerView
-    android:id="@+id/search_results"
-    style="@style/Widget.FastScroller"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:listitem="@layout/widget_channel_search" />
-
   <de.kuschku.quasseldroid.util.ui.view.WarningBarView
     android:id="@+id/error"
     android:layout_width="match_parent"
@@ -100,4 +93,11 @@
     app:icon="@drawable/ic_alert"
     app:mode="none" />
 
+  <de.kuschku.quasseldroid.util.ui.fastscroll.views.FastScrollRecyclerView
+    android:id="@+id/search_results"
+    style="@style/Widget.FastScroller"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:listitem="@layout/widget_channel_search" />
+
 </LinearLayout>

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

@@ -30,6 +30,10 @@
     android:animateLayoutChanges="true"
     android:orientation="vertical">
 
+    <TextView
+      style="@style/Widget.Info.Section"
+      android:text="@string/label_core_version" />
+
     <LinearLayout style="@style/Widget.Info.Item">
 
       <TextView
@@ -52,6 +56,14 @@
         android:text="@string/label_missing_features" />
     </LinearLayout>
 
+    <TextView
+      style="@style/Widget.Info.Section"
+      android:text="@string/label_core_uptime" />
+
+    <TextView
+      style="@style/Widget.Info.Section"
+      android:text="@string/label_core_security" />
+
     <LinearLayout
       android:id="@+id/uptime_container"
       style="@style/Widget.Info.Item"
@@ -64,6 +76,16 @@
         tools:text="30 minutes" />
     </LinearLayout>
 
+    <View
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:background="?colorDivider" />
+
+    <View
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:background="?colorDivider" />
+
     <LinearLayout
       style="@style/Widget.Info.Item"
       android:orientation="vertical">
@@ -109,17 +131,10 @@
         android:text="@string/label_info" />
     </LinearLayout>
 
-    <TextView
-      style="@style/Widget.Info.Section"
-      android:text="@string/label_core_version" />
-
-    <TextView
-      style="@style/Widget.Info.Section"
-      android:text="@string/label_core_uptime" />
-
-    <TextView
-      style="@style/Widget.Info.Section"
-      android:text="@string/label_core_security" />
+    <View
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:background="?colorDivider" />
 
     <TextView
       android:id="@+id/clients_title"
@@ -128,21 +143,6 @@
       android:visibility="gone"
       tools:visibility="visible" />
 
-    <View
-      android:layout_width="match_parent"
-      android:layout_height="1dp"
-      android:background="?colorDivider" />
-
-    <View
-      android:layout_width="match_parent"
-      android:layout_height="1dp"
-      android:background="?colorDivider" />
-
-    <View
-      android:layout_width="match_parent"
-      android:layout_height="1dp"
-      android:background="?colorDivider" />
-
     <androidx.recyclerview.widget.RecyclerView
       android:id="@+id/clients"
       android:layout_width="match_parent"

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

@@ -37,6 +37,52 @@
       android:orientation="vertical"
       tools:ignore="UnusedAttribute">
 
+      <LinearLayout style="@style/Widget.Info.Header">
+
+        <TextView
+          android:id="@+id/nick"
+          style="@style/Widget.Info.Header.Name"
+          android:textIsSelectable="true"
+          tools:text="justJanne" />
+
+        <TextView
+          android:id="@+id/real_name"
+          style="@style/Widget.Info.Header.Description"
+          android:textIsSelectable="true"
+          tools:text="Janne Mareike Koschinski https://kuschku.de/" />
+      </LinearLayout>
+
+      <LinearLayout
+        android:id="@+id/away_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <TextView
+          style="@style/Widget.Info.Section"
+          android:text="@string/label_user_away" />
+
+        <LinearLayout style="@style/Widget.Info.Item">
+
+          <TextView
+            android:id="@+id/away_message"
+            style="@style/Widget.Info.Item.Content"
+            android:textIsSelectable="true"
+            tools:text="~justJanne" />
+
+          <TextView
+            style="@style/Widget.Info.Item.Description"
+            android:text="@string/label_user_away_reason" />
+        </LinearLayout>
+
+        <View
+          android:layout_width="match_parent"
+          android:layout_height="1dp"
+          android:background="?colorDivider" />
+      </LinearLayout>
+
       <HorizontalScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -89,51 +135,19 @@
         </LinearLayout>
       </HorizontalScrollView>
 
-      <LinearLayout style="@style/Widget.Info.Header">
-
-        <TextView
-          android:id="@+id/nick"
-          style="@style/Widget.Info.Header.Name"
-          android:textIsSelectable="true"
-          tools:text="justJanne" />
-
       <TextView
-          android:id="@+id/real_name"
-          style="@style/Widget.Info.Header.Description"
-          android:textIsSelectable="true"
-          tools:text="Janne Mareike Koschinski https://kuschku.de/" />
-      </LinearLayout>
+        style="@style/Widget.Info.Section"
+        android:text="@string/label_user_identity" />
 
-      <LinearLayout
-        android:id="@+id/away_container"
+      <View
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:visibility="gone"
-        tools:visibility="visible">
-
-        <LinearLayout style="@style/Widget.Info.Item">
-
-          <TextView
-            android:id="@+id/away_message"
-            style="@style/Widget.Info.Item.Content"
-            android:textIsSelectable="true"
-            tools:text="~justJanne" />
-
-          <TextView
-            style="@style/Widget.Info.Item.Description"
-            android:text="@string/label_user_away_reason" />
-        </LinearLayout>
-
-        <TextView
-          style="@style/Widget.Info.Section"
-          android:text="@string/label_user_away" />
+        android:layout_height="1dp"
+        android:background="?colorDivider" />
 
       <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:background="?colorDivider" />
-      </LinearLayout>
 
       <LinearLayout
         android:id="@+id/account_container"
@@ -203,24 +217,10 @@
           android:text="@string/label_user_server" />
       </LinearLayout>
 
-      <TextView
-        style="@style/Widget.Info.Section"
-        android:text="@string/label_user_identity" />
-
       <TextView
         style="@style/Widget.Info.Section"
         android:text="@string/label_user_common_channels" />
 
-      <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?colorDivider" />
-
-      <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?colorDivider" />
-
       <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/common_channels"
         android:layout_width="match_parent"

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

@@ -51,23 +51,6 @@
         app:srcCompat="@drawable/ic_tab"
         app:tint="?attr/colorTextSecondary" />
 
-      <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/send"
-        style="?attr/buttonStyleSmall"
-        android:layout_width="?attr/actionBarSize"
-        android:layout_height="?attr/actionBarSize"
-        android:layout_gravity="top"
-        android:autoMirrored="true"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        android:contentDescription="@string/label_send"
-        android:padding="12dp"
-        android:scaleType="fitXY"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_send"
-        app:tint="?attr/colorAccent"
-        tools:ignore="UnusedAttribute" />
-
       <de.kuschku.quasseldroid.util.ui.FixedNestingScrollView
         android:id="@+id/chatline_scroller"
         android:layout_width="0dip"
@@ -92,6 +75,23 @@
           android:textColor="?attr/colorForeground"
           android:textSize="16sp" />
       </de.kuschku.quasseldroid.util.ui.FixedNestingScrollView>
+
+      <androidx.appcompat.widget.AppCompatImageButton
+        android:id="@+id/send"
+        style="?attr/buttonStyleSmall"
+        android:layout_width="?attr/actionBarSize"
+        android:layout_height="?attr/actionBarSize"
+        android:layout_gravity="top"
+        android:autoMirrored="true"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/label_send"
+        android:padding="12dp"
+        android:scaleType="fitXY"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_send"
+        app:tint="?attr/colorAccent"
+        tools:ignore="UnusedAttribute" />
     </LinearLayout>
 
     <androidx.recyclerview.widget.RecyclerView