mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-26 01:36:55 +00:00
Code Issues Releases Wiki Activity

Show account usage on start screen

Browse source
This commit is contained in:
M66B 2020-10-29 11:06:50 +01:00
parent 5a36462feb
commit 70b868cc41
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/eu/faircode/email/AdapterAccount.java
View file

@ -95,6 +95,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
private ImageView ivState; private ImageView ivState;
private TextView tvHost; private TextView tvHost;
private TextView tvLast; private TextView tvLast;
private TextView tvUsage;
private TextView tvQuota; private TextView tvQuota;
private TextView tvMaxSize; private TextView tvMaxSize;
private TextView tvIdentity; private TextView tvIdentity;
@ -121,6 +122,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
ivState = itemView.findViewById(R.id.ivState); ivState = itemView.findViewById(R.id.ivState);
tvHost = itemView.findViewById(R.id.tvHost); tvHost = itemView.findViewById(R.id.tvHost);
tvLast = itemView.findViewById(R.id.tvLast); tvLast = itemView.findViewById(R.id.tvLast);
tvUsage = itemView.findViewById(R.id.tvUsage);
tvQuota = itemView.findViewById(R.id.tvQuota); tvQuota = itemView.findViewById(R.id.tvQuota);
tvMaxSize = itemView.findViewById(R.id.tvMaxSize); tvMaxSize = itemView.findViewById(R.id.tvMaxSize);
tvIdentity = itemView.findViewById(R.id.tvIdentity); tvIdentity = itemView.findViewById(R.id.tvIdentity);
@ -195,6 +197,11 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
"/" + account.keep_alive_ok + "/" + account.keep_alive_ok +
"/" + account.keep_alive_failed + "/" + account.keep_alive_failed +
"/" + account.keep_alive_succeeded : ""))); "/" + account.keep_alive_succeeded : "")));
Integer percent = null;
if (!settings && account.quota_usage != null && account.quota_limit != null)
percent = Math.round((float) account.quota_usage * 100 / account.quota_limit);
tvUsage.setText(percent == null ? null : NF.format(percent) + "%");
tvUsage.setVisibility(percent == null ? View.GONE : View.VISIBLE);
tvQuota.setText(context.getString(R.string.title_storage_quota, tvQuota.setText(context.getString(R.string.title_storage_quota,
(account.quota_usage == null ? "-" : Helper.humanReadableByteCount(account.quota_usage)), (account.quota_usage == null ? "-" : Helper.humanReadableByteCount(account.quota_usage)),
(account.quota_limit == null ? "-" : Helper.humanReadableByteCount(account.quota_limit)))); (account.quota_limit == null ? "-" : Helper.humanReadableByteCount(account.quota_limit))));

14
app/src/main/res/layout/item_account.xml
View file

@ -154,10 +154,22 @@
android:singleLine="true" android:singleLine="true"
android:text="Last connected time" android:text="Last connected time"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toStartOf="@id/tvUsage"
app:layout_constraintStart_toEndOf="@+id/ivState" app:layout_constraintStart_toEndOf="@+id/ivState"
app:layout_constraintTop_toBottomOf="@id/tvHost" /> app:layout_constraintTop_toBottomOf="@id/tvHost" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvUsage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="6dp"
android:ellipsize="start"
android:singleLine="true"
android:text="50%"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvHost" />
<eu.faircode.email.FixedTextView <eu.faircode.email.FixedTextView
android:id="@+id/tvQuota" android:id="@+id/tvQuota"
android:layout_width="0dp" android:layout_width="0dp"