msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Revert "Beige navigation menu"

Browse Source 
This reverts commit be5a5cddce.
pull/185/head
M66B 5 years ago
parent c13cb867f3
commit 5819846b19
6 changed files with 14 additions and 51 deletions
Show Stats Download Patch File Download Diff File

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

@ -170,7 +170,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
rvMenu = drawerContainer.findViewById(R.id.rvMenu); rvMenu = drawerContainer.findViewById(R.id.rvMenu);
LinearLayoutManager llm = new LinearLayoutManager(this); LinearLayoutManager llm = new LinearLayoutManager(this);
rvMenu.setLayoutManager(llm); rvMenu.setLayoutManager(llm);
final AdapterNavMenu adapter = new AdapterNavMenu(this, this, false); final AdapterNavMenu adapter = new AdapterNavMenu(this, this);
rvMenu.setAdapter(adapter); rvMenu.setAdapter(adapter);
final Drawable d = getDrawable(R.drawable.divider); final Drawable d = getDrawable(R.drawable.divider);

19
app/src/main/java/eu/faircode/email/ActivityView.java
Unescape View File

@ -51,7 +51,6 @@ import androidx.annotation.Nullable;
import androidx.appcompat.app.ActionBarDrawerToggle; import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import androidx.core.content.ContextCompat;
import androidx.core.widget.NestedScrollView; import androidx.core.widget.NestedScrollView;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
@ -232,14 +231,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
drawerContainer = findViewById(R.id.drawer_container); drawerContainer = findViewById(R.id.drawer_container);
boolean beige = prefs.getBoolean("cards", true) &&
prefs.getBoolean("beige", true) &&
!Helper.isDarkTheme(ActivityView.this);
if (beige)
drawerContainer.setBackgroundColor(
ContextCompat.getColor(ActivityView.this, R.color.lightColorBackground_cards_beige));
int drawerWidth; int drawerWidth;
DisplayMetrics dm = getResources().getDisplayMetrics(); DisplayMetrics dm = getResources().getDisplayMetrics();
if (portrait || !landscape3) { if (portrait || !landscape3) {
@ -265,7 +256,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
rvAccount = drawerContainer.findViewById(R.id.rvAccount); rvAccount = drawerContainer.findViewById(R.id.rvAccount);
rvAccount.setLayoutManager(new LinearLayoutManager(this)); rvAccount.setLayoutManager(new LinearLayoutManager(this));
adapterNavAccount = new AdapterNavAccount(this, this, beige); adapterNavAccount = new AdapterNavAccount(this, this);
rvAccount.setAdapter(adapterNavAccount); rvAccount.setAdapter(adapterNavAccount);
boolean nav_account = prefs.getBoolean("nav_account", true); boolean nav_account = prefs.getBoolean("nav_account", true);
@ -287,7 +278,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
rvUnified = drawerContainer.findViewById(R.id.rvUnified); rvUnified = drawerContainer.findViewById(R.id.rvUnified);
rvUnified.setLayoutManager(new LinearLayoutManager(this)); rvUnified.setLayoutManager(new LinearLayoutManager(this));
adapterNavUnified = new AdapterNavUnified(this, this, beige); adapterNavUnified = new AdapterNavUnified(this, this);
rvUnified.setAdapter(adapterNavUnified); rvUnified.setAdapter(adapterNavUnified);
boolean unified_system = prefs.getBoolean("unified_system", true); boolean unified_system = prefs.getBoolean("unified_system", true);
@ -307,12 +298,12 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
// Navigation folders // Navigation folders
rvFolder = drawerContainer.findViewById(R.id.rvFolder); rvFolder = drawerContainer.findViewById(R.id.rvFolder);
rvFolder.setLayoutManager(new LinearLayoutManager(this)); rvFolder.setLayoutManager(new LinearLayoutManager(this));
adapterNavFolder = new AdapterNavFolder(this, this, beige); adapterNavFolder = new AdapterNavFolder(this, this);
rvFolder.setAdapter(adapterNavFolder); rvFolder.setAdapter(adapterNavFolder);
rvMenu = drawerContainer.findViewById(R.id.rvMenu); rvMenu = drawerContainer.findViewById(R.id.rvMenu);
rvMenu.setLayoutManager(new LinearLayoutManager(this)); rvMenu.setLayoutManager(new LinearLayoutManager(this));
adapterNavMenu = new AdapterNavMenu(this, this, beige); adapterNavMenu = new AdapterNavMenu(this, this);
rvMenu.setAdapter(adapterNavMenu); rvMenu.setAdapter(adapterNavMenu);
// Extra menus // Extra menus
@ -321,7 +312,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
rvMenuExtra = drawerContainer.findViewById(R.id.rvMenuExtra); rvMenuExtra = drawerContainer.findViewById(R.id.rvMenuExtra);
LinearLayoutManager llm = new LinearLayoutManager(this); LinearLayoutManager llm = new LinearLayoutManager(this);
rvMenuExtra.setLayoutManager(llm); rvMenuExtra.setLayoutManager(llm);
adapterNavMenuExtra = new AdapterNavMenu(this, this, beige); adapterNavMenuExtra = new AdapterNavMenu(this, this);
rvMenuExtra.setAdapter(adapterNavMenuExtra); rvMenuExtra.setAdapter(adapterNavMenuExtra);
final Drawable d = getDrawable(R.drawable.divider); final Drawable d = getDrawable(R.drawable.divider);

11
app/src/main/java/eu/faircode/email/AdapterNavAccount.java
Unescape View File

@ -31,7 +31,6 @@ import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LifecycleOwner;
import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
@ -51,7 +50,6 @@ public class AdapterNavAccount extends RecyclerView.Adapter<AdapterNavAccount.Vi
private Context context; private Context context;
private LifecycleOwner owner; private LifecycleOwner owner;
private LayoutInflater inflater; private LayoutInflater inflater;
private boolean beige;
private int colorUnread; private int colorUnread;
private int textColorSecondary; private int textColorSecondary;
@ -176,11 +174,10 @@ public class AdapterNavAccount extends RecyclerView.Adapter<AdapterNavAccount.Vi
} }
} }
AdapterNavAccount(Context context, LifecycleOwner owner, boolean beige) { AdapterNavAccount(Context context, LifecycleOwner owner) {
this.context = context; this.context = context;
this.owner = owner; this.owner = owner;
this.inflater = LayoutInflater.from(context); this.inflater = LayoutInflater.from(context);
this.beige = beige;
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean highlight_unread = prefs.getBoolean("highlight_unread", true); boolean highlight_unread = prefs.getBoolean("highlight_unread", true);
@ -279,11 +276,7 @@ public class AdapterNavAccount extends RecyclerView.Adapter<AdapterNavAccount.Vi
@Override @Override
@NonNull @NonNull
public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View view = inflater.inflate(R.layout.item_nav, parent, false); return new ViewHolder(inflater.inflate(R.layout.item_nav, parent, false));
if (beige)
view.setBackgroundColor(
ContextCompat.getColor(context, R.color.lightColorBackground_cards_beige));
return new ViewHolder(view);
} }
@Override @Override

