mirror of
https://github.com/M66B/FairEmail.git
synced 2026-01-04 11:54:10 +01:00
Added pull down to refresh
Single folders only for now
This commit is contained in:
@@ -135,7 +135,9 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
|
||||
else
|
||||
ivState.setImageResource(android.R.drawable.stat_sys_warning);
|
||||
} else {
|
||||
if ("syncing".equals(folder.sync_state))
|
||||
if ("requested".equals(folder.sync_state))
|
||||
ivState.setImageResource(R.drawable.baseline_hourglass_empty_24);
|
||||
else if ("syncing".equals(folder.sync_state))
|
||||
ivState.setImageResource(R.drawable.baseline_compare_arrows_24);
|
||||
else if ("downloading".equals(folder.sync_state))
|
||||
ivState.setImageResource(R.drawable.baseline_cloud_download_24);
|
||||
|
||||
@@ -92,8 +92,10 @@ public class EntityOperation {
|
||||
}
|
||||
|
||||
static void sync(DB db, long folder) {
|
||||
if (db.operation().getOperationCount(folder, EntityOperation.SYNC) == 0)
|
||||
if (db.operation().getOperationCount(folder, EntityOperation.SYNC) == 0) {
|
||||
queue(db, folder, null, EntityOperation.SYNC, new JSONArray());
|
||||
db.folder().setFolderSyncState(folder, "requested");
|
||||
}
|
||||
}
|
||||
|
||||
private static void queue(DB db, long folder, Long message, String name, JSONArray jargs) {
|
||||
|
||||
@@ -24,6 +24,7 @@ import android.content.DialogInterface;
|
||||
import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.graphics.Canvas;
|
||||
import android.graphics.Color;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.net.ConnectivityManager;
|
||||
import android.os.Bundle;
|
||||
@@ -31,6 +32,7 @@ import android.os.Handler;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.text.TextUtils;
|
||||
import android.util.Log;
|
||||
import android.util.TypedValue;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuInflater;
|
||||
@@ -70,9 +72,11 @@ import androidx.recyclerview.selection.StorageStrategy;
|
||||
import androidx.recyclerview.widget.ItemTouchHelper;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
|
||||
|
||||
public class FragmentMessages extends FragmentEx {
|
||||
private ViewGroup view;
|
||||
private SwipeRefreshLayout swipeRefresh;
|
||||
private View popupAnchor;
|
||||
private TextView tvSupport;
|
||||
private ImageButton ibHintSupport;
|
||||
@@ -168,6 +172,7 @@ public class FragmentMessages extends FragmentEx {
|
||||
setHasOptionsMenu(true);
|
||||
|
||||
// Get controls
|
||||
swipeRefresh = view.findViewById(R.id.swipeRefresh);
|
||||
popupAnchor = view.findViewById(R.id.popupAnchor);
|
||||
tvSupport = view.findViewById(R.id.tvSupport);
|
||||
ibHintSupport = view.findViewById(R.id.ibHintSupport);
|
||||
@@ -189,6 +194,37 @@ public class FragmentMessages extends FragmentEx {
|
||||
|
||||
// Wire controls
|
||||
|
||||
TypedValue tv = new TypedValue();
|
||||
getContext().getTheme().resolveAttribute(R.attr.colorAccent, tv, true);
|
||||
swipeRefresh.setColorSchemeColors(tv.data, tv.data, tv.data);
|
||||
swipeRefresh.setProgressBackgroundColorSchemeColor(Color.WHITE);
|
||||
swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
|
||||
@Override
|
||||
public void onRefresh() {
|
||||
Bundle args = new Bundle();
|
||||
args.putLong("id", folder);
|
||||
new SimpleTask<Void>() {
|
||||
@Override
|
||||
protected Void onLoad(Context context, Bundle args) {
|
||||
long id = args.getLong("id");
|
||||
|
||||
DB db = DB.getInstance(context);
|
||||
try {
|
||||
db.beginTransaction();
|
||||
|
||||
EntityOperation.sync(db, id);
|
||||
|
||||
db.setTransactionSuccessful();
|
||||
} finally {
|
||||
db.endTransaction();
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}.load(FragmentMessages.this, args);
|
||||
}
|
||||
});
|
||||
|
||||
tvSupport.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
@@ -977,6 +1013,7 @@ public class FragmentMessages extends FragmentEx {
|
||||
((ActivityBase) getActivity()).addBackPressedListener(onBackPressedListener);
|
||||
|
||||
// Initialize
|
||||
swipeRefresh.setEnabled(viewType == AdapterMessage.ViewType.FOLDER);
|
||||
tvNoEmail.setVisibility(View.GONE);
|
||||
bottom_navigation.setVisibility(View.GONE);
|
||||
grpReady.setVisibility(View.GONE);
|
||||
@@ -1072,6 +1109,8 @@ public class FragmentMessages extends FragmentEx {
|
||||
outbox = EntityFolder.OUTBOX.equals(folder.type);
|
||||
getActivity().invalidateOptionsMenu();
|
||||
}
|
||||
|
||||
swipeRefresh.setRefreshing(folder != null && folder.sync_state != null);
|
||||
}
|
||||
});
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user