From 517606da52a5c8ebd4a8c0528d9d9ddc55ad9fa8 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sun, 14 Oct 2018 13:56:43 +0800
Subject: [PATCH] AppListAdapter: use blended color for frozen & selected apps

---
 .../net/typeblog/shelter/ui/AppListAdapter.java    | 14 ++++++++++----
 app/src/main/res/values/colors.xml                 |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/net/typeblog/shelter/ui/AppListAdapter.java b/app/src/main/java/net/typeblog/shelter/ui/AppListAdapter.java
index afd2640..9e2f930 100644
--- a/app/src/main/java/net/typeblog/shelter/ui/AppListAdapter.java
+++ b/app/src/main/java/net/typeblog/shelter/ui/AppListAdapter.java
@@ -129,15 +129,21 @@ public class AppListAdapter extends RecyclerView.Adapter<AppListAdapter.ViewHold
         // When an item should be displayed in selected state
         // (not necessarily when the user clicked on it; the view might have been recycled)
         void showSelectOrder() {
-            mView.setBackgroundResource(R.color.selectedAppBackground);
+            if (!mList.get(mIndex).isHidden()) {
+                mView.setBackgroundResource(R.color.selectedAppBackground);
+            } else {
+                // The app is both frozen and selected
+                // we use a blended color of the two for its background
+                mView.setBackgroundResource(R.color.selectedAndDisabledAppBackground);
+            }
             mSelectOrder.setVisibility(View.VISIBLE);
             mSelectOrder.setText(String.valueOf(mSelectedIndices.indexOf(mIndex) + 1));
         }
 
         // When an item should be displayed in deselected state
-        void hideSelectOrder(ApplicationInfoWrapper info) {
+        void hideSelectOrder() {
             // First, determine the hidden (frozen) state
-            if (!info.isHidden()) {
+            if (!mList.get(mIndex).isHidden()) {
                 mView.setBackground(null);
             } else {
                 mView.setBackgroundResource(R.color.disabledAppBackground);
@@ -166,7 +172,7 @@ public class AppListAdapter extends RecyclerView.Adapter<AppListAdapter.ViewHold
                 if (mMultiSelectMode && mSelectedIndices.contains(mIndex)) {
                     showSelectOrder();
                 } else {
-                    hideSelectOrder(info);
+                    hideSelectOrder();
                 }
 
                 // Load the application icon from cache
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 4308954..deb24d5 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,5 @@
     <color name="grey">#999999</color>
     <color name="disabledAppBackground">#E0F2F1</color>
     <color name="selectedAppBackground">#EEEEEE</color>
+    <color name="selectedAndDisabledAppBackground">#CEE1E0</color>
 </resources>