From a8fc3d2b2c58f3182fc7a8cec4dfe91e0408f5eb Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 30 Apr 2019 17:00:34 +0200
Subject: [PATCH 1/9] gitlab-ci: output versions for base 'tools' and
 'emulator' packages

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a8cdb0c5e..c7b81c15b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,7 +79,8 @@ errorprone:
           unzip -qq -d $ANDROID_HOME emulator-linux-5264690.zip;
           set +x;
       fi
-    - grep Revision $ANDROID_HOME/emulator/source.properties
+    - grep -v '^License' $ANDROID_HOME/tools/source.properties
+                         $ANDROID_HOME/emulator/source.properties
 
     - alias sdkmanager
     - echo y | sdkmanager "platforms;android-$AVD_SDK" > /dev/null

From 40c52821fa8be88a1532a78742e2ea20ceeba018 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 6 May 2019 10:50:44 +0200
Subject: [PATCH 2/9] standardized code format for all swap layout XML

---
 .../res/layout-sw480dp/start_swap_header.xml  |  51 ++--
 app/src/full/res/layout/start_swap_header.xml |  11 +-
 app/src/full/res/layout/swap_activity.xml     |  24 +-
 .../full/res/layout/swap_app_list_item.xml    | 152 +++++-----
 app/src/full/res/layout/swap_blank.xml        | 272 +++++++++---------
 .../full/res/layout/swap_confirm_receive.xml  |  35 +--
 app/src/full/res/layout/swap_connecting.xml   |  26 +-
 .../full/res/layout/swap_initial_loading.xml  |  37 +--
 app/src/full/res/layout/swap_join_wifi.xml    |  19 +-
 app/src/full/res/layout/swap_nfc.xml          |  15 +-
 .../full/res/layout/swap_peer_list_item.xml   |  62 ++--
 app/src/full/res/layout/swap_wifi_qr.xml      |  30 +-
 12 files changed, 370 insertions(+), 364 deletions(-)

diff --git a/app/src/full/res/layout-sw480dp/start_swap_header.xml b/app/src/full/res/layout-sw480dp/start_swap_header.xml
index a3163d65f..39c24a221 100644
--- a/app/src/full/res/layout-sw480dp/start_swap_header.xml
+++ b/app/src/full/res/layout-sw480dp/start_swap_header.xml
@@ -1,32 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/header"
-    android:layout_width="match_parent"
-    android:layout_height="130dp"
-    android:layout_alignParentTop="true"
-    tools:showIn="@layout/swap_blank">
+<RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/header"
+        android:layout_width="match_parent"
+        android:layout_height="130dp"
+        android:layout_alignParentTop="true"
+        tools:showIn="@layout/swap_blank">
 
     <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop"
-        android:src="@drawable/swap_start_header" />
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            android:src="@drawable/swap_start_header"/>
 
     <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_alignParentBottom="true"
-        android:padding="20dp"
-        android:paddingLeft="30dp"
-        android:paddingRight="30dp"
-        android:paddingEnd="30dp"
-        android:gravity="center"
-        android:textAlignment="center"
-        android:text="@string/swap_intro"
-        android:textColor="@android:color/white"
-        android:textSize="18sp"
-        tools:ignore="UnusedAttribute" />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_alignParentBottom="true"
+            android:padding="20dp"
+            android:paddingLeft="30dp"
+            android:paddingRight="30dp"
+            android:paddingEnd="30dp"
+            android:gravity="center"
+            android:textAlignment="center"
+            android:text="@string/swap_intro"
+            android:textColor="@android:color/white"
+            android:textSize="18sp"
+            tools:ignore="UnusedAttribute"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/full/res/layout/start_swap_header.xml b/app/src/full/res/layout/start_swap_header.xml
index 2f8a78fdc..296f97286 100644
--- a/app/src/full/res/layout/start_swap_header.xml
+++ b/app/src/full/res/layout/start_swap_header.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/header"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_alignParentTop="true">
+<RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true">
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/full/res/layout/swap_activity.xml b/app/src/full/res/layout/swap_activity.xml
index 8bda77a4c..517f6621e 100644
--- a/app/src/full/res/layout/swap_activity.xml
+++ b/app/src/full/res/layout/swap_activity.xml
@@ -5,20 +5,20 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
-    
+
     <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:titleTextAppearance="@style/SwapTheme.Wizard.Text"
-        titleTextAppearance="@style/SwapTheme.Wizard.Text"
-        android:minHeight="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        tools:ignore="UnusedAttribute" />
+            android:id="@+id/toolbar"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:titleTextAppearance="@style/SwapTheme.Wizard.Text"
+            titleTextAppearance="@style/SwapTheme.Wizard.Text"
+            android:minHeight="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            tools:ignore="UnusedAttribute"/>
 
     <FrameLayout
-        android:id="@+id/fragment_container"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent" />
+            android:id="@+id/fragment_container"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/full/res/layout/swap_app_list_item.xml b/app/src/full/res/layout/swap_app_list_item.xml
index 84aedf51c..cbe716ff7 100644
--- a/app/src/full/res/layout/swap_app_list_item.xml
+++ b/app/src/full/res/layout/swap_app_list_item.xml
@@ -1,96 +1,96 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
-    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:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingBottom="2dip"
-    android:paddingTop="2dip">
+        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:minHeight="?android:attr/listPreferredItemHeight"
+        android:paddingBottom="2dip"
+        android:paddingTop="2dip">
 
     <ImageView
-        android:id="@android:id/icon"
-        android:layout_width="48dip"
-        android:layout_height="48dip"
-        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="6dip"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"
-        tools:src="@drawable/ic_launcher" />
+            android:id="@android:id/icon"
+            android:layout_width="48dip"
+            android:layout_height="48dip"
+            android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+            android:layout_marginLeft="10dp"
+            android:layout_marginTop="6dip"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentLeft="true"
+            tools:src="@drawable/ic_launcher"/>
 
     <LinearLayout
-        android:id="@+id/button_or_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_centerInParent="true"
-        android:orientation="vertical"
-        android:gravity="end"
-        android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:layout_marginRight="10dp">
+            android:id="@+id/button_or_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_centerInParent="true"
+            android:orientation="vertical"
+            android:gravity="end"
+            android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
+            android:layout_marginRight="10dp">
 
         <Button
-            android:id="@+id/btn_install"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:backgroundTint="@color/swap_light_blue"
-            android:textColor="@android:color/white"
-            android:maxEms="10"
-            android:ellipsize="end"
-            android:singleLine="true"
-            android:text="@string/menu_install"
-            tools:ignore="UnusedAttribute" />
+                android:id="@+id/btn_install"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:backgroundTint="@color/swap_light_blue"
+                android:textColor="@android:color/white"
+                android:maxEms="10"
+                android:ellipsize="end"
+                android:singleLine="true"
+                android:text="@string/menu_install"
+                tools:ignore="UnusedAttribute"/>
 
         <TextView
-            android:id="@+id/status_installed"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textStyle="italic"
-            android:text="@string/app_installed" />
+                android:id="@+id/status_installed"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textStyle="italic"
+                android:text="@string/app_installed"/>
 
         <TextView
-            android:id="@+id/status_incompatible"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textStyle="italic"
-            android:textColor="@color/swap_incompatible"
-            android:text="@string/app_incompatible" />
+                android:id="@+id/status_incompatible"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textStyle="italic"
+                android:textColor="@color/swap_incompatible"
+                android:text="@string/app_incompatible"/>
 
     </LinearLayout>
 
     <TextView
-        android:id="@+id/name"
-        android:layout_toEndOf="@android:id/icon"
-        android:layout_toRightOf="@android:id/icon"
-        android:layout_toStartOf="@+id/button_or_text"
-        android:layout_toLeftOf="@+id/button_or_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="6dip"
-        android:layout_marginBottom="6dip"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        tools:text="F-Droid" />
+            android:id="@+id/name"
+            android:layout_toEndOf="@android:id/icon"
+            android:layout_toRightOf="@android:id/icon"
+            android:layout_toStartOf="@+id/button_or_text"
+            android:layout_toLeftOf="@+id/button_or_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+            android:layout_marginLeft="10dp"
+            android:layout_marginTop="6dip"
+            android:layout_marginBottom="6dip"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            tools:text="F-Droid"/>
 
     <ProgressBar
-        android:id="@+id/progress"
-        android:visibility="gone"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:indeterminate="true"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_toEndOf="@android:id/icon"
-        android:paddingStart="5dp"
-        android:paddingLeft="5dp"
-        android:paddingEnd="5dp"
-        android:paddingRight="5dp"
-        android:layout_toRightOf="@android:id/icon"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_below="@+id/name"
-        />
+            android:id="@+id/progress"
+            android:visibility="gone"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:indeterminate="true"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_toEndOf="@android:id/icon"
+            android:paddingStart="5dp"
+            android:paddingLeft="5dp"
+            android:paddingEnd="5dp"
+            android:paddingRight="5dp"
+            android:layout_toRightOf="@android:id/icon"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
+            android:layout_below="@+id/name"
+    />
 
 </RelativeLayout>
diff --git a/app/src/full/res/layout/swap_blank.xml b/app/src/full/res/layout/swap_blank.xml
index 55493c486..47106d40a 100644
--- a/app/src/full/res/layout/swap_blank.xml
+++ b/app/src/full/res/layout/swap_blank.xml
@@ -5,205 +5,205 @@
      http://stackoverflow.com/questions/27449776/conflicting-lint-messages-regarding-paddingstart-usage?lq=1
      -->
 <org.fdroid.fdroid.views.swap.StartSwapView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".views.swap.SwapWorkflowActivity">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".views.swap.SwapWorkflowActivity">
 
     <!-- Misc header -->
-    <include layout="@layout/start_swap_header" />
+    <include layout="@layout/start_swap_header"/>
 
     <!-- Bluetooth swap status + toggle -->
     <LinearLayout
-        android:id="@+id/bluetooth_info"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/header"
-        android:padding="10dp"
-        android:orientation="horizontal">
+            android:id="@+id/bluetooth_info"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/header"
+            android:padding="10dp"
+            android:orientation="horizontal">
 
         <ImageView
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:tint="@color/swap_grey_icon"
-            android:src="@drawable/ic_bluetooth_white" />
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:tint="@color/swap_grey_icon"
+                android:src="@drawable/ic_bluetooth_white"/>
 
         <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingLeft="15dp"
-            android:paddingStart="15dp"
-            android:layout_weight="1.00"
-            tools:ignore="RtlSymmetry">
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingLeft="15dp"
+                android:paddingStart="15dp"
+                android:layout_weight="1.00"
+                tools:ignore="RtlSymmetry">
 
             <TextView
-                android:id="@+id/bluetooth_visible"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                tools:text="@string/swap_visible_bluetooth"
-                android:textSize="18sp" />
+                    android:id="@+id/bluetooth_visible"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:text="@string/swap_visible_bluetooth"
+                    android:textSize="18sp"/>
 
             <TextView
-                android:id="@+id/device_id_bluetooth"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                tools:text="SP-120"
-                android:textColor="@color/swap_light_text" />
+                    android:id="@+id/device_id_bluetooth"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:text="SP-120"
+                    android:textColor="@color/swap_light_text"/>
 
         </LinearLayout>
 
         <android.support.v7.widget.SwitchCompat
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:enabled="false"
-            android:id="@+id/switch_bluetooth" />
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:enabled="false"
+                android:id="@+id/switch_bluetooth"/>
 
     </LinearLayout>
 
     <!-- WiFi swap status + toggle -->
     <LinearLayout
-        android:id="@+id/wifi_info"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/bluetooth_info"
-        android:padding="10dp"
-        android:orientation="horizontal">
+            android:id="@+id/wifi_info"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/bluetooth_info"
+            android:padding="10dp"
+            android:orientation="horizontal">
 
         <ImageView
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:tint="@color/swap_grey_icon"
-            android:src="@drawable/ic_network_wifi_white" />
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:tint="@color/swap_grey_icon"
+                android:src="@drawable/ic_network_wifi_white"/>
 
         <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingLeft="15dp"
-            android:paddingStart="15dp"
-            android:layout_weight="1.00"
-            tools:ignore="RtlSymmetry">
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingLeft="15dp"
+                android:paddingStart="15dp"
+                android:layout_weight="1.00"
+                tools:ignore="RtlSymmetry">
 
             <TextView
-                android:id="@+id/wifi_visible"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                tools:text="@string/swap_not_visible_wifi"
-                android:textSize="18sp" />
+                    android:id="@+id/wifi_visible"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:text="@string/swap_not_visible_wifi"
+                    android:textSize="18sp"/>
 
             <TextView
-                android:id="@+id/device_id_wifi"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/swap_wifi_device_name"
-                android:textColor="@color/swap_light_text" />
+                    android:id="@+id/device_id_wifi"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/swap_wifi_device_name"
+                    android:textColor="@color/swap_light_text"/>
 
             <TextView
-                android:id="@+id/wifi_network"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                tools:text="wifi network name"
-                android:textColor="@color/swap_bright_blue"
-                android:textSize="16sp" />
+                    android:id="@+id/wifi_network"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:text="wifi network name"
+                    android:textColor="@color/swap_bright_blue"
+                    android:textSize="16sp"/>
 
         </LinearLayout>
 
         <android.support.v7.widget.SwitchCompat
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:enabled="false"
-            android:id="@+id/switch_wifi" />
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:enabled="false"
+                android:id="@+id/switch_wifi"/>
 
     </LinearLayout>
 
     <!-- Feedback for "searching for nearby people..." -->
     <LinearLayout
-        android:id="@+id/feedback_searching"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/wifi_info"
-        android:paddingStart="20dp"
-        android:paddingEnd="20dp"
-        android:paddingBottom="5dp"
-        android:paddingTop="20dp">
+            android:id="@+id/feedback_searching"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/wifi_info"
+            android:paddingStart="20dp"
+            android:paddingEnd="20dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="20dp">
 
         <TextView
-            android:id="@+id/text_people_nearby"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:text="@string/swap_people_nearby"
-            android:textColor="@color/swap_light_text"
-            android:layout_weight="1.00"/>
+                android:id="@+id/text_people_nearby"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:text="@string/swap_people_nearby"
+                android:textColor="@color/swap_light_text"
+                android:layout_weight="1.00"/>
 
         <ProgressBar
-            android:id="@+id/searching_people_nearby"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:indeterminate="true" />
+                android:id="@+id/searching_people_nearby"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:indeterminate="true"/>
 
     </LinearLayout>
 
 
     <!-- Buttons to help the user when they can't find any peers. Shown at bottom of relative layout -->
     <LinearLayout
-        android:id="@+id/cant_find_peers"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true">
+            android:id="@+id/cant_find_peers"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true">
 
         <Button