11
app/src/main/java/eu/faircode/email/AdapterNavFolder.java
Unescape View File

@ -30,7 +30,6 @@ import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LifecycleOwner;
import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
@ -49,7 +48,6 @@ public class AdapterNavFolder extends RecyclerView.Adapter<AdapterNavFolder.View
private Context context; private Context context;
private LifecycleOwner owner; private LifecycleOwner owner;
private LayoutInflater inflater; private LayoutInflater inflater;
private boolean beige;
private boolean debug; private boolean debug;
private int colorUnread; private int colorUnread;
@ -155,11 +153,10 @@ public class AdapterNavFolder extends RecyclerView.Adapter<AdapterNavFolder.View
} }
} }
AdapterNavFolder(Context context, LifecycleOwner owner, boolean beige) { AdapterNavFolder(Context context, LifecycleOwner owner) {
this.context = context; this.context = context;
this.owner = owner; this.owner = owner;
this.inflater = LayoutInflater.from(context); this.inflater = LayoutInflater.from(context);
this.beige = beige;
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean highlight_unread = prefs.getBoolean("highlight_unread", true); boolean highlight_unread = prefs.getBoolean("highlight_unread", true);
@ -253,11 +250,7 @@ public class AdapterNavFolder extends RecyclerView.Adapter<AdapterNavFolder.View
@Override @Override
@NonNull @NonNull
public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View view = inflater.inflate(R.layout.item_nav, parent, false); return new ViewHolder(inflater.inflate(R.layout.item_nav, parent, false));
if (beige)
view.setBackgroundColor(
ContextCompat.getColor(context, R.color.lightColorBackground_cards_beige));
return new ViewHolder(view);
} }
@Override @Override

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

