diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-06 23:39:26 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-06 23:40:22 +0200 |
commit | b779211f55a126d54c643fb9f13a0a17b46c37bf (patch) | |
tree | a526af2e5d385691c20393560443e17f9a61201a /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util | |
parent | fa614383065a22269c5ca249819c46b82e20a194 (diff) | |
parent | 7cfc0d80d0b4318ce1ae027536d70c2cda4c8605 (diff) | |
download | open-keychain-b779211f55a126d54c643fb9f13a0a17b46c37bf.tar.gz open-keychain-b779211f55a126d54c643fb9f13a0a17b46c37bf.tar.bz2 open-keychain-b779211f55a126d54c643fb9f13a0a17b46c37bf.zip |
Merge branch 'master' into v/multi-decrypt
this also fixes weird-bug
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Notify.java | 38 |
1 files changed, 25 insertions, 13 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 7e07ed818..8c554dbde 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 @@ -62,9 +62,10 @@ public class Notify { public static final int LENGTH_INDEFINITE = 0; public static final int LENGTH_LONG = 3500; + public static final int LENGTH_SHORT = 1500; public static Showable create(final Activity activity, String text, int duration, Style style, - final ActionListener actionListener, int actionResId) { + final ActionListener actionListener, Integer actionResId) { final Snackbar snackbar = Snackbar.with(activity) .type(SnackbarType.MULTI_LINE) .text(text); @@ -77,14 +78,16 @@ public class Notify { style.applyToBar(snackbar); + if (actionResId != null) { + snackbar.actionLabel(actionResId); + } if (actionListener != null) { - snackbar.actionLabel(actionResId) - .actionListener(new ActionClickListener() { - @Override - public void onActionClicked(Snackbar snackbar) { - actionListener.onAction(); - } - }); + snackbar.actionListener(new ActionClickListener() { + @Override + public void onActionClicked(Snackbar snackbar) { + actionListener.onAction(); + } + }); } if (activity instanceof FabContainer) { @@ -108,6 +111,13 @@ public class Notify { } @Override + public void show(Fragment fragment, boolean animate) { + snackbar.animation(animate); + snackbar.dismissOnActionClicked(animate); + show(fragment); + } + + @Override public void show(Fragment fragment) { if (fragment != null) { View view = fragment.getView(); @@ -134,7 +144,7 @@ public class Notify { } public static Showable create(Activity activity, String text, int duration, Style style) { - return create(activity, text, duration, style, null, -1); + return create(activity, text, duration, style, null, null); } public static Showable create(Activity activity, String text, Style style) { @@ -159,24 +169,26 @@ public class Notify { /** * Shows the notification on the bottom of the Activity. */ - public void show(); + void show(); + + void show(Fragment fragment, boolean animate); /** * Shows the notification on the bottom of the Fragment. */ - public void show(Fragment fragment); + void show(Fragment fragment); /** * Shows the notification on the given ViewGroup. * The viewGroup should be either a RelativeLayout or FrameLayout. */ - public void show(ViewGroup viewGroup); + void show(ViewGroup viewGroup); } public interface ActionListener { - public void onAction(); + void onAction(); } |