diff options
author | Samuel Tardieu <sam@rfc1149.net> | 2014-01-11 14:01:53 +0100 |
---|---|---|
committer | Samuel Tardieu <sam@rfc1149.net> | 2014-01-11 14:09:46 +0100 |
commit | 4fde6849e36a74b0dfc6f725bee9e642f5c02d9c (patch) | |
tree | c90c6b170ba4ec68b3beadc22df4ece6b9df86e6 /main/src/cgeo/geocaching/ui/dialog | |
parent | 99e9d48ce7773f18aaa83e34d8cf18b4bbf5dbfc (diff) | |
download | cgeo-4fde6849e36a74b0dfc6f725bee9e642f5c02d9c.zip cgeo-4fde6849e36a74b0dfc6f725bee9e642f5c02d9c.tar.gz cgeo-4fde6849e36a74b0dfc6f725bee9e642f5c02d9c.tar.bz2 |
Use RxJava.Action1 instead of our RunnableWithArgument
Diffstat (limited to 'main/src/cgeo/geocaching/ui/dialog')
-rw-r--r-- | main/src/cgeo/geocaching/ui/dialog/Dialogs.java | 6 | ||||
-rw-r--r-- | main/src/cgeo/geocaching/ui/dialog/LiveMapInfoDialogBuilder.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/main/src/cgeo/geocaching/ui/dialog/Dialogs.java b/main/src/cgeo/geocaching/ui/dialog/Dialogs.java index 865ba70..4f6de39 100644 --- a/main/src/cgeo/geocaching/ui/dialog/Dialogs.java +++ b/main/src/cgeo/geocaching/ui/dialog/Dialogs.java @@ -1,10 +1,10 @@ package cgeo.geocaching.ui.dialog; import cgeo.geocaching.CgeoApplication; -import cgeo.geocaching.utils.RunnableWithArgument; import org.apache.commons.lang3.StringUtils; import org.eclipse.jdt.annotation.Nullable; +import rx.util.functions.Action1; import android.app.Activity; import android.app.AlertDialog; @@ -310,7 +310,7 @@ public final class Dialogs { * @param okayListener * listener to be run on okay */ - public static void input(final Activity context, final int title, final String defaultValue, final int buttonTitle, final RunnableWithArgument<String> okayListener) { + public static void input(final Activity context, final int title, final String defaultValue, final int buttonTitle, final Action1<String> okayListener) { final EditText input = new EditText(context); input.setInputType(InputType.TYPE_TEXT_FLAG_CAP_SENTENCES | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS | InputType.TYPE_CLASS_TEXT); input.setText(defaultValue); @@ -322,7 +322,7 @@ public final class Dialogs { @Override public void onClick(DialogInterface dialog, int which) { - okayListener.run(input.getText().toString()); + okayListener.call(input.getText().toString()); } }); builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { diff --git a/main/src/cgeo/geocaching/ui/dialog/LiveMapInfoDialogBuilder.java b/main/src/cgeo/geocaching/ui/dialog/LiveMapInfoDialogBuilder.java index 6ad59ec..702b85d 100644 --- a/main/src/cgeo/geocaching/ui/dialog/LiveMapInfoDialogBuilder.java +++ b/main/src/cgeo/geocaching/ui/dialog/LiveMapInfoDialogBuilder.java @@ -1,8 +1,8 @@ package cgeo.geocaching.ui.dialog; +import cgeo.geocaching.CgeoApplication; import cgeo.geocaching.R; import cgeo.geocaching.settings.Settings; -import cgeo.geocaching.CgeoApplication; import android.app.Activity; import android.app.AlertDialog; |