Visited waypoints - small fixes and polishing

5 files changed, 19 insertions, 5 deletions

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 2009bff..43ce65f 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -74,6 +74,7 @@ import android.text.method.LinkMovementMethod;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.StrikethroughSpan;
 import android.text.style.StyleSpan;
+import android.util.TypedValue;
 import android.view.ContextMenu;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -2230,7 +2231,12 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
 
                 // visited
                 if (wpt.isVisited()) {
-                    nameView.setTextColor(getResources().getColor(R.color.text_grey_dark));
+                    TypedValue a = new TypedValue();
+                    getTheme().resolveAttribute(R.attr.text_color_grey, a, true);
+                    if (a.type >= TypedValue.TYPE_FIRST_COLOR_INT && a.type <= TypedValue.TYPE_LAST_COLOR_INT) {
+                        // really should be just a color!
+                        nameView.setTextColor(a.data);
+                    }
                 }
 
                 // note
diff --git a/main/src/cgeo/geocaching/EditWaypointActivity.java b/main/src/cgeo/geocaching/EditWaypointActivity.java
index 8d00d1e..e886dea 100644
--- a/main/src/cgeo/geocaching/EditWaypointActivity.java
+++ b/main/src/cgeo/geocaching/EditWaypointActivity.java
@@ -178,7 +178,6 @@ public class EditWaypointActivity extends AbstractActivity {
                 visited = isChecked;
             }
         });
-        buttonLat.setOnClickListener(new coordDialogListener());
 
         initializeDistanceUnitSelector();
 
diff --git a/main/src/cgeo/geocaching/Waypoint.java b/main/src/cgeo/geocaching/Waypoint.java
index e3b2be0..4b014a6 100644
--- a/main/src/cgeo/geocaching/Waypoint.java
+++ b/main/src/cgeo/geocaching/Waypoint.java
@@ -30,6 +30,13 @@ public class Waypoint implements IWaypoint, Comparable<Waypoint> {
     private int cachedOrder = ORDER_UNDEFINED;
     private boolean own = false;
     private boolean visited = false;
+    // preliminary default for mdpi screens
+    private static int VISITED_INSET = 7;
+
+    public static void initializeScale() {
+        // Calculate visited inset based on screen density
+        VISITED_INSET = (int) (6.6f * cgeoapplication.getInstance().getResources().getDisplayMetrics().density + 0.5f);
+    }
 
     /**
      * require name and type for every waypoint
@@ -60,8 +67,8 @@ public class Waypoint implements IWaypoint, Comparable<Waypoint> {
             LayerDrawable ld = new LayerDrawable(new Drawable[] {
                     res.getDrawable(waypointType.markerId),
                     res.getDrawable(R.drawable.tick) });
-            ld.setLayerInset(0, 0, 0, 10, 10);
-            ld.setLayerInset(1, 10, 10, 0, 0);
+            ld.setLayerInset(0, 0, 0, VISITED_INSET, VISITED_INSET);
+            ld.setLayerInset(1, VISITED_INSET, VISITED_INSET, 0, 0);
             icon = ld;
         } else {
             icon = res.getDrawable(waypointType.markerId);
diff --git a/main/src/cgeo/geocaching/cgData.java b/main/src/cgeo/geocaching/cgData.java
index 359083b..c17eb15 100644
--- a/main/src/cgeo/geocaching/cgData.java
+++ b/main/src/cgeo/geocaching/cgData.java
@@ -174,7 +174,7 @@ public class cgData {
             + "latitude double, "
             + "longitude double, "
             + "note text, "
-            + "own integer default 0"
+            + "own integer default 0, "
             + "visited integer default 0"
             + "); ";
     private static final String dbCreateSpoilers = ""
diff --git a/main/src/cgeo/geocaching/cgeoapplication.java b/main/src/cgeo/geocaching/cgeoapplication.java
index f25701e..a1fd7d1 100644
--- a/main/src/cgeo/geocaching/cgeoapplication.java
+++ b/main/src/cgeo/geocaching/cgeoapplication.java
@@ -35,6 +35,8 @@ public class cgeoapplication extends Application {
     @Override
     public void onCreate() {
         new Thread(statusUpdater).start();
+        // Initialize densitiy related waypoint data
+        Waypoint.initializeScale();
     }
 
     @Override