Merge branch 'material-design' into swap-demolition-material

F-Droid/build.gradle

@@ -16,9 +16,9 @@ if ( !hasProperty( 'sourceDeps' ) ) {
 
     dependencies {
 
-        compile 'com.android.support:support-v4:20.0.0',
-                'com.android.support:appcompat-v7:20.0.0',
-                'com.android.support:support-annotations:20.0.0',
+        compile 'com.android.support:support-v4:22.1.0',
+                'com.android.support:appcompat-v7:22.1.0',
+                'com.android.support:support-annotations:22.1.0',
 
                 'org.thoughtcrime.ssl.pinning:AndroidPinning:1.0.0',
                 'com.nostra13.universalimageloader:universal-image-loader:1.9.3',
@@ -80,9 +80,9 @@ if ( !hasProperty( 'sourceDeps' ) ) {
         // then you can find the relevant portions of the ../build.gradle file that
         // include magic required to make it work at around about the v0.78 git tag.
         // They have since been removed to clean up the build file.
-        compile 'com.android.support:support-v4:20.0.0',
-                'com.android.support:appcompat-v7:20.0.0',
-                'com.android.support:support-annotations:20.0.0'
+        compile 'com.android.support:support-v4:22.1.0',
+                'com.android.support:appcompat-v7:22.1.0',
+                'com.android.support:support-annotations:22.1.0'
 
         androidTestCompile 'commons-io:commons-io:2.2'
     }

F-Droid/res/layout/available_app_list.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <Spinner
+        android:id="@+id/category_spinner"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+    </Spinner>
+
+    <ListView
+        android:id="@android:id/list"
+        android:fastScrollEnabled="true"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    </ListView>
+
+</LinearLayout>

F-Droid/res/layout/swap_blank.xml

@@ -17,7 +17,7 @@
             android:id="@+id/button_start_swap"
             android:text="@string/swap_start"
             style="@style/SwapTheme.StartSwap.StartButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"/>
 
 </org.fdroid.fdroid.views.swap.StartSwapView>

F-Droid/res/menu/main.xml

@@ -4,12 +4,12 @@
 
     <item
         android:id="@+id/action_search"
-        android:icon="@android:drawable/ic_menu_search"
+        android:icon="@drawable/ic_search_white"
         android:title="@string/menu_search"
         app:showAsAction="always"/>
     <item
         android:id="@+id/action_update_repo"
-        android:icon="@drawable/ic_menu_refresh"
+        android:icon="@drawable/ic_refresh_white"
         android:title="@string/menu_update_repo"
         app:showAsAction="ifRoom"/>
     <item
@@ -18,22 +18,22 @@
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/action_manage_repos"
-        android:icon="@android:drawable/ic_menu_agenda"
+        android:icon="@drawable/ic_view_headline_white"
         android:title="@string/menu_manage"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/action_bluetooth_apk"
-        android:icon="@android:drawable/stat_sys_data_bluetooth"
+        android:icon="@drawable/ic_bluetooth_white"
         android:title="@string/menu_send_apk_bt"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/action_settings"
-        android:icon="@android:drawable/ic_menu_preferences"
+        android:icon="@drawable/ic_settings_white"
         android:title="@string/menu_preferences"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/action_about"
-        android:icon="@android:drawable/ic_menu_help"
+        android:icon="@drawable/ic_help_white"
         android:title="@string/menu_about"
         app:showAsAction="ifRoom"/>