diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2012-12-10 09:00:32 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2012-12-10 09:00:32 +0100 |
| commit | a0f379adc1b96cc47d25db0a223d4975a4f743ce (patch) | |
| tree | d29921bff967a93c452b8ca3735889980ff8a9cd /main | |
| parent | 93e9e5f240eba9ba2a199de54cee18391d929bdc (diff) | |
| download | cgeo-a0f379adc1b96cc47d25db0a223d4975a4f743ce.zip cgeo-a0f379adc1b96cc47d25db0a223d4975a4f743ce.tar.gz cgeo-a0f379adc1b96cc47d25db0a223d4975a4f743ce.tar.bz2 | |
Remove extraneous layout level
The LinearLayout is always made visible during the initialization, and
serves no purpose as it is included in a very same layout with similar
properties.
Diffstat (limited to 'main')
| -rw-r--r-- | main/res/layout/popup.xml | 63 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/CachePopup.java | 2 |
2 files changed, 29 insertions, 36 deletions
diff --git a/main/res/layout/popup.xml b/main/res/layout/popup.xml index bf266e1..daa888f 100644 --- a/main/res/layout/popup.xml +++ b/main/res/layout/popup.xml @@ -41,40 +41,35 @@ android:id="@+id/more_details" android:text="@string/popup_more" /> </LinearLayout> - <LinearLayout android:id="@+id/offline_box" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - </RelativeLayout> - <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" > - <TextView android:id="@+id/offline_text" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="6dip" - android:layout_marginRight="130dip" - android:layout_alignParentLeft="true" - android:layout_gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" /> - <Button style="@style/button_small" - android:id="@+id/offline_refresh" - android:visibility="gone" - android:layout_width="60dip" - android:layout_marginRight="71dip" - android:layout_alignParentRight="true" - android:text="@string/cache_offline_refresh" /> - <Button style="@style/button_small" - android:id="@+id/offline_store" - android:layout_width="60dip" - android:layout_alignParentRight="true" - android:text="@string/cache_offline_store" /> - </RelativeLayout> - </LinearLayout> + <RelativeLayout style="@style/separator_horizontal_layout" > + <View style="@style/separator_horizontal" /> + </RelativeLayout> + <RelativeLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" > + <TextView android:id="@+id/offline_text" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="6dip" + android:layout_marginRight="130dip" + android:layout_alignParentLeft="true" + android:layout_gravity="left" + android:paddingRight="3dip" + android:textSize="14dip" + android:textColor="?text_color" /> + <Button style="@style/button_small" + android:id="@+id/offline_refresh" + android:visibility="gone" + android:layout_width="60dip" + android:layout_marginRight="71dip" + android:layout_alignParentRight="true" + android:text="@string/cache_offline_refresh" /> + <Button style="@style/button_small" + android:id="@+id/offline_store" + android:layout_width="60dip" + android:layout_alignParentRight="true" + android:text="@string/cache_offline_store" /> + </RelativeLayout> </LinearLayout> </ScrollView> </LinearLayout>
\ No newline at end of file diff --git a/main/src/cgeo/geocaching/CachePopup.java b/main/src/cgeo/geocaching/CachePopup.java index 5781d54..9b0d96d 100644 --- a/main/src/cgeo/geocaching/CachePopup.java +++ b/main/src/cgeo/geocaching/CachePopup.java @@ -89,8 +89,6 @@ public class CachePopup extends AbstractPopupActivity { addCacheDetails(); - findViewById(R.id.offline_box).setVisibility(View.VISIBLE); - // offline use final TextView offlineText = (TextView) findViewById(R.id.offline_text); final Button offlineRefresh = (Button) findViewById(R.id.offline_refresh); |