PeterCxy/Shelter
3
4
Fork 1
Code Issues Projects Releases Activity

AppListAdapter: use blended color for frozen & selected apps

Browse source
This commit is contained in:
Peter Cai 2018-10-14 13:56:43 +08:00
parent f5e5e1b8af
commit 517606da52
No known key found for this signature in database
GPG key ID: 71F5FB4E4F3FD54F
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/net/typeblog/shelter/ui/AppListAdapter.java
View file

@ -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

1
app/src/main/res/values/colors.xml
View file

@ -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>