diff options
| -rw-r--r-- | main/res/layout/livemapinfo.xml | 7 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/CgeoApplication.java | 10 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/maps/CGeoMap.java | 3 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/ui/dialog/LiveMapInfoDialogBuilder.java | 11 |
4 files changed, 8 insertions, 23 deletions
diff --git a/main/res/layout/livemapinfo.xml b/main/res/layout/livemapinfo.xml index 1b1e9ea..889febc 100644 --- a/main/res/layout/livemapinfo.xml +++ b/main/res/layout/livemapinfo.xml @@ -19,13 +19,6 @@ android:textColor="?text_color" android:textSize="14sp" /> - <CheckBox - android:id="@+id/live_map_hint_hide" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:text="@string/live_map_note_dontshow" - android:visibility="gone" /> </LinearLayout> </ScrollView>
\ No newline at end of file diff --git a/main/src/cgeo/geocaching/CgeoApplication.java b/main/src/cgeo/geocaching/CgeoApplication.java index 1cea5f1..7bee97e 100644 --- a/main/src/cgeo/geocaching/CgeoApplication.java +++ b/main/src/cgeo/geocaching/CgeoApplication.java @@ -18,7 +18,7 @@ public class CgeoApplication extends Application { private volatile Observable<Float> dir; private boolean forceRelog = false; // c:geo needs to log into cache providers public boolean showLoginToast = true; //login toast shown just once. - private boolean liveMapHintShown = false; // livemap hint has been shown + private boolean liveMapHintShownInThisSession = false; // livemap hint has been shown private static CgeoApplication instance; public CgeoApplication() { @@ -96,12 +96,12 @@ public class CgeoApplication extends Application { return currentDirObject().first().toBlockingObservable().single(); } - public boolean isLiveMapHintShown() { - return liveMapHintShown; + public boolean isLiveMapHintShownInThisSession() { + return liveMapHintShownInThisSession; } - public void setLiveMapHintShown() { - liveMapHintShown = true; + public void setLiveMapHintShownInThisSession() { + liveMapHintShownInThisSession = true; } /** diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java index 722b3eb..05b05be 100644 --- a/main/src/cgeo/geocaching/maps/CGeoMap.java +++ b/main/src/cgeo/geocaching/maps/CGeoMap.java @@ -42,6 +42,7 @@ import cgeo.geocaching.utils.Log; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.HashCodeBuilder; + import rx.util.functions.Action1; import android.app.Activity; @@ -466,7 +467,7 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto prepareFilterBar(); - if (!app.isLiveMapHintShown() && !Settings.getHideLiveMapHint()) { + if (!app.isLiveMapHintShownInThisSession() && !Settings.getHideLiveMapHint() && Settings.getLiveMapHintShowCount() <= 3) { LiveMapInfoDialogBuilder.create(activity).show(); } } diff --git a/main/src/cgeo/geocaching/ui/dialog/LiveMapInfoDialogBuilder.java b/main/src/cgeo/geocaching/ui/dialog/LiveMapInfoDialogBuilder.java index 702b85d..c29f549 100644 --- a/main/src/cgeo/geocaching/ui/dialog/LiveMapInfoDialogBuilder.java +++ b/main/src/cgeo/geocaching/ui/dialog/LiveMapInfoDialogBuilder.java @@ -9,7 +9,6 @@ import android.app.AlertDialog; import android.content.DialogInterface; import android.view.ContextThemeWrapper; import android.view.View; -import android.widget.CheckBox; public class LiveMapInfoDialogBuilder { @@ -20,12 +19,7 @@ public class LiveMapInfoDialogBuilder { final View layout = View.inflate(new ContextThemeWrapper(activity, R.style.dark), R.layout.livemapinfo, null); builder.setView(layout); - final CheckBox checkBoxHide = (CheckBox) layout.findViewById(R.id.live_map_hint_hide); - final int showCount = Settings.getLiveMapHintShowCount(); - if (showCount > 2) { - checkBoxHide.setVisibility(View.VISIBLE); - } Settings.setLiveMapHintShowCount(showCount + 1); builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { @@ -33,10 +27,7 @@ public class LiveMapInfoDialogBuilder { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); - CgeoApplication.getInstance().setLiveMapHintShown(); - if (checkBoxHide.getVisibility() == View.VISIBLE && checkBoxHide.isChecked()) { - Settings.setHideLiveHint(true); - } + CgeoApplication.getInstance().setLiveMapHintShownInThisSession(); } }); return builder.create(); |