Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-04 11:54:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added normal/compact message view

Browse Source
This commit is contained in:
M66B
2018-10-21 16:53:56 +00:00
parent 157b37144d
commit 52292e6304
7 changed files with 608 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,7 +69,8 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
@Override
public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
Log.i(Helper.TAG, "Preference " + key + "=" + prefs.getAll().get(key));
if ("theme".equals(key) || "debug".equals(key)) {
if ("theme".equals(key) ||
(!this.getClass().equals(ActivitySetup.class) && ("compact".equals(key) || "debug".equals(key)))) {
finish();
startActivity(getIntent());
}

9
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@@ -106,6 +106,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
private boolean contacts;
private boolean avatars;
private boolean compact;
private boolean debug;
private DateFormat df = SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.LONG, SimpleDateFormat.LONG);
@@ -279,7 +280,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
else
ivFlagged.setVisibility(message.count - message.unflagged > 0 ? View.VISIBLE : View.GONE);
tvFrom.setText(MessageHelper.getFormattedAddresses(message.from, false));
tvFrom.setText(MessageHelper.getFormattedAddresses(message.from, !compact));
if (EntityFolder.DRAFTS.equals(message.folderType) ||
EntityFolder.OUTBOX.equals(message.folderType) ||
@@ -1349,6 +1350,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
this.contacts = (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_CONTACTS)
== PackageManager.PERMISSION_GRANTED);
this.avatars = (prefs.getBoolean("avatars", true) && this.contacts);
this.compact = prefs.getBoolean("compact", false);
this.debug = prefs.getBoolean("debug", false);
}
@@ -1370,7 +1372,10 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
@Override
@NonNull
public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
return new ViewHolder(LayoutInflater.from(context).inflate(R.layout.item_message, parent, false));
return new ViewHolder(LayoutInflater.from(context).inflate(
compact ? R.layout.item_message_compact : R.layout.item_message_normal,
parent,
false));
}
@Override

10
app/src/main/java/eu/faircode/email/FragmentOptions.java
View File

@@ -37,6 +37,7 @@ public class FragmentOptions extends FragmentEx {
private CheckBox cbLight;
private CheckBox cbBrowse;
private CheckBox cbSwipe;
private CheckBox cbCompact;
private CheckBox cbDebug;
@Override
@@ -52,6 +53,7 @@ public class FragmentOptions extends FragmentEx {
cbLight = view.findViewById(R.id.cbLight);
cbBrowse = view.findViewById(R.id.cbBrowse);
cbSwipe = view.findViewById(R.id.cbSwipe);
cbCompact = view.findViewById(R.id.cbCompact);
cbDebug = view.findViewById(R.id.cbDebug);
// Wire controls
@@ -102,6 +104,14 @@ public class FragmentOptions extends FragmentEx {
}
});
cbCompact.setChecked(prefs.getBoolean("compact", false));
cbCompact.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("compact", checked).apply();
}
});
cbDebug.setChecked(prefs.getBoolean("debug", false));
cbDebug.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override