1 files changed, 135 insertions, 14 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Notify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Notify.java
index 551ac039d..3bc29edb6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Notify.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Notify.java
@@ -20,46 +20,135 @@ package org.sufficientlysecure.keychain.ui.util;
 import android.app.Activity;
 import android.content.res.Resources;
 
-import com.github.johnpersano.supertoasts.SuperCardToast;
-import com.github.johnpersano.supertoasts.SuperToast;
+import com.nispok.snackbar.Snackbar;
+import com.nispok.snackbar.Snackbar.SnackbarDuration;
+import com.nispok.snackbar.SnackbarManager;
+import com.nispok.snackbar.enums.SnackbarType;
+import com.nispok.snackbar.listeners.ActionClickListener;
+import com.nispok.snackbar.listeners.EventListenerAdapter;
+
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.util.FabContainer;
 
 /**
- * @author danielhass
  * Notify wrapper which allows a more easy use of different notification libraries
  */
 public class Notify {
 
     public static enum Style {OK, WARN, INFO, ERROR}
 
+    public static final int LENGTH_INDEFINITE = 0;
+    public static final int LENGTH_LONG = 3500;
+
     /**
      * Shows a simple in-layout notification with the CharSequence given as parameter
-     * @param activity
      * @param text     Text to show
      * @param style    Notification styling
      */
-    public static void showNotify(Activity activity, CharSequence text, Style style) {
+    public static void showNotify(final Activity activity, CharSequence text, Style style) {
+
+        Snackbar bar = getSnackbar(activity)
+                .text(text);
+
+        switch (style) {
+            case OK:
+                break;
+            case WARN:
+                bar.textColor(activity.getResources().getColor(R.color.android_orange_light));
+                break;
+            case ERROR:
+                bar.textColor(activity.getResources().getColor(R.color.android_red_light));
+                break;
+        }
+
+        SnackbarManager.show(bar);
+
+    }
+
+    public static Showable createNotify (Activity activity, int resId, int duration, Style style) {
+        final Snackbar bar = getSnackbar(activity)
+                .text(resId);
+
+        if (duration == LENGTH_INDEFINITE) {
+            bar.duration(SnackbarDuration.LENGTH_INDEFINITE);
+        } else {
+            bar.duration(duration);
+        }
+
+        switch (style) {
+            case OK:
+                bar.actionColor(activity.getResources().getColor(R.color.android_green_light));
+                break;
+            case WARN:
+                bar.textColor(activity.getResources().getColor(R.color.android_orange_light));
+                break;
+            case ERROR:
+                bar.textColor(activity.getResources().getColor(R.color.android_red_light));
+                break;
+        }
 
-        SuperCardToast st = new SuperCardToast(activity);
-        st.setText(text);
-        st.setDuration(SuperToast.Duration.MEDIUM);
-        switch (style){
+        return new Showable () {
+            @Override
+            public void show() {
+                SnackbarManager.show(bar);
+            }
+        };
+    }
+
+    public static Showable createNotify(Activity activity, int resId, int duration, Style style,
+                                        final ActionListener listener, int resIdAction) {
+        return createNotify(activity, activity.getString(resId), duration, style, listener, resIdAction);
+    }
+
+    public static Showable createNotify(Activity activity, String msg, int duration, Style style) {
+        return createNotify(activity, msg, duration, style, null, 0);
+    }
+
+    public static Showable createNotify(Activity activity, String msg, int duration, Style style,
+                                        final ActionListener listener, int resIdAction) {
+
+        final Snackbar bar = getSnackbar(activity)
+                .text(msg);
+
+        if (listener != null) {
+            bar.actionLabel(resIdAction);
+            bar.actionListener(new ActionClickListener() {
+                @Override
+                public void onActionClicked(Snackbar snackbar) {
+                    listener.onAction();
+                }
+            });
+        }
+
+        if (duration == LENGTH_INDEFINITE) {
+            bar.duration(SnackbarDuration.LENGTH_INDEFINITE);
+        } else {
+            bar.duration(duration);
+        }
+
+        switch (style) {
             case OK:
-                st.setBackground(SuperToast.Background.GREEN);
+                bar.actionColor(activity.getResources().getColor(R.color.android_green_light));
                 break;
             case WARN:
-                st.setBackground(SuperToast.Background.ORANGE);
+                bar.textColor(activity.getResources().getColor(R.color.android_orange_light));
                 break;
             case ERROR:
-                st.setBackground(SuperToast.Background.RED);
+                bar.textColor(activity.getResources().getColor(R.color.android_red_light));
                 break;
         }
-        st.show();
+
+        return new Showable () {
+            @Override
+            public void show() {
+                SnackbarManager.show(bar);
+            }
+        };
 
     }
 
     /**
      * Shows a simple in-layout notification with the resource text from given id
-     * @param activity
      * @param resId    ResourceId of notification text
      * @param style    Notification styling
      * @throws Resources.NotFoundException
@@ -67,4 +156,36 @@ public class Notify {
     public static void showNotify(Activity activity, int resId, Style style) throws Resources.NotFoundException {
         showNotify(activity, activity.getResources().getText(resId), style);
     }
+
+    private static Snackbar getSnackbar(final Activity activity) {
+        Snackbar bar = Snackbar.with(activity)
+                .type(SnackbarType.MULTI_LINE)
+                .duration(SnackbarDuration.LENGTH_LONG);
+
+        if (activity instanceof FabContainer) {
+            bar.eventListener(new EventListenerAdapter() {
+                @Override
+                public void onShow(Snackbar snackbar) {
+                    ((FabContainer) activity).fabMoveUp(snackbar.getHeight());
+                }
+
+                @Override
+                public void onDismiss(Snackbar snackbar) {
+                    ((FabContainer) activity).fabRestorePosition();
+                }
+            });
+        }
+        return bar;
+    }
+
+    public interface Showable {
+        public void show();
+
+    }
+
+    public interface ActionListener {
+        public void onAction();
+
+    }
+
 }
\ No newline at end of file