[android] Apply updated Android XML layout formatting

briar-android/src/main/res/layout/activity_change_password.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -11,12 +10,12 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="vertical"
-		android:paddingBottom="@dimen/margin_activity_vertical"
-		android:paddingEnd="@dimen/margin_activity_horizontal"
-		android:paddingLeft="@dimen/margin_activity_horizontal"
-		android:paddingRight="@dimen/margin_activity_horizontal"
 		android:paddingStart="@dimen/margin_activity_horizontal"
-		android:paddingTop="@dimen/margin_activity_vertical">
+		android:paddingLeft="@dimen/margin_activity_horizontal"
+		android:paddingTop="@dimen/margin_activity_vertical"
+		android:paddingEnd="@dimen/margin_activity_horizontal"
+		android:paddingRight="@dimen/margin_activity_horizontal"
+		android:paddingBottom="@dimen/margin_activity_vertical">
 
 		<com.google.android.material.textfield.TextInputLayout
 			android:id="@+id/current_password_entry_wrapper"
@@ -29,7 +28,7 @@
 			app:layout_constraintTop_toTopOf="parent"
 			app:passwordToggleEnabled="true">
 
-			<android.support.design.widget.TextInputEditText
+			<com.google.android.material.textfield.TextInputEditText
 				android:id="@+id/current_password_entry"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
@@ -53,7 +52,7 @@
 			app:layout_constraintTop_toBottomOf="@id/current_password_entry_wrapper"
 			app:passwordToggleEnabled="true">
 
-			<android.support.design.widget.TextInputEditText
+			<com.google.android.material.textfield.TextInputEditText
 				android:id="@+id/new_password_entry"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
@@ -74,7 +73,7 @@
 			app:layout_constraintTop_toBottomOf="@id/new_password_entry_wrapper"
 			app:passwordToggleEnabled="true">
 
-			<android.support.design.widget.TextInputEditText
+			<com.google.android.material.textfield.TextInputEditText
 				android:id="@+id/new_password_confirm"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"

briar-android/src/main/res/layout/activity_conversation.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -31,8 +30,8 @@
 					style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse"
 					android:layout_width="wrap_content"
 					android:layout_height="match_parent"
-					android:layout_marginLeft="@dimen/margin_medium"
 					android:layout_marginStart="@dimen/margin_medium"
+					android:layout_marginLeft="@dimen/margin_medium"
 					android:ellipsize="end"
 					android:gravity="center_vertical"
 					android:maxLines="1"

briar-android/src/main/res/layout/activity_create_forum.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -15,7 +14,7 @@
 		app:errorEnabled="true"
 		app:hintEnabled="false">
 
-		<android.support.design.widget.TextInputEditText
+		<com.google.android.material.textfield.TextInputEditText
 			android:id="@+id/createForumNameEntry"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"

briar-android/src/main/res/layout/activity_dev_report.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical">

briar-android/src/main/res/layout/activity_expired.xml

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
-	<LinearLayout
-		xmlns:android="http://schemas.android.com/apk/res/android"
+	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_margin="@dimen/margin_large"

briar-android/src/main/res/layout/activity_fragment_container.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@+id/fragmentContainer"
-	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent" />

briar-android/src/main/res/layout/activity_fragment_container_toolbar.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
@@ -9,9 +8,8 @@
 
 	<include layout="@layout/toolbar" />
 
-	<FrameLayout
+	<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 		android:id="@+id/fragmentContainer"
-		xmlns:android="http://schemas.android.com/apk/res/android"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent" />
 

briar-android/src/main/res/layout/activity_image.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.briarproject.briar.android.view.PullDownLayout
-	android:id="@+id/layout"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<org.briarproject.briar.android.view.PullDownLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/layout"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:background="@color/briar_black"

briar-android/src/main/res/layout/activity_nav_drawer.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout
-	android:id="@+id/drawer_layout"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.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:id="@+id/drawer_layout"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	tools:context=".android.navdrawer.NavDrawerActivity">

briar-android/src/main/res/layout/activity_panic_preferences.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
 	<fragment
 		android:id="@+id/fragment"
+		android:name="org.briarproject.briar.android.panic.PanicPreferencesFragment"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:name="org.briarproject.briar.android.panic.PanicPreferencesFragment"/>
+		android:layout_height="match_parent" />
 </FrameLayout>

briar-android/src/main/res/layout/activity_reveal_contacts.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
@@ -16,10 +15,10 @@
 	<Button
 		android:id="@+id/revealButton"
 		style="@style/BriarButton"
-		android:layout_marginEnd="@dimen/margin_small"
-		android:layout_marginLeft="@dimen/margin_small"
-		android:layout_marginRight="@dimen/margin_small"
 		android:layout_marginStart="@dimen/margin_small"
+		android:layout_marginLeft="@dimen/margin_small"
+		android:layout_marginEnd="@dimen/margin_small"
+		android:layout_marginRight="@dimen/margin_small"
 		android:text="@string/groups_reveal_contacts" />
 
 </LinearLayout>

briar-android/src/main/res/layout/activity_rss_feed_import.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -18,7 +17,7 @@
 		app:cardCornerRadius="0dp"
 		app:cardUseCompatPadding="false">
 
-		<android.support.design.widget.TextInputEditText
+		<com.google.android.material.textfield.TextInputEditText
 			android:id="@+id/urlInput"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
@@ -33,7 +32,7 @@
 
 			<requestFocus />
 
-		</android.support.design.widget.TextInputEditText>
+		</com.google.android.material.textfield.TextInputEditText>
 
 	</androidx.cardview.widget.CardView>
 

briar-android/src/main/res/layout/activity_rss_feed_manage.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.briarproject.briar.android.view.BriarRecyclerView
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
+<org.briarproject.briar.android.view.BriarRecyclerView 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/feedList"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	app:scrollToEnd="false"
 	app:emptyText="@string/blogs_rss_feeds_manage_empty_state"
+	app:scrollToEnd="false"
 	tools:listitem="@layout/list_item_rss_feed" />

briar-android/src/main/res/layout/activity_settings.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
 	<fragment
 		android:id="@+id/fragment"
+		android:name="org.briarproject.briar.android.settings.SettingsFragment"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:name="org.briarproject.briar.android.settings.SettingsFragment"/>
+		android:layout_height="match_parent" />
 </FrameLayout>

briar-android/src/main/res/layout/activity_sharing_status.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	android:id="@+id/linearLayout"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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/linearLayout"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
@@ -11,8 +10,8 @@
 		android:id="@+id/infoView"
 		android:layout_width="wrap_content"
 		android:layout_height="0dp"
-		android:layout_marginLeft="8dp"
 		android:layout_marginStart="8dp"
+		android:layout_marginLeft="8dp"
 		android:elevation="@dimen/margin_tiny"
 		android:src="@drawable/ic_info_white"
 		app:layout_constraintBottom_toTopOf="@+id/divider"

briar-android/src/main/res/layout/activity_test_data.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"

briar-android/src/main/res/layout/activity_threaded_conversation.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<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"

briar-android/src/main/res/layout/activity_unlock.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"

briar-android/src/main/res/layout/activity_write_blog_post.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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"

briar-android/src/main/res/layout/author_view.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
-	android:id="@+id/merge"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<merge 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/merge"
 	tools:layout_height="wrap_content"
 	tools:layout_width="match_parent"
 	tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
@@ -39,10 +38,10 @@
 		android:id="@+id/authorName"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/margin_medium"
