mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added color to nav menu items

This commit is contained in:
M66B 2021-07-23 09:38:16 +02:00
parent df7238d69a
commit 140bd2b1d6
3 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/faircode/email/ActivitySetup.java
View File

@ -189,13 +189,14 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
final List<NavMenuItem> menus = new ArrayList<>();
int colorWarning = Helper.resolveColor(this, R.attr.colorWarning);
menus.add(new NavMenuItem(R.drawable.twotone_close_24, R.string.title_setup_close, new Runnable() {
@Override
public void run() {
drawerLayout.closeDrawer(drawerContainer, false);
onBackPressed();
}
}).setSeparated());
}).setColor(colorWarning).setSeparated());
menus.add(new NavMenuItem(R.drawable.twotone_archive_24, R.string.title_setup_export, new Runnable() {
@Override

12
app/src/main/java/eu/faircode/email/AdapterNavMenu.java
View File

@ -21,6 +21,7 @@ package eu.faircode.email;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.res.ColorStateList;
import android.graphics.Typeface;
import android.view.LayoutInflater;
import android.view.View;
@ -46,6 +47,7 @@ public class AdapterNavMenu extends RecyclerView.Adapter<AdapterNavMenu.ViewHold
private LayoutInflater inflater;
private int colorUnread;
private int colorControlNormal;
private int textColorSecondary;
private List<NavMenuItem> items = new ArrayList<>();
@ -84,13 +86,16 @@ public class AdapterNavMenu extends RecyclerView.Adapter<AdapterNavMenu.ViewHold
private void bindTo(NavMenuItem menu) {
ivItem.setImageResource(menu.getIcon());
Integer color = menu.getColor();
ivItem.setImageTintList(ColorStateList.valueOf(color == null ? colorControlNormal : color));
if (menu.getCount() == null)
tvItem.setText(menu.getTitle());
else
tvItem.setText(context.getString(R.string.title_name_count,
context.getString(menu.getTitle()), NF.format(menu.getCount())));
tvItem.setTextColor(menu.getCount() == null ? textColorSecondary : colorUnread);
tvItem.setTextColor(menu.getCount() == null ? (color == null ? textColorSecondary : color) : colorUnread);
tvItem.setTypeface(menu.getCount() == null ? Typeface.DEFAULT : Typeface.DEFAULT_BOLD);
tvItemExtra.setText(menu.getSubtitle());
@ -130,6 +135,7 @@ public class AdapterNavMenu extends RecyclerView.Adapter<AdapterNavMenu.ViewHold
boolean highlight_unread = prefs.getBoolean("highlight_unread", true);
int colorHighlight = prefs.getInt("highlight_color", Helper.resolveColor(context, R.attr.colorUnreadHighlight));
this.colorUnread = (highlight_unread ? colorHighlight : Helper.resolveColor(context, R.attr.colorUnread));
this.colorControlNormal = Helper.resolveColor(context, R.attr.colorControlNormal);
this.textColorSecondary = Helper.resolveColor(context, android.R.attr.textColorSecondary);
setHasStableIds(true);
@ -200,9 +206,7 @@ public class AdapterNavMenu extends RecyclerView.Adapter<AdapterNavMenu.ViewHold
public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
NavMenuItem m1 = prev.get(oldItemPosition);
NavMenuItem m2 = next.get(newItemPosition);
return m1.getIcon() == m2.getIcon() &&
m1.getTitle() == m2.getTitle() &&
Objects.equals(m1.getCount(), m2.getCount());
return m1.equals(m2);
}
}

33
app/src/main/java/eu/faircode/email/NavMenuItem.java
View File

@ -19,8 +19,11 @@ package eu.faircode.email;
Copyright 2018-2021 by Marcel Bokhorst (M66B)
*/
import java.util.Objects;
public class NavMenuItem {
private int icon;
private Integer color;
private int title;
private String subtitle = null;
private Integer count = null;
@ -43,6 +46,11 @@ public class NavMenuItem {
this.longClick = longClick;
}
NavMenuItem setColor(Integer color) {
this.color = color;
return this;
}
NavMenuItem setSubtitle(String subtitle) {
this.subtitle = subtitle;
return this;
@ -72,6 +80,10 @@ public class NavMenuItem {
return this.icon;
}
Integer getColor() {
return this.color;
}
int getTitle() {
return this.title;
}
@ -114,4 +126,25 @@ public class NavMenuItem {
return false;
}
}
@Override
public boolean equals(Object object) {
if (object instanceof NavMenuItem) {
NavMenuItem other = (NavMenuItem) object;
return (this.icon == other.icon &&
Objects.equals(this.color, other.color) &&
this.title == other.title &&
Objects.equals(this.subtitle, other.subtitle) &&
Objects.equals(this.count, other.count) &&
this.external == other.external &&
this.warning == other.warning &&
this.separated == other.separated);
} else
return false;
}
@Override
public int hashCode() {
return Objects.hash(icon, color, title, subtitle, count, external, warning, separated);
}
}