-            android:id="@+id/btn_send_fdroid"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawableLeft="@drawable/ic_fdroid_grey"
-            android:drawableStart="@drawable/ic_fdroid_grey"
-            android:text="@string/swap_send_fdroid"
-            android:drawablePadding="10dp"
-            android:paddingLeft="25dp"
-            android:paddingRight="25dp"
-            android:paddingEnd="25dp"
-            android:background="@android:color/transparent" />
+                android:id="@+id/btn_send_fdroid"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:drawableLeft="@drawable/ic_fdroid_grey"
+                android:drawableStart="@drawable/ic_fdroid_grey"
+                android:text="@string/swap_send_fdroid"
+                android:drawablePadding="10dp"
+                android:paddingLeft="25dp"
+                android:paddingRight="25dp"
+                android:paddingEnd="25dp"
+                android:background="@android:color/transparent"/>
 
         <Button
-            android:id="@+id/btn_qr_scanner"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawableLeft="@drawable/ic_qr_grey"
-            android:drawableStart="@drawable/ic_qr_grey"
-            android:text="@string/swap_scan_qr"
-            android:drawablePadding="10dp"
-            android:paddingLeft="25dp"
-            android:paddingRight="25dp"
-            android:paddingEnd="25dp"
-            android:background="@android:color/transparent" />
+                android:id="@+id/btn_qr_scanner"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:drawableLeft="@drawable/ic_qr_grey"
+                android:drawableStart="@drawable/ic_qr_grey"
+                android:text="@string/swap_scan_qr"
+                android:drawablePadding="10dp"
+                android:paddingLeft="25dp"
+                android:paddingRight="25dp"
+                android:paddingEnd="25dp"
+                android:background="@android:color/transparent"/>
 
     </LinearLayout>
 
     <!-- Heading for "can't find peers" -->
     <TextView
