mirror of https://github.com/M66B/FairEmail.git
Removed messaging style
This commit is contained in:
parent
ccb4939ae5
commit
ef2dff7082
|
@ -189,7 +189,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|||
|
||||
private boolean date;
|
||||
private boolean threading;
|
||||
private boolean bubble;
|
||||
private boolean avatars;
|
||||
private boolean name_email;
|
||||
private boolean distinguish_contacts;
|
||||
|
@ -251,10 +250,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|||
View.OnTouchListener,
|
||||
View.OnLayoutChangeListener,
|
||||
BottomNavigationView.OnNavigationItemSelectedListener {
|
||||
private ImageView ivAvatarStart;
|
||||
private ViewCardOptional card;
|
||||
private View view;
|
||||
private ImageView ivAvatarEnd;
|
||||
|
||||
private View vwColor;
|
||||
private ImageButton ibExpander;
|
||||
|
@ -368,10 +365,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|||
ViewHolder(final View itemView) {
|
||||
super(itemView);
|
||||
|
||||
ivAvatarStart = itemView.findViewById(R.id.ivAvatarStart);
|
||||
card = itemView.findViewById(R.id.card);
|
||||
view = itemView.findViewById(R.id.clItem);
|
||||
ivAvatarEnd = itemView.findViewById(R.id.ivAvatarEnd);
|
||||
|
||||
vwColor = itemView.findViewById(R.id.vwColor);
|
||||
ibExpander = itemView.findViewById(R.id.ibExpander);
|
||||
|
@ -633,8 +628,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|||
}
|
||||
|
||||
private void clear() {
|
||||
ivAvatarStart.setVisibility(View.GONE);
|
||||
ivAvatarEnd.setVisibility(View.GONE);
|
||||
vwColor.setVisibility(View.GONE);
|
||||
ibExpander.setVisibility(View.GONE);
|
||||
ibFlagged.setVisibility(View.GONE);
|
||||
|
@ -670,16 +663,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|||
Address[] addresses = (outgoing && viewType != ViewType.THREAD ? message.to : message.senders);
|
||||
boolean expanded = (viewType == ViewType.THREAD && properties.getValue("expanded", message.id));
|
||||
|
||||
if (viewType == ViewType.THREAD) {
|
||||
ivAvatarStart.setVisibility(outgoing && bubble ? View.INVISIBLE : View.GONE);
|
||||
ivAvatarEnd.setVisibility(outgoing || !bubble ? View.GONE : View.INVISIBLE);
|
||||
ivAvatar.setVisibility(bubble || !avatars ? View.GONE : View.INVISIBLE);
|
||||
} else {
|
||||
ivAvatarStart.setVisibility(View.GONE);
|
||||
ivAvatarEnd.setVisibility(View.GONE);
|
||||
ivAvatar.setVisibility(avatars ? View.INVISIBLE : View.GONE);
|
||||
}
|
||||
|
||||
// Text size
|
||||
if (textSize != 0) {
|
||||
tvFrom.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize * (message.unseen > 0 ? 1.1f : 1f));
|
||||
|
@ -773,6 +756,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|||
else
|
||||
ibExpander.setVisibility(View.GONE);
|
||||
|
||||
// Photo
|
||||
ivAvatar.setVisibility(avatars ? View.INVISIBLE : View.GONE);
|
||||
|
||||
// Line 1
|
||||
tvFrom.setText(MessageHelper.formatAddresses(addresses, name_email, false));
|
||||
tvFrom.setPaintFlags(tvFrom.getPaintFlags() & ~Paint.UNDERLINE_TEXT_FLAG);
|
||||
|
@ -1016,27 +1002,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|||
}
|
||||
|
||||
private void bindContactInfo(ContactInfo info, TupleMessageEx message) {
|
||||
if (bubble && viewType == ViewType.THREAD) {
|
||||
boolean outgoing = isOutgoing(message);
|
||||
if (outgoing) {
|
||||
if (info.hasPhoto())
|
||||
ivAvatarStart.setImageBitmap(info.getPhotoBitmap());
|
||||
else
|
||||
ivAvatarStart.setImageResource(R.drawable.baseline_person_24);
|
||||
ivAvatarStart.setVisibility(View.VISIBLE);
|
||||
} else {
|
||||
if (info.hasPhoto())
|
||||
ivAvatarEnd.setImageBitmap(info.getPhotoBitmap());
|
||||
else
|
||||
ivAvatarEnd.setImageResource(R.drawable.baseline_person_24);
|
||||
ivAvatarEnd.setVisibility(View.VISIBLE);
|
||||
}
|
||||
} else {
|
||||
if (info.hasPhoto()) {
|
||||
ivAvatar.setImageBitmap(info.getPhotoBitmap());
|
||||
ivAvatar.setVisibility(View.VISIBLE);
|
||||
}
|
||||
}
|
||||
if (info.hasPhoto()) {
|
||||
ivAvatar.setImageBitmap(info.getPhotoBitmap());
|
||||
ivAvatar.setVisibility(View.VISIBLE);
|
||||
} else
|
||||
ivAvatar.setVisibility(View.GONE);
|
||||
|
||||
if (distinguish_contacts && info.isKnown())
|
||||
tvFrom.setPaintFlags(tvFrom.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
|
||||
|
@ -3506,7 +3476,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|||
|
||||
this.date = prefs.getBoolean("date", true);
|
||||
this.threading = prefs.getBoolean("threading", true);
|
||||
this.bubble = prefs.getBoolean("bubble", false);
|
||||
this.avatars = (contacts && avatars) || generated;
|
||||
this.name_email = prefs.getBoolean("name_email", false);
|
||||
this.distinguish_contacts = prefs.getBoolean("distinguish_contacts", false);
|
||||
|
|
|
@ -39,7 +39,7 @@ public class FragmentOptions extends FragmentBase {
|
|||
|
||||
static String[] OPTIONS_RESTART = new String[]{
|
||||
"subscriptions",
|
||||
"startup", "cards", "date", "threading", "bubble", "highlight_unread",
|
||||
"startup", "cards", "date", "threading", "highlight_unread",
|
||||
"avatars", "generated_icons", "identicons", "circular",
|
||||
"name_email", "distinguish_contacts", "authentication",
|
||||
"subject_top", "subject_italic", "subject_ellipsize",
|
||||
|
|
|
@ -48,7 +48,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
|
|||
private SwitchCompat swCards;
|
||||
private SwitchCompat swDate;
|
||||
private SwitchCompat swThreading;
|
||||
private SwitchCompat swBubble;
|
||||
private SwitchCompat swHighlightUnread;
|
||||
private SwitchCompat swAvatars;
|
||||
private SwitchCompat swGeneratedIcons;
|
||||
|
@ -76,7 +75,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
|
|||
private SwitchCompat swActionbar;
|
||||
|
||||
private final static String[] RESET_OPTIONS = new String[]{
|
||||
"theme", "startup", "cards", "date", "threading", "bubble", "highlight_unread",
|
||||
"theme", "startup", "cards", "date", "threading", "highlight_unread",
|
||||
"avatars", "generated_icons", "identicons", "circular", "name_email", "distinguish_contacts", "authentication",
|
||||
"subject_top", "subject_italic", "subject_ellipsize",
|
||||
"flags", "flags_background", "preview", "preview_italic", "addresses", "attachments_alt",
|
||||
|
@ -99,7 +98,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
|
|||
swCards = view.findViewById(R.id.swCards);
|
||||
swDate = view.findViewById(R.id.swDate);
|
||||
swThreading = view.findViewById(R.id.swThreading);
|
||||
swBubble = view.findViewById(R.id.swBubble);
|
||||
swHighlightUnread = view.findViewById(R.id.swHighlightUnread);
|
||||
swAvatars = view.findViewById(R.id.swAvatars);
|
||||
swGeneratedIcons = view.findViewById(R.id.swGeneratedIcons);
|
||||
|
@ -173,13 +171,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
|
|||
}
|
||||
});
|
||||
|
||||
swBubble.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
||||
@Override
|
||||
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
|
||||
prefs.edit().putBoolean("bubble", checked).apply();
|
||||
}
|
||||
});
|
||||
|
||||
swHighlightUnread.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
||||
@Override
|
||||
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
|
||||
|
@ -419,7 +410,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
|
|||
swCards.setChecked(prefs.getBoolean("cards", true));
|
||||
swDate.setChecked(prefs.getBoolean("date", true));
|
||||
swThreading.setChecked(prefs.getBoolean("threading", true));
|
||||
swBubble.setChecked(prefs.getBoolean("bubble", false));
|
||||
swHighlightUnread.setChecked(prefs.getBoolean("highlight_unread", false));
|
||||
swAvatars.setChecked(prefs.getBoolean("avatars", true));
|
||||
swGeneratedIcons.setChecked(prefs.getBoolean("generated_icons", true));
|
||||
|
|
|
@ -116,18 +116,6 @@
|
|||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/swThreading" />
|
||||
|
||||
<androidx.appcompat.widget.SwitchCompat
|
||||
android:id="@+id/swBubble"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="12dp"
|
||||
android:checked="true"
|
||||
android:text="@string/title_advanced_bubble"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/tvThreadingHint"
|
||||
app:switchPadding="12dp" />
|
||||
|
||||
<androidx.appcompat.widget.SwitchCompat
|
||||
android:id="@+id/swHighlightUnread"
|
||||
android:layout_width="0dp"
|
||||
|
@ -137,7 +125,7 @@
|
|||
android:text="@string/title_advanced_highlight_unread"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/swBubble"
|
||||
app:layout_constraintTop_toBottomOf="@id/tvThreadingHint"
|
||||
app:switchPadding="12dp" />
|
||||
|
||||
<androidx.appcompat.widget.SwitchCompat
|
||||
|
|
|
@ -1,29 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/ivAvatarStart"
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="6dp"
|
||||
android:contentDescription="@string/title_legend_avatar"
|
||||
android:padding="6dp"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:srcCompat="@drawable/baseline_person_24" />
|
||||
|
||||
<eu.faircode.email.ViewCardOptional
|
||||
android:id="@+id/card"
|
||||
android:layout_width="0dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:foreground="?android:attr/selectableItemBackground"
|
||||
app:layout_constraintEnd_toStartOf="@+id/ivAvatarEnd"
|
||||
app:layout_constraintStart_toEndOf="@id/ivAvatarStart"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
android:foreground="?android:attr/selectableItemBackground">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/clItem"
|
||||
|
@ -52,16 +37,4 @@
|
|||
app:layout_constraintTop_toBottomOf="@id/inHeader" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</eu.faircode.email.ViewCardOptional>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/ivAvatarEnd"
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginEnd="6dp"
|
||||
android:contentDescription="@string/title_legend_avatar"
|
||||
android:padding="6dp"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:srcCompat="@drawable/baseline_person_24" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</FrameLayout>
|
||||
|
|
|
@ -1,29 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/ivAvatarStart"
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="6dp"
|
||||
android:contentDescription="@string/title_legend_avatar"
|
||||
android:padding="6dp"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:srcCompat="@drawable/baseline_person_24" />
|
||||
|
||||
<eu.faircode.email.ViewCardOptional
|
||||
android:id="@+id/card"
|
||||
android:layout_width="0dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:foreground="?android:attr/selectableItemBackground"
|
||||
app:layout_constraintEnd_toStartOf="@+id/ivAvatarEnd"
|
||||
app:layout_constraintStart_toEndOf="@id/ivAvatarStart"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
android:foreground="?android:attr/selectableItemBackground">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/clItem"
|
||||
|
@ -53,16 +38,4 @@
|
|||
app:layout_constraintTop_toBottomOf="@id/inHeader" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</eu.faircode.email.ViewCardOptional>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/ivAvatarEnd"
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginEnd="6dp"
|
||||
android:contentDescription="@string/title_legend_avatar"
|
||||
android:padding="6dp"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:srcCompat="@drawable/baseline_person_24" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</FrameLayout>
|
||||
|
|
|
@ -243,7 +243,6 @@
|
|||
<string name="title_advanced_cards">Show cards</string>
|
||||
<string name="title_advanced_date_header">Group by date</string>
|
||||
<string name="title_advanced_threading">Conversation threading</string>
|
||||
<string name="title_advanced_bubble">Show conversations in messaging style</string>
|
||||
<string name="title_advanced_highlight_unread">Highlight unread messages</string>
|
||||
<string name="title_advanced_distinguish_contacts">Distinguish messages from known and unknown contacts</string>
|
||||
<string name="title_advanced_avatars">Show contact photos</string>
|
||||
|
|
Loading…
Reference in New Issue