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

Revert "Show downloading folders" 

This reverts commit a51fd94a68.
This commit is contained in:
M66B 2019-01-05 14:11:07 +00:00
parent eb27f5015a
commit aa1e961bdf
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/faircode/email/AdapterFolder.java
View File

@ -73,7 +73,6 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
private ImageView ivUnified; private ImageView ivUnified;
private TextView tvType; private TextView tvType;
private TextView tvAfter; private TextView tvAfter;
private ImageView ivDownload;
private ImageView ivSync; private ImageView ivSync;
private TextView tvKeywords; private TextView tvKeywords;
private TextView tvError; private TextView tvError;
@ -96,7 +95,6 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
ivUnified = itemView.findViewById(R.id.ivUnified); ivUnified = itemView.findViewById(R.id.ivUnified);
tvType = itemView.findViewById(R.id.tvType); tvType = itemView.findViewById(R.id.tvType);
tvAfter = itemView.findViewById(R.id.tvAfter); tvAfter = itemView.findViewById(R.id.tvAfter);
ivDownload = itemView.findViewById(R.id.ivDownload);
ivSync = itemView.findViewById(R.id.ivSync); ivSync = itemView.findViewById(R.id.ivSync);
tvKeywords = itemView.findViewById(R.id.tvKeywords); tvKeywords = itemView.findViewById(R.id.tvKeywords);
tvError = itemView.findViewById(R.id.tvError); tvError = itemView.findViewById(R.id.tvError);
@ -176,10 +174,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
if (folder.account == null) { if (folder.account == null) {
tvAfter.setText(null); tvAfter.setText(null);
ivDownload.setVisibility(View.GONE);
ivSync.setImageResource(R.drawable.baseline_sync_24); ivSync.setImageResource(R.drawable.baseline_sync_24);
} else { } else {
ivDownload.setVisibility(folder.download ? View.VISIBLE : View.GONE);
if (folder.keep_days == Integer.MAX_VALUE) if (folder.keep_days == Integer.MAX_VALUE)
tvAfter.setText(String.format("%d/∞", folder.sync_days)); tvAfter.setText(String.format("%d/∞", folder.sync_days));
else else

12
app/src/main/res/layout/item_folder.xml
View File

@ -108,20 +108,10 @@
android:minHeight="24dp" android:minHeight="24dp"
android:text="type" android:text="type"
android:textAppearance="@android:style/TextAppearance.Small" android:textAppearance="@android:style/TextAppearance.Small"
app:layout_constraintEnd_toStartOf="@+id/ivDownload" app:layout_constraintEnd_toStartOf="@+id/tvAfter"
app:layout_constraintStart_toEndOf="@id/vwLevel" app:layout_constraintStart_toEndOf="@id/vwLevel"
app:layout_constraintTop_toBottomOf="@id/tvName" /> app:layout_constraintTop_toBottomOf="@id/tvName" />
<ImageView
android:id="@+id/ivDownload"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginEnd="6dp"
android:src="@drawable/baseline_cloud_download_24"
app:layout_constraintBottom_toBottomOf="@id/tvType"
app:layout_constraintEnd_toStartOf="@+id/tvAfter"
app:layout_constraintTop_toTopOf="@+id/tvType" />
<TextView <TextView
android:id="@+id/tvAfter" android:id="@+id/tvAfter"
android:layout_width="wrap_content" android:layout_width="wrap_content"