-        android:id="@+id/header_cant_find_peers"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/cant_find_peers"
-        android:text="@string/swap_cant_find_peers"
-        android:paddingLeft="20dp"
-        android:paddingStart="20dp"
-        android:paddingRight="20dp"
-        android:paddingEnd="20dp"
-        android:paddingTop="20dp"
-        android:textColor="@color/swap_light_text" />
+            android:id="@+id/header_cant_find_peers"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_above="@id/cant_find_peers"
+            android:text="@string/swap_cant_find_peers"
+            android:paddingLeft="20dp"
+            android:paddingStart="20dp"
+            android:paddingRight="20dp"
+            android:paddingEnd="20dp"
+            android:paddingTop="20dp"
+            android:textColor="@color/swap_light_text"/>
 
     <!-- List of all currently known peers (i.e. bluetooth and wifi devices that have been identified -->
     <ListView
-        android:id="@+id/list_people_nearby"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/feedback_searching"
-        android:layout_above="@id/header_cant_find_peers">
+            android:id="@+id/list_people_nearby"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/feedback_searching"
+            android:layout_above="@id/header_cant_find_peers">
 
     </ListView>
 
diff --git a/app/src/full/res/layout/swap_confirm_receive.xml b/app/src/full/res/layout/swap_confirm_receive.xml
index fb1c5fc26..92490da18 100644
--- a/app/src/full/res/layout/swap_confirm_receive.xml
+++ b/app/src/full/res/layout/swap_confirm_receive.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<org.fdroid.fdroid.views.swap.ConfirmReceive xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/swap_blue"
-    android:padding="18dp">
+<org.fdroid.fdroid.views.swap.ConfirmReceive
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/swap_blue"
+        android:padding="18dp">
     <!-- Padding is 32px * 0.56 = 18dip -->
 
     <ImageView
@@ -17,7 +18,7 @@
             android:layout_width="117.6dp"
             android:layout_height="117.6dp"
             android:layout_centerHorizontal="true"/>
-            <!-- 210 * 0.56 = 117.6 -->
+    <!-- 210 * 0.56 = 117.6 -->
 
     <TextView
             android:id="@+id/text_title"
@@ -27,10 +28,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="28sp"
-            android:lines="1" />
-            <!-- 60 * 0.56 = 33.6 -->
-            <!-- Temporarily making it smaller than 33.6 until we figure out how to
-             prevent line breaks on the hyphen in F-Droid. -->
+            android:lines="1"/>
+    <!-- 60 * 0.56 = 33.6 -->
+    <!-- Temporarily making it smaller than 33.6 until we figure out how to
+     prevent line breaks on the hyphen in F-Droid. -->
 
     <TextView
             android:id="@+id/text_description"
@@ -40,7 +41,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="25.75sp"/>
-            <!-- 46px * 0.56 = 25.76sp -->
+    <!-- 46px * 0.56 = 25.76sp -->
 
     <LinearLayout
             android:layout_width="wrap_content"
@@ -49,9 +50,9 @@
             android:layout_below="@+id/text_description"
             android:layout_centerInParent="true"
             android:layout_marginTop="45dp">
-            <!-- 80px * 0.56 = 45dp -->
+        <!-- 80px * 0.56 = 45dp -->
 
-            <!-- TODO: Remove associated style files style="@style/SwapTheme.Wizard.ReceiveSwap.Deny"-->
+        <!-- TODO: Remove associated style files style="@style/SwapTheme.Wizard.ReceiveSwap.Deny"-->
         <Button
                 android:id="@+id/no_button"
                 android:text="@string/no"
@@ -60,7 +61,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="25dp"
                 android:layout_marginRight="25dp"
-                tools:ignore="UnusedAttribute" />
+                tools:ignore="UnusedAttribute"/>
 
         <!-- TODO: Remove associated style files style="@style/SwapTheme.Wizard.ReceiveSwap.Confirm" -->
         <Button
@@ -69,7 +70,7 @@
                 android:backgroundTint="@color/swap_light_blue"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                tools:ignore="UnusedAttribute" />
+                tools:ignore="UnusedAttribute"/>
 
     </LinearLayout>
 
diff --git a/app/src/full/res/layout/swap_connecting.xml b/app/src/full/res/layout/swap_connecting.xml
index c9e319935..3075e7d3c 100644
--- a/app/src/full/res/layout/swap_connecting.xml
+++ b/app/src/full/res/layout/swap_connecting.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <org.fdroid.fdroid.views.swap.SwapConnecting
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
-        <TextView
+    <TextView
             android:id="@+id/heading"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -16,15 +16,15 @@
             android:textAlignment="center"
             android:gravity="center"
             tools:text="Connecting with Nexus 4"
-            tools:ignore="UnusedAttribute" />
+            tools:ignore="UnusedAttribute"/>
 
-        <ProgressBar
+    <ProgressBar
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:indeterminate="true"
-            android:layout_gravity="center" />
+            android:layout_gravity="center"/>
 
-        <TextView
+    <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:id="@+id/error"
@@ -34,9 +34,9 @@
             android:text="@string/swap_connection_misc_error"
             android:visibility="gone"
             android:padding="30dp"
-            tools:ignore="UnusedAttribute" />
+            tools:ignore="UnusedAttribute"/>
 
-        <Button
+    <Button
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/back"
@@ -45,6 +45,6 @@
             android:layout_gravity="center_horizontal"
             android:visibility="gone"
             android:text="@string/back"
-            tools:ignore="UnusedAttribute" />
+            tools:ignore="UnusedAttribute"/>
 
 </org.fdroid.fdroid.views.swap.SwapConnecting>
diff --git a/app/src/full/res/layout/swap_initial_loading.xml b/app/src/full/res/layout/swap_initial_loading.xml
index d1e169875..b1f2a5dab 100644
--- a/app/src/full/res/layout/swap_initial_loading.xml
+++ b/app/src/full/res/layout/swap_initial_loading.xml
@@ -1,26 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<org.fdroid.fdroid.views.swap.InitialLoadingView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/swap_blue"
-    android:paddingTop="38.8dp"> <!-- 69px * 96dpi / 160dpi -->
+<org.fdroid.fdroid.views.swap.InitialLoadingView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/swap_blue"
+        android:paddingTop="38.8dp"> <!-- 69px * 96dpi / 160dpi -->
 
     <ProgressBar
-        android:id="@+id/progress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        />
+            android:id="@+id/progress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+    />
 
     <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/loading"
-        android:textSize="18sp"
-        android:layout_below="@+id/progress"
-        android:textColor="@android:color/white"
-        android:layout_centerHorizontal="true" />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/loading"
+            android:textSize="18sp"
+            android:layout_below="@+id/progress"
+            android:textColor="@android:color/white"
+            android:layout_centerHorizontal="true"/>
 
 </org.fdroid.fdroid.views.swap.InitialLoadingView>
\ No newline at end of file
diff --git a/app/src/full/res/layout/swap_join_wifi.xml b/app/src/full/res/layout/swap_join_wifi.xml
index 8df458f7b..a17e3d655 100644
--- a/app/src/full/res/layout/swap_join_wifi.xml
+++ b/app/src/full/res/layout/swap_join_wifi.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<org.fdroid.fdroid.views.swap.JoinWifiView xmlns:android="http://schemas.android.com/apk/res/android"
-      android:orientation="vertical"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      xmlns:tools="http://schemas.android.com/tools"
-      android:background="@color/swap_blue"
-      tools:context=".views.swap.SwapWorkflowActivity">
+<org.fdroid.fdroid.views.swap.JoinWifiView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/swap_blue"
+        tools:context=".views.swap.SwapWorkflowActivity">
 
     <TextView
             android:layout_width="wrap_content"
@@ -24,7 +25,7 @@
             android:id="@+id/wifi_icon"
             android:src="@drawable/wifi"
             android:layout_below="@+id/text_description"
-            android:layout_centerHorizontal="true" />
+            android:layout_centerHorizontal="true"/>
 
     <!--
     <Button style="@style/SwapTheme.Wizard.OptionButton"
@@ -40,7 +41,7 @@
             android:id="@+id/wifi_ssid"
             style="@style/SwapTheme.Wizard.WifiSSID"
             android:layout_below="@id/wifi_icon"
-            android:layout_centerHorizontal="true" />
+            android:layout_centerHorizontal="true"/>
     <!--android:layout_above="@id/wifi_available_networks_prompt"-->
 
     <TextView
diff --git a/app/src/full/res/layout/swap_nfc.xml b/app/src/full/res/layout/swap_nfc.xml
index 572edfac0..0369ee921 100644
--- a/app/src/full/res/layout/swap_nfc.xml
+++ b/app/src/full/res/layout/swap_nfc.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<org.fdroid.fdroid.views.swap.NfcView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/swap_blue"
-    android:paddingTop="38.8dp"> <!-- 69px * 96dpi / 160dpi -->
+<org.fdroid.fdroid.views.swap.NfcView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/swap_blue"
+        android:paddingTop="38.8dp"> <!-- 69px * 96dpi / 160dpi -->
 
     <ImageView
             android:layout_width="wrap_content"
@@ -21,7 +22,7 @@
             style="@style/SwapTheme.Wizard.MainText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/icon_nfc" />
+            android:layout_below="@id/icon_nfc"/>
 
     <CheckBox
             android:id="@+id/checkbox_dont_show"
diff --git a/app/src/full/res/layout/swap_peer_list_item.xml b/app/src/full/res/layout/swap_peer_list_item.xml
index be779ce94..a284a3f2e 100644
--- a/app/src/full/res/layout/swap_peer_list_item.xml
+++ b/app/src/full/res/layout/swap_peer_list_item.xml
@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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="?attr/listPreferredItemHeight"
-    android:orientation="horizontal"
-    android:minHeight="?attr/listPreferredItemHeight"
-    android:paddingBottom="4dip"
-    android:paddingTop="4dip">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/listPreferredItemHeight"
+        android:orientation="horizontal"
+        android:minHeight="?attr/listPreferredItemHeight"
+        android:paddingBottom="4dip"
+        android:paddingTop="4dip">
 
     <RelativeLayout
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_marginLeft="?attr/listPreferredItemPaddingLeft"
-        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
-        android:layout_gravity="center_vertical">
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_marginLeft="?attr/listPreferredItemPaddingLeft"
+            android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+            android:layout_gravity="center_vertical">
 
         <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:src="@drawable/circle"
-            android:tint="@color/swap_light_grey_icon"/>
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@drawable/circle"
+                android:tint="@color/swap_light_grey_icon"/>
 
         <ImageView
-            android:id="@+id/icon"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_centerInParent="true"
-            tools:src="@drawable/ic_bluetooth_white" />
+                android:id="@+id/icon"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_centerInParent="true"
+                tools:src="@drawable/ic_bluetooth_white"/>
 
     </RelativeLayout>
 
     <TextView
-        android:id="@+id/peer_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginLeft="?attr/listPreferredItemPaddingLeft"
-        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
-        android:textSize="20sp"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        tools:text="Nexus 4" />
+            android:id="@+id/peer_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="?attr/listPreferredItemPaddingLeft"
+            android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+            android:textSize="20sp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            tools:text="Nexus 4"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/full/res/layout/swap_wifi_qr.xml b/app/src/full/res/layout/swap_wifi_qr.xml
index 44d64a6dc..b6d51594b 100644
--- a/app/src/full/res/layout/swap_wifi_qr.xml
+++ b/app/src/full/res/layout/swap_wifi_qr.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <org.fdroid.fdroid.views.swap.WifiQrView
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/swap_blue"
-    android:layout_height="match_parent"
-    android:layout_width="wrap_content">
+        xmlns:tools="http://schemas.android.com/tools"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:background="@color/swap_blue"
+        android:layout_height="match_parent"
+        android:layout_width="wrap_content">
 
     <LinearLayout android:orientation="vertical"
                   android:gravity="center"
@@ -20,10 +20,10 @@
                 tools:src="@drawable/swap_qr_example"/>
 
         <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/swap_scan_or_type_url"
-            style="@style/SwapTheme.Wizard.MainText"/>
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/swap_scan_or_type_url"
+                style="@style/SwapTheme.Wizard.MainText"/>
 
         <!--
         <Button style="@style/SwapTheme.Wizard.OptionButton"
@@ -45,12 +45,12 @@
                 android:id="@+id/btn_qr_scanner"/>
 
         <TextView
-            android:id="@+id/warning_qr_scanner"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/warning_scaning_qr_code"
-            android:visibility="gone"
-            style="@style/SwapTheme.Wizard.QRScanWarningText"/>
+                android:id="@+id/warning_qr_scanner"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/warning_scaning_qr_code"
+                android:visibility="gone"
+                style="@style/SwapTheme.Wizard.QRScanWarningText"/>
 
     </LinearLayout>
 

From 9aa73b95e492c06de5b134a30e870bb5d0edf20a Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 6 May 2019 11:39:03 +0200
Subject: [PATCH 3/9] rename SwapConnecting to ConnectingView to match standard

---
 .../{SwapConnecting.java => ConnectingView.java}     | 12 ++++++------
 app/src/full/res/layout/swap_connecting.xml          |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename app/src/full/java/org/fdroid/fdroid/views/swap/{SwapConnecting.java => ConnectingView.java} (94%)

diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapConnecting.java b/app/src/full/java/org/fdroid/fdroid/views/swap/ConnectingView.java
similarity index 94%
rename from app/src/full/java/org/fdroid/fdroid/views/swap/SwapConnecting.java
rename to app/src/full/java/org/fdroid/fdroid/views/swap/ConnectingView.java
index d35ea3492..1ec235d24 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapConnecting.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/ConnectingView.java
@@ -21,26 +21,26 @@ import org.fdroid.fdroid.UpdateService;
 import org.fdroid.fdroid.localrepo.SwapService;
 
 // TODO: Use this for the "Preparing local repo" dialog also.
-public class SwapConnecting extends LinearLayout implements SwapWorkflowActivity.InnerView {
+public class ConnectingView extends LinearLayout implements SwapWorkflowActivity.InnerView {
 
     @SuppressWarnings("unused")
-    private static final String TAG = "SwapConnecting";
+    private static final String TAG = "ConnectingView";
 
-    public SwapConnecting(Context context) {
+    public ConnectingView(Context context) {
         super(context);
     }
 
-    public SwapConnecting(Context context, AttributeSet attrs) {
+    public ConnectingView(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
     @TargetApi(11)
-    public SwapConnecting(Context context, AttributeSet attrs, int defStyleAttr) {
+    public ConnectingView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
     }
 
     @TargetApi(21)
-    public SwapConnecting(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+    public ConnectingView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
     }
 
diff --git a/app/src/full/res/layout/swap_connecting.xml b/app/src/full/res/layout/swap_connecting.xml
index 3075e7d3c..ea60adb97 100644
--- a/app/src/full/res/layout/swap_connecting.xml
+++ b/app/src/full/res/layout/swap_connecting.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<org.fdroid.fdroid.views.swap.SwapConnecting
+<org.fdroid.fdroid.views.swap.ConnectingView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         android:orientation="vertical"
@@ -47,4 +47,4 @@
             android:text="@string/back"
             tools:ignore="UnusedAttribute"/>
 
-</org.fdroid.fdroid.views.swap.SwapConnecting>
+</org.fdroid.fdroid.views.swap.ConnectingView>

From 68cc241bc05583ad37285a35b5f7b9f2144b656f Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 6 May 2019 12:35:30 +0200
Subject: [PATCH 4/9] rename ConfirmReceive to ConfirmReceiveView to match
 standard

---
 .../{ConfirmReceive.java => ConfirmReceiveView.java}  | 11 +++++------
 app/src/full/res/layout/swap_confirm_receive.xml      |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)
 rename app/src/full/java/org/fdroid/fdroid/views/swap/{ConfirmReceive.java => ConfirmReceiveView.java} (84%)

diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/ConfirmReceive.java b/app/src/full/java/org/fdroid/fdroid/views/swap/ConfirmReceiveView.java
similarity index 84%
rename from app/src/full/java/org/fdroid/fdroid/views/swap/ConfirmReceive.java
rename to app/src/full/java/org/fdroid/fdroid/views/swap/ConfirmReceiveView.java
index 2e23d4a05..d78857a87 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/ConfirmReceive.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/ConfirmReceiveView.java
@@ -10,29 +10,28 @@ import android.view.MenuInflater;
 import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.data.NewRepoConfig;
 import org.fdroid.fdroid.localrepo.SwapService;
 
-public class ConfirmReceive extends RelativeLayout implements SwapWorkflowActivity.InnerView {
+public class ConfirmReceiveView extends RelativeLayout implements SwapWorkflowActivity.InnerView {
 
     private NewRepoConfig config;
 
-    public ConfirmReceive(Context context) {
+    public ConfirmReceiveView(Context context) {
         super(context);
     }
 
-    public ConfirmReceive(Context context, AttributeSet attrs) {
+    public ConfirmReceiveView(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
-    public ConfirmReceive(Context context, AttributeSet attrs, int defStyleAttr) {
+    public ConfirmReceiveView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
     }
 
     @TargetApi(21)
-    public ConfirmReceive(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+    public ConfirmReceiveView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
     }
 
diff --git a/app/src/full/res/layout/swap_confirm_receive.xml b/app/src/full/res/layout/swap_confirm_receive.xml
index 92490da18..aa0dee9c0 100644
--- a/app/src/full/res/layout/swap_confirm_receive.xml
+++ b/app/src/full/res/layout/swap_confirm_receive.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<org.fdroid.fdroid.views.swap.ConfirmReceive
+<org.fdroid.fdroid.views.swap.ConfirmReceiveView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         android:orientation="vertical"
@@ -74,4 +74,4 @@
 
     </LinearLayout>
 
-</org.fdroid.fdroid.views.swap.ConfirmReceive>
+</org.fdroid.fdroid.views.swap.ConfirmReceiveView>

From 568abe9f3b19c772299ceacd47f98efc24640514 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 6 May 2019 11:57:18 +0200
Subject: [PATCH 5/9] rename swap_blank to swap_start_swap to match View name

---
 .../org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java    | 4 ++--
 app/src/full/res/layout-sw480dp/start_swap_header.xml         | 2 +-
 .../full/res/layout/{swap_blank.xml => swap_start_swap.xml}   | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename app/src/full/res/layout/{swap_blank.xml => swap_start_swap.xml} (100%)

diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
index c55d773b6..99000ac0d 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
@@ -349,7 +349,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
                 break;
             case SwapService.STEP_CONNECTING:
                 // TODO: Properly decide what to do here (i.e. returning to the activity after it was connecting)...
-                inflateInnerView(R.layout.swap_blank);
+                inflateInnerView(R.layout.swap_start_swap);
                 break;
         }
     }
@@ -414,7 +414,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
             }
         }
 
-        inflateInnerView(R.layout.swap_blank);
+        inflateInnerView(R.layout.swap_start_swap);
     }
 
     private void showConfirmSwap(@NonNull NewRepoConfig config) {
diff --git a/app/src/full/res/layout-sw480dp/start_swap_header.xml b/app/src/full/res/layout-sw480dp/start_swap_header.xml
index 39c24a221..049c2d4fe 100644
--- a/app/src/full/res/layout-sw480dp/start_swap_header.xml
+++ b/app/src/full/res/layout-sw480dp/start_swap_header.xml
@@ -6,7 +6,7 @@
         android:layout_width="match_parent"
         android:layout_height="130dp"
         android:layout_alignParentTop="true"
-        tools:showIn="@layout/swap_blank">
+        tools:showIn="@layout/swap_start_swap">
 
     <ImageView
             android:layout_width="match_parent"
diff --git a/app/src/full/res/layout/swap_blank.xml b/app/src/full/res/layout/swap_start_swap.xml
similarity index 100%
rename from app/src/full/res/layout/swap_blank.xml
rename to app/src/full/res/layout/swap_start_swap.xml

From 6a8f5fb4a7c756b993c9f320ced71a9ea38a6b32 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 6 May 2019 14:10:36 +0200
Subject: [PATCH 6/9] rename SwapAppsView things to "Swap Success"

---
 .../org/fdroid/fdroid/localrepo/SwapService.java     |  4 ++--
 .../org/fdroid/fdroid/views/swap/ConnectingView.java |  2 +-
 .../swap/{SwapAppsView.java => SwapSuccessView.java} | 12 ++++++------
 .../fdroid/views/swap/SwapWorkflowActivity.java      |  6 +++---
 app/src/full/res/layout/swap_success.xml             |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)
 rename app/src/full/java/org/fdroid/fdroid/views/swap/{SwapAppsView.java => SwapSuccessView.java} (97%)

diff --git a/app/src/full/java/org/fdroid/fdroid/localrepo/SwapService.java b/app/src/full/java/org/fdroid/fdroid/localrepo/SwapService.java
index a205ab066..db2206166 100644
--- a/app/src/full/java/org/fdroid/fdroid/localrepo/SwapService.java
+++ b/app/src/full/java/org/fdroid/fdroid/localrepo/SwapService.java
@@ -140,7 +140,7 @@ public class SwapService extends Service {
     public static final int STEP_SHOW_NFC = 4;
     public static final int STEP_WIFI_QR = 5;
     public static final int STEP_CONNECTING = 6;
-    public static final int STEP_SUCCESS = 7;
+    public static final int STEP_SWAP_SUCCESS = 7;
     public static final int STEP_CONFIRM_SWAP = 8;
 
     /**
@@ -276,7 +276,7 @@ public class SwapService extends Service {
      * This is the same as, e.g. {@link Context#getSystemService(String)}
      */
     @IntDef({STEP_INTRO, STEP_SELECT_APPS, STEP_JOIN_WIFI, STEP_SHOW_NFC, STEP_WIFI_QR,
-            STEP_CONNECTING, STEP_SUCCESS, STEP_CONFIRM_SWAP, STEP_INITIAL_LOADING})
+            STEP_CONNECTING, STEP_SWAP_SUCCESS, STEP_CONFIRM_SWAP, STEP_INITIAL_LOADING})
     @Retention(RetentionPolicy.SOURCE)
     public @interface SwapStep {
     }
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/ConnectingView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/ConnectingView.java
index 1ec235d24..bd71098dc 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/ConnectingView.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/ConnectingView.java
@@ -146,7 +146,7 @@ public class ConnectingView extends LinearLayout implements SwapWorkflowActivity
 
         @Override
         protected void onComplete() {
-            getActivity().showSwapConnected();
+            getActivity().showSwapSuccess();
         }
 
     }
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapAppsView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapSuccessView.java
similarity index 97%
rename from app/src/full/java/org/fdroid/fdroid/views/swap/SwapAppsView.java
rename to app/src/full/java/org/fdroid/fdroid/views/swap/SwapSuccessView.java
index 88ad58021..a0de37a5e 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapAppsView.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapSuccessView.java
@@ -55,25 +55,25 @@ import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
 
-public class SwapAppsView extends ListView implements
+public class SwapSuccessView extends ListView implements
         SwapWorkflowActivity.InnerView,
         LoaderManager.LoaderCallbacks<Cursor>,
         SearchView.OnQueryTextListener {
 
-    public SwapAppsView(Context context) {
+    public SwapSuccessView(Context context) {
         super(context);
     }
 
-    public SwapAppsView(Context context, AttributeSet attrs) {
+    public SwapSuccessView(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
-    public SwapAppsView(Context context, AttributeSet attrs, int defStyleAttr) {
+    public SwapSuccessView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
     }
 
     @TargetApi(21)
-    public SwapAppsView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+    public SwapSuccessView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
     }
 
@@ -165,7 +165,7 @@ public class SwapAppsView extends ListView implements
 
     @Override
     public int getStep() {
-        return SwapService.STEP_SUCCESS;
+        return SwapService.STEP_SWAP_SUCCESS;
     }
 
     @Override
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
index 99000ac0d..5c3beb660 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
@@ -344,8 +344,8 @@ public class SwapWorkflowActivity extends AppCompatActivity {
             case SwapService.STEP_WIFI_QR:
                 showWifiQr();
                 break;
-            case SwapService.STEP_SUCCESS:
-                showSwapConnected();
+            case SwapService.STEP_SWAP_SUCCESS:
+                showSwapSuccess();
                 break;
             case SwapService.STEP_CONNECTING:
                 // TODO: Properly decide what to do here (i.e. returning to the activity after it was connecting)...
@@ -545,7 +545,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
         inflateInnerView(R.layout.swap_send_fdroid);
     }
 
-    public void showSwapConnected() {
+    public void showSwapSuccess() {
         inflateInnerView(R.layout.swap_success);
     }
 
diff --git a/app/src/full/res/layout/swap_success.xml b/app/src/full/res/layout/swap_success.xml
index dce3336f6..e00d3c09c 100644
--- a/app/src/full/res/layout/swap_success.xml
+++ b/app/src/full/res/layout/swap_success.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<org.fdroid.fdroid.views.swap.SwapAppsView
+<org.fdroid.fdroid.views.swap.SwapSuccessView
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-</org.fdroid.fdroid.views.swap.SwapAppsView>
\ No newline at end of file
+</org.fdroid.fdroid.views.swap.SwapSuccessView>
\ No newline at end of file

From fe595226666effc489885c2fb7cec298ff2f750e Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 7 Aug 2018 13:38:16 +0200
Subject: [PATCH 7/9] SwapView base class so all swap views can just be XML

Almost all of the nearby/swap view classes could be condensed into a single
base class that is instantiated in the view XML.  This is the first step
towards making that happen.

It also lays the groundwork where "steps" are all SwapViews.  The
original concept of "steps" put all steps together, whether
F-Droid could control them or not.  For example, the Views were
mixed with the system Bluetooth prompts.  This is the first step
towards converting the steps to always be SwapViews, which are
always under control of this app.

When coming back to a SwapView/step, it does not seem feasible to handle
automatically restarting things like permissions and Bluetooth prompts. If
there is a way, it should be possible to first load the proper SwapView
instance, then trigger the system prompt.  The makes the SwapView a pure
View, without any Controller in it.
---
 .../fdroid/fdroid/localrepo/SwapService.java  |  52 +----
 .../org/fdroid/fdroid/localrepo/SwapView.java |  76 +++++++
 .../fdroid/views/swap/ConfirmReceiveView.java |  41 +---
 .../fdroid/views/swap/ConnectingView.java     |  58 ++---
 .../fdroid/views/swap/InitialLoadingView.java |  58 -----
 .../fdroid/views/swap/JoinWifiView.java       |  32 +--
 .../org/fdroid/fdroid/views/swap/NfcView.java |  32 +--
 .../fdroid/views/swap/SelectAppsView.java     |  48 +---
 .../fdroid/views/swap/SendFDroidView.java     |  38 +---
 .../fdroid/views/swap/StartSwapView.java      |  44 +---
 .../fdroid/views/swap/SwapSuccessView.java    |  34 +--
 .../views/swap/SwapWorkflowActivity.java      | 214 ++++++++----------
 .../fdroid/fdroid/views/swap/WifiQrView.java  |  39 +---
 .../full/res/layout/swap_confirm_receive.xml  |   2 +
 app/src/full/res/layout/swap_connecting.xml   |  24 +-
 .../full/res/layout/swap_initial_loading.xml  |   6 +-
 app/src/full/res/layout/swap_join_wifi.xml    |   2 +
 app/src/full/res/layout/swap_nfc.xml          |   2 +
 app/src/full/res/layout/swap_select_apps.xml  |  10 +-
 app/src/full/res/layout/swap_send_fdroid.xml  |   5 +-
 app/src/full/res/layout/swap_start_swap.xml   |   3 +
 app/src/full/res/layout/swap_success.xml      |  10 +-
 app/src/full/res/layout/swap_wifi_qr.xml      |   5 +-
 app/src/full/res/values/attrs.xml             |   4 +
 24 files changed, 280 insertions(+), 559 deletions(-)
 create mode 100644 app/src/full/java/org/fdroid/fdroid/localrepo/SwapView.java
 delete mode 100644 app/src/full/java/org/fdroid/fdroid/views/swap/InitialLoadingView.java

diff --git a/app/src/full/java/org/fdroid/fdroid/localrepo/SwapService.java b/app/src/full/java/org/fdroid/fdroid/localrepo/SwapService.java
index db2206166..332cea135 100644
--- a/app/src/full/java/org/fdroid/fdroid/localrepo/SwapService.java
+++ b/app/src/full/java/org/fdroid/fdroid/localrepo/SwapService.java
@@ -15,7 +15,7 @@ import android.net.Uri;
 import android.net.wifi.WifiManager;
 import android.os.AsyncTask;
 import android.os.IBinder;
-import android.support.annotation.IntDef;
+import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.NotificationCompat;
@@ -46,8 +46,6 @@ import rx.schedulers.Schedulers;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.Collections;
@@ -129,43 +127,21 @@ public class SwapService extends Service {
         return peerFinder;
     }
 
-    // ==========================================================
-    //                 Manage the current step
-    // ("Step" refers to the current view being shown in the UI)
-    // ==========================================================
-
     public static final int STEP_INTRO = 1;
-    public static final int STEP_SELECT_APPS = 2;
-    public static final int STEP_JOIN_WIFI = 3;
-    public static final int STEP_SHOW_NFC = 4;
-    public static final int STEP_WIFI_QR = 5;
-    public static final int STEP_CONNECTING = 6;
-    public static final int STEP_SWAP_SUCCESS = 7;
-    public static final int STEP_CONFIRM_SWAP = 8;
 
-    /**
-     * Special view, that we don't really want to actually store against the
-     * {@link SwapService#step}. Rather, we use it for the purpose of specifying
-     * we are in the state waiting for the {@link SwapService} to get started and
-     * bound to the {@link SwapWorkflowActivity}.
-     */
-    public static final int STEP_INITIAL_LOADING = 9;
-
-    @SwapStep
-    private int step = STEP_INTRO;
+    @LayoutRes
+    private int currentView = STEP_INTRO;
 
     /**
      * Current screen that the swap process is up to.
-     * Will be one of the SwapState.STEP_* values.
      */
-    @SwapStep
-    public int getStep() {
-        return step;
+    @LayoutRes
+    public int getCurrentView() {
+        return currentView;
     }
 
-    public SwapService setStep(@SwapStep int step) {
-        this.step = step;
-        return this;
+    public void setCurrentView(@LayoutRes int currentView) {
+        this.currentView = currentView;
     }
 
     @NonNull
@@ -269,18 +245,6 @@ public class SwapService extends Service {
         return peerRepo;
     }
 
-    /**
-     * Ensure that we don't get put into an incorrect state, by forcing people to pass valid
-     * states to setStep. Ideally this would be done by requiring an enum or something to
-     * be passed rather than in integer, however that is harder to persist on disk than an int.
-     * This is the same as, e.g. {@link Context#getSystemService(String)}
-     */
-    @IntDef({STEP_INTRO, STEP_SELECT_APPS, STEP_JOIN_WIFI, STEP_SHOW_NFC, STEP_WIFI_QR,
-            STEP_CONNECTING, STEP_SWAP_SUCCESS, STEP_CONFIRM_SWAP, STEP_INITIAL_LOADING})
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface SwapStep {
-    }
-
     // =================================================
     //    Have selected a specific peer to swap with
     //  (Rather than showing a generic QR code to scan)
diff --git a/app/src/full/java/org/fdroid/fdroid/localrepo/SwapView.java b/app/src/full/java/org/fdroid/fdroid/localrepo/SwapView.java
new file mode 100644
index 000000000..9e204ba9e
--- /dev/null
+++ b/app/src/full/java/org/fdroid/fdroid/localrepo/SwapView.java
@@ -0,0 +1,76 @@
+package org.fdroid.fdroid.localrepo;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.support.annotation.ColorInt;
+import android.support.annotation.LayoutRes;
+import android.util.AttributeSet;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.widget.RelativeLayout;
+import org.fdroid.fdroid.R;
+import org.fdroid.fdroid.views.swap.SwapWorkflowActivity;
+
+/**
+ * A {@link android.view.View} that registers to handle the swap events from
+ * {@link SwapService}.
+ */
+public class SwapView extends RelativeLayout {
+    public static final String TAG = "SwapView";
+
+    @ColorInt
+    public final int toolbarColor;
+    public final String toolbarTitle;
+
+    private int layoutResId;
+
+    public SwapView(Context context) {
+        this(context, null);
+    }
+
+    public SwapView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public SwapView(Context context, AttributeSet attrs, int defStyleAttr) {
+        this(context, attrs, defStyleAttr, 0);
+    }
+
+    @TargetApi(21)
+    public SwapView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        final TypedArray a = context.obtainStyledAttributes(
+                attrs, R.styleable.SwapView, 0, 0);
+        toolbarColor = a.getColor(R.styleable.SwapView_toolbarColor,
+                getResources().getColor(R.color.swap_blue));
+        toolbarTitle = a.getString(R.styleable.SwapView_toolbarTitle);
+        a.recycle();
+    }
+
+    @Override
+    public boolean buildMenu(Menu menu, @NonNull MenuInflater inflater) {
+        return false;
+    }
+    @LayoutRes
+    public int getLayoutResId() {
+        return layoutResId;
+    }
+
+    public void setLayoutResId(@LayoutRes int layoutResId) {
+        this.layoutResId = layoutResId;
+    }
+
+    public SwapWorkflowActivity getActivity() {
+        return (SwapWorkflowActivity) getContext();
+    }
+
+    @ColorInt
+    public int getToolbarColour() {
+        return toolbarColor;
+    }
+
+    public String getToolbarTitle() {
+        return toolbarTitle;
+    }
+}
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/ConfirmReceiveView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/ConfirmReceiveView.java
index d78857a87..7cce11196 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/ConfirmReceiveView.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/ConfirmReceiveView.java
@@ -2,19 +2,13 @@ package org.fdroid.fdroid.views.swap;
 
 import android.annotation.TargetApi;
 import android.content.Context;
-import android.support.annotation.ColorRes;
-import android.support.annotation.NonNull;
 import android.util.AttributeSet;
-import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.View;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.data.NewRepoConfig;
-import org.fdroid.fdroid.localrepo.SwapService;
+import org.fdroid.fdroid.localrepo.SwapView;
 
-public class ConfirmReceiveView extends RelativeLayout implements SwapWorkflowActivity.InnerView {
+public class ConfirmReceiveView extends SwapView {
 
     private NewRepoConfig config;
 
@@ -35,10 +29,6 @@ public class ConfirmReceiveView extends RelativeLayout implements SwapWorkflowAc
         super(context, attrs, defStyleAttr, defStyleRes);
     }
 
-    private SwapWorkflowActivity getActivity() {
-        return (SwapWorkflowActivity) getContext();
-    }
-
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
@@ -58,34 +48,7 @@ public class ConfirmReceiveView extends RelativeLayout implements SwapWorkflowAc
         });
     }
 
-    @Override
-    public boolean buildMenu(Menu menu, @NonNull MenuInflater inflater) {
-        return true;
-    }
-
-    @Override
-    public int getStep() {
-        return SwapService.STEP_CONFIRM_SWAP;
-    }
-
-    @Override
-    public int getPreviousStep() {
-        return SwapService.STEP_INTRO;
-    }
-
-    @ColorRes
-    public int getToolbarColour() {
-        return R.color.swap_blue;
-    }
-
-    @Override
-    public String getToolbarTitle() {
-        return getResources().getString(R.string.swap_confirm);
-    }
-
     public void setup(NewRepoConfig config) {
         this.config = config;
-        TextView descriptionTextView = (TextView) findViewById(R.id.text_description);
-        descriptionTextView.setText(getResources().getString(R.string.swap_confirm_connect, config.getHost()));
     }
 }
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/ConnectingView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/ConnectingView.java
index bd71098dc..9a1208bff 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/ConnectingView.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/ConnectingView.java
@@ -5,23 +5,17 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.support.annotation.ColorRes;
-import android.support.annotation.NonNull;
 import android.support.v4.content.LocalBroadcastManager;
 import android.util.AttributeSet;
-import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.View;
 import android.widget.Button;
-import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 import android.widget.TextView;
-
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.UpdateService;
-import org.fdroid.fdroid.localrepo.SwapService;
+import org.fdroid.fdroid.localrepo.SwapView;
 
-// TODO: Use this for the "Preparing local repo" dialog also.
-public class ConnectingView extends LinearLayout implements SwapWorkflowActivity.InnerView {
+public class ConnectingView extends SwapView {
 
     @SuppressWarnings("unused")
     private static final String TAG = "ConnectingView";
@@ -44,10 +38,6 @@ public class ConnectingView extends LinearLayout implements SwapWorkflowActivity
         super(context, attrs, defStyleAttr, defStyleRes);
     }
 
-    private SwapWorkflowActivity getActivity() {
-        return (SwapWorkflowActivity) getContext();
-    }
-
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
@@ -83,9 +73,9 @@ public class ConnectingView extends LinearLayout implements SwapWorkflowActivity
 
     /**
      * Listens for feedback about a local repository being prepared:
-     *  * Apk files copied to the LocalHTTPD webroot
-     *  * index.html file prepared
-     *  * Icons will be copied to the webroot in the background and so are not part of this process.
+     * * Apk files copied to the LocalHTTPD webroot
+     * * index.html file prepared
+     * * Icons will be copied to the webroot in the background and so are not part of this process.
      */
     class PrepareSwapReceiver extends Receiver {
 
@@ -116,7 +106,7 @@ public class ConnectingView extends LinearLayout implements SwapWorkflowActivity
 
     /**
      * Listens for feedback about a repo update process taking place.
-     *  * Tracks an index.jar download and show the progress messages
+     * Tracks an index.jar download and show the progress messages
      */
     class ConnectSwapReceiver extends Receiver {
 
@@ -146,7 +136,7 @@ public class ConnectingView extends LinearLayout implements SwapWorkflowActivity
 
         @Override
         protected void onComplete() {
-            getActivity().showSwapSuccess();
+            getActivity().inflateSwapView(R.layout.swap_success);
         }
 
     }
@@ -165,8 +155,9 @@ public class ConnectingView extends LinearLayout implements SwapWorkflowActivity
         public void onReceive(Context context, Intent intent) {
 
             TextView progressText = (TextView) findViewById(R.id.heading);
-            TextView errorText    = (TextView) findViewById(R.id.error);
-            Button   backButton   = (Button) findViewById(R.id.back);
+            ProgressBar progressBar = findViewById(R.id.progress_bar);
+            TextView errorText = (TextView) findViewById(R.id.error);
+            Button backButton = (Button) findViewById(R.id.back);
 
             String message;
             if (intent.hasExtra(getMessageExtra())) {
@@ -177,11 +168,13 @@ public class ConnectingView extends LinearLayout implements SwapWorkflowActivity
             }
 
             progressText.setVisibility(View.VISIBLE);
+            progressBar.setVisibility(View.VISIBLE);
             errorText.setVisibility(View.GONE);
             backButton.setVisibility(View.GONE);
 
             if (isError(intent)) {
                 progressText.setVisibility(View.GONE);
+                progressBar.setVisibility(View.GONE);
                 errorText.setVisibility(View.VISIBLE);
                 backButton.setVisibility(View.VISIBLE);
                 return;
@@ -192,29 +185,4 @@ public class ConnectingView extends LinearLayout implements SwapWorkflowActivity
             }
         }
     }
-
-    @Override
-    public boolean buildMenu(Menu menu, @NonNull MenuInflater inflater) {
-        return true;
-    }
-
-    @Override
-    public int getStep() {
-        return SwapService.STEP_CONNECTING;
-    }
-
-    @Override
-    public int getPreviousStep() {
-        return SwapService.STEP_SELECT_APPS;
-    }
-
-    @ColorRes
-    public int getToolbarColour() {
-        return R.color.swap_bright_blue;
-    }
-
-    @Override
-    public String getToolbarTitle() {
-        return getResources().getString(R.string.swap_connecting);
-    }
 }
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/InitialLoadingView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/InitialLoadingView.java
deleted file mode 100644
index 56d2fba05..000000000
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/InitialLoadingView.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.fdroid.fdroid.views.swap;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.support.annotation.ColorRes;
-import android.support.annotation.NonNull;
-import android.util.AttributeSet;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.widget.RelativeLayout;
-
-import org.fdroid.fdroid.R;
-import org.fdroid.fdroid.localrepo.SwapService;
-
-public class InitialLoadingView extends RelativeLayout implements SwapWorkflowActivity.InnerView {
-
-    public InitialLoadingView(Context context) {
-        super(context);
-    }
-
-    public InitialLoadingView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public InitialLoadingView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    @TargetApi(21)
-    public InitialLoadingView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-    }
-
-    @Override
-    public boolean buildMenu(Menu menu, @NonNull MenuInflater inflater) {
-        return true;
-    }
-
-    @Override
-    public int getStep() {
-        return SwapService.STEP_INITIAL_LOADING;
-    }
-
-    @Override
-    public int getPreviousStep() {
-        return SwapService.STEP_JOIN_WIFI;
-    }
-
-    @ColorRes
-    public int getToolbarColour() {
-        return R.color.swap_blue;
-    }
-
-    @Override
-    public String getToolbarTitle() {
-        return getResources().getString(R.string.swap);
-    }
-}
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/JoinWifiView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/JoinWifiView.java
index ef59e8823..f9e97b74c 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/JoinWifiView.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/JoinWifiView.java
@@ -6,7 +6,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.wifi.WifiManager;
-import android.support.annotation.ColorRes;
 import android.support.annotation.NonNull;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v4.view.MenuItemCompat;
@@ -17,14 +16,13 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageView;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.R;
-import org.fdroid.fdroid.localrepo.SwapService;
+import org.fdroid.fdroid.localrepo.SwapView;
 import org.fdroid.fdroid.net.WifiStateChangeService;
 
-public class JoinWifiView extends RelativeLayout implements SwapWorkflowActivity.InnerView {
+public class JoinWifiView extends SwapView {
 
     public JoinWifiView(Context context) {
         super(context);
@@ -43,10 +41,6 @@ public class JoinWifiView extends RelativeLayout implements SwapWorkflowActivity
         super(context, attrs, defStyleAttr, defStyleRes);
     }
 
-    private SwapWorkflowActivity getActivity() {
-        return (SwapWorkflowActivity) getContext();
-    }
-
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
@@ -115,33 +109,13 @@ public class JoinWifiView extends RelativeLayout implements SwapWorkflowActivity
         next.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
             @Override
             public boolean onMenuItemClick(MenuItem item) {
-                getActivity().showSelectApps();
+                getActivity().inflateInnerView(R.layout.swap_select_apps);
                 return true;
             }
         });
         return true;
     }
 
-    @Override
-    public int getStep() {
-        return SwapService.STEP_JOIN_WIFI;
-    }
-
-    @Override
-    public int getPreviousStep() {
-        return SwapService.STEP_INTRO;
-    }
-
-    @ColorRes
-    public int getToolbarColour() {
-        return R.color.swap_blue;
-    }
-
-    @Override
-    public String getToolbarTitle() {
-        return getResources().getString(R.string.swap_join_same_wifi);
-    }
-
     private final BroadcastReceiver onWifiStateChange = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/NfcView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/NfcView.java
index 5d2ef5760..af69cde14 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/NfcView.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/NfcView.java
@@ -2,7 +2,6 @@ package org.fdroid.fdroid.views.swap;
 
 import android.annotation.TargetApi;
 import android.content.Context;
-import android.support.annotation.ColorRes;
 import android.support.annotation.NonNull;
 import android.support.v4.view.MenuItemCompat;
 import android.util.AttributeSet;
@@ -11,12 +10,11 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
-import android.widget.RelativeLayout;
 import org.fdroid.fdroid.Preferences;
 import org.fdroid.fdroid.R;
-import org.fdroid.fdroid.localrepo.SwapService;
+import org.fdroid.fdroid.localrepo.SwapView;
 
-public class NfcView extends RelativeLayout implements SwapWorkflowActivity.InnerView {
+public class NfcView extends SwapView {
 
     public NfcView(Context context) {
         super(context);
@@ -35,10 +33,6 @@ public class NfcView extends RelativeLayout implements SwapWorkflowActivity.Inne
         super(context, attrs, defStyleAttr, defStyleRes);
     }
 
-    private SwapWorkflowActivity getActivity() {
-        return (SwapWorkflowActivity) getContext();
-    }
-
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
@@ -60,30 +54,10 @@ public class NfcView extends RelativeLayout implements SwapWorkflowActivity.Inne
         next.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
             @Override
             public boolean onMenuItemClick(MenuItem item) {
-                getActivity().showWifiQr();
+                getActivity().inflateInnerView(R.layout.swap_wifi_qr);
                 return true;
             }
         });
         return true;
     }
-
-    @Override
-    public int getStep() {
-        return SwapService.STEP_SHOW_NFC;
-    }
-
-    @Override
-    public int getPreviousStep() {
-        return SwapService.STEP_JOIN_WIFI;
-    }
-
-    @ColorRes
-    public int getToolbarColour() {
-        return R.color.swap_blue;
-    }
-
-    @Override
-    public String getToolbarTitle() {
-        return getResources().getString(R.string.swap_nfc_title);
-    }
 }
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SelectAppsView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SelectAppsView.java
index 5f0d7a496..3e10f4218 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/SelectAppsView.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/SelectAppsView.java
@@ -8,7 +8,6 @@ import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.ColorRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.LoaderManager;
@@ -32,14 +31,13 @@ import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
-
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.data.InstalledAppProvider;
 import org.fdroid.fdroid.data.Schema.InstalledAppTable;
 import org.fdroid.fdroid.localrepo.SwapService;
+import org.fdroid.fdroid.localrepo.SwapView;
 
-public class SelectAppsView extends ListView implements
-        SwapWorkflowActivity.InnerView,
+public class SelectAppsView extends SwapView implements
         LoaderManager.LoaderCallbacks<Cursor>,
         SearchView.OnQueryTextListener {
 
@@ -60,33 +58,31 @@ public class SelectAppsView extends ListView implements
         super(context, attrs, defStyleAttr, defStyleRes);
     }
 
-    private SwapWorkflowActivity getActivity() {
-        return (SwapWorkflowActivity) getContext();
-    }
-
     private SwapService getState() {
         return getActivity().getState();
     }
 
     private static final int LOADER_INSTALLED_APPS = 253341534;
 
+    private ListView listView;
     private AppListAdapter adapter;
     private String currentFilterString;
 
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
-        adapter = new AppListAdapter(this, getContext(),
+        listView = findViewById(R.id.list);
+        adapter = new AppListAdapter(listView, getContext(),
                 getContext().getContentResolver().query(InstalledAppProvider.getContentUri(),
                         InstalledAppTable.Cols.ALL, null, null, null));
 
-        setAdapter(adapter);
-        setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
+        listView.setAdapter(adapter);
+        listView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
 
         // either reconnect with an existing loader or start a new one
         getActivity().getSupportLoaderManager().initLoader(LOADER_INSTALLED_APPS, null, this);
 
-        setOnItemClickListener(new AdapterView.OnItemClickListener() {
+        listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
                 toggleAppSelected(position);
             }
@@ -118,28 +114,6 @@ public class SelectAppsView extends ListView implements
         return true;
     }
 
-    @Override
-    public int getStep() {
-        return SwapService.STEP_SELECT_APPS;
-    }
-
-    @Override
-    public int getPreviousStep() {
-        // TODO: The STEP_JOIN_WIFI step isn't shown first, need to make it
-        // so that it is, or so that this doesn't go back there.
-        return getState().isConnectingWithPeer() ? SwapService.STEP_INTRO : SwapService.STEP_JOIN_WIFI;
-    }
-
-    @ColorRes
-    public int getToolbarColour() {
-        return R.color.swap_bright_blue;
-    }
-
-    @Override
-    public String getToolbarTitle() {
-        return getResources().getString(R.string.swap_choose_apps);
-    }
-
     private void toggleAppSelected(int position) {
         Cursor c = (Cursor) adapter.getItem(position);
         String packageName = c.getString(c.getColumnIndex(InstalledAppTable.Cols.Package.NAME));
@@ -174,13 +148,13 @@ public class SelectAppsView extends ListView implements
     public void onLoadFinished(Loader<Cursor> loader, Cursor cursor) {
         adapter.swapCursor(cursor);
 
-        for (int i = 0; i < getCount(); i++) {
-            Cursor c = (Cursor) getItemAtPosition(i);
+        for (int i = 0; i < listView.getCount(); i++) {
+            Cursor c = (Cursor) listView.getItemAtPosition(i);
             String packageName = c.getString(c.getColumnIndex(InstalledAppTable.Cols.Package.NAME));
             getState().ensureFDroidSelected();
             for (String selected : getState().getAppsToSwap()) {
                 if (TextUtils.equals(packageName, selected)) {
-                    setItemChecked(i, true);
+                    listView.setItemChecked(i, true);
                 }
             }
         }
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SendFDroidView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SendFDroidView.java
index 60bf9fc02..30ba74da7 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/SendFDroidView.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/SendFDroidView.java
@@ -7,28 +7,23 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.graphics.LightingColorFilter;
-import android.support.annotation.ColorRes;
-import android.support.annotation.NonNull;
 import android.support.v4.content.LocalBroadcastManager;
 import android.text.TextUtils;
 import android.util.AttributeSet;
-import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
-import android.widget.ScrollView;
 import android.widget.TextView;
 import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.Preferences;
 import org.fdroid.fdroid.QrGenAsyncTask;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.Utils;
-import org.fdroid.fdroid.localrepo.SwapService;
+import org.fdroid.fdroid.localrepo.SwapView;
 import org.fdroid.fdroid.net.WifiStateChangeService;
 import org.fdroid.fdroid.views.swap.device.camera.CameraCharacteristicsChecker;
 
-public class SendFDroidView extends ScrollView implements SwapWorkflowActivity.InnerView {
+public class SendFDroidView extends SwapView {
 
     private static final String TAG = "SendFDroidView";
 
@@ -49,10 +44,6 @@ public class SendFDroidView extends ScrollView implements SwapWorkflowActivity.I
         super(context, attrs, defStyleAttr, defStyleRes);
     }
 
-    private SwapWorkflowActivity getActivity() {
-        return (SwapWorkflowActivity) getContext();
-    }
-
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
@@ -96,31 +87,6 @@ public class SendFDroidView extends ScrollView implements SwapWorkflowActivity.I
         LocalBroadcastManager.getInstance(getActivity()).unregisterReceiver(onWifiStateChanged);
     }
 
-    @Override
-    public boolean buildMenu(Menu menu, @NonNull MenuInflater inflater) {
-        return false;
-    }
-
-    @Override
-    public int getStep() {
-        return SwapService.STEP_INTRO;
-    }
-
-    @Override
-    public int getPreviousStep() {
-        return SwapService.STEP_INTRO;
-    }
-
-    @ColorRes
-    public int getToolbarColour() {
-        return R.color.swap_blue;
-    }
-
-    @Override
-    public String getToolbarTitle() {
-        return getResources().getString(R.string.swap_send_fdroid);
-    }
-
     @SuppressLint("HardwareIds")
     private void setUIFromWifi() {
         if (TextUtils.isEmpty(FDroidApp.repo.address)) {
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/StartSwapView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/StartSwapView.java
index 03aeeb2ac..09c1558d4 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/StartSwapView.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/StartSwapView.java
@@ -7,16 +7,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.wifi.WifiConfiguration;
-import android.support.annotation.ColorRes;
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.widget.SwitchCompat;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -25,13 +21,13 @@ import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.ProgressBar;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 import cc.mvdan.accesspoint.WifiApControl;
 import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.localrepo.SwapService;
+import org.fdroid.fdroid.localrepo.SwapView;
 import org.fdroid.fdroid.localrepo.peers.Peer;
 import org.fdroid.fdroid.net.WifiStateChangeService;
 import rx.Subscriber;
@@ -40,7 +36,7 @@ import rx.Subscription;
 import java.util.ArrayList;
 
 @SuppressWarnings("LineLength")
-public class StartSwapView extends RelativeLayout implements SwapWorkflowActivity.InnerView {
+public class StartSwapView extends SwapView {
 
     private static final String TAG = "StartSwapView";
 
@@ -58,7 +54,6 @@ public class StartSwapView extends RelativeLayout implements SwapWorkflowActivit
         super(context, attrs);
     }
 
-    @TargetApi(11)
     public StartSwapView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
     }
@@ -91,10 +86,6 @@ public class StartSwapView extends RelativeLayout implements SwapWorkflowActivit
 
     }
 
-    private SwapWorkflowActivity getActivity() {
-        return (SwapWorkflowActivity) getContext();
-    }
-
     private SwapService getManager() {
         return getActivity().getState();
     }
@@ -456,35 +447,4 @@ public class StartSwapView extends RelativeLayout implements SwapWorkflowActivit
     private void onPeerSelected(Peer peer) {
         getActivity().swapWith(peer);
     }
-
-    @Override
-    public boolean buildMenu(Menu menu, @NonNull MenuInflater inflater) {
-        return false;
-    }
-
-    @Override
-    public int getStep() {
-        return SwapService.STEP_INTRO;
-    }
-
-    @Override
-    public int getPreviousStep() {
-        // TODO: Currently this is handleed by the SwapWorkflowActivity as a special case, where
-        // if getStep is STEP_INTRO, don't even bother asking for getPreviousStep. But that is a
-        // bit messy. It would be nicer if this was handled using the same mechanism as everything
-        // else.
-        return SwapService.STEP_INTRO;
-    }
-
-    @Override
-    @ColorRes
-    public int getToolbarColour() {
-        return R.color.swap_bright_blue;
-    }
-
-    @Override
-    public String getToolbarTitle() {
-        return getResources().getString(R.string.swap_nearby);
-    }
-
 }
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapSuccessView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapSuccessView.java
index a0de37a5e..e3197dfbb 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapSuccessView.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapSuccessView.java
@@ -12,7 +12,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.ColorRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.LoaderManager;
@@ -47,7 +46,7 @@ import org.fdroid.fdroid.data.App;
 import org.fdroid.fdroid.data.AppProvider;
 import org.fdroid.fdroid.data.Repo;
 import org.fdroid.fdroid.data.Schema.AppMetadataTable;
-import org.fdroid.fdroid.localrepo.SwapService;
+import org.fdroid.fdroid.localrepo.SwapView;
 import org.fdroid.fdroid.net.Downloader;
 import org.fdroid.fdroid.net.DownloaderService;
 
@@ -55,8 +54,7 @@ import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
 
-public class SwapSuccessView extends ListView implements
-        SwapWorkflowActivity.InnerView,
+public class SwapSuccessView extends SwapView implements
         LoaderManager.LoaderCallbacks<Cursor>,
         SearchView.OnQueryTextListener {
 
@@ -77,10 +75,6 @@ public class SwapSuccessView extends ListView implements
         super(context, attrs, defStyleAttr, defStyleRes);
     }
 
-    private SwapWorkflowActivity getActivity() {
-        return (SwapWorkflowActivity) getContext();
-    }
-
     private static final int LOADER_SWAPABLE_APPS = 759283741;
     private static final String TAG = "SwapAppsView";
 
@@ -102,8 +96,8 @@ public class SwapSuccessView extends ListView implements
 
         adapter = new AppListAdapter(getContext(), getContext().getContentResolver().query(
                 AppProvider.getRepoUri(repo), AppMetadataTable.Cols.ALL, null, null, null));
-
-        setAdapter(adapter);
+        ListView listView = findViewById(R.id.list);
+        listView.setAdapter(adapter);
 
         // either reconnect with an existing loader or start a new one
         getActivity().getSupportLoaderManager().initLoader(LOADER_SWAPABLE_APPS, null, this);
@@ -163,26 +157,6 @@ public class SwapSuccessView extends ListView implements
         return true;
     }
 
-    @Override
-    public int getStep() {
-        return SwapService.STEP_SWAP_SUCCESS;
-    }
-
-    @Override
-    public int getPreviousStep() {
-        return SwapService.STEP_INTRO;
-    }
-
-    @ColorRes
-    public int getToolbarColour() {
-        return R.color.swap_bright_blue;
-    }
-
-    @Override
-    public String getToolbarTitle() {
-        return getResources().getString(R.string.swap_success);
-    }
-
     @Override
     public CursorLoader onCreateLoader(int id, Bundle args) {
         Uri uri = TextUtils.isEmpty(currentFilterString)
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
index 5c3beb660..870ff9703 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
@@ -17,7 +17,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.provider.Settings;
-import android.support.annotation.ColorRes;
 import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -28,9 +27,9 @@ import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 import android.widget.Toast;
 import cc.mvdan.accesspoint.WifiApControl;
 import com.google.zxing.integration.android.IntentIntegrator;
@@ -48,6 +47,7 @@ import org.fdroid.fdroid.installer.InstallManagerService;
 import org.fdroid.fdroid.installer.Installer;
 import org.fdroid.fdroid.localrepo.LocalRepoManager;
 import org.fdroid.fdroid.localrepo.SwapService;
+import org.fdroid.fdroid.localrepo.SwapView;
 import org.fdroid.fdroid.localrepo.peers.Peer;
 import org.fdroid.fdroid.net.BluetoothDownloader;
 import org.fdroid.fdroid.net.HttpDownloader;
@@ -68,6 +68,7 @@ import java.util.TimerTask;
  */
 @SuppressWarnings("LineLength")
 public class SwapWorkflowActivity extends AppCompatActivity {
+    private static final String TAG = "SwapWorkflowActivity";
 
     /**
      * When connecting to a swap, we then go and initiate a connection with that
@@ -87,28 +88,6 @@ public class SwapWorkflowActivity extends AppCompatActivity {
 
     private ViewGroup container;
 
-    /**
-     * A UI component (subclass of {@link View}) which forms part of the swap workflow.
-     * There is a one to one mapping between an {@link org.fdroid.fdroid.views.swap.SwapWorkflowActivity.InnerView}
-     * and a {@link SwapService.SwapStep}, and these views know what
-     * the previous view before them should be.
-     */
-    public interface InnerView {
-        /** @return True if the menu should be shown. */
-        boolean buildMenu(Menu menu, @NonNull MenuInflater inflater);
-
-        /** @return The step that this view represents. */
-        @SwapService.SwapStep int getStep();
-
-        @SwapService.SwapStep int getPreviousStep();
-
-        @ColorRes int getToolbarColour();
-
-        String getToolbarTitle();
-    }
-
-    private static final String TAG = "SwapWorkflowActivity";
-
     private static final int CONNECT_TO_SWAP = 1;
     private static final int REQUEST_BLUETOOTH_ENABLE_FOR_SWAP = 2;
     private static final int REQUEST_BLUETOOTH_DISCOVERABLE = 3;
@@ -116,7 +95,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
     private static final int REQUEST_WRITE_SETTINGS_PERMISSION = 5;
 
     private Toolbar toolbar;
-    private InnerView currentView;
+    private SwapView currentView;
     private boolean hasPreparedLocalRepo;
     private PrepareSwapRepo updateSwappableAppsTask;
     private NewRepoConfig confirmSwapConfig;
@@ -165,12 +144,50 @@ public class SwapWorkflowActivity extends AppCompatActivity {
 
     @Override
     public void onBackPressed() {
-        if (currentView.getStep() == SwapService.STEP_INTRO) {
-            SwapService.stop(this);
+        if (currentView.getLayoutResId() == SwapService.STEP_INTRO) {
+            SwapService.stop(this);  // TODO SwapService should always be running, while swap is running
             finish();
         } else {
-            int nextStep = currentView.getPreviousStep();
-            getService().setStep(nextStep);
+            // TODO: Currently StartSwapView is handleed by the SwapWorkflowActivity as a special case, where
+            // if getLayoutResId is STEP_INTRO, don't even bother asking for getPreviousStep. But that is a
+            // bit messy. It would be nicer if this was handled using the same mechanism as everything
+            // else.
+            int nextStep = -1;
+            switch (currentView.getLayoutResId()) {
+                case R.layout.swap_confirm_receive:
+                    nextStep = SwapService.STEP_INTRO;
+                    break;
+                case R.layout.swap_connecting:
+                    nextStep = R.layout.swap_select_apps;
+                    break;
+                case R.layout.swap_initial_loading:
+                    nextStep = R.layout.swap_join_wifi;
+                    break;
+                case R.layout.swap_join_wifi:
+                    nextStep = SwapService.STEP_INTRO;
+                    break;
+                case R.layout.swap_nfc:
+                    nextStep = R.layout.swap_join_wifi;
+                    break;
+                case R.layout.swap_select_apps:
+                    // TODO: The STEP_JOIN_WIFI step isn't shown first, need to make it
+                    // so that it is, or so that this doesn't go back there.
+                    nextStep = getState().isConnectingWithPeer() ? SwapService.STEP_INTRO : R.layout.swap_join_wifi;
+                    break;
+                case R.layout.swap_send_fdroid:
+                    nextStep = SwapService.STEP_INTRO;
+                    break;
+                case R.layout.swap_start_swap:
+                    nextStep = SwapService.STEP_INTRO;
+                    break;
+                case R.layout.swap_success:
+                    nextStep = SwapService.STEP_INTRO;
+                    break;
+                case R.layout.swap_wifi_qr:
+                    nextStep = R.layout.swap_join_wifi;
+                    break;
+            }
+            getService().setCurrentView(nextStep);
             showRelevantView();
         }
     }
@@ -310,7 +327,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
     private void showRelevantView(boolean forceReload) {
 
         if (service == null) {
-            showInitialLoading();
+            inflateSwapView(R.layout.swap_initial_loading);
             return;
         }
 
@@ -323,62 +340,50 @@ public class SwapWorkflowActivity extends AppCompatActivity {
             return;
         }
 
-        if (!forceReload && (container.getVisibility() == View.GONE || currentView != null && currentView.getStep() == service.getStep())) {
+        if (!forceReload && (container.getVisibility() == View.GONE || currentView != null && currentView.getLayoutResId() == service.getCurrentView())) {
             // Already showing the correct step, so don't bother changing anything.
             return;
         }
 
-        switch (service.getStep()) {
+        int currentView = service.getCurrentView();
+        switch (currentView) {
             case SwapService.STEP_INTRO:
                 showIntro();
+                return;
+            case R.layout.swap_nfc:
+                if (!attemptToShowNfc()) {
+                    inflateSwapView(R.layout.swap_wifi_qr);
+                    return;
+                }
                 break;
-            case SwapService.STEP_SELECT_APPS:
-                showSelectApps();
-                break;
-            case SwapService.STEP_SHOW_NFC:
-                showNfc();
-                break;
-            case SwapService.STEP_JOIN_WIFI:
-                showJoinWifi();
-                break;
-            case SwapService.STEP_WIFI_QR:
-                showWifiQr();
-                break;
-            case SwapService.STEP_SWAP_SUCCESS:
-                showSwapSuccess();
-                break;
-            case SwapService.STEP_CONNECTING:
+            case R.layout.swap_connecting:
                 // TODO: Properly decide what to do here (i.e. returning to the activity after it was connecting)...
-                inflateInnerView(R.layout.swap_start_swap);
-                break;
+                inflateSwapView(R.layout.swap_start_swap);
+                return;
         }
+        inflateSwapView(currentView);
     }
 
     public SwapService getState() {
         return service;
     }
 
-    private void showNfc() {
-        if (!attemptToShowNfc()) {
-            showWifiQr();
-        }
-    }
-
-    private InnerView inflateInnerView(@LayoutRes int viewRes) {
+    public SwapView inflateSwapView(@LayoutRes int viewRes) {
         container.removeAllViews();
         View view = ((LayoutInflater) getSystemService(LAYOUT_INFLATER_SERVICE)).inflate(viewRes, container, false);
-        currentView = (InnerView) view;
+        currentView = (SwapView) view;
+        currentView.setLayoutResId(viewRes);
 
         // Don't actually set the step to STEP_INITIAL_LOADING, as we are going to use this view
         // purely as a placeholder for _whatever view is meant to be shown_.
-        if (currentView.getStep() != SwapService.STEP_INITIAL_LOADING) {
+        if (currentView.getLayoutResId() != R.layout.swap_initial_loading) {
             if (service == null) {
                 throw new IllegalStateException("We are not in the STEP_INITIAL_LOADING state, but the service is not ready.");
             }
-            service.setStep(currentView.getStep());
+            service.setCurrentView(currentView.getLayoutResId());
         }
 
-        toolbar.setBackgroundColor(getResources().getColor(currentView.getToolbarColour()));
+        toolbar.setBackgroundColor(currentView.getToolbarColour());
         toolbar.setTitle(currentView.getToolbarTitle());
         toolbar.setNavigationIcon(R.drawable.ic_close_white_24dp);
         toolbar.setNavigationOnClickListener(new View.OnClickListener() {
@@ -398,10 +403,6 @@ public class SwapWorkflowActivity extends AppCompatActivity {
         finish();
     }
 
-    private void showInitialLoading() {
-        inflateInnerView(R.layout.swap_initial_loading);
-    }
-
     public void showIntro() {
         // If we were previously swapping with a specific client, forget that we were doing that,
         // as we are starting over now.
@@ -414,11 +415,13 @@ public class SwapWorkflowActivity extends AppCompatActivity {
             }
         }
 
-        inflateInnerView(R.layout.swap_start_swap);
+        inflateSwapView(R.layout.swap_start_swap);
     }
 
     private void showConfirmSwap(@NonNull NewRepoConfig config) {
-        ((ConfirmReceive) inflateInnerView(R.layout.swap_confirm_receive)).setup(config);
+        ((ConfirmReceiveView) inflateSwapView(R.layout.swap_confirm_receive)).setup(config);
+        TextView descriptionTextView = (TextView) findViewById(R.id.text_description);
+        descriptionTextView.setText(getResources().getString(R.string.swap_confirm_connect, config.getHost()));
     }
 
     public void startQrWorkflow() {
@@ -435,14 +438,10 @@ public class SwapWorkflowActivity extends AppCompatActivity {
                     })
                     .create().show();
         } else {
-            showWifiQr();
+            inflateSwapView(R.layout.swap_wifi_qr);
         }
     }
 
-    public void showSelectApps() {
-        inflateInnerView(R.layout.swap_select_apps);
-    }
-
     /**
      * On {@code android-26}, only apps with privileges can access
      * {@code WRITE_SETTINGS}.  So this just shows the tethering settings
@@ -471,7 +470,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
         if (adapter == null
                 || Build.VERSION.SDK_INT >= 23 // TODO make Bluetooth work with content:// URIs
                 || (!adapter.isEnabled() && getService().getWifiSwap().isConnected())) {
-            showSendFDroid();
+            inflateSwapView(R.layout.swap_send_fdroid);
         } else {
             sendFDroidBluetooth();
         }
@@ -503,8 +502,8 @@ public class SwapWorkflowActivity extends AppCompatActivity {
         if (updateSwappableAppsTask == null && !hasPreparedLocalRepo) {
             updateSwappableAppsTask = new PrepareSwapRepo(getService().getAppsToSwap());
             updateSwappableAppsTask.execute();
-            getService().setStep(SwapService.STEP_CONNECTING);
-            inflateInnerView(R.layout.swap_connecting);
+            getService().setCurrentView(R.layout.swap_connecting);
+            inflateSwapView(R.layout.swap_connecting);
         } else {
             onLocalRepoPrepared();
         }
@@ -513,10 +512,10 @@ public class SwapWorkflowActivity extends AppCompatActivity {
     /**
      * Once the UpdateAsyncTask has finished preparing our repository index, we can
      * show the next screen to the user. This will be one of two things:
-     *  * If we directly selected a peer to swap with initially, we will skip straight to getting
-     *    the list of apps from that device.
-     *  * Alternatively, if we didn't have a person to connect to, and instead clicked "Scan QR Code",
-     *    then we want to show a QR code or NFC dialog.
+     * * If we directly selected a peer to swap with initially, we will skip straight to getting
+     * the list of apps from that device.
+     * * Alternatively, if we didn't have a person to connect to, and instead clicked "Scan QR Code",
+     * then we want to show a QR code or NFC dialog.
      */
     public void onLocalRepoPrepared() {
         updateSwappableAppsTask = null;
@@ -524,29 +523,13 @@ public class SwapWorkflowActivity extends AppCompatActivity {
         if (getService().isConnectingWithPeer()) {
             startSwappingWithPeer();
         } else if (!attemptToShowNfc()) {
-            showWifiQr();
+            inflateSwapView(R.layout.swap_wifi_qr);
         }
     }
 
     private void startSwappingWithPeer() {
         getService().connectToPeer();
-        inflateInnerView(R.layout.swap_connecting);
-    }
-
-    private void showJoinWifi() {
-        inflateInnerView(R.layout.swap_join_wifi);
-    }
-
-    public void showWifiQr() {
-        inflateInnerView(R.layout.swap_wifi_qr);
-    }
-
-    public void showSendFDroid() {
-        inflateInnerView(R.layout.swap_send_fdroid);
-    }
-
-    public void showSwapSuccess() {
-        inflateInnerView(R.layout.swap_success);
+        inflateSwapView(R.layout.swap_connecting);
     }
 
     private boolean attemptToShowNfc() {
@@ -559,7 +542,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
         boolean nfcMessageReady = NfcHelper.setPushMessage(this, Utils.getSharingUri(FDroidApp.repo));
 
         if (Preferences.get().showNfcDuringSwap() && nfcMessageReady) {
-            inflateInnerView(R.layout.swap_nfc);
+            inflateSwapView(R.layout.swap_nfc);
             return true;
         }
         return false;
@@ -567,20 +550,20 @@ public class SwapWorkflowActivity extends AppCompatActivity {
 
     public void swapWith(Peer peer) {
         getService().swapWith(peer);
-        showSelectApps();
+        inflateSwapView(R.layout.swap_select_apps);
     }
 
     /**
      * This is for when we initiate a swap by viewing the "Are you sure you want to swap with" view
      * This can arise either:
-     *   * As a result of scanning a QR code (in which case we likely already have a repo setup) or
-     *   * As a result of the other device selecting our device in the "start swap" screen, in which
-     *     case we are likely just sitting on the start swap screen also, and haven't configured
-     *     anything yet.
+     * * As a result of scanning a QR code (in which case we likely already have a repo setup) or
+     * * As a result of the other device selecting our device in the "start swap" screen, in which
+     * case we are likely just sitting on the start swap screen also, and haven't configured
+     * anything yet.
      */
     public void swapWith(NewRepoConfig repoConfig) {
         Peer peer = repoConfig.toPeer();
-        if (getService().getStep() == SwapService.STEP_INTRO || getService().getStep() == SwapService.STEP_CONFIRM_SWAP) {
+        if (getService().getCurrentView() == SwapService.STEP_INTRO || getService().getCurrentView() == R.layout.swap_confirm_receive) {
             // This will force the "Select apps to swap" workflow to begin.
             // TODO: Find a better way to decide whether we need to select the apps. Not sure if we
             //       can or cannot be in STEP_INTRO with a full blown repo ready to swap.
@@ -784,15 +767,14 @@ public class SwapWorkflowActivity extends AppCompatActivity {
      * the harder it becomes to reason about and debug the whole thing. Thus,this class
      * will periodically dump the state to logcat so that it is easier to see when certain
      * protocols are enabled/disabled.
-     *
+     * <p>
      * To view only this output from logcat:
-     *
-     *  adb logcat | grep 'Swap Status'
-     *
+     * <p>
+     * adb logcat | grep 'Swap Status'
+     * <p>
      * To exclude this output from logcat (it is very noisy):
-     *
-     *  adb logcat | grep -v 'Swap Status'
-     *
+     * <p>
+     * adb logcat | grep -v 'Swap Status'
      */
     class SwapDebug {
 
@@ -826,11 +808,11 @@ public class SwapWorkflowActivity extends AppCompatActivity {
             Utils.debugLog("Swap Status", now.getHours() + ":" + now.getMinutes() + ":" + now.getSeconds() + " " + message);
 
             new Timer().schedule(new TimerTask() {
-                    @Override
-                    public void run() {
-                        new SwapDebug().logStatus();
-                    }
-                }, 1000
+                                     @Override
+                                     public void run() {
+                                         new SwapDebug().logStatus();
+                                     }
+                                 }, 1000
             );
         }
     }
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/WifiQrView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/WifiQrView.java
index ab55abd2c..ad8fadbba 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/WifiQrView.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/WifiQrView.java
@@ -7,31 +7,26 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.graphics.LightingColorFilter;
 import android.net.Uri;
-import android.support.annotation.ColorRes;
-import android.support.annotation.NonNull;
 import android.support.v4.content.LocalBroadcastManager;
 import android.text.TextUtils;
 import android.util.AttributeSet;
-import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
-import android.widget.ScrollView;
 import android.widget.TextView;
 import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.Preferences;
 import org.fdroid.fdroid.QrGenAsyncTask;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.Utils;
-import org.fdroid.fdroid.localrepo.SwapService;
+import org.fdroid.fdroid.localrepo.SwapView;
 import org.fdroid.fdroid.net.WifiStateChangeService;
 import org.fdroid.fdroid.views.swap.device.camera.CameraCharacteristicsChecker;
 
 import java.util.Locale;
 import java.util.Set;
 
-public class WifiQrView extends ScrollView implements SwapWorkflowActivity.InnerView {
+public class WifiQrView extends SwapView {
 
     private static final String TAG = "WifiQrView";
 
@@ -52,10 +47,6 @@ public class WifiQrView extends ScrollView implements SwapWorkflowActivity.Inner
         super(context, attrs, defStyleAttr, defStyleRes);
     }
 
-    private SwapWorkflowActivity getActivity() {
-        return (SwapWorkflowActivity) getContext();
-    }
-
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
@@ -98,32 +89,6 @@ public class WifiQrView extends ScrollView implements SwapWorkflowActivity.Inner
         LocalBroadcastManager.getInstance(getActivity()).unregisterReceiver(onWifiStateChanged);
     }
 
-    @Override
-    public boolean buildMenu(Menu menu, @NonNull MenuInflater inflater) {
-        return false;
-    }
-
-    @Override
-    public int getStep() {
-        return SwapService.STEP_WIFI_QR;
-    }
-
-    @Override
-    public int getPreviousStep() {
-        // TODO: Find a way to make this optionally go back to the NFC screen if appropriate.
-        return SwapService.STEP_JOIN_WIFI;
-    }
-
-    @ColorRes
-    public int getToolbarColour() {
-        return R.color.swap_blue;
-    }
-
-    @Override
-    public String getToolbarTitle() {
-        return getResources().getString(R.string.swap_scan_qr);
-    }
-
     private void setUIFromWifi() {
 
         if (TextUtils.isEmpty(FDroidApp.repo.address)) {
diff --git a/app/src/full/res/layout/swap_confirm_receive.xml b/app/src/full/res/layout/swap_confirm_receive.xml
index aa0dee9c0..93cb17a52 100644
--- a/app/src/full/res/layout/swap_confirm_receive.xml
+++ b/app/src/full/res/layout/swap_confirm_receive.xml
@@ -3,6 +3,8 @@
 <org.fdroid.fdroid.views.swap.ConfirmReceiveView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
+        xmlns:swap="http://schemas.android.com/apk/res-auto"
+        swap:toolbarTitle="@string/swap_confirm"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/full/res/layout/swap_connecting.xml b/app/src/full/res/layout/swap_connecting.xml
index ea60adb97..deb4b5c71 100644
--- a/app/src/full/res/layout/swap_connecting.xml
+++ b/app/src/full/res/layout/swap_connecting.xml
@@ -2,7 +2,9 @@
 
 <org.fdroid.fdroid.views.swap.ConnectingView
         xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
+        xmlns:swap="http://schemas.android.com/apk/res-auto"
+        swap:toolbarColor="@color/swap_bright_blue"
+        swap:toolbarTitle="@string/swap_connecting"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -11,40 +13,40 @@
             android:id="@+id/heading"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
             android:textSize="20sp"
             android:padding="30dp"
             android:textAlignment="center"
-            android:gravity="center"
-            tools:text="Connecting with Nexus 4"
-            tools:ignore="UnusedAttribute"/>
+            android:gravity="center"/>
 
     <ProgressBar
+            android:id="@+id/progress_bar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:indeterminate="true"
-            android:layout_gravity="center"/>
+            android:layout_centerInParent="true"
+            android:layout_below="@+id/heading"/>
 
     <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
             android:id="@+id/error"
             android:textSize="20sp"
             android:textAlignment="center"
-            android:gravity="center"
             android:text="@string/swap_connection_misc_error"
             android:visibility="gone"
-            android:padding="30dp"
-            tools:ignore="UnusedAttribute"/>
+            android:padding="30dp"/>
 
     <Button
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_below="@+id/error"
             android:id="@+id/back"
             android:backgroundTint="@color/swap_light_blue"
             android:textColor="@android:color/white"
-            android:layout_gravity="center_horizontal"
             android:visibility="gone"
-            android:text="@string/back"
-            tools:ignore="UnusedAttribute"/>
+            android:text="@string/back"/>
 
 </org.fdroid.fdroid.views.swap.ConnectingView>
diff --git a/app/src/full/res/layout/swap_initial_loading.xml b/app/src/full/res/layout/swap_initial_loading.xml
index b1f2a5dab..502420b66 100644
--- a/app/src/full/res/layout/swap_initial_loading.xml
+++ b/app/src/full/res/layout/swap_initial_loading.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<org.fdroid.fdroid.views.swap.InitialLoadingView
+<org.fdroid.fdroid.localrepo.SwapView
         xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:swap="http://schemas.android.com/apk/res-auto"
+        swap:toolbarTitle="@string/swap"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -24,4 +26,4 @@
             android:textColor="@android:color/white"
             android:layout_centerHorizontal="true"/>
 
-</org.fdroid.fdroid.views.swap.InitialLoadingView>
\ No newline at end of file
+</org.fdroid.fdroid.localrepo.SwapView>
\ No newline at end of file
diff --git a/app/src/full/res/layout/swap_join_wifi.xml b/app/src/full/res/layout/swap_join_wifi.xml
index a17e3d655..b1e1146cc 100644
--- a/app/src/full/res/layout/swap_join_wifi.xml
+++ b/app/src/full/res/layout/swap_join_wifi.xml
@@ -3,6 +3,8 @@
 <org.fdroid.fdroid.views.swap.JoinWifiView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
+        xmlns:swap="http://schemas.android.com/apk/res-auto"
+        swap:toolbarTitle="@string/swap_join_same_wifi"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/full/res/layout/swap_nfc.xml b/app/src/full/res/layout/swap_nfc.xml
index 0369ee921..01c9533be 100644
--- a/app/src/full/res/layout/swap_nfc.xml
+++ b/app/src/full/res/layout/swap_nfc.xml
@@ -2,6 +2,8 @@
 
 <org.fdroid.fdroid.views.swap.NfcView
         xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:swap="http://schemas.android.com/apk/res-auto"
+        swap:toolbarTitle="@string/swap_nfc_title"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/full/res/layout/swap_select_apps.xml b/app/src/full/res/layout/swap_select_apps.xml
index 52489d994..1e36310fa 100644
--- a/app/src/full/res/layout/swap_select_apps.xml
+++ b/app/src/full/res/layout/swap_select_apps.xml
@@ -2,8 +2,16 @@
 
 <org.fdroid.fdroid.views.swap.SelectAppsView
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
+        xmlns:swap="http://schemas.android.com/apk/res-auto"
+        swap:toolbarColor="@color/swap_bright_blue"
+        swap:toolbarTitle="@string/swap_choose_apps"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+    <ListView
+            android:id="@+id/list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"/>
+
 </org.fdroid.fdroid.views.swap.SelectAppsView>
\ No newline at end of file
diff --git a/app/src/full/res/layout/swap_send_fdroid.xml b/app/src/full/res/layout/swap_send_fdroid.xml
index 79f1736e5..c86099843 100644
--- a/app/src/full/res/layout/swap_send_fdroid.xml
+++ b/app/src/full/res/layout/swap_send_fdroid.xml
@@ -3,10 +3,13 @@
 <org.fdroid.fdroid.views.swap.SendFDroidView
         xmlns:tools="http://schemas.android.com/tools"
         xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:swap="http://schemas.android.com/apk/res-auto"
+        swap:toolbarTitle="@string/swap_send_fdroid"
         android:background="@color/swap_blue"
         android:layout_height="match_parent"
         android:layout_width="wrap_content">
 
+    <ScrollView android:layout_width="match_parent" android:layout_height="match_parent">
     <LinearLayout android:orientation="vertical"
                   android:gravity="center"
                   android:layout_width="wrap_content"
@@ -46,5 +49,5 @@
                 style="@style/SwapTheme.Wizard.QRScanWarningText"/>
 
     </LinearLayout>
-
+    </ScrollView>
 </org.fdroid.fdroid.views.swap.SendFDroidView>
\ No newline at end of file
diff --git a/app/src/full/res/layout/swap_start_swap.xml b/app/src/full/res/layout/swap_start_swap.xml
index 47106d40a..7a2137e32 100644
--- a/app/src/full/res/layout/swap_start_swap.xml
+++ b/app/src/full/res/layout/swap_start_swap.xml
@@ -7,6 +7,9 @@
 <org.fdroid.fdroid.views.swap.StartSwapView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
+        xmlns:swap="http://schemas.android.com/apk/res-auto"
+        swap:toolbarColor="@color/swap_bright_blue"
+        swap:toolbarTitle="@string/swap_nearby"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/full/res/layout/swap_success.xml b/app/src/full/res/layout/swap_success.xml
index e00d3c09c..e36ea2b43 100644
--- a/app/src/full/res/layout/swap_success.xml
+++ b/app/src/full/res/layout/swap_success.xml
@@ -2,8 +2,16 @@
 
 <org.fdroid.fdroid.views.swap.SwapSuccessView
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
+        xmlns:swap="http://schemas.android.com/apk/res-auto"
+        swap:toolbarColor="@color/swap_bright_blue"
+        swap:toolbarTitle="@string/swap_success"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+    <ListView
+            android:id="@+id/list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"/>
+
 </org.fdroid.fdroid.views.swap.SwapSuccessView>
\ No newline at end of file
diff --git a/app/src/full/res/layout/swap_wifi_qr.xml b/app/src/full/res/layout/swap_wifi_qr.xml
index b6d51594b..6678e3b84 100644
--- a/app/src/full/res/layout/swap_wifi_qr.xml
+++ b/app/src/full/res/layout/swap_wifi_qr.xml
@@ -3,10 +3,13 @@
 <org.fdroid.fdroid.views.swap.WifiQrView
         xmlns:tools="http://schemas.android.com/tools"
         xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:swap="http://schemas.android.com/apk/res-auto"
+        swap:toolbarTitle="@string/swap_scan_qr"
         android:background="@color/swap_blue"
         android:layout_height="match_parent"
         android:layout_width="wrap_content">
 
+    <ScrollView android:layout_width="match_parent" android:layout_height="match_parent">
     <LinearLayout android:orientation="vertical"
                   android:gravity="center"
                   android:layout_width="wrap_content"
@@ -53,5 +56,5 @@
                 style="@style/SwapTheme.Wizard.QRScanWarningText"/>
 
     </LinearLayout>
-
+    </ScrollView>
 </org.fdroid.fdroid.views.swap.WifiQrView>
\ No newline at end of file
diff --git a/app/src/full/res/values/attrs.xml b/app/src/full/res/values/attrs.xml
index 2e1d9cd0b..fda44846d 100644
--- a/app/src/full/res/values/attrs.xml
+++ b/app/src/full/res/values/attrs.xml
@@ -3,4 +3,8 @@
 
     <integer name="unhidePin">1337</integer>
 
+    <declare-styleable name="SwapView">
+        <attr name="toolbarColor" format="color"/>
+        <attr name="toolbarTitle" format="string"/>
+    </declare-styleable>
 </resources>

From 9d6c95d51db539e3b98c7e5ac287ffd55d7c6f22 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 6 May 2019 18:08:30 +0200
Subject: [PATCH 8/9] move menu handling to SwapView and SwapWorkflowActivity

The menus originate in the Activity, so avoid pushing it to the Views.
---
 .../org/fdroid/fdroid/localrepo/SwapView.java |  16 +--
 .../fdroid/views/swap/JoinWifiView.java       |  21 ----
 .../org/fdroid/fdroid/views/swap/NfcView.java |  21 ----
 .../fdroid/views/swap/SelectAppsView.java     |  59 +---------
 .../fdroid/views/swap/SwapSuccessView.java    |  50 +--------
 .../views/swap/SwapWorkflowActivity.java      | 102 +++++++++++++++++-
 app/src/full/res/layout/swap_select_apps.xml  |   1 +
 app/src/full/res/layout/swap_success.xml      |   1 +
 app/src/full/res/menu/swap_skip.xml           |  12 ---
 9 files changed, 116 insertions(+), 167 deletions(-)
 delete mode 100644 app/src/full/res/menu/swap_skip.xml

diff --git a/app/src/full/java/org/fdroid/fdroid/localrepo/SwapView.java b/app/src/full/java/org/fdroid/fdroid/localrepo/SwapView.java
index 9e204ba9e..9404ad14f 100644
--- a/app/src/full/java/org/fdroid/fdroid/localrepo/SwapView.java
+++ b/app/src/full/java/org/fdroid/fdroid/localrepo/SwapView.java
@@ -6,8 +6,6 @@ import android.content.res.TypedArray;
 import android.support.annotation.ColorInt;
 import android.support.annotation.LayoutRes;
 import android.util.AttributeSet;
-import android.view.Menu;
-import android.view.MenuInflater;
 import android.widget.RelativeLayout;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.views.swap.SwapWorkflowActivity;
@@ -25,6 +23,8 @@ public class SwapView extends RelativeLayout {
 
     private int layoutResId;
 
+    protected String currentFilterString;
+
     public SwapView(Context context) {
         this(context, null);
     }
@@ -48,10 +48,6 @@ public class SwapView extends RelativeLayout {
         a.recycle();
     }
 
-    @Override
-    public boolean buildMenu(Menu menu, @NonNull MenuInflater inflater) {
-        return false;
-    }
     @LayoutRes
     public int getLayoutResId() {
         return layoutResId;
@@ -61,6 +57,14 @@ public class SwapView extends RelativeLayout {
         this.layoutResId = layoutResId;
     }
 
+    public String getCurrentFilterString() {
+        return this.currentFilterString;
+    }
+
+    public void setCurrentFilterString(String currentFilterString) {
+        this.currentFilterString = currentFilterString;
+    }
+
     public SwapWorkflowActivity getActivity() {
         return (SwapWorkflowActivity) getContext();
     }
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/JoinWifiView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/JoinWifiView.java
index f9e97b74c..ac8454e47 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/JoinWifiView.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/JoinWifiView.java
@@ -6,14 +6,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.wifi.WifiManager;
-import android.support.annotation.NonNull;
 import android.support.v4.content.LocalBroadcastManager;
-import android.support.v4.view.MenuItemCompat;
 import android.text.TextUtils;
 import android.util.AttributeSet;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -100,22 +95,6 @@ public class JoinWifiView extends SwapView {
         getActivity().startActivity(new Intent(WifiManager.ACTION_PICK_WIFI_NETWORK));
     }
 
-    @Override
-    public boolean buildMenu(Menu menu, @NonNull MenuInflater inflater) {
-        inflater.inflate(R.menu.swap_next, menu);
-        MenuItem next = menu.findItem(R.id.action_next);
-        MenuItemCompat.setShowAsAction(next,
-                MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
-        next.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-            @Override
-            public boolean onMenuItemClick(MenuItem item) {
-                getActivity().inflateInnerView(R.layout.swap_select_apps);
-                return true;
-            }
-        });
-        return true;
-    }
-
     private final BroadcastReceiver onWifiStateChange = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/NfcView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/NfcView.java
index af69cde14..43c8989a0 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/NfcView.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/NfcView.java
@@ -2,12 +2,7 @@ package org.fdroid.fdroid.views.swap;
 
 import android.annotation.TargetApi;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v4.view.MenuItemCompat;
 import android.util.AttributeSet;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import org.fdroid.fdroid.Preferences;
@@ -44,20 +39,4 @@ public class NfcView extends SwapView {
             }
         });
     }
-
-    @Override
-    public boolean buildMenu(Menu menu, @NonNull MenuInflater inflater) {
-        inflater.inflate(R.menu.swap_skip, menu);
-        MenuItem next = menu.findItem(R.id.action_next);
-        MenuItemCompat.setShowAsAction(next,
-                MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
-        next.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-            @Override
-            public boolean onMenuItemClick(MenuItem item) {
-                getActivity().inflateInnerView(R.layout.swap_wifi_qr);
-                return true;
-            }
-        });
-        return true;
-    }
 }
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SelectAppsView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SelectAppsView.java
index 3e10f4218..9068be658 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/SelectAppsView.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/SelectAppsView.java
@@ -13,16 +13,11 @@ import android.support.annotation.Nullable;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
-import android.support.v4.view.MenuItemCompat;
 import android.support.v4.widget.CursorAdapter;
-import android.support.v7.widget.SearchView;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -37,9 +32,7 @@ import org.fdroid.fdroid.data.Schema.InstalledAppTable;
 import org.fdroid.fdroid.localrepo.SwapService;
 import org.fdroid.fdroid.localrepo.SwapView;
 
-public class SelectAppsView extends SwapView implements
-        LoaderManager.LoaderCallbacks<Cursor>,
-        SearchView.OnQueryTextListener {
+public class SelectAppsView extends SwapView implements LoaderManager.LoaderCallbacks<Cursor> {
 
     public SelectAppsView(Context context) {
         super(context);
@@ -62,11 +55,8 @@ public class SelectAppsView extends SwapView implements
         return getActivity().getState();
     }
 
-    private static final int LOADER_INSTALLED_APPS = 253341534;
-
     private ListView listView;
     private AppListAdapter adapter;
-    private String currentFilterString;
 
     @Override
     protected void onFinishInflate() {
@@ -80,7 +70,7 @@ public class SelectAppsView extends SwapView implements
         listView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
 
         // either reconnect with an existing loader or start a new one
-        getActivity().getSupportLoaderManager().initLoader(LOADER_INSTALLED_APPS, null, this);
+        getActivity().getSupportLoaderManager().initLoader(R.layout.swap_select_apps, null, this);
 
         listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
@@ -89,31 +79,6 @@ public class SelectAppsView extends SwapView implements
         });
     }
 
-    @Override
-    public boolean buildMenu(Menu menu, @NonNull MenuInflater inflater) {
-
-        inflater.inflate(R.menu.swap_next_search, menu);
-        MenuItem nextMenuItem = menu.findItem(R.id.action_next);
-        int flags = MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT;
-        MenuItemCompat.setShowAsAction(nextMenuItem, flags);
-        nextMenuItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-            @Override
-            public boolean onMenuItemClick(MenuItem item) {
-                getActivity().onAppsSelected();
-                return true;
-            }
-        });
-
-        SearchView searchView = new SearchView(getActivity());
-
-        MenuItem searchMenuItem = menu.findItem(R.id.action_search);
-        MenuItemCompat.setActionView(searchMenuItem, searchView);
-        MenuItemCompat.setShowAsAction(searchMenuItem, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
-
-        searchView.setOnQueryTextListener(this);
-        return true;
-    }
-
     private void toggleAppSelected(int position) {
         Cursor c = (Cursor) adapter.getItem(position);
         String packageName = c.getString(c.getColumnIndex(InstalledAppTable.Cols.Package.NAME));
@@ -165,26 +130,6 @@ public class SelectAppsView extends SwapView implements
         adapter.swapCursor(null);
     }
 
-    @Override
-    public boolean onQueryTextChange(String newText) {
-        String newFilter = !TextUtils.isEmpty(newText) ? newText : null;
-        if (currentFilterString == null && newFilter == null) {
-            return true;
-        }
-        if (currentFilterString != null && currentFilterString.equals(newFilter)) {
-            return true;
-        }
-        currentFilterString = newFilter;
-        getActivity().getSupportLoaderManager().restartLoader(LOADER_INSTALLED_APPS, null, this);
-        return true;
-    }
-
-    @Override
-    public boolean onQueryTextSubmit(String query) {
-        // this is not needed since we respond to every change in text
-        return true;
-    }
-
     private class AppListAdapter extends CursorAdapter {
 
         @Nullable
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapSuccessView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapSuccessView.java
index e3197dfbb..5fd5ac97d 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapSuccessView.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapSuccessView.java
@@ -18,15 +18,10 @@ import android.support.v4.app.LoaderManager;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
 import android.support.v4.content.LocalBroadcastManager;
-import android.support.v4.view.MenuItemCompat;
 import android.support.v4.widget.CursorAdapter;
-import android.support.v7.widget.SearchView;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -54,9 +49,8 @@ import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
 
-public class SwapSuccessView extends SwapView implements
-        LoaderManager.LoaderCallbacks<Cursor>,
-        SearchView.OnQueryTextListener {
+public class SwapSuccessView extends SwapView implements LoaderManager.LoaderCallbacks<Cursor> {
+    private static final String TAG = "SwapAppsView";
 
     public SwapSuccessView(Context context) {
         super(context);
@@ -75,9 +69,6 @@ public class SwapSuccessView extends SwapView implements
         super(context, attrs, defStyleAttr, defStyleRes);
     }
 
-    private static final int LOADER_SWAPABLE_APPS = 759283741;
-    private static final String TAG = "SwapAppsView";
-
     private Repo repo;
     private AppListAdapter adapter;
     private String currentFilterString;
@@ -100,7 +91,7 @@ public class SwapSuccessView extends SwapView implements
         listView.setAdapter(adapter);
 
         // either reconnect with an existing loader or start a new one
-        getActivity().getSupportLoaderManager().initLoader(LOADER_SWAPABLE_APPS, null, this);
+        getActivity().getSupportLoaderManager().initLoader(R.layout.swap_success, null, this);
 
         LocalBroadcastManager.getInstance(getActivity()).registerReceiver(
                 pollForUpdatesReceiver, new IntentFilter(UpdateService.LOCAL_ACTION_STATUS));
@@ -142,21 +133,6 @@ public class SwapSuccessView extends SwapView implements
         }, 5000);
     }
 
-    @Override
-    public boolean buildMenu(Menu menu, @NonNull MenuInflater inflater) {
-
-        inflater.inflate(R.menu.swap_search, menu);
-
-        SearchView searchView = new SearchView(getActivity());
-
-        MenuItem searchMenuItem = menu.findItem(R.id.action_search);
-        MenuItemCompat.setActionView(searchMenuItem, searchView);
-        MenuItemCompat.setShowAsAction(searchMenuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
-
-        searchView.setOnQueryTextListener(this);
-        return true;
-    }
-
     @Override
     public CursorLoader onCreateLoader(int id, Bundle args) {
         Uri uri = TextUtils.isEmpty(currentFilterString)
@@ -177,26 +153,6 @@ public class SwapSuccessView extends SwapView implements
         adapter.swapCursor(null);
     }
 
-    @Override
-    public boolean onQueryTextChange(String newText) {
-        String newFilter = !TextUtils.isEmpty(newText) ? newText : null;
-        if (currentFilterString == null && newFilter == null) {
-            return true;
-        }
-        if (currentFilterString != null && currentFilterString.equals(newFilter)) {
-            return true;
-        }
-        currentFilterString = newFilter;
-        getActivity().getSupportLoaderManager().restartLoader(LOADER_SWAPABLE_APPS, null, this);
-        return true;
-    }
-
-    @Override
-    public boolean onQueryTextSubmit(String query) {
-        // this is not needed since we respond to every change in text
-        return true;
-    }
-
     private class AppListAdapter extends CursorAdapter {
 
         private class ViewHolder {
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
index 870ff9703..3410b5356 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
@@ -20,13 +20,19 @@ import android.provider.Settings;
 import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
 import android.support.v4.content.LocalBroadcastManager;
+import android.support.v4.view.MenuItemCompat;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.SearchView;
 import android.support.v7.widget.Toolbar;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
@@ -228,9 +234,99 @@ public class SwapWorkflowActivity extends AppCompatActivity {
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         menu.clear();
-        boolean parent = super.onPrepareOptionsMenu(menu);
-        boolean inner = currentView != null && currentView.buildMenu(menu, getMenuInflater());
-        return parent || inner;
+
+        MenuInflater menuInflater = getMenuInflater();
+        switch (currentView.getLayoutResId()) {
+            case R.layout.swap_select_apps:
+                menuInflater.inflate(R.menu.swap_next_search, menu);
+                setUpNextButton(menu, R.string.next);
+                setUpSearchView(menu);
+                return true;
+            case R.layout.swap_success:
+                menuInflater.inflate(R.menu.swap_search, menu);
+                setUpSearchView(menu);
+                return true;
+            case R.layout.swap_join_wifi:
+                menuInflater.inflate(R.menu.swap_next, menu);
+                setUpNextButton(menu, R.string.next);
+                return true;
+            case R.layout.swap_nfc:
+                menuInflater.inflate(R.menu.swap_next, menu);
+                setUpNextButton(menu, R.string.skip);
+                return true;
+        }
+
+        return super.onPrepareOptionsMenu(menu);
+    }
+
+    private void setUpNextButton(Menu menu, @StringRes int titleResId) {
+        MenuItem next = menu.findItem(R.id.action_next);
+        CharSequence title = getString(titleResId);
+        next.setTitle(title);
+        next.setTitleCondensed(title);
+        MenuItemCompat.setShowAsAction(next,
+                MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
+        next.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+            @Override
+            public boolean onMenuItemClick(MenuItem item) {
+                sendNext();
+                return true;
+            }
+        });
+    }
+
+    void sendNext() {
+        int currentLayoutResId = currentView.getLayoutResId();
+        switch (currentLayoutResId) {
+            case R.layout.swap_select_apps:
+                onAppsSelected();
+                break;
+            case R.layout.swap_join_wifi:
+                inflateSwapView(R.layout.swap_select_apps);
+                break;
+            case R.layout.swap_nfc:
+                inflateSwapView(R.layout.swap_wifi_qr);
+                break;
+        }
+    }
+
+    private void setUpSearchView(Menu menu) {
+        SearchView searchView = new SearchView(this);
+
+        MenuItem searchMenuItem = menu.findItem(R.id.action_search);
+        MenuItemCompat.setActionView(searchMenuItem, searchView);
+        MenuItemCompat.setShowAsAction(searchMenuItem, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
+
+        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+
+            @Override
+            public boolean onQueryTextSubmit(String newText) {
+                String currentFilterString = currentView.getCurrentFilterString();
+                String newFilter = !TextUtils.isEmpty(newText) ? newText : null;
+                if (currentFilterString == null && newFilter == null) {
+                    return true;
+                }
+                if (currentFilterString != null && currentFilterString.equals(newFilter)) {
+                    return true;
+                }
+                currentView.setCurrentFilterString(newFilter);
+                if (currentView instanceof SelectAppsView) {
+                    getSupportLoaderManager().restartLoader(currentView.getLayoutResId(), null,
+                            (SelectAppsView) currentView);
+                } else if (currentView instanceof SwapSuccessView) {
+                    getSupportLoaderManager().restartLoader(currentView.getLayoutResId(), null,
+                            (SwapSuccessView) currentView);
+                } else {
+                    throw new IllegalStateException(currentView.getClass() + " does not have Loader!");
+                }
+                return true;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String s) {
+                return true;
+            }
+        });
     }
 
     @Override
diff --git a/app/src/full/res/layout/swap_select_apps.xml b/app/src/full/res/layout/swap_select_apps.xml
index 1e36310fa..a422e701a 100644
--- a/app/src/full/res/layout/swap_select_apps.xml
+++ b/app/src/full/res/layout/swap_select_apps.xml
@@ -5,6 +5,7 @@
         xmlns:swap="http://schemas.android.com/apk/res-auto"
         swap:toolbarColor="@color/swap_bright_blue"
         swap:toolbarTitle="@string/swap_choose_apps"
+        android:id="@+id/select_apps"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
diff --git a/app/src/full/res/layout/swap_success.xml b/app/src/full/res/layout/swap_success.xml
index e36ea2b43..ffcb3c180 100644
--- a/app/src/full/res/layout/swap_success.xml
+++ b/app/src/full/res/layout/swap_success.xml
@@ -5,6 +5,7 @@
         xmlns:swap="http://schemas.android.com/apk/res-auto"
         swap:toolbarColor="@color/swap_bright_blue"
         swap:toolbarTitle="@string/swap_success"
+        android:id="@+id/swap_success"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
diff --git a/app/src/full/res/menu/swap_skip.xml b/app/src/full/res/menu/swap_skip.xml
deleted file mode 100644
index 4adcb7942..000000000
--- a/app/src/full/res/menu/swap_skip.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/action_next"
-        android:icon="@drawable/ic_arrow_forward_white"
-        android:title="@string/skip"
-        android:titleCondensed="@string/skip"/>
-
-    <!-- Currently in a style, but that style probably wont work on 8 -> 11 devices -->
-    <!--android:drawable="@drawable/swap_action_button_skin"-->
-
-</menu>
\ No newline at end of file

From 291e4c4c3c90cd605406add3aef0da6800b472ce Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 7 May 2019 11:17:37 +0200
Subject: [PATCH 9/9] change 'fragment' name to avoid confusion, Swap doesn't
 use Fragments

---
 .../java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java | 2 +-
 app/src/full/res/layout/swap_activity.xml                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
index 3410b5356..ee92c4dca 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
@@ -217,7 +217,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
         toolbar.setTitleTextAppearance(getApplicationContext(), R.style.SwapTheme_Wizard_Text_Toolbar);
         setSupportActionBar(toolbar);
 
-        container = (ViewGroup) findViewById(R.id.fragment_container);
+        container = (ViewGroup) findViewById(R.id.container);
 
         localBroadcastManager = LocalBroadcastManager.getInstance(this);
         wifiManager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
diff --git a/app/src/full/res/layout/swap_activity.xml b/app/src/full/res/layout/swap_activity.xml
index 517f6621e..6d25e3a3d 100644
--- a/app/src/full/res/layout/swap_activity.xml
+++ b/app/src/full/res/layout/swap_activity.xml
@@ -17,7 +17,7 @@
             tools:ignore="UnusedAttribute"/>
 
     <FrameLayout
-            android:id="@+id/fragment_container"
+            android:id="@+id/container"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"/>