-		android:layout_marginLeft="@dimen/margin_medium"
-		android:layout_marginRight="@dimen/margin_medium"
 		android:layout_marginStart="@dimen/margin_medium"
+		android:layout_marginLeft="@dimen/margin_medium"
+		android:layout_marginEnd="@dimen/margin_medium"
+		android:layout_marginRight="@dimen/margin_medium"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constrainedWidth="true"

briar-android/src/main/res/layout/briar_recycler_view.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -31,11 +30,11 @@
 		android:id="@+id/emptyImage"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="16dp"
-		android:layout_marginLeft="16dp"
-		android:layout_marginRight="16dp"
 		android:layout_marginStart="16dp"
+		android:layout_marginLeft="16dp"
 		android:layout_marginTop="16dp"
+		android:layout_marginEnd="16dp"
+		android:layout_marginRight="16dp"
 		app:layout_constraintBottom_toTopOf="@+id/emptyText"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
@@ -63,9 +62,9 @@
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:gravity="center"
-		android:paddingBottom="@dimen/margin_large"
 		android:paddingLeft="@dimen/margin_large"
 		android:paddingRight="@dimen/margin_large"
+		android:paddingBottom="@dimen/margin_large"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"

briar-android/src/main/res/layout/checkbox.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content">
 
@@ -8,8 +7,8 @@
 		android:id="@+id/checkbox"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginLeft="@dimen/margin_activity_horizontal"
 		android:layout_marginStart="@dimen/margin_activity_horizontal"
+		android:layout_marginLeft="@dimen/margin_activity_horizontal"
 		android:layout_marginTop="@dimen/margin_activity_vertical"
 		android:checked="false"
 		android:text="@string/don_t_ask_again" />

briar-android/src/main/res/layout/contact_avatar_status.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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="32dp"

briar-android/src/main/res/layout/dialog_screen_filter.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"

briar-android/src/main/res/layout/emoji_text_input_view.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<merge 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"

briar-android/src/main/res/layout/fragment_alias_dialog.xml

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:orientation="vertical"
 	android:paddingLeft="16dp"
-	android:paddingRight="16dp"
-	android:paddingTop="16dp">
+	android:paddingTop="16dp"
+	android:paddingRight="16dp">
 
 	<TextView
 		android:id="@+id/titleView"
@@ -40,8 +39,8 @@
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginLeft="@dimen/margin_xxlarge"
 		android:layout_marginStart="@dimen/margin_xxlarge"
+		android:layout_marginLeft="@dimen/margin_xxlarge"
 		android:gravity="end"
 		android:orientation="horizontal">
 

briar-android/src/main/res/layout/fragment_blog.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.briarproject.briar.android.view.BriarRecyclerView
-	android:id="@+id/postList"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<org.briarproject.briar.android.view.BriarRecyclerView 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/postList"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	app:scrollToEnd="false"

briar-android/src/main/res/layout/fragment_blog_post.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 

briar-android/src/main/res/layout/fragment_contact_list.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">

briar-android/src/main/res/layout/fragment_crash.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"

briar-android/src/main/res/layout/fragment_create_group.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -15,7 +14,7 @@
 		app:errorEnabled="true"
 		app:hintEnabled="false">
 
-		<android.support.design.widget.TextInputEditText
+		<com.google.android.material.textfield.TextInputEditText
 			android:id="@+id/name"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"

briar-android/src/main/res/layout/fragment_error.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -10,11 +9,11 @@
 		android:id="@+id/errorIcon"
 		android:layout_width="128dp"
 		android:layout_height="128dp"
-		android:layout_marginEnd="8dp"
-		android:layout_marginLeft="8dp"
-		android:layout_marginRight="8dp"
 		android:layout_marginStart="8dp"
+		android:layout_marginLeft="8dp"
 		android:layout_marginTop="8dp"
+		android:layout_marginEnd="8dp"
+		android:layout_marginRight="8dp"
 		android:src="@drawable/alerts_and_states_error"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
@@ -26,11 +25,11 @@
 		android:id="@+id/errorTitle"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="8dp"
-		android:layout_marginLeft="8dp"
-		android:layout_marginRight="8dp"
 		android:layout_marginStart="8dp"
+		android:layout_marginLeft="8dp"
 		android:layout_marginTop="8dp"
+		android:layout_marginEnd="8dp"
+		android:layout_marginRight="8dp"
 		android:text="@string/sorry"
 		android:textSize="@dimen/text_size_xlarge"
 		app:layout_constraintEnd_toEndOf="parent"
@@ -41,11 +40,11 @@
 		android:id="@+id/errorMessage"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="16dp"
-		android:layout_marginLeft="16dp"
-		android:layout_marginRight="16dp"
 		android:layout_marginStart="16dp"
+		android:layout_marginLeft="16dp"
 		android:layout_marginTop="8dp"
+		android:layout_marginEnd="16dp"
+		android:layout_marginRight="16dp"
 		android:textSize="@dimen/text_size_medium"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"

briar-android/src/main/res/layout/fragment_error_contact_exchange.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -28,8 +27,8 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="16dp"
-			android:layout_marginRight="16dp"
 			android:layout_marginTop="16dp"
+			android:layout_marginRight="16dp"
 			android:scaleType="fitCenter"
 			android:src="@drawable/qr_code_error"
 			app:layout_constraintEnd_toEndOf="parent"
@@ -42,11 +41,11 @@
 			android:id="@+id/errorMessage"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginEnd="16dp"
-			android:layout_marginLeft="16dp"
-			android:layout_marginRight="16dp"
 			android:layout_marginStart="16dp"
+			android:layout_marginLeft="16dp"
 			android:layout_marginTop="8dp"
+			android:layout_marginEnd="16dp"
+			android:layout_marginRight="16dp"
 			android:textColor="?android:attr/textColorPrimary"
 			android:textSize="@dimen/text_size_medium"
 			app:layout_constraintBottom_toTopOf="@+id/sendFeedback"
@@ -61,11 +60,11 @@
 			android:id="@+id/sendFeedback"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginEnd="16dp"
-			android:layout_marginLeft="16dp"
-			android:layout_marginRight="16dp"
 			android:layout_marginStart="16dp"
+			android:layout_marginLeft="16dp"
 			android:layout_marginTop="8dp"
+			android:layout_marginEnd="16dp"
+			android:layout_marginRight="16dp"
 			android:text="@string/connection_error_feedback"
 			android:textColor="?android:attr/textColorPrimary"
 			android:textSize="@dimen/text_size_medium"
@@ -79,9 +78,9 @@
 			style="@style/BriarButtonFlat.Positive"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginBottom="8dp"
 			android:layout_marginEnd="8dp"
 			android:layout_marginRight="8dp"
+			android:layout_marginBottom="8dp"
 			android:text="@string/try_again_button"
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintEnd_toEndOf="parent"
@@ -93,11 +92,11 @@
 			style="@style/BriarButtonFlat.Negative"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginBottom="8dp"
-			android:layout_marginEnd="8dp"
-			android:layout_marginLeft="8dp"
-			android:layout_marginRight="8dp"
 			android:layout_marginStart="8dp"
+			android:layout_marginLeft="8dp"
+			android:layout_marginEnd="8dp"
+			android:layout_marginRight="8dp"
+			android:layout_marginBottom="8dp"
 			android:text="@string/cancel"
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintEnd_toStartOf="@+id/tryAgainButton"

