Merge branch 'new-swap'

F-Droid/AndroidManifest.xml

@@ -42,8 +42,10 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="18" />
@@ -299,18 +301,6 @@
                 android:name="android.app.default_searchable"
                 android:value=".SearchResults" />
         </activity>
-        <activity
-            android:name=".views.swap.ConnectSwapActivity"
-            android:theme="@style/SwapTheme.Wizard.ReceiveSwap"
-            android:label=""
-            android:noHistory="true"
-            android:parentActivityName=".FDroid"
-            android:screenOrientation="portrait"
-            android:configChanges="orientation|keyboardHidden">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".FDroid" />
-        </activity>
         <activity
             android:name=".installer.InstallConfirmActivity"
             android:label="@string/menu_install"
@@ -379,14 +369,6 @@
                 android:value=".FDroid" />
 
         </activity>
-        <activity
-            android:name=".views.swap.SwapAppListActivity$SwapAppDetails"
-            android:label="@string/app_details"
-            android:parentActivityName=".views.swap.SwapAppListActivity" >
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".views.swap.SwapAppListActivity" />
-        </activity>
         <activity
             android:label="@string/menu_preferences"
             android:name=".PreferencesActivity"
@@ -397,7 +379,7 @@
         </activity>
         <activity
             android:label="@string/menu_swap"
-            android:name=".views.swap.SwapActivity"
+            android:name=".views.swap.SwapWorkflowActivity"
             android:parentActivityName=".FDroid"
             android:theme="@style/SwapTheme.Wizard"
             android:screenOrientation="portrait"
@@ -406,17 +388,6 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".FDroid" />
         </activity>
-        <activity
-            android:label="@string/swap"
-            android:name=".views.swap.SwapAppListActivity"
-            android:parentActivityName=".FDroid"
-            android:theme="@style/SwapTheme.AppList"
-            android:screenOrientation="portrait"
-            android:configChanges="orientation|keyboardHidden">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".FDroid" />
-        </activity>
         <!-- Note: Theme.NoDisplay, this activity shows dialogs only -->
         <activity
             android:name=".installer.InstallIntoSystemDialogActivity"
@@ -482,7 +453,7 @@
 
         <service android:name=".UpdateService" />
         <service android:name=".net.WifiStateChangeService" />
-        <service android:name=".localrepo.LocalRepoService" />
+        <service android:name=".localrepo.SwapService" />
     </application>
 
 </manifest>

F-Droid/build.gradle

