Revert "Replaced body spinner by hourglass"

This reverts commit b1e2080fa8.
pull/156/head
M66B 6 years ago
parent b1e2080fa8
commit c4d6f7a89f

@ -263,7 +263,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private ImageButton ibImages; private ImageButton ibImages;
private ImageButton ibFull; private ImageButton ibFull;
private TextView tvBody; private TextView tvBody;
private ImageView ivBodyWait; private ContentLoadingProgressBar pbBody;
private TextView tvNoInternetBody; private TextView tvNoInternetBody;
private TextView tvCalendarSummary; private TextView tvCalendarSummary;
@ -398,7 +398,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibImages = vsBody.findViewById(R.id.ibImages); ibImages = vsBody.findViewById(R.id.ibImages);
ibFull = vsBody.findViewById(R.id.ibFull); ibFull = vsBody.findViewById(R.id.ibFull);
tvBody = vsBody.findViewById(R.id.tvBody); tvBody = vsBody.findViewById(R.id.tvBody);
ivBodyWait = vsBody.findViewById(R.id.ivBodyWait); pbBody = vsBody.findViewById(R.id.pbBody);
tvNoInternetBody = vsBody.findViewById(R.id.tvNoInternetBody); tvNoInternetBody = vsBody.findViewById(R.id.tvNoInternetBody);
rvImage = vsBody.findViewById(R.id.rvImage); rvImage = vsBody.findViewById(R.id.rvImage);
@ -820,7 +820,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibImages.setVisibility(View.GONE); ibImages.setVisibility(View.GONE);
ibFull.setVisibility(View.GONE); ibFull.setVisibility(View.GONE);
tvBody.setVisibility(View.GONE); tvBody.setVisibility(View.GONE);
ivBodyWait.setVisibility(View.GONE); pbBody.setVisibility(View.GONE);
tvNoInternetBody.setVisibility(View.GONE); tvNoInternetBody.setVisibility(View.GONE);
} }
@ -1072,7 +1072,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}.execute(context, owner, sargs, "message:actions"); }.execute(context, owner, sargs, "message:actions");
// Message text // Message text
ivBodyWait.setVisibility(suitable || message.content ? View.VISIBLE : View.GONE); pbBody.setVisibility(suitable || message.content ? View.VISIBLE : View.GONE);
tvNoInternetBody.setVisibility(suitable || message.content ? View.GONE : View.VISIBLE); tvNoInternetBody.setVisibility(suitable || message.content ? View.GONE : View.VISIBLE);
Spanned body = properties.getBody(message.id); Spanned body = properties.getBody(message.id);
@ -2056,7 +2056,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
tvBody.setTextIsSelectable(true); tvBody.setTextIsSelectable(true);
tvBody.setMovementMethod(new TouchHandler(message)); tvBody.setMovementMethod(new TouchHandler(message));
ivBodyWait.setVisibility(View.GONE); pbBody.setVisibility(View.GONE);
} }
@Override @Override

@ -37,12 +37,13 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/inAttachments" /> app:layout_constraintTop_toBottomOf="@id/inAttachments" />
<ImageView <eu.faircode.email.ContentLoadingProgressBar
android:id="@+id/ivBodyWait" android:id="@+id/pbBody"
android:layout_width="wrap_content" style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_height="wrap_content" android:layout_width="48dp"
android:layout_height="48dp"
android:indeterminate="true"
android:padding="12dp" android:padding="12dp"
android:src="@drawable/baseline_hourglass_empty_24"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/inNavigation" /> app:layout_constraintTop_toBottomOf="@id/inNavigation" />

Loading…
Cancel
Save