luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-05-14 22:12:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Save the database after a drag-drop event and stop saving it on onStop

Browse source
This commit is contained in:
Alexander Bakker 2017-12-12 03:14:26 +01:00
parent 17378937a9
commit dbc79b49e8
4 changed files with 32 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/me/impy/aegis/KeyProfileAdapter.java
View file

@ -56,6 +56,11 @@ public class KeyProfileAdapter extends RecyclerView.Adapter<KeyProfileAdapter.Ke
} }
@Override
public void onItemDrop(int position) {
_listener.onKeyProfileDrop(_keyProfiles.get(position));
}
@Override @Override
public void onItemMove(int firstPosition, int secondPosition) { public void onItemMove(int firstPosition, int secondPosition) {
// notify the database first // notify the database first
@ -177,5 +182,6 @@ public class KeyProfileAdapter extends RecyclerView.Adapter<KeyProfileAdapter.Ke
void onKeyProfileClick(KeyProfile profile); void onKeyProfileClick(KeyProfile profile);
boolean onLongKeyProfileClick(KeyProfile profile); boolean onLongKeyProfileClick(KeyProfile profile);
void onKeyProfileMove(KeyProfile profile1, KeyProfile profile2); void onKeyProfileMove(KeyProfile profile1, KeyProfile profile2);
void onKeyProfileDrop(KeyProfile profile);
} }
} }

18
app/src/main/java/me/impy/aegis/MainActivity.java
View file

@ -344,12 +344,6 @@ public class MainActivity extends AppCompatActivity implements KeyProfileAdapter
setPreferredTheme(); setPreferredTheme();
} }
@Override
protected void onStop() {
saveDatabase();
super.onStop();
}
private BottomSheetDialog createBottomSheet(KeyProfile profile) { private BottomSheetDialog createBottomSheet(KeyProfile profile) {
View bottomSheetView = getLayoutInflater().inflate(R.layout.bottom_sheet_edit_profile, null); View bottomSheetView = getLayoutInflater().inflate(R.layout.bottom_sheet_edit_profile, null);
LinearLayout copyLayout = bottomSheetView.findViewById(R.id.copy_button); LinearLayout copyLayout = bottomSheetView.findViewById(R.id.copy_button);
@ -474,16 +468,11 @@ public class MainActivity extends AppCompatActivity implements KeyProfileAdapter
} }
if (restart) { if (restart) {
finish(); recreate();
startActivity(new Intent(this, this.getClass()));
} }
} }
private void saveDatabase() { private void saveDatabase() {
if (!_db.isDecrypted()) {
return;
}
try { try {
_db.save(); _db.save();
} catch (Exception e) { } catch (Exception e) {
@ -536,4 +525,9 @@ public class MainActivity extends AppCompatActivity implements KeyProfileAdapter
throw new UndeclaredThrowableException(e); throw new UndeclaredThrowableException(e);
} }
} }
@Override
public void onKeyProfileDrop(KeyProfile profile) {
saveDatabase();
}
} }

7
app/src/main/java/me/impy/aegis/helpers/ItemTouchHelperAdapter.java
View file

@ -30,4 +30,11 @@ public interface ItemTouchHelperAdapter {
* @see RecyclerView.ViewHolder#getAdapterPosition() * @see RecyclerView.ViewHolder#getAdapterPosition()
*/ */
void onItemDismiss(int position); void onItemDismiss(int position);
/**
* Called when an item has been dropped after a drag.
*
* @param position The position of the moved item.
*/
void onItemDrop(int position);
} }

12
app/src/main/java/me/impy/aegis/helpers/SimpleItemTouchHelperCallback.java
View file

@ -6,6 +6,7 @@ import android.support.v7.widget.helper.ItemTouchHelper;
public class SimpleItemTouchHelperCallback extends ItemTouchHelper.Callback { public class SimpleItemTouchHelperCallback extends ItemTouchHelper.Callback {
private final ItemTouchHelperAdapter _adapter; private final ItemTouchHelperAdapter _adapter;
private boolean _positionChanged = false;
public SimpleItemTouchHelperCallback(ItemTouchHelperAdapter adapter) { public SimpleItemTouchHelperCallback(ItemTouchHelperAdapter adapter) {
_adapter = adapter; _adapter = adapter;
@ -32,6 +33,7 @@ public class SimpleItemTouchHelperCallback extends ItemTouchHelper.Callback {
public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder,
RecyclerView.ViewHolder target) { RecyclerView.ViewHolder target) {
_adapter.onItemMove(viewHolder.getAdapterPosition(), target.getAdapterPosition()); _adapter.onItemMove(viewHolder.getAdapterPosition(), target.getAdapterPosition());
_positionChanged = true;
return true; return true;
} }
@ -39,4 +41,14 @@ public class SimpleItemTouchHelperCallback extends ItemTouchHelper.Callback {
public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) { public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
_adapter.onItemDismiss(viewHolder.getAdapterPosition()); _adapter.onItemDismiss(viewHolder.getAdapterPosition());
} }
@Override
public void clearView(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
super.clearView(recyclerView, viewHolder);
if (_positionChanged) {
_adapter.onItemDrop(viewHolder.getAdapterPosition());
_positionChanged = false;
}
}
} }