revert to old colors, blue/orange was indeed ugly

This commit is contained in:
Mohamed Zenadi 2015-10-13 20:16:13 +02:00
parent 794d153834
commit d885693532
4 changed files with 19 additions and 15 deletions

View file

@ -75,7 +75,7 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
holder.card.setCardBackgroundColor(activity.getResources().getColor(R.color.deep_orange_400));
} else {
holder.type.setText(pass.getFullPathName());
holder.card.setCardBackgroundColor(activity.getResources().getColor(R.color.light_blue_600));
holder.card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_400));
}
holder.view.setOnClickListener(new View.OnClickListener() {
@ -188,15 +188,19 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
public void toggleSelection(int position, CardView card, char type) {
if (!selectedItems.remove(position)) {
selectedItems.add(position);
if (type == PasswordItem.TYPE_CATEGORY)
if (type == PasswordItem.TYPE_CATEGORY) {
card.setCardBackgroundColor(activity.getResources().getColor(R.color.deep_orange_200));
else
card.setCardBackgroundColor(activity.getResources().getColor(R.color.light_blue_200));
}
else {
card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_200));
}
} else {
if (type == PasswordItem.TYPE_CATEGORY)
if (type == PasswordItem.TYPE_CATEGORY) {
card.setCardBackgroundColor(activity.getResources().getColor(R.color.deep_orange_400));
else
card.setCardBackgroundColor(activity.getResources().getColor(R.color.light_blue_600));
}
else {
card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_400));
}
}
}

View file

@ -25,8 +25,8 @@
android:layout_gravity="bottom|end"
app:elevation="6dp"
app:pressedTranslationZ="12dp"
app:backgroundTint="@color/indigo_A700"
app:rippleColor="@color/blue_500"
app:backgroundTint="@color/blue_grey_500"
app:rippleColor="@color/blue_grey_50"
app:borderWidth="0dp"
android:layout_margin="@dimen/fab_compat_margin"
android:layout_alignParentBottom="true"

View file

@ -18,7 +18,7 @@
card_view:contentPaddingLeft="4dp"
card_view:cardCornerRadius="4dp"
card_view:cardElevation="3dp"
card_view:cardBackgroundColor="@color/light_blue_600">
card_view:cardBackgroundColor="@color/light_blue_50">
<TextView
android:id="@+id/type"

View file

@ -2,15 +2,15 @@
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="colorPrimary">@color/indigo_A400</item>
<item name="colorPrimaryDark">@color/indigo_A700</item>
<item name="android:windowBackground">@color/indigo_50</item>
<item name="android:textColorPrimary">@color/blue_500</item>
<item name="colorPrimary">@color/blue_grey_500</item>
<item name="colorPrimaryDark">@color/blue_grey_700</item>
<item name="android:windowBackground">@color/blue_grey_50</item>
<item name="android:textColorPrimary">@color/teal_900</item>
<item name="android:textColor">@color/text_color</item>
<item name="actionModeStyle">@style/ActionMode</item>
</style>
<style name="ActionMode" parent="@style/Widget.AppCompat.ActionMode">
<item name="background">@color/indigo_A700</item>
<item name="background">@color/blue_grey_700</item>
</style>
</resources>