mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-29 03:05:31 +00:00
Code Issues Releases Wiki Activity

Cleanup

Browse source
This commit is contained in:
M66B 2019-10-20 09:22:08 +02:00
parent 80a131cd96
commit 7dd42155f6
3 changed files with 2 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/eu/faircode/email/AdapterMessage.java
View file

@ -295,7 +295,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private TextView tvIdentityTitle;
private TextView tvTimeExTitle;
private TextView tvSizeExTitle;
private TextView tvFolderExTitle;
private TextView tvFromEx;
private TextView tvTo;
@ -305,7 +304,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private TextView tvIdentity;
private TextView tvTimeEx;
private TextView tvSizeEx;
private TextView tvFolderEx;
private TextView tvSubjectEx;
private TextView tvFlags;
@ -437,7 +435,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
tvIdentityTitle = vsBody.findViewById(R.id.tvIdentityTitle);
tvTimeExTitle = vsBody.findViewById(R.id.tvTimeExTitle);
tvSizeExTitle = vsBody.findViewById(R.id.tvSizeExTitle);
tvFolderExTitle = vsBody.findViewById(R.id.tvFolderExTitle);
tvFromEx = vsBody.findViewById(R.id.tvFromEx);
tvTo = vsBody.findViewById(R.id.tvTo);
@ -448,7 +445,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
tvTimeEx = vsBody.findViewById(R.id.tvTimeEx);
tvSizeEx = vsBody.findViewById(R.id.tvSizeEx);
tvFolderEx = vsBody.findViewById(R.id.tvFolderEx);
tvSubjectEx = vsBody.findViewById(R.id.tvSubjectEx);
tvFlags = vsBody.findViewById(R.id.tvFlags);
tvKeywords = vsBody.findViewById(R.id.tvKeywords);
@ -947,7 +943,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
tvIdentityTitle.setVisibility(View.GONE);
tvTimeExTitle.setVisibility(View.GONE);
tvSizeExTitle.setVisibility(View.GONE);
tvFolderExTitle.setVisibility(View.GONE);
tvFromEx.setVisibility(View.GONE);
tvTo.setVisibility(View.GONE);
@ -957,7 +952,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
tvIdentity.setVisibility(View.GONE);
tvTimeEx.setVisibility(View.GONE);
tvSizeEx.setVisibility(View.GONE);
tvFolderEx.setVisibility(View.GONE);
tvSubjectEx.setVisibility(View.GONE);
tvFlags.setVisibility(View.GONE);
tvKeywords.setVisibility(View.GONE);
@ -1133,10 +1127,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
.append(message.total == null ? "-" : Helper.humanReadableByteCount(message.total, true));
tvSizeEx.setText(size.toString());
tvFolderExTitle.setVisibility(show_addresses ? View.VISIBLE : View.GONE);
tvFolderEx.setVisibility(show_addresses ? View.VISIBLE : View.GONE);
tvFolderEx.setText(tvFolder.getText());
tvSubjectEx.setVisibility(show_addresses ? View.VISIBLE : View.GONE);
tvSubjectEx.setText(message.subject);
if (subject_italic)

29
app/src/main/res/layout/include_message_addresses.xml
View file

@ -290,30 +290,6 @@
app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
app:layout_constraintTop_toBottomOf="@id/tvTimeEx" />
<TextView
android:id="@+id/tvFolderExTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:text="@string/title_folder"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvSizeEx" />
<TextView
android:id="@+id/tvFolderEx"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginEnd="6dp"
android:text="Folder"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textIsSelectable="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
app:layout_constraintTop_toBottomOf="@id/tvSizeEx" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/barrier_addresses"
android:layout_width="wrap_content"
@ -323,8 +299,7 @@
tvFromExTitle,tvToTitle,tvReplyToTitle,
tvCcTitle,tvBccTitle,
tvIdentityTitle,
tvTimeExTitle,tvSizeExTitle,
tvFolderExTitle" />
tvTimeExTitle,tvSizeExTitle" />
<TextView
android:id="@+id/tvSubjectEx"
@ -337,7 +312,7 @@
android:textIsSelectable="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvFolderEx" />
app:layout_constraintTop_toBottomOf="@id/tvSizeEx" />
<TextView
android:id="@+id/tvFlags"

1
app/src/main/res/values/strings.xml
View file

@ -607,7 +607,6 @@
<string name="title_via_identity">Via:</string>
<string name="title_received">Received:</string>
<string name="title_size">Size:</string>
<string name="title_folder">Folder:</string>
<string name="title_subject">Subject:</string>
<string name="title_body_hint">Your message</string>
<string name="title_discard">Discard</string>