briar-android/src/main/res/layout/fragment_forum_list.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.briarproject.briar.android.view.BriarRecyclerView
-	android:id="@+id/forumList"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<org.briarproject.briar.android.view.BriarRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:id="@+id/forumList"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	app:emptyAction="@string/no_forums_action"

briar-android/src/main/res/layout/fragment_image.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.github.chrisbanes.photoview.PhotoView
-	android:id="@+id/photoView"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<com.github.chrisbanes.photoview.PhotoView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/photoView"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	tools:ignore="ContentDescription"

briar-android/src/main/res/layout/fragment_keyagreement_id.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	android:id="@+id/scrollView"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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/scrollView"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:orientation="vertical">
@@ -33,8 +32,8 @@
 			android:layout_height="wrap_content"
 			android:adjustViewBounds="true"
 			android:paddingLeft="@dimen/margin_large"
-			android:paddingRight="@dimen/margin_large"
 			android:paddingTop="@dimen/margin_large"
+			android:paddingRight="@dimen/margin_large"
 			android:scaleType="fitCenter"
 			android:src="@drawable/qr_code_explanation"
 			app:layout_constraintBottom_toTopOf="@id/explanationText"

briar-android/src/main/res/layout/fragment_keyagreement_qr.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"

briar-android/src/main/res/layout/fragment_link_dialog.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -10,11 +9,11 @@
 		android:id="@+id/linkWarning"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="16dp"
-		android:layout_marginLeft="16dp"
-		android:layout_marginRight="16dp"
 		android:layout_marginStart="16dp"
+		android:layout_marginLeft="16dp"
 		android:layout_marginTop="16dp"
+		android:layout_marginEnd="16dp"
+		android:layout_marginRight="16dp"
 		android:text="@string/link_warning_title"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_large"
@@ -30,11 +29,11 @@
 		android:id="@+id/scrollView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="16dp"
-		android:layout_marginLeft="16dp"
-		android:layout_marginRight="16dp"
 		android:layout_marginStart="16dp"
+		android:layout_marginLeft="16dp"
 		android:layout_marginTop="16dp"
+		android:layout_marginEnd="16dp"
+		android:layout_marginRight="16dp"
 		app:layout_constrainedHeight="true"
 		app:layout_constraintBottom_toTopOf="@+id/cancelButton"
 		app:layout_constraintEnd_toEndOf="parent"
@@ -59,8 +58,8 @@
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_gravity="center_vertical"
-				android:layout_marginBottom="16dp"
 				android:layout_marginTop="16dp"
+				android:layout_marginBottom="16dp"
 				android:background="@color/briar_white"
 				android:padding="8dp"
 				android:textColor="@color/briar_text_primary"

briar-android/src/main/res/layout/fragment_link_exchange.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -91,8 +90,8 @@
 			android:id="@+id/yourLink"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="8dp"
 			android:layout_marginStart="8dp"
+			android:layout_marginLeft="8dp"
 			android:gravity="left|start"
 			android:text="@string/your_link"
 			android:textSize="16sp"
@@ -124,9 +123,9 @@
 			style="@style/BriarButtonFlat.Positive.Tiny"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:drawableStart="@drawable/ic_content_copy"
 			android:drawableLeft="@drawable/ic_content_copy"
 			android:drawablePadding="8dp"
-			android:drawableStart="@drawable/ic_content_copy"
 			android:enabled="false"
 			android:text="@string/copy_button"
 			app:layout_constraintEnd_toStartOf="@id/shareButton"
@@ -140,9 +139,9 @@
 			style="@style/BriarButtonFlat.Positive.Tiny"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:drawableStart="@drawable/social_share_blue"
 			android:drawableLeft="@drawable/social_share_blue"
 			android:drawablePadding="8dp"
-			android:drawableStart="@drawable/social_share_blue"
 			android:enabled="false"
 			android:text="@string/share_button"
 			app:layout_constraintBottom_toBottomOf="@id/copyButton"
@@ -167,8 +166,8 @@
 			android:id="@+id/inputLink"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="8dp"
 			android:layout_marginStart="8dp"
+			android:layout_marginLeft="8dp"
 			android:gravity="left|start"
 			android:text="@string/contact_link_intro"
 			android:textSize="16sp"
@@ -203,9 +202,9 @@
 			style="@style/BriarButtonFlat.Positive.Tiny"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:drawableStart="@drawable/ic_content_paste"
 			android:drawableLeft="@drawable/ic_content_paste"
 			android:drawablePadding="8dp"
-			android:drawableStart="@drawable/ic_content_paste"
 			android:text="@string/paste_button"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintHorizontal_bias="1.0"

briar-android/src/main/res/layout/fragment_message.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.briarproject.briar.android.view.LargeTextInputView
-	android:id="@+id/messageView"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<org.briarproject.briar.android.view.LargeTextInputView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:id="@+id/messageView"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	app:allowEmptyText="true"

briar-android/src/main/res/layout/fragment_nickname.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -104,8 +103,8 @@
 			android:id="@+id/nicknameIntro"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="8dp"
 			android:layout_marginStart="8dp"
+			android:layout_marginLeft="8dp"
 			android:gravity="left|start"
 			android:text="@string/nickname_intro"
 			android:textSize="16sp"

briar-android/src/main/res/layout/fragment_open_database.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"

briar-android/src/main/res/layout/fragment_password.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"

briar-android/src/main/res/layout/fragment_reblog.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"

briar-android/src/main/res/layout/fragment_report_form.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -15,11 +14,11 @@
 			android:id="@+id/user_comment_layout"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginEnd="@dimen/margin_large"
-			android:layout_marginLeft="@dimen/margin_large"
-			android:layout_marginRight="@dimen/margin_large"
 			android:layout_marginStart="@dimen/margin_large"
+			android:layout_marginLeft="@dimen/margin_large"
 			android:layout_marginTop="@dimen/margin_large"
+			android:layout_marginEnd="@dimen/margin_large"
+			android:layout_marginRight="@dimen/margin_large"
 			app:hintEnabled="false"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
@@ -39,10 +38,10 @@
 			android:id="@+id/user_email_layout"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginEnd="@dimen/margin_large"
-			android:layout_marginLeft="@dimen/margin_large"
-			android:layout_marginRight="@dimen/margin_large"
 			android:layout_marginStart="@dimen/margin_large"
+			android:layout_marginLeft="@dimen/margin_large"
+			android:layout_marginEnd="@dimen/margin_large"
+			android:layout_marginRight="@dimen/margin_large"
 			app:hintEnabled="false"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
@@ -62,8 +61,8 @@
 			android:id="@+id/include_debug_report"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="@dimen/margin_large"
 			android:layout_marginStart="@dimen/margin_large"
+			android:layout_marginLeft="@dimen/margin_large"
 			android:checked="false"
 			android:text="@string/include_debug_report_crash"
 			app:layout_constraintBottom_toBottomOf="@+id/chevron"
@@ -86,10 +85,10 @@
 			android:layout_height="wrap_content"
 			android:gravity="center_horizontal"
 			android:orientation="vertical"
-			android:paddingBottom="@dimen/listitem_height_one_line_avatar"
-			android:paddingEnd="@dimen/margin_large"
 			android:paddingStart="@dimen/margin_large"
 			android:paddingTop="@dimen/margin_small"
+			android:paddingEnd="@dimen/margin_large"
+			android:paddingBottom="@dimen/listitem_height_one_line_avatar"
 			android:visibility="gone"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@id/include_debug_report"

