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

Use ContentLoadingProgressBar

This commit is contained in:
M66B 2018-11-05 08:29:21 +00:00
parent b67c118da8
commit 708c617873
27 changed files with 106 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@ -59,7 +59,6 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
@ -92,6 +91,7 @@ import androidx.annotation.Nullable;
import androidx.appcompat.widget.PopupMenu;
import androidx.constraintlayout.widget.Group;
import androidx.core.content.ContextCompat;
import androidx.core.widget.ContentLoadingProgressBar;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.LifecycleOwner;
@ -146,7 +146,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
private ImageView ivThread;
private TextView tvPreview;
private TextView tvError;
private ProgressBar pbLoading;
private ContentLoadingProgressBar pbLoading;
private ImageView ivExpanderAddress;
private TextView tvFromEx;
@ -159,7 +159,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
private TextView tvSubjectEx;
private TextView tvHeaders;
private ProgressBar pbHeaders;
private ContentLoadingProgressBar pbHeaders;
private BottomNavigationView bnvActions;
@ -167,7 +167,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
private Button btnHtml;
private Button btnImages;
private TextView tvBody;
private ProgressBar pbBody;
private ContentLoadingProgressBar pbBody;
private RecyclerView rvAttachment;
private AdapterAttachment adapter;
@ -270,15 +270,15 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
ivThread.setVisibility(View.GONE);
tvPreview.setVisibility(View.GONE);
tvError.setVisibility(View.GONE);
pbLoading.setVisibility(View.VISIBLE);
pbLoading.show();
ivAddContact.setVisibility(View.GONE);
pbHeaders.setVisibility(View.GONE);
pbHeaders.hide();
bnvActions.setVisibility(View.GONE);
vSeparatorBody.setVisibility(View.GONE);
btnHtml.setVisibility(View.GONE);
btnImages.setVisibility(View.GONE);
pbBody.setVisibility(View.GONE);
pbBody.hide();
grpAddress.setVisibility(View.GONE);
grpHeaders.setVisibility(View.GONE);
@ -292,7 +292,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
boolean show_addresses = properties.showAddresses(message.id);
boolean show_headers = properties.showHeaders(message.id);
pbLoading.setVisibility(View.GONE);
pbLoading.hide();
boolean photo = false;
if (avatars) {
@ -401,13 +401,13 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
grpAddress.setVisibility(viewType == ViewType.THREAD && show_expanded && show_addresses ? View.VISIBLE : View.GONE);
ivAddContact.setVisibility(viewType == ViewType.THREAD && show_expanded && contacts && message.from != null ? View.VISIBLE : View.GONE);
pbHeaders.setVisibility(View.GONE);
pbHeaders.hide();
grpHeaders.setVisibility(show_headers && show_expanded ? View.VISIBLE : View.GONE);
bnvActions.setVisibility(View.GONE);
vSeparatorBody.setVisibility(View.GONE);
btnHtml.setVisibility(View.GONE);
btnImages.setVisibility(View.GONE);
pbBody.setVisibility(View.GONE);
pbBody.hide();
grpAttachments.setVisibility(message.attachments > 0 && show_expanded ? View.VISIBLE : View.GONE);
grpExpanded.setVisibility(viewType == ViewType.THREAD && show_expanded ? View.VISIBLE : View.GONE);
@ -436,7 +436,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
vSeparatorBody.setVisibility(View.VISIBLE);
tvBody.setText(null);
pbBody.setVisibility(View.VISIBLE);
pbBody.show();
if (message.content) {
Bundle args = new Bundle();
@ -652,7 +652,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
btnHtml.setVisibility(Helper.classExists("android.webkit.WebView") && show_expanded ? View.VISIBLE : View.GONE);
btnImages.setVisibility(has_images && show_expanded && !show_images ? View.VISIBLE : View.GONE);
tvBody.setText(body);
pbBody.setVisibility(View.GONE);
pbBody.hide();
btnHtml.setHasTransientState(false);
btnImages.setHasTransientState(false);
@ -1102,7 +1102,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
properties.setHeaders(data.message.id, show_headers);
if (show_headers) {
grpHeaders.setVisibility(View.VISIBLE);
pbHeaders.setVisibility(View.VISIBLE);
pbHeaders.show();
Bundle args = new Bundle();
args.putLong("id", data.message.id);

26
app/src/main/java/eu/faircode/email/FragmentAccount.java
View File

@ -52,7 +52,6 @@ import android.widget.CompoundButton;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.ScrollView;
import android.widget.Spinner;
import android.widget.TextView;
@ -86,6 +85,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.Group;
import androidx.core.content.ContextCompat;
import androidx.core.widget.ContentLoadingProgressBar;
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.Observer;
@ -123,7 +123,7 @@ public class FragmentAccount extends FragmentEx {
private EditText etInterval;
private Button btnCheck;
private ProgressBar pbCheck;
private ContentLoadingProgressBar pbCheck;
private TextView tvIdle;
@ -135,9 +135,9 @@ public class FragmentAccount extends FragmentEx {
private Spinner spJunk;
private Button btnSave;
private ProgressBar pbSave;
private ContentLoadingProgressBar pbSave;
private ImageButton ibDelete;
private ProgressBar pbWait;
private ContentLoadingProgressBar pbWait;
private Group grpServer;
private Group grpAuthorize;
@ -412,7 +412,7 @@ public class FragmentAccount extends FragmentEx {
Helper.setViewsEnabled(view, false);
btnAuthorize.setEnabled(false);
btnCheck.setEnabled(false);
pbCheck.setVisibility(View.VISIBLE);
pbCheck.show();
tvIdle.setVisibility(View.GONE);
grpFolders.setVisibility(View.GONE);
btnSave.setVisibility(View.GONE);
@ -535,7 +535,7 @@ public class FragmentAccount extends FragmentEx {
Helper.setViewsEnabled(view, true);
btnAuthorize.setEnabled(true);
btnCheck.setEnabled(true);
pbCheck.setVisibility(View.GONE);
pbCheck.hide();
tvIdle.setVisibility(result.idle ? View.GONE : View.VISIBLE);
@ -554,7 +554,7 @@ public class FragmentAccount extends FragmentEx {
Helper.setViewsEnabled(view, true);
btnAuthorize.setEnabled(true);
btnCheck.setEnabled(true);
pbCheck.setVisibility(View.GONE);
pbCheck.hide();
grpFolders.setVisibility(View.GONE);
btnSave.setVisibility(View.GONE);
@ -575,7 +575,7 @@ public class FragmentAccount extends FragmentEx {
btnAuthorize.setEnabled(false);
btnCheck.setEnabled(false);
btnSave.setEnabled(false);
pbSave.setVisibility(View.VISIBLE);
pbSave.show();
Provider provider = (Provider) spProvider.getSelectedItem();
@ -792,7 +792,7 @@ public class FragmentAccount extends FragmentEx {
btnAuthorize.setEnabled(true);
btnCheck.setEnabled(true);
btnSave.setEnabled(true);
pbSave.setVisibility(View.GONE);
pbSave.hide();
new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
.setMessage(Helper.formatThrowable(ex))
@ -816,7 +816,7 @@ public class FragmentAccount extends FragmentEx {
btnAuthorize.setEnabled(false);
btnCheck.setEnabled(false);
btnSave.setEnabled(false);
pbWait.setVisibility(View.VISIBLE);
pbWait.show();
Bundle args = new Bundle();
args.putLong("id", id);
@ -868,10 +868,10 @@ public class FragmentAccount extends FragmentEx {
tvIdle.setVisibility(View.GONE);
btnCheck.setVisibility(View.GONE);
pbCheck.setVisibility(View.GONE);
pbCheck.hide();
btnSave.setVisibility(View.GONE);
pbSave.setVisibility(View.GONE);
pbSave.hide();
ibDelete.setVisibility(View.GONE);
@ -993,7 +993,7 @@ public class FragmentAccount extends FragmentEx {
// Consider previous check/save/delete as cancelled
ibDelete.setVisibility(account == null ? View.GONE : View.VISIBLE);
pbWait.setVisibility(View.GONE);
pbWait.hide();
if (account != null) {
db.folder().liveFolders(account.id).observe(getViewLifecycleOwner(), new Observer<List<TupleFolderEx>>() {

8
app/src/main/java/eu/faircode/email/FragmentAccounts.java
View File

@ -23,7 +23,6 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ProgressBar;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
@ -33,6 +32,7 @@ import java.util.List;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.Group;
import androidx.core.widget.ContentLoadingProgressBar;
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.Observer;
import androidx.recyclerview.widget.LinearLayoutManager;
@ -40,7 +40,7 @@ import androidx.recyclerview.widget.RecyclerView;
public class FragmentAccounts extends FragmentEx {
private RecyclerView rvAccount;
private ProgressBar pbWait;
private ContentLoadingProgressBar pbWait;
private Group grpReady;
private FloatingActionButton fab;
@ -81,7 +81,7 @@ public class FragmentAccounts extends FragmentEx {
// Initialize
grpReady.setVisibility(View.GONE);
pbWait.setVisibility(View.VISIBLE);
pbWait.show();
return view;
}
@ -99,7 +99,7 @@ public class FragmentAccounts extends FragmentEx {
adapter.set(accounts);
pbWait.setVisibility(View.GONE);
pbWait.hide();
grpReady.setVisibility(View.VISIBLE);
}
});

8
app/src/main/java/eu/faircode/email/FragmentAnswer.java
View File

@ -27,13 +27,13 @@ import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.EditText;
import android.widget.ProgressBar;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.Group;
import androidx.core.widget.ContentLoadingProgressBar;
import androidx.lifecycle.Observer;
public class FragmentAnswer extends FragmentEx {
@ -41,7 +41,7 @@ public class FragmentAnswer extends FragmentEx {
private EditText etName;
private EditText etText;
private BottomNavigationView bottom_navigation;
private ProgressBar pbWait;
private ContentLoadingProgressBar pbWait;
private Group grpReady;
private long id = -1;
@ -85,7 +85,7 @@ public class FragmentAnswer extends FragmentEx {
// Initialize
grpReady.setVisibility(View.GONE);
pbWait.setVisibility(View.VISIBLE);
pbWait.show();
return view;
}
@ -101,7 +101,7 @@ public class FragmentAnswer extends FragmentEx {
etText.setText(answer == null ? null : Html.fromHtml(answer.text));
bottom_navigation.findViewById(R.id.action_delete).setVisibility(answer == null ? View.GONE : View.VISIBLE);
pbWait.setVisibility(View.GONE);
pbWait.hide();
grpReady.setVisibility(View.VISIBLE);
}
});

8
app/src/main/java/eu/faircode/email/FragmentAnswers.java
View File

@ -23,7 +23,6 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ProgressBar;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
@ -32,6 +31,7 @@ import java.util.List;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.Group;
import androidx.core.widget.ContentLoadingProgressBar;
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.Observer;
import androidx.recyclerview.widget.LinearLayoutManager;
@ -39,7 +39,7 @@ import androidx.recyclerview.widget.RecyclerView;
public class FragmentAnswers extends FragmentEx {
private RecyclerView rvAnswer;
private ProgressBar pbWait;
private ContentLoadingProgressBar pbWait;
private Group grpReady;
private FloatingActionButton fab;
@ -78,7 +78,7 @@ public class FragmentAnswers extends FragmentEx {
// Initialize
grpReady.setVisibility(View.GONE);
pbWait.setVisibility(View.VISIBLE);
pbWait.show();
return view;
}
@ -92,7 +92,7 @@ public class FragmentAnswers extends FragmentEx {
@Override
public void onChanged(List<EntityAnswer> answers) {
adapter.set(answers);
pbWait.setVisibility(View.GONE);
pbWait.hide();
grpReady.setVisibility(View.VISIBLE);
}
});

8
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@ -58,7 +58,6 @@ import android.widget.EditText;
import android.widget.FilterQueryProvider;
import android.widget.ImageView;
import android.widget.MultiAutoCompleteTextView;
import android.widget.ProgressBar;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;
@ -97,6 +96,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.Group;
import androidx.core.content.ContextCompat;
import androidx.core.widget.ContentLoadingProgressBar;
import androidx.cursoradapter.widget.SimpleCursorAdapter;
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.Lifecycle;
@ -120,7 +120,7 @@ public class FragmentCompose extends FragmentEx {
private RecyclerView rvAttachment;
private EditText etBody;
private BottomNavigationView bottom_navigation;
private ProgressBar pbWait;
private ContentLoadingProgressBar pbWait;
private Group grpHeader;
private Group grpAddresses;
private Group grpAttachments;
@ -228,7 +228,7 @@ public class FragmentCompose extends FragmentEx {
grpAttachments.setVisibility(View.GONE);
etBody.setVisibility(View.GONE);
bottom_navigation.setVisibility(View.GONE);
pbWait.setVisibility(View.VISIBLE);
pbWait.show();
getActivity().invalidateOptionsMenu();
spFrom.setEnabled(false);
@ -1242,7 +1242,7 @@ public class FragmentCompose extends FragmentEx {
getActivity().invalidateOptionsMenu();
Helper.setViewsEnabled(view, true);
pbWait.setVisibility(View.GONE);
pbWait.hide();
grpHeader.setVisibility(View.VISIBLE);
grpAddresses.setVisibility("reply_all".equals(action) ? View.VISIBLE : View.GONE);
etBody.setVisibility(View.VISIBLE);

20
app/src/main/java/eu/faircode/email/FragmentFolder.java
View File

@ -31,7 +31,6 @@ import android.widget.Button;
import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.ProgressBar;
import com.google.android.material.snackbar.Snackbar;
import com.sun.mail.imap.IMAPFolder;
@ -44,6 +43,7 @@ import javax.mail.Session;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.widget.ContentLoadingProgressBar;
import androidx.lifecycle.Observer;
public class FragmentFolder extends FragmentEx {
@ -56,8 +56,8 @@ public class FragmentFolder extends FragmentEx {
private EditText etAfter;
private Button btnSave;
private ImageButton ibDelete;
private ProgressBar pbSave;
private ProgressBar pbWait;
private ContentLoadingProgressBar pbSave;
private ContentLoadingProgressBar pbWait;
private long id = -1;
private long account = -1;
@ -97,7 +97,7 @@ public class FragmentFolder extends FragmentEx {
Helper.setViewsEnabled(view, false);
btnSave.setEnabled(false);
ibDelete.setEnabled(false);
pbSave.setVisibility(View.VISIBLE);
pbSave.show();
Bundle args = new Bundle();
args.putLong("id", id);
@ -199,7 +199,7 @@ public class FragmentFolder extends FragmentEx {
Helper.setViewsEnabled(view, true);
btnSave.setEnabled(true);
ibDelete.setEnabled(true);
pbSave.setVisibility(View.GONE);
pbSave.hide();
if (ex instanceof IllegalArgumentException)
Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
@ -221,7 +221,7 @@ public class FragmentFolder extends FragmentEx {
Helper.setViewsEnabled(view, false);
btnSave.setEnabled(false);
ibDelete.setEnabled(false);
pbSave.setVisibility(View.VISIBLE);
pbSave.show();
Bundle args = new Bundle();
args.putLong("id", id);
@ -272,7 +272,7 @@ public class FragmentFolder extends FragmentEx {
Helper.setViewsEnabled(view, true);
btnSave.setEnabled(true);
ibDelete.setEnabled(true);
pbSave.setVisibility(View.GONE);
pbSave.hide();
if (ex instanceof IllegalArgumentException)
Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
@ -292,8 +292,8 @@ public class FragmentFolder extends FragmentEx {
btnSave.setEnabled(false);
ibDelete.setEnabled(false);
ibDelete.setVisibility(View.GONE);
pbSave.setVisibility(View.GONE);
pbWait.setVisibility(View.VISIBLE);
pbSave.hide();
pbWait.show();
return view;
}
@ -323,7 +323,7 @@ public class FragmentFolder extends FragmentEx {
}
// Consider previous save as cancelled
pbWait.setVisibility(View.GONE);
pbWait.hide();
Helper.setViewsEnabled(view, true);
etRename.setEnabled(folder == null || EntityFolder.USER.equals(folder.type));
btnSave.setEnabled(true);

8
app/src/main/java/eu/faircode/email/FragmentFolders.java
View File

@ -27,7 +27,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.CompoundButton;
import android.widget.ImageButton;
import android.widget.ProgressBar;
import android.widget.ToggleButton;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
@ -37,6 +36,7 @@ import java.util.List;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.Group;
import androidx.core.widget.ContentLoadingProgressBar;
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.Observer;
import androidx.recyclerview.widget.LinearLayoutManager;
@ -46,7 +46,7 @@ public class FragmentFolders extends FragmentEx {
private ImageButton ibHintActions;
private ToggleButton tbShowHidden;
private RecyclerView rvFolder;
private ProgressBar pbWait;
private ContentLoadingProgressBar pbWait;
private Group grpHintActions;
private Group grpReady;
private FloatingActionButton fab;
@ -118,7 +118,7 @@ public class FragmentFolders extends FragmentEx {
// Initialize
tbShowHidden.setVisibility(View.GONE);
grpReady.setVisibility(View.GONE);
pbWait.setVisibility(View.VISIBLE);
pbWait.show();
return view;
}
@ -160,7 +160,7 @@ public class FragmentFolders extends FragmentEx {
adapter.set(folders);
pbWait.setVisibility(View.GONE);
pbWait.hide();
grpReady.setVisibility(View.VISIBLE);
}
});

8
app/src/main/java/eu/faircode/email/FragmentIdentities.java
View File

@ -23,7 +23,6 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ProgressBar;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
@ -33,6 +32,7 @@ import java.util.List;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.Group;
import androidx.core.widget.ContentLoadingProgressBar;
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.Observer;
import androidx.recyclerview.widget.LinearLayoutManager;
@ -40,7 +40,7 @@ import androidx.recyclerview.widget.RecyclerView;
public class FragmentIdentities extends FragmentEx {
private RecyclerView rvIdentity;
private ProgressBar pbWait;
private ContentLoadingProgressBar pbWait;
private Group grpReady;
private FloatingActionButton fab;
@ -81,7 +81,7 @@ public class FragmentIdentities extends FragmentEx {
// Initialize
grpReady.setVisibility(View.GONE);
pbWait.setVisibility(View.VISIBLE);
pbWait.show();
return view;
}
@ -96,7 +96,7 @@ public class FragmentIdentities extends FragmentEx {
public void onChanged(@Nullable List<TupleIdentityEx> identities) {
adapter.set(identities == null ? new ArrayList<TupleIdentityEx>() : identities);
pbWait.setVisibility(View.GONE);
pbWait.hide();
grpReady.setVisibility(View.VISIBLE);
}
});

16
app/src/main/java/eu/faircode/email/FragmentIdentity.java
View File

@ -37,7 +37,6 @@ import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.ProgressBar;
import android.widget.ScrollView;
import android.widget.Spinner;
import android.widget.TextView;
@ -61,6 +60,7 @@ import javax.mail.Transport;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.Group;
import androidx.core.widget.ContentLoadingProgressBar;
import androidx.lifecycle.Observer;
public class FragmentIdentity extends FragmentEx {
@ -84,9 +84,9 @@ public class FragmentIdentity extends FragmentEx {
private CheckBox cbPrimary;
private CheckBox cbStoreSent;
private Button btnSave;
private ProgressBar pbSave;
private ContentLoadingProgressBar pbSave;
private ImageButton ibDelete;
private ProgressBar pbWait;
private ContentLoadingProgressBar pbWait;
private Group grpAdvanced;
private long id = -1;
@ -301,7 +301,7 @@ public class FragmentIdentity extends FragmentEx {
public void onClick(View v) {
Helper.setViewsEnabled(view, false);
btnSave.setEnabled(false);
pbSave.setVisibility(View.VISIBLE);
pbSave.show();
EntityAccount account = (EntityAccount) spAccount.getSelectedItem();
@ -431,7 +431,7 @@ public class FragmentIdentity extends FragmentEx {
protected void onException(Bundle args, Throwable ex) {
Helper.setViewsEnabled(view, true);
btnSave.setEnabled(true);
pbSave.setVisibility(View.GONE);
pbSave.hide();
new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
.setMessage(Helper.formatThrowable(ex))
@ -453,7 +453,7 @@ public class FragmentIdentity extends FragmentEx {
public void onClick(DialogInterface dialog, int which) {
Helper.setViewsEnabled(view, false);
btnSave.setEnabled(false);
pbWait.setVisibility(View.VISIBLE);
pbWait.show();
Bundle args = new Bundle();
args.putLong("id", id);
@ -491,7 +491,7 @@ public class FragmentIdentity extends FragmentEx {
btnSave.setVisibility(View.GONE);
btnAdvanced.setVisibility(View.GONE);
grpAdvanced.setVisibility(View.GONE);
pbSave.setVisibility(View.GONE);
pbSave.hide();
ibDelete.setVisibility(View.GONE);
return view;
@ -560,7 +560,7 @@ public class FragmentIdentity extends FragmentEx {
// Consider previous save/delete as cancelled
ibDelete.setVisibility(identity == null ? View.GONE : View.VISIBLE);
pbWait.setVisibility(View.GONE);
pbWait.hide();
db.account().liveAccounts().removeObservers(getViewLifecycleOwner());
db.account().liveAccounts().observe(getViewLifecycleOwner(), new Observer<List<EntityAccount>>() {

8
app/src/main/java/eu/faircode/email/FragmentLogs.java
View File

@ -23,7 +23,6 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ProgressBar;
import java.util.ArrayList;
import java.util.Date;
@ -32,13 +31,14 @@ import java.util.List;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.Group;
import androidx.core.widget.ContentLoadingProgressBar;
import androidx.lifecycle.Observer;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
public class FragmentLogs extends FragmentEx {
private RecyclerView rvLog;
private ProgressBar pbWait;
private ContentLoadingProgressBar pbWait;
private Group grpReady;
private AdapterLog adapter;
@ -66,7 +66,7 @@ public class FragmentLogs extends FragmentEx {
// Initialize
grpReady.setVisibility(View.GONE);
pbWait.setVisibility(View.VISIBLE);
pbWait.show();
return view;
}
@ -86,7 +86,7 @@ public class FragmentLogs extends FragmentEx {
adapter.set(logs);
pbWait.setVisibility(View.GONE);
pbWait.hide();
grpReady.setVisibility(View.VISIBLE);
}
});

16
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@ -36,7 +36,6 @@ import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageButton;
import android.widget.ProgressBar;
import android.widget.TextView;
import com.google.android.material.bottomnavigation.BottomNavigationView;
@ -58,6 +57,7 @@ import androidx.annotation.Nullable;
import androidx.appcompat.widget.PopupMenu;
import androidx.appcompat.widget.SearchView;
import androidx.constraintlayout.widget.Group;
import androidx.core.widget.ContentLoadingProgressBar;
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LiveData;
@ -83,7 +83,7 @@ public class FragmentMessages extends FragmentEx {
private TextView tvNoEmail;
private RecyclerView rvMessage;
private BottomNavigationView bottom_navigation;
private ProgressBar pbWait;
private ContentLoadingProgressBar pbWait;
private Group grpSupport;
private Group grpHintSupport;
private Group grpHintSwipe;
@ -704,7 +704,7 @@ public class FragmentMessages extends FragmentEx {
tvNoEmail.setVisibility(View.GONE);
bottom_navigation.setVisibility(View.GONE);
grpReady.setVisibility(View.GONE);
pbWait.setVisibility(View.VISIBLE);
pbWait.show();
fab.hide();
fabMove.hide();
@ -1087,12 +1087,12 @@ public class FragmentMessages extends FragmentEx {
new BoundaryCallbackMessages.IBoundaryCallbackMessages() {
@Override
public void onLoading() {
pbWait.setVisibility(View.VISIBLE);
pbWait.show();
}
@Override
public void onLoaded() {
pbWait.setVisibility(View.GONE);
pbWait.hide();
}
@Override
@ -1129,12 +1129,12 @@ public class FragmentMessages extends FragmentEx {
@Override
public void onLoading() {
tvNoEmail.setVisibility(View.GONE);
pbWait.setVisibility(View.VISIBLE);
pbWait.show();
}
@Override
public void onLoaded() {
pbWait.setVisibility(View.GONE);
pbWait.hide();
if (messages.getValue() == null || messages.getValue().size() == 0)
tvNoEmail.setVisibility(View.VISIBLE);
}
@ -1238,7 +1238,7 @@ public class FragmentMessages extends FragmentEx {
boolean searching = (searchCallback != null && searchCallback.isSearching());
if (!searching)
pbWait.setVisibility(View.GONE);
pbWait.hide();
grpReady.setVisibility(View.VISIBLE);
if (messages.size() == 0) {

8
app/src/main/java/eu/faircode/email/FragmentOperations.java
View File

@ -23,7 +23,6 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ProgressBar;
import java.util.ArrayList;
import java.util.List;
@ -31,13 +30,14 @@ import java.util.List;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.Group;
import androidx.core.widget.ContentLoadingProgressBar;
import androidx.lifecycle.Observer;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
public class FragmentOperations extends FragmentEx {
private RecyclerView rvOperation;
private ProgressBar pbWait;
private ContentLoadingProgressBar pbWait;
private Group grpReady;
private AdapterOperation adapter;
@ -65,7 +65,7 @@ public class FragmentOperations extends FragmentEx {
// Initialize
grpReady.setVisibility(View.GONE);
pbWait.setVisibility(View.VISIBLE);
pbWait.show();
return view;
}
@ -83,7 +83,7 @@ public class FragmentOperations extends FragmentEx {
adapter.set(operations);
pbWait.setVisibility(View.GONE);
pbWait.hide();
grpReady.setVisibility(View.VISIBLE);
}
});

6
app/src/main/res/layout/fragment_account.xml
View File

@ -372,7 +372,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/etInterval" />
<ProgressBar
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/pbCheck"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="24dp"
@ -515,7 +515,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/spJunk" />
<ProgressBar
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/pbSave"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="24dp"
@ -526,7 +526,7 @@
app:layout_constraintStart_toEndOf="@id/btnSave"
app:layout_constraintTop_toTopOf="@id/btnSave" />
<ProgressBar
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/pbWait"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="wrap_content"

2
app/src/main/res/layout/fragment_accounts.xml
View File

@ -17,7 +17,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ProgressBar
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/pbWait"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="wrap_content"

2
app/src/main/res/layout/fragment_answer.xml
View File

@ -77,7 +77,7 @@
app:layout_constraintStart_toStartOf="parent"
app:menu="@menu/action_answer" />
<ProgressBar
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/pbWait"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="wrap_content"

2
app/src/main/res/layout/fragment_answers.xml
View File

@ -17,7 +17,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ProgressBar
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/pbWait"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="wrap_content"

2
app/src/main/res/layout/fragment_compose.xml
View File

@ -202,7 +202,7 @@
app:layout_constraintStart_toStartOf="parent"
app:menu="@menu/action_compose" />
<ProgressBar
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/pbWait"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="wrap_content"

4
app/src/main/res/layout/fragment_folder.xml
View File

@ -120,7 +120,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/etAfter" />
<ProgressBar
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/pbSave"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="24dp"
@ -131,7 +131,7 @@
app:layout_constraintStart_toEndOf="@id/btnSave"
app:layout_constraintTop_toTopOf="@id/btnSave" />
<ProgressBar
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/pbWait"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="wrap_content"

2
app/src/main/res/layout/fragment_folders.xml
View File

@ -64,7 +64,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tbShowHidden" />
<ProgressBar
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/pbWait"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="wrap_content"

2
app/src/main/res/layout/fragment_identities.xml
View File

@ -17,7 +17,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ProgressBar
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/pbWait"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="wrap_content"

4
app/src/main/res/layout/fragment_identity.xml
View File

@ -336,7 +336,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbStoreSent" />
<ProgressBar
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/pbSave"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="24dp"
@ -356,7 +356,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbStoreSent" />
<ProgressBar
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/pbWait"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="wrap_content"

2
app/src/main/res/layout/fragment_logs.xml
View File

@ -17,7 +17,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ProgressBar
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/pbWait"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="wrap_content"

2
app/src/main/res/layout/fragment_messages.xml
View File

@ -153,7 +153,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorHintSelect" />
<ProgressBar
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/pbWait"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="wrap_content"

2
app/src/main/res/layout/fragment_operations.xml
View File

@ -17,7 +17,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ProgressBar
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/pbWait"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="wrap_content"

6
app/src/main/res/layout/item_message_compact.xml
View File

@ -212,7 +212,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvError" />
<ProgressBar
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/pbLoading"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="24dp"
@ -420,7 +420,7 @@
app:layout_constraintStart_toEndOf="@id/vwColor"
app:layout_constraintTop_toBottomOf="@id/vSeparatorHeaders" />
<ProgressBar
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/pbHeaders"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="24dp"
@ -497,7 +497,7 @@
app:layout_constraintStart_toEndOf="@id/vwColor"
app:layout_constraintTop_toBottomOf="@id/btnHtml" />
<ProgressBar
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/pbBody"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="24dp"

6
app/src/main/res/layout/item_message_normal.xml
View File

@ -209,7 +209,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvError" />
<ProgressBar
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/pbLoading"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="24dp"
@ -418,7 +418,7 @@
app:layout_constraintStart_toEndOf="@id/vwColor"
app:layout_constraintTop_toBottomOf="@id/vSeparatorHeaders" />
<ProgressBar
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/pbHeaders"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="24dp"
@ -495,7 +495,7 @@
app:layout_constraintStart_toEndOf="@id/vwColor"
app:layout_constraintTop_toBottomOf="@id/btnHtml" />
<ProgressBar
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/pbBody"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="24dp"