Add Snackbar for Entry deletion, fixing #41

also removes unused view in EditorActivity layout

Signed-off-by: Aron Heinecke <aron.heinecke@t-online.de>

Author: 0xpr03

app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/activity/EditorActivity.java

@@ -5,6 +5,7 @@
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.Snackbar;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
@@ -58,7 +59,6 @@ public class EditorActivity extends AppCompatActivity implements VEntryEditorDia
     private EntryListAdapter adapter;
     private ListView listView;
     private Database db;
-    private View undoContainer;
     private VEntry lastDeleted;
     private int deletedPosition;
     private int sortSetting;
@@ -104,8 +104,6 @@ protected void onCreate(Bundle savedInstanceState) {
         },ID_RESERVED_SKIP);
 
         Intent intent = getIntent();
-        undoContainer = findViewById(R.id.undobar);
-        undoContainer.setVisibility(View.GONE);
 
         FloatingActionButton bNewEntry = findViewById(R.id.bEditorNewEntry);
         bNewEntry.setOnClickListener(v -> addEntry());
@@ -296,19 +294,44 @@ private void showEntryDeleteDialog(final VEntry entry, final int position) {
         delDiag.setTitle(R.string.Editor_Diag_delete_Title);
         delDiag.setMessage(String.format(getString(R.string.Editor_Diag_delete_MSG_part) + "\n %s %s %s", entry.getAString(), entry.getBString(), entry.getTip()));
 
-        delDiag.setPositiveButton(R.string.Editor_Diag_delete_btn_OK, (dialog, whichButton) -> {
-            lastDeleted = entry;
-            deletedPosition = position;
-            adapter.remove(entry);
-            showUndo();
-            Log.d(TAG, "deleted");
-        });
+        delDiag.setPositiveButton(R.string.Editor_Diag_delete_btn_OK, (dialog, whichButton) -> deleteEntry(position, entry));
 
         delDiag.setNegativeButton(R.string.Editor_Diag_delete_btn_CANCEL, (dialog, whichButton) -> Log.d(TAG, "canceled"));
 
         delDiag.show();
     }
 
+    /**
+     * Perform entry deletion with undo possibility
+     * @param deletedPosition
+     * @param entry
+     */
+    private void deleteEntry(final int deletedPosition, final VEntry entry){
+        adapter.remove(entry);
+        Snackbar snackbar = Snackbar
+                .make(listView, R.string.Editor_Entry_Deleted_Message, Snackbar.LENGTH_LONG)
+                .setAction(R.string.GEN_Undo, view -> adapter.addEntryRendered(entry,deletedPosition))
+                .addCallback(new Snackbar.Callback(){
+                    @Override
+                    public void onDismissed(Snackbar transientBottomBar, int event) {
+                        switch(event){
+                            case DISMISS_EVENT_CONSECUTIVE: // second deletion
+                            case DISMISS_EVENT_TIMEOUT: // timeout
+                            case DISMISS_EVENT_MANUAL: // dismiss() -> view change
+                            case DISMISS_EVENT_SWIPE: // swiped away
+                                Log.d(TAG,"deleting entry");
+                                entry.setDelete(true);
+                                ArrayList<VEntry> lst = new ArrayList<>(1);
+                                lst.add(entry);
+                                Database db = new Database(getApplicationContext());
+                                db.upsertEntries(lst); // TODO make a single function
+                                break;
+                        }
+                    }
+                });
+        snackbar.show();
+    }
+
     /**
      * Show entry edit dialog for new vocable
      * @param entry
@@ -385,80 +408,6 @@ private void showTableInfoDialog() {
         listEditorDialog.show(getSupportFragmentManager(), VListEditorDialog.TAG);
     }
 
-    /**
-     * Show undo view<br>
-     * On viewchange during the animation we're not deleting the vocable
-     */
-    private void showUndo() {
-        undoContainer.setVisibility(View.VISIBLE);
-        undoContainer.bringToFront();
-        ScaleAnimation scaleAnimation = new ScaleAnimation(0f,1f,1f,1f,
-                Animation.RELATIVE_TO_SELF, 0f, // Pivot point of X scaling
-                Animation.RELATIVE_TO_SELF, 1f);
-        final AlphaAnimation alphaAnimation = new AlphaAnimation(0.0f,1.0f);
-
-        AnimationSet animationSet = new AnimationSet(true);
-        animationSet.addAnimation(scaleAnimation);
-        animationSet.addAnimation(alphaAnimation);
-        animationSet.setDuration(500);
-        animationSet.setFillEnabled(true);
-
-        animationSet.setAnimationListener(new Animation.AnimationListener() {
-            @Override
-            public void onAnimationStart(Animation animation) {}
-
-            @Override
-            public void onAnimationEnd(Animation animation) {
-                AnimationSet animationSetOut = new AnimationSet(true);
-                AlphaAnimation alphaAnimation1 = new AlphaAnimation(1f,0f);
-                ScaleAnimation scaleAnimation1 = new ScaleAnimation(1f,0f,1f,1f,
-                        Animation.RELATIVE_TO_SELF, 1f,
-                        Animation.RELATIVE_TO_SELF, 1f);
-                ScaleAnimation scaleAnimation2 = new ScaleAnimation(1f,0f,1f,0f,
-                        Animation.RELATIVE_TO_SELF, 1f,
-                        Animation.RELATIVE_TO_SELF, 1f);
-
-                scaleAnimation2.setStartOffset(500);
-                animationSetOut.addAnimation(alphaAnimation1);
-                animationSetOut.addAnimation(scaleAnimation1);
-                animationSetOut.addAnimation(scaleAnimation2);
-                animationSetOut.setDuration(2000);
-                animationSetOut.setStartOffset(2000);
-                animationSetOut.setFillEnabled(true);
-                animationSetOut.setAnimationListener(new Animation.AnimationListener() {
-                    @Override
-                    public void onAnimationStart(Animation animation) {}
-
-                    @Override
-                    public void onAnimationEnd(Animation animation) {
-                        undoContainer.setVisibility(View.GONE);
-                        lastDeleted.setDelete(true);
-                        ArrayList<VEntry> lst = new ArrayList<>(1);
-                        lst.add(lastDeleted);
-                        db.upsertEntries(lst);
-                    }
-
-                    @Override
-                    public void onAnimationRepeat(Animation animation) {}
-                });
-                undoContainer.setAnimation(animationSetOut);
-            }
-
-            @Override
-            public void onAnimationRepeat(Animation animation) {}
-        });
-        undoContainer.clearAnimation();
-        undoContainer.setAnimation(animationSet);
-
-        undoContainer.setOnClickListener(v -> {
-            Log.d(TAG, "undoing");
-            undoContainer.clearAnimation();
-            adapter.addEntryRendered(lastDeleted, deletedPosition);
-            undoContainer.setVisibility(View.GONE);
-            listView.setFocusable(true);
-        });
-    }
-
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);

