From 9170e2af917b924c81e6699438a20ac28fef6247 Mon Sep 17 00:00:00 2001
From: relan <relan@users.noreply.github.com>
Date: Thu, 29 Oct 2015 17:38:04 +0300
Subject: [PATCH] Make category filter look Material

Get rid of Gingerbred legacy.
---
 F-Droid/res/layout/available_app_list.xml     | 17 ++++++++----
 .../fragments/AvailableAppsFragment.java      | 27 -------------------
 2 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/F-Droid/res/layout/available_app_list.xml b/F-Droid/res/layout/available_app_list.xml
index f4c147f8b..fab95c3c3 100644
--- a/F-Droid/res/layout/available_app_list.xml
+++ b/F-Droid/res/layout/available_app_list.xml
@@ -8,14 +8,21 @@
     <Spinner
         android:id="@+id/category_spinner"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-    </Spinner>
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:background="@color/fdroid_green" />
 
     <ListView
         android:id="@android:id/list"
         android:fastScrollEnabled="true"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    </ListView>
+        android:layout_height="match_parent" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
index 88e7e35a5..cb00a81ae 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
@@ -6,9 +6,7 @@ import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.database.ContentObserver;
 import android.database.Cursor;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.LoaderManager;
 import android.view.LayoutInflater;
@@ -122,29 +120,6 @@ public class AvailableAppsFragment extends AppListFragment implements
         return translatedCategories;
     }
 
-    /**
-     * With holo, the menu gets lost since it looks the same as an app list item.
-     * Suppress deprecation warnings because:
-     *  * setBackgroundDrawable(Drawable) -> setBackground(Drawable) was only in API 16
-     */
-    @SuppressWarnings("deprecation")
-    private void styleSpinner(Spinner spinner) {
-
-        Drawable menuButton = getResources().getDrawable(android.R.drawable.btn_dropdown);
-        switch (FDroidApp.getCurTheme()) {
-            case dark:
-                // fallthrough
-            case night:
-                menuButton.setAlpha(32); // make it darker via alpha
-                break;
-        }
-        if (Build.VERSION.SDK_INT >= 16) {
-            spinner.setBackground(menuButton);
-        } else {
-            spinner.setBackgroundDrawable(menuButton);
-        }
-    }
-
     private Spinner setupCategorySpinner(Spinner spinner) {
 
         categorySpinner = spinner;
@@ -152,8 +127,6 @@ public class AvailableAppsFragment extends AppListFragment implements
 
         categories = AppProvider.Helper.categories(getActivity());
 
-        styleSpinner(categorySpinner);
-
         ArrayAdapter<String> adapter = new ArrayAdapter<>(
             getActivity(), android.R.layout.simple_spinner_item, translateCategories(categories));
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);