briar-android/src/main/res/layout/fragment_setup_author_name.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -10,12 +9,12 @@
 	<androidx.constraintlayout.widget.ConstraintLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:paddingBottom="@dimen/margin_activity_vertical"
-		android:paddingEnd="@dimen/margin_activity_horizontal"
-		android:paddingLeft="@dimen/margin_activity_horizontal"
-		android:paddingRight="@dimen/margin_activity_horizontal"
 		android:paddingStart="@dimen/margin_activity_horizontal"
-		android:paddingTop="@dimen/margin_activity_vertical">
+		android:paddingLeft="@dimen/margin_activity_horizontal"
+		android:paddingTop="@dimen/margin_activity_vertical"
+		android:paddingEnd="@dimen/margin_activity_horizontal"
+		android:paddingRight="@dimen/margin_activity_horizontal"
+		android:paddingBottom="@dimen/margin_activity_vertical">
 
 		<com.google.android.material.textfield.TextInputLayout
 			android:id="@+id/nickname_entry_wrapper"

briar-android/src/main/res/layout/fragment_setup_doze.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"

briar-android/src/main/res/layout/fragment_setup_password.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -10,12 +9,12 @@
 	<androidx.constraintlayout.widget.ConstraintLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:paddingBottom="@dimen/margin_activity_vertical"
-		android:paddingEnd="@dimen/margin_activity_horizontal"
-		android:paddingLeft="@dimen/margin_activity_horizontal"
-		android:paddingRight="@dimen/margin_activity_horizontal"
 		android:paddingStart="@dimen/margin_activity_horizontal"
-		android:paddingTop="@dimen/margin_activity_vertical">
+		android:paddingLeft="@dimen/margin_activity_horizontal"
+		android:paddingTop="@dimen/margin_activity_vertical"
+		android:paddingEnd="@dimen/margin_activity_horizontal"
+		android:paddingRight="@dimen/margin_activity_horizontal"
+		android:paddingBottom="@dimen/margin_activity_vertical">
 
 		<com.google.android.material.textfield.TextInputLayout
 			android:id="@+id/password_entry_wrapper"

briar-android/src/main/res/layout/fragment_sign_out.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"

briar-android/src/main/res/layout/image_preview.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<merge 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"
@@ -35,10 +34,10 @@
 		android:id="@+id/imageCancelButton"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="8dp"
+		android:layout_marginTop="8dp"
 		android:layout_marginEnd="8dp"
 		android:layout_marginRight="8dp"
-		android:layout_marginTop="8dp"
+		android:layout_marginBottom="8dp"
 		android:src="@drawable/ic_close"
 		app:backgroundTint="@color/briar_red"
 		app:fabCustomSize="26dp"

briar-android/src/main/res/layout/introduction_message.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
@@ -26,11 +25,11 @@
 			android:id="@+id/nameContact1"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginEnd="@dimen/margin_large"
-			android:layout_marginLeft="@dimen/margin_large"
-			android:layout_marginRight="@dimen/margin_large"
 			android:layout_marginStart="@dimen/margin_large"
+			android:layout_marginLeft="@dimen/margin_large"
 			android:layout_marginTop="@dimen/margin_medium"
+			android:layout_marginEnd="@dimen/margin_large"
+			android:layout_marginRight="@dimen/margin_large"
 			android:gravity="center"
 			android:textColor="?android:attr/textColorPrimary"
 			android:textSize="@dimen/text_size_small"
@@ -67,11 +66,11 @@
 			android:id="@+id/nameContact2"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginEnd="@dimen/margin_large"
-			android:layout_marginLeft="@dimen/margin_large"
-			android:layout_marginRight="@dimen/margin_large"
 			android:layout_marginStart="@dimen/margin_large"
+			android:layout_marginLeft="@dimen/margin_large"
 			android:layout_marginTop="@dimen/margin_medium"
+			android:layout_marginEnd="@dimen/margin_large"
+			android:layout_marginRight="@dimen/margin_large"
 			android:gravity="center"
 			android:textColor="?android:attr/textColorPrimary"
 			android:textSize="@dimen/text_size_small"

briar-android/src/main/res/layout/list.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.briarproject.briar.android.view.BriarRecyclerView
-	android:id="@+id/list"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<org.briarproject.briar.android.view.BriarRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:id="@+id/list"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	app:scrollToEnd="false" />

briar-android/src/main/res/layout/list_item_blog_comment.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -27,9 +26,9 @@
 		android:id="@+id/textView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:paddingBottom="@dimen/listitem_vertical_margin"
-		android:paddingEnd="@dimen/listitem_vertical_margin"
 		android:paddingStart="@dimen/listitem_vertical_margin"
+		android:paddingEnd="@dimen/listitem_vertical_margin"
+		android:paddingBottom="@dimen/listitem_vertical_margin"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintEnd_toEndOf="parent"

briar-android/src/main/res/layout/list_item_blog_post.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
-	android:id="@+id/postLayout"
-	style="@style/BriarCard"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.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/postLayout"
+	style="@style/BriarCard"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:foreground="?attr/selectableItemBackground">
@@ -17,12 +16,12 @@
 			android:id="@+id/rebloggerView"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginBottom="@dimen/listitem_horizontal_margin"
-			android:layout_marginEnd="@dimen/listitem_vertical_margin"
-			android:layout_marginLeft="@dimen/listitem_vertical_margin"
-			android:layout_marginRight="@dimen/listitem_vertical_margin"
 			android:layout_marginStart="@dimen/listitem_vertical_margin"
+			android:layout_marginLeft="@dimen/listitem_vertical_margin"
 			android:layout_marginTop="@dimen/listitem_vertical_margin"
+			android:layout_marginEnd="@dimen/listitem_vertical_margin"
+			android:layout_marginRight="@dimen/listitem_vertical_margin"
+			android:layout_marginBottom="@dimen/listitem_horizontal_margin"
 			app:layout_constraintEnd_toStartOf="@+id/commentView"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toTopOf="parent"
@@ -32,12 +31,12 @@
 			android:id="@+id/authorView"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginBottom="@dimen/listitem_horizontal_margin"
-			android:layout_marginEnd="@dimen/listitem_vertical_margin"
-			android:layout_marginLeft="@dimen/listitem_vertical_margin"
-			android:layout_marginRight="@dimen/listitem_vertical_margin"
 			android:layout_marginStart="@dimen/listitem_vertical_margin"
+			android:layout_marginLeft="@dimen/listitem_vertical_margin"
 			android:layout_marginTop="@dimen/listitem_vertical_margin"
+			android:layout_marginEnd="@dimen/listitem_vertical_margin"
+			android:layout_marginRight="@dimen/listitem_vertical_margin"
+			android:layout_marginBottom="@dimen/listitem_horizontal_margin"
 			app:layout_constraintEnd_toStartOf="@+id/commentView"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/rebloggerView" />

briar-android/src/main/res/layout/list_item_contact.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	android:id="@+id/linearLayout4"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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/linearLayout4"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:background="?attr/selectableItemBackground"
@@ -47,13 +46,13 @@
 		android:id="@+id/nameView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/margin_medium"
-		android:layout_marginLeft="@dimen/margin_medium"
-		android:layout_marginRight="@dimen/margin_medium"
 		android:layout_marginStart="@dimen/margin_medium"
+		android:layout_marginLeft="@dimen/margin_medium"
 		android:layout_marginTop="@dimen/listitem_vertical_margin"
