Fix for Issue #1114

Displays the snackbar above the keyboard on all activities.
This commit is contained in:
Manoj Khanna 2015-03-19 19:58:24 +05:30
parent d122d27eba
commit 6120365ee1

View File

@ -19,6 +19,11 @@ package org.sufficientlysecure.keychain.ui.util;
import android.app.Activity; import android.app.Activity;
import android.content.res.Resources; import android.content.res.Resources;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import android.view.View;
import android.view.ViewGroup;
import com.nispok.snackbar.Snackbar; import com.nispok.snackbar.Snackbar;
import com.nispok.snackbar.Snackbar.SnackbarDuration; import com.nispok.snackbar.Snackbar.SnackbarDuration;
@ -61,11 +66,11 @@ public class Notify {
break; break;
} }
SnackbarManager.show(bar); showSnackbar(activity, bar);
} }
public static Showable createNotify (Activity activity, int resId, int duration, Style style) { public static Showable createNotify (final Activity activity, int resId, int duration, Style style) {
final Snackbar bar = getSnackbar(activity) final Snackbar bar = getSnackbar(activity)
.text(resId); .text(resId);
@ -90,7 +95,7 @@ public class Notify {
return new Showable () { return new Showable () {
@Override @Override
public void show() { public void show() {
SnackbarManager.show(bar); showSnackbar(activity, bar);
} }
}; };
} }
@ -104,7 +109,7 @@ public class Notify {
return createNotify(activity, msg, duration, style, null, 0); return createNotify(activity, msg, duration, style, null, 0);
} }
public static Showable createNotify(Activity activity, String msg, int duration, Style style, public static Showable createNotify(final Activity activity, String msg, int duration, Style style,
final ActionListener listener, int resIdAction) { final ActionListener listener, int resIdAction) {
final Snackbar bar = getSnackbar(activity) final Snackbar bar = getSnackbar(activity)
@ -141,7 +146,7 @@ public class Notify {
return new Showable () { return new Showable () {
@Override @Override
public void show() { public void show() {
SnackbarManager.show(bar); showSnackbar(activity, bar);
} }
}; };
@ -178,6 +183,26 @@ public class Notify {
return bar; return bar;
} }
private static void showSnackbar(Activity activity, Snackbar snackbar) {
if (activity instanceof FragmentActivity) {
FragmentManager fragmentManager = ((FragmentActivity) activity).getSupportFragmentManager();
int count = fragmentManager.getBackStackEntryCount();
Fragment fragment = fragmentManager.getFragments().get(count > 0 ? count - 1 : 0);
if (fragment != null) {
View view = fragment.getView();
if (view != null) {
SnackbarManager.show(snackbar, (ViewGroup) view);
return;
}
}
}
SnackbarManager.show(snackbar);
}
public interface Showable { public interface Showable {
public void show(); public void show();