@ -29,7 +29,6 @@ import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LifecycleOwner;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.DiffUtil;
@ -45,7 +44,6 @@ public class AdapterNavMenu extends RecyclerView.Adapter<AdapterNavMenu.ViewHold
private Context context; private Context context;
private LifecycleOwner owner; private LifecycleOwner owner;
private LayoutInflater inflater; private LayoutInflater inflater;
private boolean beige;
private int colorUnread; private int colorUnread;
private int textColorSecondary; private int textColorSecondary;
@ -122,11 +120,10 @@ public class AdapterNavMenu extends RecyclerView.Adapter<AdapterNavMenu.ViewHold
} }
} }
AdapterNavMenu(Context context, LifecycleOwner owner, boolean beige) { AdapterNavMenu(Context context, LifecycleOwner owner) {
this.context = context; this.context = context;
this.owner = owner; this.owner = owner;
this.inflater = LayoutInflater.from(context); this.inflater = LayoutInflater.from(context);
this.beige = beige;
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean highlight_unread = prefs.getBoolean("highlight_unread", true); boolean highlight_unread = prefs.getBoolean("highlight_unread", true);
@ -220,11 +217,7 @@ public class AdapterNavMenu extends RecyclerView.Adapter<AdapterNavMenu.ViewHold
@Override @Override
@NonNull @NonNull
public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View view = inflater.inflate(R.layout.item_nav, parent, false); return new ViewHolder(inflater.inflate(R.layout.item_nav, parent, false));
if (beige)
view.setBackgroundColor(
ContextCompat.getColor(context, R.color.lightColorBackground_cards_beige));
return new ViewHolder(view);
} }
@Override @Override

11
app/src/main/java/eu/faircode/email/AdapterNavUnified.java
Unescape View File

@ -30,7 +30,6 @@ import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LifecycleOwner;
import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
@ -48,7 +47,6 @@ public class AdapterNavUnified extends RecyclerView.Adapter<AdapterNavUnified.Vi
private Context context; private Context context;
private LifecycleOwner owner; private LifecycleOwner owner;
private LayoutInflater inflater; private LayoutInflater inflater;
private boolean beige;
private int colorUnread; private int colorUnread;
private int textColorSecondary; private int textColorSecondary;
@ -127,11 +125,10 @@ public class AdapterNavUnified extends RecyclerView.Adapter<AdapterNavUnified.Vi
} }
} }
AdapterNavUnified(Context context, LifecycleOwner owner, boolean beige) { AdapterNavUnified(Context context, LifecycleOwner owner) {
this.context = context; this.context = context;
this.owner = owner; this.owner = owner;
this.inflater = LayoutInflater.from(context); this.inflater = LayoutInflater.from(context);
this.beige = beige;
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean highlight_unread = prefs.getBoolean("highlight_unread", true); boolean highlight_unread = prefs.getBoolean("highlight_unread", true);
@ -221,11 +218,7 @@ public class AdapterNavUnified extends RecyclerView.Adapter<AdapterNavUnified.Vi
@Override @Override
@NonNull @NonNull
public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View view = inflater.inflate(R.layout.item_nav, parent, false); return new ViewHolder(inflater.inflate(R.layout.item_nav, parent, false));
if (beige)
view.setBackgroundColor(
ContextCompat.getColor(context, R.color.lightColorBackground_cards_beige));
return new ViewHolder(view);
} }
@Override @Override

Write Preview
Loading…
Cancel
Save