-		android:paddingEnd="@dimen/margin_medium"
+		android:layout_marginEnd="@dimen/margin_medium"
+		android:layout_marginRight="@dimen/margin_medium"
 		android:paddingStart="@dimen/margin_medium"
+		android:paddingEnd="@dimen/margin_medium"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_medium"
 		app:layout_constraintBottom_toTopOf="@+id/dateView"
@@ -67,13 +66,13 @@
 		android:id="@+id/dateView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/listitem_vertical_margin"
-		android:layout_marginEnd="@dimen/margin_medium"
-		android:layout_marginLeft="@dimen/margin_medium"
-		android:layout_marginRight="@dimen/margin_medium"
 		android:layout_marginStart="@dimen/margin_medium"
-		android:paddingEnd="@dimen/margin_medium"
+		android:layout_marginLeft="@dimen/margin_medium"
+		android:layout_marginEnd="@dimen/margin_medium"
+		android:layout_marginRight="@dimen/margin_medium"
+		android:layout_marginBottom="@dimen/listitem_vertical_margin"
 		android:paddingStart="@dimen/margin_medium"
+		android:paddingEnd="@dimen/margin_medium"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintBottom_toTopOf="@+id/divider"

briar-android/src/main/res/layout/list_item_contact_small.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:orientation="horizontal"
-	android:paddingBottom="@dimen/margin_medium"
-	android:paddingTop="@dimen/margin_medium">
+	android:paddingTop="@dimen/margin_medium"
+	android:paddingBottom="@dimen/margin_medium">
 
 	<de.hdodenhof.circleimageview.CircleImageView
 		android:id="@+id/avatarView"
@@ -14,8 +13,8 @@
 		android:layout_width="@dimen/listitem_picture_size_small"
 		android:layout_height="@dimen/listitem_picture_size_small"
 		android:layout_gravity="center_vertical"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		tools:src="@mipmap/ic_launcher_round" />
 
 	<com.vanniktech.emoji.EmojiTextView
@@ -23,10 +22,10 @@
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center_vertical"
-		android:layout_marginEnd="@dimen/margin_medium"
-		android:layout_marginLeft="@dimen/margin_medium"
-		android:layout_marginRight="@dimen/margin_medium"
 		android:layout_marginStart="@dimen/margin_medium"
+		android:layout_marginLeft="@dimen/margin_medium"
+		android:layout_marginEnd="@dimen/margin_medium"
+		android:layout_marginRight="@dimen/margin_medium"
 		android:layout_weight="1"
 		android:maxLines="2"
 		android:textColor="?android:attr/textColorPrimary"

briar-android/src/main/res/layout/list_item_conversation_msg_image.xml

@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	android:id="@+id/layout"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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/layout"
 	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
-	android:layout_marginBottom="@dimen/message_bubble_margin"
-	android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
-	android:layout_marginLeft="@dimen/message_bubble_margin_tail"
-	android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 	android:layout_marginStart="@dimen/message_bubble_margin_tail"
+	android:layout_marginLeft="@dimen/message_bubble_margin_tail"
 	android:layout_marginTop="@dimen/message_bubble_margin"
+	android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
+	android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
+	android:layout_marginBottom="@dimen/message_bubble_margin"
 	android:background="@drawable/msg_in"
 	android:elevation="@dimen/message_bubble_elevation">
 
@@ -34,10 +33,10 @@
 		style="@style/TextMessage"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 		android:layout_marginLeft="@dimen/message_bubble_padding_sides_inner"
-		android:layout_marginRight="@dimen/message_bubble_padding_sides_inner"
 		android:layout_marginTop="@dimen/message_bubble_padding_top_inner"
+		android:layout_marginRight="@dimen/message_bubble_padding_sides_inner"
+		android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 		android:textColor="?android:attr/textColorPrimary"
 		android:visibility="gone"
 		app:layout_constrainedWidth="true"
@@ -52,9 +51,9 @@
 		android:id="@+id/statusLayout"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/message_bubble_padding_top"
 		android:layout_marginLeft="@dimen/message_bubble_padding_sides_inner"
 		android:layout_marginRight="@dimen/message_bubble_padding_sides_inner"
+		android:layout_marginBottom="@dimen/message_bubble_padding_top"
 		android:background="@drawable/msg_status_bubble"
 		android:orientation="horizontal"
 		app:layout_constraintBottom_toBottomOf="@+id/imageList"

briar-android/src/main/res/layout/list_item_conversation_msg_image_text.xml

@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	android:id="@+id/layout"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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/layout"
 	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
-	android:layout_marginBottom="@dimen/message_bubble_margin"
-	android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
-	android:layout_marginLeft="@dimen/message_bubble_margin_tail"
-	android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 	android:layout_marginStart="@dimen/message_bubble_margin_tail"
+	android:layout_marginLeft="@dimen/message_bubble_margin_tail"
 	android:layout_marginTop="@dimen/message_bubble_margin"
+	android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
+	android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
+	android:layout_marginBottom="@dimen/message_bubble_margin"
 	android:background="@drawable/msg_in"
 	android:elevation="@dimen/message_bubble_elevation">
 
@@ -34,10 +33,10 @@
 		style="@style/TextMessage"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 		android:layout_marginLeft="@dimen/message_bubble_padding_sides_inner"
-		android:layout_marginRight="@dimen/message_bubble_padding_sides_inner"
 		android:layout_marginTop="@dimen/message_bubble_padding_top_inner"
+		android:layout_marginRight="@dimen/message_bubble_padding_sides_inner"
+		android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 		android:textColor="?android:attr/textColorPrimary"
 		app:layout_constrainedWidth="true"
 		app:layout_constraintBottom_toTopOf="@+id/statusLayout"
@@ -51,9 +50,9 @@
 		android:id="@+id/statusLayout"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 		android:layout_marginLeft="@dimen/message_bubble_padding_sides_inner"
 		android:layout_marginRight="@dimen/message_bubble_padding_sides_inner"
+		android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 		android:orientation="horizontal"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"

briar-android/src/main/res/layout/list_item_conversation_msg_in.xml

@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	android:id="@+id/layout"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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/layout"
 	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
-	android:layout_marginBottom="@dimen/message_bubble_margin"
-	android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
-	android:layout_marginLeft="@dimen/message_bubble_margin_tail"
-	android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 	android:layout_marginStart="@dimen/message_bubble_margin_tail"
+	android:layout_marginLeft="@dimen/message_bubble_margin_tail"
 	android:layout_marginTop="@dimen/message_bubble_margin"
+	android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
+	android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
+	android:layout_marginBottom="@dimen/message_bubble_margin"
 	android:background="@drawable/msg_in"
 	android:elevation="@dimen/message_bubble_elevation">
 
@@ -35,10 +34,10 @@
 		style="@style/TextMessage"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 		android:layout_marginLeft="@dimen/message_bubble_padding_sides_inner"
-		android:layout_marginRight="@dimen/message_bubble_padding_sides_inner"
 		android:layout_marginTop="@dimen/message_bubble_padding_top_inner"
+		android:layout_marginRight="@dimen/message_bubble_padding_sides_inner"
+		android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 		android:textColor="?android:attr/textColorPrimary"
 		app:layout_constrainedWidth="true"
 		app:layout_constraintBottom_toTopOf="@+id/statusLayout"
@@ -52,9 +51,9 @@
 		android:id="@+id/statusLayout"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 		android:layout_marginLeft="@dimen/message_bubble_padding_sides_inner"
 		android:layout_marginRight="@dimen/message_bubble_padding_sides_inner"
+		android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 		android:orientation="horizontal"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"