app/src/main/res/layout/activity_editor.xml

@@ -26,74 +26,31 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         android:id="@+id/constraintLayout">
 
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginStart="8dp"
-            android:orientation="horizontal"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent">
-
-        </LinearLayout>
-
         <ListView
             android:id="@+id/listviewEditor"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_marginLeft="8dp"
             android:layout_marginRight="8dp"
-            android:layout_marginTop="8dp"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginBottom="0dp"
-            app:layout_constraintBottom_toTopOf="@+id/undobar" />
-
-        <LinearLayout
-            android:id="@+id/undobar"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal|bottom"
-            android:layout_marginBottom="0dp"
-            android:alpha="100"
-            android:dividerPadding="11dp"
-            android:gravity="center"
-            android:padding="4dp"
-            android:visibility="visible"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent">
-
-            <Button
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="#00f2f2f2"
-                android:drawableLeft="@drawable/ic_undo_white_48dp"
-                android:enabled="false"
-                android:focusable="false"
-                android:text="@string/GEN_Undo"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="@android:color/background_light" />
-        </LinearLayout>
+            app:layout_constraintTop_toTopOf="parent" />
 
         <android.support.design.widget.FloatingActionButton
             android:id="@+id/bEditorNewEntry"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:layout_marginRight="16dp"
+            android:layout_marginEnd="24dp"
+            android:layout_marginBottom="24dp"
             android:clickable="true"
             app:fabSize="normal"
             app:layout_anchor="@+id/constraintLayout"
-            app:layout_constraintBottom_toTopOf="@+id/undobar"
+            app:layout_constraintBottom_toBottomOf="@+id/listviewEditor"
             app:layout_constraintRight_toRightOf="@+id/listviewEditor"
-            app:srcCompat="@android:drawable/ic_input_add" />
+            app:srcCompat="@android:drawable/ic_input_add"
+            android:focusable="true" />
     </android.support.constraint.ConstraintLayout>
 
 </android.support.design.widget.CoordinatorLayout>

app/src/main/res/values/strings.xml

@@ -53,6 +53,7 @@
     <string name="Editor_Hint_Tip">Hint</string>
     <string name="Editor_Hint_Addition">Additional</string>
     <string name="Editor_ListSettings">List Settings</string>
+    <string name="Editor_Entry_Deleted_Message">Entry deleted</string>
     <string name="CSV_Format">CSV Format</string>
     <string name="Select_File_btn">Select File</string>
     <string name="Import_Title">Import Lists</string>