@@ -24,6 +24,7 @@ if ( !hasProperty( 'sourceDeps' ) ) {
         compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
         compile 'com.google.zxing:core:3.2.0'
         compile 'eu.chainfire:libsuperuser:1.0.0.201504231659'
+        compile 'cc.mvdan.accesspoint:library:0.1.1'
 
         // We use a slightly modified spongycastle, see
         // openkeychain/spongycastle with some changes on top of 1.51.0.0

F-Droid/res/drawable/swap_action_button_skin.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <shape>
-            <solid android:color="@color/swap_light_blue_pressed" />
-            <padding
-                android:left="26.9dp"
-                android:top="17.9dp"
-                android:right="26.9dp"
-                android:bottom="17.9dp" />
-                <!--
-                Padding left/right = 48px * 90dpi / 160dpi = ~26.9dp
-                Padding top/bottom = 32px * 90dpi / 160dpi = ~17.9dp
-                -->
-        </shape>
-    </item>
-    <item>
-        <shape>
-            <solid android:color="@color/swap_light_blue" />
-            <padding
-                android:left="26.9dp"
-                android:top="17.9dp"
-                android:right="26.9dp"
-                android:bottom="17.9dp" />
-
-        </shape>
-    </item>
-</selector>

F-Droid/res/drawable/swap_button_normal.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <solid android:color="@android:color/white" />
-            <padding
-                android:top="1dp"/>
-        </shape>
-    </item>
-    <item>
-        <shape>
-            <solid android:color="@color/swap_blue" />
-            <padding
-                android:left="10dp"
-                android:top="10dp"
-                android:right="10dp"
-                android:bottom="10dp" />
-        </shape>
-    </item>
-</layer-list>

F-Droid/res/drawable/swap_button_pressed.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <solid android:color="@android:color/white" />
-            <padding
-                android:top="1dp"/>
-        </shape>
-    </item>
-    <item>
-        <shape>
-            <solid android:color="@color/swap_blue_pressed" />
-            <padding
-                android:left="10dp"
-                android:top="10dp"
-                android:right="10dp"
-                android:bottom="10dp" />
-        </shape>
-    </item>
-</layer-list>

F-Droid/res/drawable/swap_button_skin.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/swap_button_pressed" />
-    <item android:drawable="@drawable/swap_button_normal" />
-</selector>

F-Droid/res/drawable/swap_confirm_button_skin.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <shape>
-            <solid android:color="@color/swap_confirm_pressed" />
-            <padding
-                android:left="10dp"
-                android:top="10dp"
-                android:right="10dp"
-                android:bottom="10dp" />
-        </shape>
-    </item>
-    <item>
-        <shape>
-            <solid android:color="@color/swap_confirm" />
-            <padding
-                android:left="10dp"
-                android:top="10dp"
-                android:right="10dp"
-                android:bottom="10dp" />
-        </shape>
-    </item>
-</selector>

F-Droid/res/drawable/swap_deny_button_skin.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <shape>
-            <solid android:color="@color/swap_deny_pressed" />
-            <padding
-                android:left="10dp"
-                android:top="10dp"
-                android:right="10dp"
-                android:bottom="10dp" />
-        </shape>
-    </item>
-    <item>
-        <shape>
-            <solid android:color="@color/swap_deny" />
-            <padding
-                android:left="10dp"
-                android:top="10dp"
-                android:right="10dp"
-                android:bottom="10dp" />
-        </shape>
-    </item>
-</selector>

F-Droid/res/drawable/swap_start_button_skin.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <solid android:color="@color/swap_light_blue" />
-        </shape>
-    </item>
-</selector>

F-Droid/res/drawable/swap_wifi_likely_to_work.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/swap_wifi_likely_to_work" />
-    <size android:width="88dp" android:height="7dp" />
-</shape>

F-Droid/res/drawable/swap_wifi_may_work.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/swap_wifi_may_work"/>
-    <size android:width="88dp" android:height="7dp" />
-</shape>

F-Droid/res/drawable/swap_window_background.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/swap_blue" />
-</shape>

F-Droid/res/layout-v11/select_local_apps_list_item.xml

@@ -12,14 +12,13 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:background="?android:attr/activatedBackgroundIndicator"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:paddingBottom="2dip"
-    android:paddingTop="2dip" >
+    android:paddingTop="2dip">
 
     <ImageView
         android:id="@android:id/icon"
@@ -28,30 +27,52 @@
         android:layout_marginLeft="?attr/listPreferredItemPaddingLeft"
         android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
         android:layout_marginTop="6dip"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
+        tools:src="@drawable/ic_launcher"
         tools:ignore="ContentDescription" />
 
+    <!-- Suppress InconsistentLayout because the lower API levels use a checkbox rather than this -->p
+    <ImageView
+        android:id="@+id/checked"
+        android:layout_width="32dip"
+        android:layout_height="32dip"
+        android:layout_marginRight="?attr/listPreferredItemPaddingLeft"
+        android:layout_marginEnd="?android:attr/listPreferredItemPaddingStart"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        tools:suppress="InconsistentLayout"
+        android:src="@drawable/ic_add_circle_outline_white" />
+
     <TwoLineListItem
-        android:layout_width="match_parent"
+        android:layout_toRightOf="@android:id/icon"
+        android:layout_toEndOf="@android:id/icon"
+        android:layout_toLeftOf="@id/checked"
+        android:layout_toStartOf="@id/checked"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:mode="twoLine" >
 
         <TextView
             android:id="@+id/application_label"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="?attr/listPreferredItemPaddingLeft"
             android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
             android:layout_marginTop="6dip"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            tools:text="F-Droid" />
 
         <TextView
             android:id="@+id/package_name"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignStart="@+id/application_label"
             android:layout_alignLeft="@+id/application_label"
             android:layout_below="@+id/application_label"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            tools:text="Application Manager" />
     </TwoLineListItem>
 
-</LinearLayout>
+</RelativeLayout>

F-Droid/res/layout-v17/select_local_apps_list_item.xml

@@ -12,46 +12,59 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:background="?android:attr/activatedBackgroundIndicator"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:paddingBottom="2dip"
-    android:paddingTop="2dip" >
+    android:paddingTop="2dip">
 
     <ImageView
         android:id="@android:id/icon"
         android:layout_width="48dip"
         android:layout_height="48dip"
-        android:layout_marginLeft="?attr/listPreferredItemPaddingLeft"
         android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
         android:layout_marginTop="6dip"
+        android:layout_alignParentStart="true"
+        tools:src="@drawable/ic_launcher"
         tools:ignore="ContentDescription" />
 
+    <!-- Suppress InconsistentLayout because the lower API levels use a checkbox rather than this -->
+    <ImageView
+        android:id="@+id/checked"
+        android:layout_width="32dip"
+        android:layout_height="32dip"
+        android:layout_marginEnd="?android:attr/listPreferredItemPaddingStart"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        tools:suppress="InconsistentLayout"
+        android:src="@drawable/ic_add_circle_outline_white" />
+
     <TwoLineListItem
-        android:layout_width="match_parent"
+        android:layout_toEndOf="@android:id/icon"
+        android:layout_toStartOf="@id/checked"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:mode="twoLine" >
 
         <TextView
             android:id="@+id/application_label"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="?attr/listPreferredItemPaddingLeft"
             android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
             android:layout_marginTop="6dip"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            tools:text="F-Droid" />
 
         <TextView
             android:id="@+id/package_name"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignStart="@+id/application_label"
-            android:layout_alignLeft="@+id/application_label"
             android:layout_below="@+id/application_label"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            tools:text="Application Manager" />
     </TwoLineListItem>
 
-</LinearLayout>
+</RelativeLayout>

F-Droid/res/layout/repodiscoveryitem.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-       <TextView
-          android:id="@+id/reposcanitemname"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:maxLines="1"
-          android:paddingLeft="8sp"
-          android:paddingStart="8sp"
-          android:textSize="16sp"
-          android:textStyle="bold" />
-
-       <TextView
-          android:id="@+id/reposcanitemaddress"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_below="@+id/reposcanitemname"
-          android:layout_marginTop="2dp"
-          android:paddingLeft="8sp"
-          android:paddingStart="8sp"
-          android:maxLines="1"
-          android:text="@string/waiting_for_ipaddress"
-          android:textSize="14sp" />
-
-</RelativeLayout>

F-Droid/res/layout/repodiscoverylist.xml

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingLeft="24dp"
-    android:paddingStart="24dp"
-    android:paddingRight="24dp"
-    android:paddingEnd="24dp"
-    android:paddingTop="20dp" >
-
-	<LinearLayout
-	    android:id="@+id/reposcanprogresslayout"
-	    android:layout_width="match_parent"
-	    android:layout_height="wrap_content"
-	    android:layout_alignParentTop="true"
-	    android:layout_alignParentLeft="true"
-	    android:layout_alignParentStart="true"
-	    android:layout_centerHorizontal="true"
-	    android:paddingTop="8sp" >
-
-	    <ProgressBar
-	        android:id="@+id/reposcaningspinner"
-	        style="?android:attr/progressBarStyle"
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:layout_gravity="center_horizontal"
-	        android:layout_marginRight="5dp"
-	        android:layout_marginEnd="5dp"
-	        android:indeterminate="true" />
-
-	    <TextView
-	        android:id="@+id/reposcaninglabel"
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:layout_gravity="center_horizontal"
-	        android:padding="8sp"
-	        android:text="@string/local_repos_scanning"
-	        android:textSize="15sp" />
-
-	</LinearLayout>
-
-	<ListView
-		android:id="@+id/reposcanlist"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:layout_below="@+id/reposcanprogresslayout"
-		android:padding="8sp"
-	/>
-
-</RelativeLayout>

F-Droid/res/layout/select_local_apps_list_item.xml

@@ -12,18 +12,13 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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="?attr/listPreferredItemHeight"
+    android:minHeight="?android:attr/listPreferredItemHeight"
     android:paddingBottom="2dip"
-    android:paddingTop="2dip" >
-
-    <CheckBox
-        android:id="@+id/checkbox"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+    android:paddingTop="2dip">
 
     <ImageView
         android:id="@android:id/icon"
@@ -32,30 +27,49 @@
         android:layout_marginLeft="?attr/listPreferredItemPaddingLeft"
         android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
         android:layout_marginTop="6dip"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
+        tools:src="@drawable/ic_launcher"
         tools:ignore="ContentDescription" />
 
+    <CheckBox
+        android:id="@+id/checkbox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="?attr/listPreferredItemPaddingLeft"
+        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true" />
+
     <TwoLineListItem
-        android:layout_width="match_parent"
+        android:layout_toRightOf="@android:id/icon"
+        android:layout_toEndOf="@android:id/icon"
+        android:layout_toLeftOf="@id/checkbox"
+        android:layout_toStartOf="@id/checkbox"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:mode="twoLine" >
 
         <TextView
             android:id="@+id/application_label"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="?attr/listPreferredItemPaddingLeft"
             android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
             android:layout_marginTop="6dip"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            tools:text="F-Droid" />
 
         <TextView
             android:id="@+id/package_name"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="?attr/listPreferredItemPaddingLeft"
-            android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+            android:layout_alignStart="@+id/application_label"
+            android:layout_alignLeft="@+id/application_label"
             android:layout_below="@+id/application_label"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            tools:text="Application Manager" />
     </TwoLineListItem>
 
-</LinearLayout>
+</RelativeLayout>

F-Droid/res/layout/swap_activity.xml

@@ -1,14 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        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" />
 
     <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" />
 
-    </FrameLayout>
-
-</RelativeLayout>
+</LinearLayout>

F-Droid/res/layout/swap_app_list_item.xml

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    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" />
+
+    <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">
+
+        <Button
+            android:id="@+id/btn_install"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:backgroundTint="@color/swap_light_blue"
+            app:backgroundTint="@color/swap_light_blue"
+            android:textColor="@android:color/white"
+            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/inst" />
+
+        <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/incompatible" />
+
+        <TextView
+            android:id="@+id/btn_attempt_install"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/swap_light_blue"
+            android:text="@string/swap_attempt_install" />
+
+    </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" />
+
+    <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"
+        />
+
+</RelativeLayout>

F-Droid/res/layout/swap_blank.xml

@@ -1,25 +1,240 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<RelativeLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
+<!-- TODO: Add paddingStart in places where there is only paddingLeft. However Android Studio lint
+     gives an error, which is discussed here:
+     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">
+
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
-    <TextView
-            android:id="@+id/text_description"
-            android:text="@string/swap_introduction"
-            style="@style/SwapTheme.StartSwap.MainText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+        <RelativeLayout
+            android:id="@+id/header"
+            android:layout_width="match_parent"
+            android:layout_height="130dp">
 
-    <Button
-            android:id="@+id/button_start_swap"
-            android:text="@string/swap_start"
-            style="@style/SwapTheme.StartSwap.StartButton"
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scaleType="centerCrop"
+                android:src="@drawable/swap_start_header"/>
+
+            <!--
+            Removed for now, because there is no UI to hook this up to.
+            However, the general principle of having a help screen made accessible from the
+            start swap screen is still desirable, and so should be revisited in the future.
+            <ImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/ic_info_white"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentTop="true"
+                android:layout_marginRight="10dp"
+                android:layout_marginEnd="10dp"
+                android:layout_marginTop="10dp"
+                />-->
+
+            <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" />
+
+        </RelativeLayout>
+
+        <LinearLayout
+            android:id="@+id/bluetooth_info"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/text_description"
-            android:layout_centerHorizontal="true"/>
+            android:padding="10dp"
+            android:orientation="horizontal">
 
-</RelativeLayout>
+            <ImageView
+                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">
+
+                <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" />
+
+                <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" />
+
+            </LinearLayout>
+
+            <android.support.v7.widget.SwitchCompat
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:checked="true"
+                android:id="@+id/switch_bluetooth" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            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" />
+
+            <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">
+
+                <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" />
+
+                <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" />
+
+                <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" />
+
+            </LinearLayout>
+
+            <android.support.v7.widget.SwitchCompat
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:checked="false"
+                android:id="@+id/switch_wifi" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            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"/>
+
+            <ProgressBar
+                android:id="@+id/searching_people_nearby"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:indeterminate="true" />
+
+        </LinearLayout>
+
+        <ListView
+            android:id="@+id/list_people_nearby"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+        </ListView>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            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" />
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <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" />
+
+            <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_code"
+                android:drawablePadding="10dp"
+                android:paddingLeft="25dp"
+                android:paddingRight="25dp"
+                android:paddingEnd="25dp"
+                android:background="@android:color/transparent" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</org.fdroid.fdroid.views.swap.StartSwapView>

F-Droid/res/layout/swap_confirm_receive.xml

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<RelativeLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="18dp">
+<org.fdroid.fdroid.views.swap.ConfirmReceive xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android: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
@@ -33,7 +35,7 @@
 
     <TextView
             android:id="@+id/text_description"
-            android:text="@string/swap_confirm_connect"
+            tools:text="@string/swap_confirm_connect"
             style="@style/SwapTheme.Wizard.Text"
             android:layout_below="@id/text_title"
             android:layout_width="match_parent"
@@ -42,31 +44,36 @@
             <!-- 46px * 0.56 = 25.76sp -->
 
     <LinearLayout
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:layout_below="@+id/text_description"
+            android:layout_centerInParent="true"
             android:layout_marginTop="45dp">
             <!-- 80px * 0.56 = 45dp -->
 
+            <!-- TODO: Remove associated style files style="@style/SwapTheme.Wizard.ReceiveSwap.Deny"-->
         <Button
                 android:id="@+id/no_button"
                 android:text="@string/no"
-                style="@style/SwapTheme.Wizard.ReceiveSwap.Deny"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                />
-
+                android:backgroundTint="@color/swap_deny"
+                app:backgroundTint="@color/swap_deny"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="25dp"
+                android:layout_marginRight="25dp"
+                tools:ignore="UnusedAttribute" />
 
+        <!-- TODO: Remove associated style files style="@style/SwapTheme.Wizard.ReceiveSwap.Confirm" -->
         <Button
                 android:id="@+id/yes_button"
                 android:text="@string/yes"
-                style="@style/SwapTheme.Wizard.ReceiveSwap.Confirm"
-                android:layout_width="0dp"
-                android:layout_weight="1"/>
+                android:backgroundTint="@color/swap_light_blue"
+                app:backgroundTint="@color/swap_light_blue"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:ignore="UnusedAttribute" />
 
     </LinearLayout>
 
-</RelativeLayout>
+</org.fdroid.fdroid.views.swap.ConfirmReceive>

F-Droid/res/layout/swap_connecting.xml

@@ -0,0 +1,51 @@
+<?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/heading"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textSize="20sp"
+            android:padding="30dp"
+            android:textAlignment="center"
+            tools:text="Connecting with Nexus 4"
+            tools:ignore="UnusedAttribute" />
+
+        <ProgressBar
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:indeterminate="true"
+            android:layout_gravity="center" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/error"
+            android:textSize="20sp"
+            android:textAlignment="center"
+            android:text="@string/swap_connection_misc_error"
+            android:visibility="gone"
+            android:padding="30dp"
+            tools:ignore="UnusedAttribute" />
+
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/back"
+            android:backgroundTint="@color/swap_light_blue"
+            app: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" />
+
+</org.fdroid.fdroid.views.swap.SwapConnecting>

F-Droid/res/layout/swap_initial_loading.xml

@@ -0,0 +1,26 @@
+<?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 -->
+
+    <ProgressBar
+        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" />
+
+</org.fdroid.fdroid.views.swap.InitialLoadingView>

F-Droid/res/layout/swap_join_wifi.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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.SwapActivity">
 
     <TextView
@@ -26,14 +27,9 @@
             android:layout_centerHorizontal="true" />
 
     <!--
-    <Button style="@style/SwapTheme.Wizard.OptionButton"
-            android:id="@+id/btn_bluetooth"
-            android:text="@string/swap_use_bluetooth"
-            android:layout_alignParentBottom="true" />
-
     <Button style="@style/SwapTheme.Wizard.OptionButton"
             android:text="@string/swap_wifi_help"
-            android:layout_above="@id/btn_bluetooth"
+            android:layout_alignParentBottom="true"
             android:id="@+id/btn_learn_more_about_wifi"/>
     -->
 
@@ -52,9 +48,10 @@
             android:layout_height="wrap_content"
             android:text="@string/swap_view_available_networks"
             android:id="@+id/wifi_available_networks_prompt"
+            style="@style/SwapTheme.Wizard.Text"
             android:layout_centerHorizontal="true"
             android:layout_below="@id/wifi_ssid"
             android:paddingBottom="20dp"/>
     <!-- android:layout_above="@id/btn_learn_more_about_wifi" -->
 
-</RelativeLayout>
+</org.fdroid.fdroid.views.swap.JoinWifiView>