briar-android/src/main/res/layout/list_item_conversation_msg_out.xml

@@ -1,7 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This is needed to right-align message bubble in RecyclerView -->
-<FrameLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?><!-- This is needed to right-align message bubble in RecyclerView -->
+<FrameLayout 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"
@@ -12,12 +10,12 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="right|end"
-		android:layout_marginBottom="@dimen/message_bubble_margin"
-		android:layout_marginEnd="@dimen/message_bubble_margin_tail"
-		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
-		android:layout_marginRight="@dimen/message_bubble_margin_tail"
 		android:layout_marginStart="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
 		android:layout_marginTop="@dimen/message_bubble_margin"
+		android:layout_marginEnd="@dimen/message_bubble_margin_tail"
+		android:layout_marginRight="@dimen/message_bubble_margin_tail"
+		android:layout_marginBottom="@dimen/message_bubble_margin"
 		android:background="@drawable/msg_out"
 		android:elevation="@dimen/message_bubble_elevation">
 
@@ -41,10 +39,10 @@
 			style="@style/TextMessage"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 			android:layout_marginLeft="@dimen/message_bubble_padding_sides_inner"
-			android:layout_marginRight="@dimen/message_bubble_padding_sides_inner"
 			android:layout_marginTop="@dimen/message_bubble_padding_top_inner"
+			android:layout_marginRight="@dimen/message_bubble_padding_sides_inner"
+			android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 			android:textColor="@color/briar_text_primary_inverse"
 			app:layout_constrainedWidth="true"
 			app:layout_constraintBottom_toTopOf="@+id/statusLayout"
@@ -58,9 +56,9 @@
 			android:id="@+id/statusLayout"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 			android:layout_marginLeft="@dimen/message_bubble_padding_sides_inner"
 			android:layout_marginRight="@dimen/message_bubble_padding_sides_inner"
+			android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
 			android:orientation="horizontal"
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintEnd_toEndOf="parent"

briar-android/src/main/res/layout/list_item_conversation_notice_in.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -13,10 +12,10 @@
 		style="@style/TextMessage"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
-		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
-		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 		android:layout_marginStart="@dimen/message_bubble_margin_tail"
+		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
+		android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 		android:background="@drawable/msg_in_top"
 		android:elevation="@dimen/message_bubble_elevation"
 		tools:text="Short message" />
@@ -25,11 +24,11 @@
 		android:id="@+id/layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/message_bubble_margin"
-		android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
-		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
-		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 		android:layout_marginStart="@dimen/message_bubble_margin_tail"
+		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
+		android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginBottom="@dimen/message_bubble_margin"
 		android:background="@drawable/notice_in_bottom"
 		android:elevation="@dimen/message_bubble_elevation">
 

briar-android/src/main/res/layout/list_item_conversation_notice_out.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -13,10 +12,10 @@
 		style="@style/TextMessage"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/message_bubble_margin_tail"
-		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
-		android:layout_marginRight="@dimen/message_bubble_margin_tail"
 		android:layout_marginStart="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginEnd="@dimen/message_bubble_margin_tail"
+		android:layout_marginRight="@dimen/message_bubble_margin_tail"
 		android:background="@drawable/msg_out_top"
 		android:elevation="@dimen/message_bubble_elevation"
 		android:textColor="@color/briar_text_primary_inverse"
@@ -26,11 +25,11 @@
 		android:id="@+id/layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/message_bubble_margin"
-		android:layout_marginEnd="@dimen/message_bubble_margin_tail"
-		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
-		android:layout_marginRight="@dimen/message_bubble_margin_tail"
 		android:layout_marginStart="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginEnd="@dimen/message_bubble_margin_tail"
+		android:layout_marginRight="@dimen/message_bubble_margin_tail"
+		android:layout_marginBottom="@dimen/message_bubble_margin"
 		android:background="@drawable/notice_out_bottom"
 		android:elevation="@dimen/message_bubble_elevation">
 
@@ -59,8 +58,8 @@
 			android:id="@+id/status"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="@dimen/margin_medium"
 			android:layout_marginStart="@dimen/margin_medium"
+			android:layout_marginLeft="@dimen/margin_medium"
 			app:layout_constraintBottom_toBottomOf="@+id/time"
 			app:layout_constraintStart_toEndOf="@+id/time"
 			app:layout_constraintTop_toTopOf="@+id/time"

briar-android/src/main/res/layout/list_item_conversation_request.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -13,10 +12,10 @@
 		style="@style/TextMessage"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
-		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
-		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 		android:layout_marginStart="@dimen/message_bubble_margin_tail"
+		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
+		android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 		android:background="@drawable/msg_in_top"
 		android:elevation="@dimen/message_bubble_elevation"
 		android:textColor="?android:attr/textColorPrimary"
@@ -26,11 +25,11 @@
 		android:id="@+id/layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/message_bubble_margin"
-		android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
-		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
-		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 		android:layout_marginStart="@dimen/message_bubble_margin_tail"
+		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
+		android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginBottom="@dimen/message_bubble_margin"
 		android:background="@drawable/notice_in_bottom"
 		android:elevation="@dimen/message_bubble_elevation">
 

briar-android/src/main/res/layout/list_item_crash.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -10,8 +9,8 @@
 		android:id="@+id/include_in_report"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginLeft="@dimen/margin_medium"
 		android:layout_marginStart="@dimen/margin_medium"
+		android:layout_marginLeft="@dimen/margin_medium"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_large"
 		app:layout_constraintEnd_toEndOf="parent"

briar-android/src/main/res/layout/list_item_forum.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -11,8 +10,8 @@
 		android:id="@+id/avatarView"
 		android:layout_width="@dimen/listitem_picture_frame_size"
 		android:layout_height="@dimen/listitem_picture_frame_size"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		app:layout_constraintBottom_toTopOf="@+id/divider"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent" />
@@ -21,11 +20,11 @@
 		android:id="@+id/forumNameView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginTop="@dimen/listitem_horizontal_margin"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_medium"
 		app:layout_constraintEnd_toEndOf="parent"
@@ -37,9 +36,9 @@
 		android:id="@+id/postCountView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
+		android:layout_marginTop="@dimen/margin_medium"
 		android:layout_marginEnd="8dp"
 		android:layout_marginRight="8dp"
-		android:layout_marginTop="@dimen/margin_medium"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintEnd_toStartOf="@+id/dateView"
@@ -63,8 +62,8 @@
 		android:id="@+id/divider"
 		style="@style/Divider.ThreadItem"
 		android:layout_width="0dp"
-		android:layout_marginLeft="@dimen/margin_medium"
 		android:layout_marginStart="@dimen/margin_medium"
+		android:layout_marginLeft="@dimen/margin_medium"
 		android:layout_marginTop="@dimen/listitem_horizontal_margin"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"

briar-android/src/main/res/layout/list_item_group.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -32,9 +31,9 @@
 		android:id="@+id/creatorView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
+		android:layout_marginTop="@dimen/margin_small"
 		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
 		android:layout_marginRight="@dimen/listitem_horizontal_margin"
-		android:layout_marginTop="@dimen/margin_small"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintEnd_toEndOf="parent"
@@ -46,11 +45,11 @@
 		android:id="@+id/messageCountView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginTop="@dimen/margin_medium"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintEnd_toStartOf="@+id/dateView"
