diff options
| -rw-r--r-- | main/res/layout/edit_waypoint_activity.xml (renamed from main/res/layout/waypoint_new.xml) | 38 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/EditWaypointActivity.java | 12 |
2 files changed, 13 insertions, 37 deletions
diff --git a/main/res/layout/waypoint_new.xml b/main/res/layout/edit_waypoint_activity.xml index 466ef57..03847e3 100644 --- a/main/res/layout/waypoint_new.xml +++ b/main/res/layout/edit_waypoint_activity.xml @@ -90,43 +90,17 @@ android:minLines="5" android:singleLine="false" /> - <LinearLayout - android:id="@+id/setAsCacheCoordsLayout" + <CheckBox + android:id="@+id/setAsCacheCoordsCheckBox" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="horizontal" - android:visibility="gone" > - - <CheckBox - android:id="@+id/setAsCacheCoordsCheckBox" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/waypoint_set_as_cache_coords" - android:textColor="?text_color" /> - </LinearLayout> + android:text="@string/waypoint_set_as_cache_coords" /> - <LinearLayout - android:id="@+id/uploadCoordsToWebsiteLayout" + <CheckBox + android:id="@+id/uploadCoordsToWebsiteCheckBox" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="horizontal" - android:visibility="gone" > - - <CheckBox - android:id="@+id/uploadCoordsToWebsiteCheckBox" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/waypoint_modify_on_website" - android:textColor="?text_color" /> - </LinearLayout> + android:text="@string/waypoint_modify_on_website" /> <Button android:id="@+id/add_waypoint" diff --git a/main/src/cgeo/geocaching/EditWaypointActivity.java b/main/src/cgeo/geocaching/EditWaypointActivity.java index aa04a5a..13c2d3e 100644 --- a/main/src/cgeo/geocaching/EditWaypointActivity.java +++ b/main/src/cgeo/geocaching/EditWaypointActivity.java @@ -106,7 +106,7 @@ public class EditWaypointActivity extends AbstractActivity { super.onCreate(savedInstanceState); setTheme(); - setContentView(R.layout.waypoint_new); + setContentView(R.layout.edit_waypoint_activity); setTitle("waypoint"); // get parameters @@ -170,12 +170,14 @@ public class EditWaypointActivity extends AbstractActivity { } private void setCoordsCheckBoxesVisibility(IConnector con, cgCache cache) { + final View cacheCoords = findViewById(R.id.setAsCacheCoordsCheckBox); + final View uploadWebsite = findViewById(R.id.uploadCoordsToWebsiteCheckBox); if (cache != null && (cache.getType() == CacheType.MYSTERY || cache.getType() == CacheType.MULTI)) { - findViewById(R.id.setAsCacheCoordsLayout).setVisibility(View.VISIBLE); - findViewById(R.id.uploadCoordsToWebsiteLayout).setVisibility(con.supportsOwnCoordinates() ? View.VISIBLE : View.GONE); + cacheCoords.setVisibility(View.VISIBLE); + uploadWebsite.setVisibility(con.supportsOwnCoordinates() ? View.VISIBLE : View.GONE); } else { - findViewById(R.id.setAsCacheCoordsLayout).setVisibility(View.GONE); - findViewById(R.id.uploadCoordsToWebsiteLayout).setVisibility(View.GONE); + cacheCoords.setVisibility(View.GONE); + uploadWebsite.setVisibility(View.GONE); } } |