@@ -76,11 +75,11 @@
 		android:id="@+id/statusView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginTop="@dimen/margin_medium"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorTertiary"
 		app:layout_constraintEnd_toStartOf="@+id/removeButton"
 		app:layout_constraintLeft_toRightOf="@+id/avatarView"
@@ -104,8 +103,8 @@
 		android:id="@+id/divider"
 		style="@style/Divider.ThreadItem"
 		android:layout_width="0dp"
-		android:layout_marginLeft="@dimen/margin_medium"
 		android:layout_marginStart="@dimen/margin_medium"
+		android:layout_marginLeft="@dimen/margin_medium"
 		android:layout_marginTop="@dimen/listitem_horizontal_margin"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/avatarView"

briar-android/src/main/res/layout/list_item_group_join_notice.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	android:id="@+id/layout"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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/layout"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:background="@drawable/list_item_thread_background">

briar-android/src/main/res/layout/list_item_group_member.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -31,8 +30,8 @@
 		android:id="@+id/creatorView"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginLeft="40dp"
 		android:layout_marginStart="40dp"
+		android:layout_marginLeft="40dp"
 		android:layout_marginTop="@dimen/margin_small"
 		android:text="@string/groups_member_created_you"
 		android:textColor="?android:attr/textColorSecondary"
@@ -43,8 +42,8 @@
 	<View
 		android:id="@+id/divider"
 		style="@style/Divider.ContactList"
-		android:layout_marginLeft="36dp"
 		android:layout_marginStart="36dp"
+		android:layout_marginLeft="36dp"
 		android:layout_marginTop="@dimen/margin_medium"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintStart_toStartOf="parent"

briar-android/src/main/res/layout/list_item_image.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageView
-	android:id="@+id/imageView"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/imageView"
 	android:layout_width="@dimen/message_bubble_image_default"
 	android:layout_height="@dimen/message_bubble_image_default"
 	android:scaleType="centerCrop"

briar-android/src/main/res/layout/list_item_image_preview.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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="wrap_content"

briar-android/src/main/res/layout/list_item_image_preview_single.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"

briar-android/src/main/res/layout/list_item_invitations.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -19,8 +18,8 @@
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_margin="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_medium"
 		app:layout_constraintEnd_toEndOf="parent"
@@ -32,9 +31,9 @@
 		android:id="@+id/sharedByView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
+		android:layout_marginTop="@dimen/margin_medium"
 		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
 		android:layout_marginRight="@dimen/listitem_horizontal_margin"
-		android:layout_marginTop="@dimen/margin_medium"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintEnd_toEndOf="parent"
@@ -46,11 +45,11 @@
 		android:id="@+id/forumSubscribedView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginTop="@dimen/margin_medium"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:text="@string/forum_invitation_exists"
 		android:textColor="?android:attr/textColorTertiary"
 		android:textSize="@dimen/text_size_small"

briar-android/src/main/res/layout/list_item_pending_contact.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	android:id="@+id/linearLayout4"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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/linearLayout4"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content">
 
@@ -11,10 +10,10 @@
 		android:id="@+id/avatar"
 		android:layout_width="@dimen/listitem_picture_frame_size"
 		android:layout_height="@dimen/listitem_picture_frame_size"
-		android:layout_marginBottom="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginTop="@dimen/listitem_horizontal_margin"
+		android:layout_marginBottom="@dimen/listitem_horizontal_margin"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent" />
 
@@ -22,8 +21,8 @@
 		android:id="@+id/name"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginLeft="@dimen/margin_large"
 		android:layout_marginStart="@dimen/margin_large"
+		android:layout_marginLeft="@dimen/margin_large"
 		android:layout_marginTop="@dimen/margin_large"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_medium"
@@ -52,9 +51,9 @@
 		android:id="@+id/status"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
+		android:layout_marginTop="8dp"
 		android:layout_marginEnd="16dp"
 		android:layout_marginRight="16dp"
-		android:layout_marginTop="8dp"
 		android:text="@string/adding_contact_failed"
 		app:layout_constrainedWidth="true"
 		app:layout_constraintBottom_toTopOf="@+id/divider"
@@ -67,9 +66,9 @@
 		android:id="@+id/time"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
+		android:layout_marginTop="0dp"
 		android:layout_marginEnd="@dimen/margin_large"
 		android:layout_marginRight="@dimen/margin_large"
-		android:layout_marginTop="0dp"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintBottom_toTopOf="@+id/divider"
@@ -83,8 +82,8 @@
 		android:id="@+id/divider"
 		style="@style/Divider.ContactList"
 		android:layout_width="0dp"
-		android:layout_marginLeft="8dp"
 		android:layout_marginStart="8dp"
+		android:layout_marginLeft="8dp"
 		android:layout_marginTop="@dimen/margin_large"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/avatar"

briar-android/src/main/res/layout/list_item_revealable_contact.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -22,11 +21,11 @@
 		android:id="@+id/nameView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginTop="@dimen/listitem_vertical_margin"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_medium"
 		app:layout_constraintEnd_toStartOf="@+id/checkBox"
@@ -38,8 +37,8 @@
 		android:id="@+id/visibilityView"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginTop="4dp"
 		android:src="@drawable/ic_visibility"
 		app:layout_constraintStart_toEndOf="@+id/avatarView"
@@ -51,11 +50,11 @@
 		android:id="@+id/infoView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/listitem_vertical_margin"
-		android:layout_marginEnd="@dimen/margin_small"
-		android:layout_marginLeft="@dimen/margin_small"
-		android:layout_marginRight="@dimen/margin_small"
 		android:layout_marginStart="@dimen/margin_small"
+		android:layout_marginLeft="@dimen/margin_small"
+		android:layout_marginEnd="@dimen/margin_small"
+		android:layout_marginRight="@dimen/margin_small"
+		android:layout_marginBottom="@dimen/listitem_vertical_margin"
 		android:text="@string/groups_reveal_visible"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
@@ -79,8 +78,8 @@
 		android:id="@+id/divider"
 		style="@style/Divider.ContactList"
 		android:layout_width="0dp"
-		android:layout_marginLeft="@dimen/margin_medium"
 		android:layout_marginStart="@dimen/margin_medium"
+		android:layout_marginLeft="@dimen/margin_medium"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintStart_toEndOf="@id/avatarView" />
 

briar-android/src/main/res/layout/list_item_rss_feed.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
@@ -11,8 +10,8 @@
 		android:id="@+id/titleView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginTop="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_medium"
@@ -48,10 +47,10 @@
 		android:id="@+id/authorView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/margin_small"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/margin_small"
+		android:layout_marginLeft="@dimen/margin_small"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintBaseline_toBaselineOf="@+id/author"
@@ -74,10 +73,10 @@
 		android:id="@+id/importedView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/margin_small"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/margin_small"
+		android:layout_marginLeft="@dimen/margin_small"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintBaseline_toBaselineOf="@+id/imported"
@@ -100,10 +99,10 @@
 		android:id="@+id/updatedView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/margin_small"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/margin_small"
+		android:layout_marginLeft="@dimen/margin_small"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintBottom_toBottomOf="@+id/updated"
@@ -115,11 +114,11 @@
 		android:id="@+id/descriptionView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginTop="@dimen/margin_medium"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintEnd_toEndOf="parent"

briar-android/src/main/res/layout/list_item_selectable_contact.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-	android:id="@+id/linearLayout2"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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/linearLayout2"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:background="?attr/selectableItemBackground">
@@ -23,11 +22,11 @@
 		android:id="@+id/nameView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		android:layout_marginTop="@dimen/listitem_horizontal_margin"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_medium"
 		app:layout_constraintBottom_toTopOf="@+id/infoView"
@@ -42,11 +41,11 @@
 		android:id="@+id/infoView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/listitem_horizontal_margin"
-		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
+		android:layout_marginBottom="@dimen/listitem_horizontal_margin"
 		android:maxLines="2"
 		android:text="@string/forum_invitation_already_sharing"
 		android:textColor="?android:attr/textColorTertiary"
@@ -71,8 +70,8 @@
 		android:id="@+id/divider"
 		style="@style/Divider.ContactList"
 		android:layout_width="0dp"
-		android:layout_marginLeft="@dimen/margin_medium"
 		android:layout_marginStart="@dimen/margin_medium"
+		android:layout_marginLeft="@dimen/margin_medium"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintStart_toEndOf="@id/avatarView" />
 

briar-android/src/main/res/layout/list_item_thread.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -81,11 +80,11 @@
 			android:id="@+id/author"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:paddingEnd="@dimen/margin_medium"
-			android:paddingLeft="@dimen/margin_medium"
-			android:paddingRight="@dimen/margin_medium"
 			android:paddingStart="@dimen/margin_medium"
+			android:paddingLeft="@dimen/margin_medium"
 			android:paddingTop="@dimen/margin_medium"
+			android:paddingEnd="@dimen/margin_medium"
+			android:paddingRight="@dimen/margin_medium"
 			app:layout_constraintBottom_toBottomOf="@+id/text"
 			app:layout_constraintEnd_toStartOf="@+id/btn_reply"
 			app:layout_constraintStart_toStartOf="parent"
@@ -98,10 +97,10 @@
 			style="@style/BriarButtonFlat.Positive.Tiny"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:paddingEnd="@dimen/margin_medium"
-			android:paddingLeft="@dimen/margin_medium"
-			android:paddingRight="@dimen/margin_medium"
 			android:paddingStart="@dimen/margin_medium"
+			android:paddingLeft="@dimen/margin_medium"
+			android:paddingEnd="@dimen/margin_medium"
+			android:paddingRight="@dimen/margin_medium"
 			android:text="@string/btn_reply"
 			android:textSize="@dimen/text_size_tiny"
 			app:layout_constraintEnd_toEndOf="parent"

briar-android/src/main/res/layout/list_item_transport.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"

briar-android/src/main/res/layout/navigation_header.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="85dp"
@@ -11,11 +10,11 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="bottom|start"
-		android:layout_marginBottom="@dimen/margin_medium"
-		android:layout_marginEnd="@dimen/margin_medium"
-		android:layout_marginLeft="@dimen/margin_medium"
-		android:layout_marginRight="@dimen/margin_medium"
 		android:layout_marginStart="@dimen/margin_medium"
+		android:layout_marginLeft="@dimen/margin_medium"
+		android:layout_marginEnd="@dimen/margin_medium"
+		android:layout_marginRight="@dimen/margin_medium"
+		android:layout_marginBottom="@dimen/margin_medium"
 		android:contentDescription="@string/app_name"
 		android:src="@drawable/navigation_drawer_header" />
 

briar-android/src/main/res/layout/navigation_menu.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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="wrap_content"

briar-android/src/main/res/layout/power_view.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<merge 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"
@@ -11,11 +10,11 @@
 		android:id="@+id/textView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/margin_large"
-		android:layout_marginLeft="@dimen/margin_large"
-		android:layout_marginRight="@dimen/margin_large"
 		android:layout_marginStart="@dimen/margin_large"
+		android:layout_marginLeft="@dimen/margin_large"
 		android:layout_marginTop="@dimen/margin_medium"
+		android:layout_marginEnd="@dimen/margin_large"
+		android:layout_marginRight="@dimen/margin_large"
 		android:textSize="@dimen/text_size_medium"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"

briar-android/src/main/res/layout/preference_switch_compat.xml

@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Needed for SwitchPreference on Android 4 (API < 21)-->
-<androidx.appcompat.widget.SwitchCompat
-	android:id="@android:id/switch_widget"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?><!-- Needed for SwitchPreference on Android 4 (API < 21)-->
+<androidx.appcompat.widget.SwitchCompat xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@android:id/switch_widget"
 	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
 	android:background="@null"

briar-android/src/main/res/layout/preferences_category.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView
-	android:id="@android:id/title"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@android:id/title"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:background="@color/preference_category_background"

briar-android/src/main/res/layout/qr_code_view.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	tools:showIn="@layout/fragment_keyagreement_qr">
 

briar-android/src/main/res/layout/splash.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 

briar-android/src/main/res/layout/text_avatar_view.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	tools:showIn="@layout/list_item_forum">
 
@@ -17,9 +16,9 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center"
+		android:layout_marginTop="@dimen/listitem_picture_frame_offset_vertical"
 		android:layout_marginEnd="@dimen/listitem_picture_frame_offset_horizontal"
 		android:layout_marginRight="@dimen/listitem_picture_frame_offset_horizontal"
-		android:layout_marginTop="@dimen/listitem_picture_frame_offset_vertical"
 		android:maxLength="1"
 		android:shadowColor="@color/forum_avatar_shadow"
 		android:shadowDx="0"

briar-android/src/main/res/layout/text_input_view.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<merge 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"

briar-android/src/main/res/layout/text_input_view_large.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<merge 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"
@@ -11,11 +10,11 @@
 		android:id="@+id/input_layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginEnd="@dimen/margin_medium"
-		android:layout_marginLeft="@dimen/margin_medium"
-		android:layout_marginRight="@dimen/margin_medium"
 		android:layout_marginStart="@dimen/margin_medium"
+		android:layout_marginLeft="@dimen/margin_medium"
 		android:layout_marginTop="@dimen/margin_medium"
+		android:layout_marginEnd="@dimen/margin_medium"
+		android:layout_marginRight="@dimen/margin_medium"
 		android:elevation="@dimen/cardview_default_elevation"
 		android:minHeight="@dimen/text_input_height"
 		app:cardBackgroundColor="@color/card_background"
@@ -34,10 +33,10 @@
 	<Button
 		android:id="@+id/compositeSendButton"
 		style="@style/BriarButton"
-		android:layout_marginEnd="@dimen/margin_small"
-		android:layout_marginLeft="@dimen/margin_small"
-		android:layout_marginRight="@dimen/margin_small"
 		android:layout_marginStart="@dimen/margin_small"
+		android:layout_marginLeft="@dimen/margin_small"
+		android:layout_marginEnd="@dimen/margin_small"
+		android:layout_marginRight="@dimen/margin_small"
 		tools:text="@string/send" />
 
 </merge>

briar-android/src/main/res/layout/toolbar.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.AppBarLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"

briar-android/src/main/res/layout/transports_list.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"

briar-android/src/main/res/layout/unread_message_button.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<merge 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"
 	tools:showIn="@layout/activity_threaded_conversation">
@@ -17,9 +16,9 @@
 		android:layout_width="wrap_content"
 		android:layout_height="@dimen/unread_bubble_size"
 		android:layout_gravity="right|end|top"
+		android:layout_marginTop="10dp"
 		android:layout_marginEnd="5dp"
 		android:layout_marginRight="5dp"
-		android:layout_marginTop="10dp"
 		android:background="@drawable/bubble"
 		android:elevation="7dp"
 		android:gravity="center"

briar-android/src/main/res/layout/view_composite_send_button.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<merge 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="@dimen/text_input_height"