diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2013-03-12 18:33:42 +0100 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2013-03-12 18:33:42 +0100 |
| commit | 787597e75d704a347ce348b546a35dc7120da3ce (patch) | |
| tree | 77e9c7efa0fff7392b7fdd5fdce85018eb063f86 | |
| parent | 440101b73ce76bf8c0066dd3fead4813da623cf0 (diff) | |
| download | cgeo-787597e75d704a347ce348b546a35dc7120da3ce.zip cgeo-787597e75d704a347ce348b546a35dc7120da3ce.tar.gz cgeo-787597e75d704a347ce348b546a35dc7120da3ce.tar.bz2 | |
refactoring: reformat all layout sources
* preparation for extracting the toolbar
37 files changed, 2212 insertions, 1648 deletions
diff --git a/main/res/layout-land/navigate.xml b/main/res/layout-land/navigate.xml index d13f345..5897f65 100644 --- a/main/res/layout-land/navigate.xml +++ b/main/res/layout-land/navigate.xml @@ -1,98 +1,138 @@ <?xml version="1.0" encoding="UTF-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical"> - <LinearLayout style="@style/action_bar"> - <ImageView style="@style/action_bar_action" - android:onClick="goHome" /> - <View style="@style/action_bar_separator" /> - <TextView style="@style/action_bar_title" /> - <View style="@style/action_bar_separator" /> - <ImageView style="@style/action_bar_action" - android:src="@drawable/actionbar_manual" - android:onClick="goManual" /> - </LinearLayout> + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <LinearLayout style="@style/action_bar" > + + <ImageView + style="@style/action_bar_action" + android:onClick="goHome" /> + + <View style="@style/action_bar_separator" /> + + <TextView style="@style/action_bar_title" /> + + <View style="@style/action_bar_separator" /> + + <ImageView + style="@style/action_bar_action" + android:onClick="goManual" + android:src="@drawable/actionbar_manual" /> + </LinearLayout> + <LinearLayout - android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="horizontal" > + <RelativeLayout + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_weight="1" + android:orientation="vertical" > + + <TextView + android:id="@+id/destination" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_alignParentLeft="false" + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" + android:layout_gravity="center" + android:gravity="center_horizontal" + android:textColor="?text_color" + android:textSize="14dip" /> + + <TextView + android:id="@+id/cacheinfo" android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" android:layout_weight="1"> - <TextView android:id="@+id/destination" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_gravity="center" - android:textSize="14dip" - android:textColor="?text_color" android:layout_alignParentLeft="false" - android:layout_alignParentTop="true" - android:gravity="center_horizontal"/> - <TextView android:id="@+id/cacheinfo" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_gravity="center" - android:textSize="14dip" - android:textColor="?text_color" android:layout_alignParentLeft="false" - android:layout_alignParentTop="false" - android:layout_below="@+id/destination" android:gravity="center_horizontal"/> - <TextView android:id="@+id/heading" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="3dip" - android:layout_alignParentLeft="true" - android:layout_gravity="left" - android:textSize="26dip" - android:textColor="?text_color" - android:text="@null" android:layout_centerVertical="true"/> - <TextView android:id="@+id/distance" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginRight="3dip" - android:layout_alignParentRight="true" - android:layout_gravity="right" - android:textSize="26dip" - android:textColor="?text_color" - android:text="@null" android:layout_centerVertical="true"/> - <TextView android:id="@+id/nav_location" - style="@style/location_current" - android:layout_above="@id/status" - android:text="@string/loc_trying" android:layout_alignParentLeft="false" - android:layout_marginLeft="0dp" android:layout_alignParentTop="false" - android:layout_marginTop="95dp" android:layout_alignParentBottom="false" - /> + android:layout_height="wrap_content" + android:layout_alignParentLeft="false" + android:layout_alignParentTop="false" + android:layout_below="@+id/destination" + android:layout_centerHorizontal="true" + android:layout_gravity="center" + android:gravity="center_horizontal" + android:textColor="?text_color" + android:textSize="14dip" /> + + <TextView + android:id="@+id/heading" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:layout_gravity="left" + android:layout_marginLeft="3dip" + android:text="@null" + android:textColor="?text_color" + android:textSize="26dip" /> + + <TextView + android:id="@+id/distance" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:layout_gravity="right" + android:layout_marginRight="3dip" + android:text="@null" + android:textColor="?text_color" + android:textSize="26dip" /> + + <TextView + android:id="@+id/nav_location" + style="@style/location_current" + android:layout_above="@id/status" + android:layout_alignParentBottom="false" + android:layout_alignParentLeft="false" + android:layout_alignParentTop="false" + android:layout_marginLeft="0dp" + android:layout_marginTop="95dp" + android:text="@string/loc_trying" /> + <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="16dip" android:longClickable="true" - android:layout_alignParentLeft="false" - android:layout_alignParentTop="false" - android:layout_alignParentBottom="true" android:id="@+id/status"> - <TextView android:id="@+id/nav_type" - style="@style/location_current_type" - android:textColor="?text_color_grey" /> - <TextView android:id="@+id/nav_accuracy" - style="@style/location_current_accuracy" - android:textColor="?text_color_grey" /> - <TextView android:id="@+id/nav_satellites" - style="@style/location_current_satellites" - android:textColor="?text_color_grey" /> - </RelativeLayout> - </RelativeLayout> - <view class="cgeo.geocaching.ui.CompassView" - android:id="@+id/rose" + android:id="@+id/status" android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_marginTop="6dip" - android:layout_marginBottom="1dip" - android:layout_marginRight="1dip" - android:layout_marginLeft="1dip" - android:layout_gravity="center_vertical" - android:keepScreenOn="true" - android:gravity="center" - android:padding="4dip" - android:layout_weight="1"/> + android:layout_height="16dip" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="false" + android:layout_alignParentTop="false" + android:longClickable="true" > + + <TextView + android:id="@+id/nav_type" + style="@style/location_current_type" + android:textColor="?text_color_grey" /> + + <TextView + android:id="@+id/nav_accuracy" + style="@style/location_current_accuracy" + android:textColor="?text_color_grey" /> + + <TextView + android:id="@+id/nav_satellites" + style="@style/location_current_satellites" + android:textColor="?text_color_grey" /> + </RelativeLayout> + </RelativeLayout> + + <view + android:id="@+id/rose" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_gravity="center_vertical" + android:layout_marginBottom="1dip" + android:layout_marginLeft="1dip" + android:layout_marginRight="1dip" + android:layout_marginTop="6dip" + android:layout_weight="1" + class="cgeo.geocaching.ui.CompassView" + android:gravity="center" + android:keepScreenOn="true" + android:padding="4dip" /> </LinearLayout> + </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/addresses.xml b/main/res/layout/addresses.xml index 1f8665e..2be131d 100644 --- a/main/res/layout/addresses.xml +++ b/main/res/layout/addresses.xml @@ -1,21 +1,28 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical"> - <LinearLayout style="@style/action_bar"> - <ImageView style="@style/action_bar_action" - android:onClick="goHome" /> - <View style="@style/action_bar_separator" /> - <TextView style="@style/action_bar_title" /> - </LinearLayout> - <ListView - android:id="@android:id/list" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_margin="0dip" - android:padding="0dip" - android:dividerHeight="1dip" - android:background="?background_color" - android:cacheColorHint="?background_color" /> + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <LinearLayout style="@style/action_bar" > + + <ImageView + style="@style/action_bar_action" + android:onClick="goHome" /> + + <View style="@style/action_bar_separator" /> + + <TextView style="@style/action_bar_title" /> + </LinearLayout> + + <ListView + android:id="@android:id/list" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_margin="0dip" + android:background="?background_color" + android:cacheColorHint="?background_color" + android:dividerHeight="1dip" + android:padding="0dip" /> + </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/attribute_image.xml b/main/res/layout/attribute_image.xml index d2faa17..f68aef4 100644 --- a/main/res/layout/attribute_image.xml +++ b/main/res/layout/attribute_image.xml @@ -1,9 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/attribute_images" - android:layout_width="wrap_content" - android:layout_height="wrap_content" > - <ImageView android:id="@+id/attribute_image" - android:layout_height="32dp" - android:layout_width="32dp" /> -</FrameLayout> + android:id="@+id/attribute_images" + android:layout_width="wrap_content" + android:layout_height="wrap_content" > + + <ImageView + android:id="@+id/attribute_image" + android:layout_width="32dp" + android:layout_height="32dp" /> + +</FrameLayout>
\ No newline at end of file diff --git a/main/res/layout/cache_image_item.xml b/main/res/layout/cache_image_item.xml index 2362ee9..7ed4782 100644 --- a/main/res/layout/cache_image_item.xml +++ b/main/res/layout/cache_image_item.xml @@ -1,22 +1,30 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - <RelativeLayout style="@style/separator_horizontal_layout" - android:id="@+id/titleLayout" - android:visibility="gone" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" - android:id="@+id/title" - android:text="@null" /> - </RelativeLayout> - <TextView android:id="@+id/description" - android:visibility="gone" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="3dip" - android:textSize="14dip" - android:textColor="?text_color" /> + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <RelativeLayout + android:id="@+id/titleLayout" + style="@style/separator_horizontal_layout" + android:visibility="gone" > + + <View style="@style/separator_horizontal" /> + + <TextView + android:id="@+id/title" + style="@style/separator_horizontal_headline" + android:text="@null" /> + </RelativeLayout> + + <TextView + android:id="@+id/description" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:padding="3dip" + android:textColor="?text_color" + android:textSize="14dip" + android:visibility="gone" /> + </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/caches.xml b/main/res/layout/caches.xml index 3381341..147a596 100644 --- a/main/res/layout/caches.xml +++ b/main/res/layout/caches.xml @@ -1,48 +1,67 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical"> - <LinearLayout style="@style/action_bar"> - <ImageView style="@style/action_bar_action" - android:onClick="goHome" /> - <View style="@style/action_bar_separator" /> - <TextView style="@style/action_bar_title" - android:clickable="true" - android:onClick="selectList" /> - <ProgressBar style="@style/action_bar_progress" - android:visibility="gone" /> - <View style="@style/action_bar_separator" /> - <ImageView style="@style/action_bar_action" - android:src="@drawable/actionbar_map" - android:onClick="goMap" /> - <View style="@style/action_bar_separator" /> - <ImageView style="@style/action_bar_action" - android:src="@drawable/actionbar_manual" - android:onClick="goManual" /> - </LinearLayout> - - <include layout="@layout/filter_bar"/> - - <RelativeLayout android:id="@+id/loading" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - <ProgressBar style="@android:style/Widget.ProgressBar.Large" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerInParent="true" - android:gravity="center" - android:indeterminate="true" - android:indeterminateOnly="true" /> - </RelativeLayout> - - <ListView android:id="@android:id/list" - android:visibility="gone" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_margin="0dip" - android:padding="0dip" - android:dividerHeight="1dip" - android:background="?background_color" - android:cacheColorHint="?background_color" /> + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <LinearLayout style="@style/action_bar" > + + <ImageView + style="@style/action_bar_action" + android:onClick="goHome" /> + + <View style="@style/action_bar_separator" /> + + <TextView + style="@style/action_bar_title" + android:clickable="true" + android:onClick="selectList" /> + + <ProgressBar + style="@style/action_bar_progress" + android:visibility="gone" /> + + <View style="@style/action_bar_separator" /> + + <ImageView + style="@style/action_bar_action" + android:onClick="goMap" + android:src="@drawable/actionbar_map" /> + + <View style="@style/action_bar_separator" /> + + <ImageView + style="@style/action_bar_action" + android:onClick="goManual" + android:src="@drawable/actionbar_manual" /> + </LinearLayout> + + <include layout="@layout/filter_bar" /> + + <RelativeLayout + android:id="@+id/loading" + android:layout_width="fill_parent" + android:layout_height="fill_parent" > + + <ProgressBar + style="@android:style/Widget.ProgressBar.Large" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:gravity="center" + android:indeterminate="true" + android:indeterminateOnly="true" /> + </RelativeLayout> + + <ListView + android:id="@android:id/list" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_margin="0dip" + android:background="?background_color" + android:cacheColorHint="?background_color" + android:dividerHeight="1dip" + android:padding="0dip" + android:visibility="gone" /> + </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/caches_footer.xml b/main/res/layout/caches_footer.xml index f33aca2..7182488 100644 --- a/main/res/layout/caches_footer.xml +++ b/main/res/layout/caches_footer.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/more_caches" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_gravity="center" - android:gravity="center" - android:padding="8dip" - android:lines="1" - android:singleLine="true" - android:scrollHorizontally="true" - android:ellipsize="marquee" - android:textSize="16dip" - android:textColor="@color/just_white" - android:text="@string/caches_no_cache" - android:background="@drawable/actionbar_background" />
\ No newline at end of file + android:id="@+id/more_caches" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_gravity="center" + android:background="@drawable/actionbar_background" + android:ellipsize="marquee" + android:gravity="center" + android:lines="1" + android:padding="8dip" + android:scrollHorizontally="true" + android:singleLine="true" + android:text="@string/caches_no_cache" + android:textColor="@color/just_white" + android:textSize="16dip" /> diff --git a/main/res/layout/cacheview_description.xml b/main/res/layout/cacheview_description.xml index 044329b..732ab91 100644 --- a/main/res/layout/cacheview_description.xml +++ b/main/res/layout/cacheview_description.xml @@ -53,8 +53,8 @@ <ProgressBar
style="?progressSpinnerLarge"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center"
android:indeterminate="true"
@@ -129,11 +129,11 @@ android:textColor="?text_color"
android:textColorLink="?text_color_link"
android:textSize="14dip" />
+
<Button
- android:id="@+id/edit_personalnote"
- style="@style/button_small"
- android:text="@string/cache_personal_note_edit" />
-
+ android:id="@+id/edit_personalnote"
+ style="@style/button_small"
+ android:text="@string/cache_personal_note_edit" />
</LinearLayout>
</LinearLayout>
diff --git a/main/res/layout/cacheview_details.xml b/main/res/layout/cacheview_details.xml index 8bb5ad5..54d4719 100644 --- a/main/res/layout/cacheview_details.xml +++ b/main/res/layout/cacheview_details.xml @@ -66,8 +66,8 @@ android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
- android:layout_gravity="left"
android:layout_centerVertical="true"
+ android:layout_gravity="left"
android:layout_marginLeft="6dip"
android:layout_marginRight="130dip"
android:paddingRight="3dip"
@@ -98,16 +98,16 @@ android:id="@+id/list_box"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
+ android:orientation="vertical"
android:visibility="gone" >
-
+
<TextView
android:id="@+id/list_text"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
- android:layout_gravity="left"
android:layout_centerVertical="true"
+ android:layout_gravity="left"
android:layout_marginLeft="6dip"
android:layout_marginRight="130dip"
android:paddingRight="3dip"
@@ -120,7 +120,6 @@ android:layout_alignParentRight="true"
android:text="@string/cache_list_change"
android:visibility="visible" />
-
</RelativeLayout>
<!-- Watchlist box -->
@@ -145,8 +144,8 @@ android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
- android:layout_gravity="left"
android:layout_centerVertical="true"
+ android:layout_gravity="left"
android:layout_marginLeft="6dip"
android:layout_marginRight="130dip"
android:paddingRight="3dip"
@@ -168,7 +167,7 @@ android:visibility="gone" />
</RelativeLayout>
</LinearLayout>
-
+
<!-- Favorite points box -->
<LinearLayout
@@ -191,8 +190,8 @@ android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
- android:layout_gravity="left"
android:layout_centerVertical="true"
+ android:layout_gravity="left"
android:layout_marginLeft="6dip"
android:layout_marginRight="130dip"
android:paddingRight="3dip"
@@ -265,9 +264,9 @@ android:layout_height="80dip"
android:layout_gravity="center"
android:gravity="center"
+ android:onClick="showNavigationMenu"
android:scaleType="centerCrop"
- android:src="@null"
- android:onClick="showNavigationMenu" />
+ android:src="@null" />
</LinearLayout>
</LinearLayout>
diff --git a/main/res/layout/cacheview_logs_item.xml b/main/res/layout/cacheview_logs_item.xml index c0b4b68..b54446e 100644 --- a/main/res/layout/cacheview_logs_item.xml +++ b/main/res/layout/cacheview_logs_item.xml @@ -1,101 +1,120 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingTop="3dip" - android:paddingBottom="3dip" > - <TextView android:id="@+id/author" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentTop="true" - android:layout_gravity="left|top" - android:lines="1" - android:singleLine="true" - android:scrollHorizontally="true" - android:ellipsize="marquee" - android:textSize="18dip" - android:textColor="?text_color" /> - <LinearLayout android:id="@+id/detail_box" - android:layout_width="82dip" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_gravity="left|top" - android:orientation="horizontal" - android:layout_below="@id/author" > - <LinearLayout - android:layout_width="80dip" - android:layout_height="wrap_content" - android:layout_gravity="right|top" - android:padding="3dip" - android:orientation="vertical" > - <TextView android:id="@+id/added" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:gravity="left" - android:lines="1" - android:singleLine="true" - android:scrollHorizontally="true" - android:ellipsize="marquee" - android:textSize="14dip" - android:textColor="?text_color_headline" /> - <TextView android:id="@+id/type" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:gravity="left" - android:lines="1" - android:singleLine="true" - android:scrollHorizontally="true" - android:ellipsize="marquee" - android:textSize="14dip" - android:textColor="?text_color_headline" /> - <TextView android:id="@+id/count" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:gravity="left" - android:lines="1" - android:singleLine="true" - android:scrollHorizontally="true" - android:ellipsize="marquee" - android:textSize="14dip" - android:textColor="?text_color_headline" /> - </LinearLayout> - <ImageView android:id="@+id/log_mark" - android:layout_width="2dip" - android:layout_height="fill_parent" - android:layout_marginTop="2dip" - android:layout_marginBottom="2dip" - android:scaleType="fitXY" - android:src="@drawable/mark_green" /> - </LinearLayout> - <LinearLayout android:id="@+id/log_layout" - android:layout_height="wrap_content" - android:layout_width="fill_parent" - android:orientation="vertical" - android:paddingLeft="3dip" - android:textSize="14dip" - android:layout_toRightOf="@id/detail_box"> - <TextView android:id="@+id/log" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginTop="22dip" - android:layout_gravity="left" - android:gravity="left" - android:textSize="14dip" - android:textColor="?text_color" - android:autoLink="web" /> + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingBottom="3dip" + android:paddingTop="3dip" > + + <TextView + android:id="@+id/author" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_alignParentTop="true" + android:layout_gravity="left|top" + android:ellipsize="marquee" + android:lines="1" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="?text_color" + android:textSize="18dip" /> + + <LinearLayout + android:id="@+id/detail_box" + android:layout_width="82dip" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_below="@id/author" + android:layout_gravity="left|top" + android:orientation="horizontal" > + + <LinearLayout + android:layout_width="80dip" + android:layout_height="wrap_content" + android:layout_gravity="right|top" + android:orientation="vertical" + android:padding="3dip" > + <TextView - android:id="@+id/log_images" + android:id="@+id/added" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="left|top" - android:layout_marginTop="3dip" - android:drawableLeft="?log_img_icon" - android:drawablePadding="3dip" - android:textSize="14dip" - android:textColor="?text_color"/> - </LinearLayout> + android:layout_gravity="right" + android:ellipsize="marquee" + android:gravity="left" + android:lines="1" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="?text_color_headline" + android:textSize="14dip" /> + + <TextView + android:id="@+id/type" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:ellipsize="marquee" + android:gravity="left" + android:lines="1" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="?text_color_headline" + android:textSize="14dip" /> + + <TextView + android:id="@+id/count" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:ellipsize="marquee" + android:gravity="left" + android:lines="1" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="?text_color_headline" + android:textSize="14dip" /> + </LinearLayout> + + <ImageView + android:id="@+id/log_mark" + android:layout_width="2dip" + android:layout_height="fill_parent" + android:layout_marginBottom="2dip" + android:layout_marginTop="2dip" + android:scaleType="fitXY" + android:src="@drawable/mark_green" /> + </LinearLayout> + + <LinearLayout + android:id="@+id/log_layout" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/detail_box" + android:orientation="vertical" + android:paddingLeft="3dip" + android:textSize="14dip" > + + <TextView + android:id="@+id/log" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginTop="22dip" + android:autoLink="web" + android:gravity="left" + android:textColor="?text_color" + android:textSize="14dip" /> + + <TextView + android:id="@+id/log_images" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left|top" + android:layout_marginTop="3dip" + android:drawableLeft="?log_img_icon" + android:drawablePadding="3dip" + android:textColor="?text_color" + android:textSize="14dip" /> + </LinearLayout> + </RelativeLayout>
\ No newline at end of file diff --git a/main/res/layout/cacheview_waypoints.xml b/main/res/layout/cacheview_waypoints.xml index fc990d5..8a24aa8 100644 --- a/main/res/layout/cacheview_waypoints.xml +++ b/main/res/layout/cacheview_waypoints.xml @@ -19,8 +19,8 @@ <Button
android:id="@+id/add_waypoint"
style="@style/button_full"
- android:text="@string/cache_waypoints_add"
- android:layout_marginTop="9dp" />
+ android:layout_marginTop="9dp"
+ android:text="@string/cache_waypoints_add" />
</LinearLayout>
</ScrollView>
\ No newline at end of file diff --git a/main/res/layout/date.xml b/main/res/layout/date.xml index 4ea2fb1..8357de4 100644 --- a/main/res/layout/date.xml +++ b/main/res/layout/date.xml @@ -1,9 +1,12 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - <DatePicker android:id="@+id/picker" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_margin="10dip" /> + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <DatePicker + android:id="@+id/picker" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_margin="10dip" /> + </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/editor.xml b/main/res/layout/editor.xml index 9b7dc33..d556836 100644 --- a/main/res/layout/editor.xml +++ b/main/res/layout/editor.xml @@ -1,8 +1,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/linearLayout1" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> + android:id="@+id/linearLayout1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > <EditText android:id="@+id/editorEditText" @@ -15,10 +15,11 @@ <requestFocus /> </EditText> - <Button style="@style/button_full" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/editorSave" - android:text="@string/editor_save" /> - -</LinearLayout> + <Button + android:id="@+id/editorSave" + style="@style/button_full" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/editor_save" /> + +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/gpx.xml b/main/res/layout/gpx.xml index 1f8665e..2be131d 100644 --- a/main/res/layout/gpx.xml +++ b/main/res/layout/gpx.xml @@ -1,21 +1,28 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical"> - <LinearLayout style="@style/action_bar"> - <ImageView style="@style/action_bar_action" - android:onClick="goHome" /> - <View style="@style/action_bar_separator" /> - <TextView style="@style/action_bar_title" /> - </LinearLayout> - <ListView - android:id="@android:id/list" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_margin="0dip" - android:padding="0dip" - android:dividerHeight="1dip" - android:background="?background_color" - android:cacheColorHint="?background_color" /> + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <LinearLayout style="@style/action_bar" > + + <ImageView + style="@style/action_bar_action" + android:onClick="goHome" /> + + <View style="@style/action_bar_separator" /> + + <TextView style="@style/action_bar_title" /> + </LinearLayout> + + <ListView + android:id="@android:id/list" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_margin="0dip" + android:background="?background_color" + android:cacheColorHint="?background_color" + android:dividerHeight="1dip" + android:padding="0dip" /> + </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/image_item.xml b/main/res/layout/image_item.xml index 6988d87..3478444 100644 --- a/main/res/layout/image_item.xml +++ b/main/res/layout/image_item.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <ImageView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/map_image" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:gravity="center" />
\ No newline at end of file + android:id="@+id/map_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:gravity="center" /> diff --git a/main/res/layout/init.xml b/main/res/layout/init.xml index 676eeca..a1fd3ae 100644 --- a/main/res/layout/init.xml +++ b/main/res/layout/init.xml @@ -1,621 +1,842 @@ <?xml version="1.0" encoding="UTF-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical"> - <LinearLayout style="@style/action_bar"> - <ImageView style="@style/action_bar_action" - android:onClick="goHome" /> - <View style="@style/action_bar_separator" /> - <TextView style="@style/action_bar_title" /> - <View style="@style/action_bar_separator" /> - <ImageView style="@style/action_bar_action" - android:src="@drawable/actionbar_manual" - android:onClick="goManual" /> - </LinearLayout> - <ScrollView - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:padding="4dip" - android:orientation="vertical" > - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > -<!-- ** --> - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" - android:text="@string/init_geocaching" /> - </RelativeLayout> - <TextView android:id="@+id/legal_note" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:layout_gravity="left" - android:padding="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:textColorLink="?text_color_link" - android:linksClickable="true" - android:text="@string/legal_note" /> - <EditText style="@style/edittext_full" - android:id="@+id/username" - android:hint="@string/init_username" /> - <EditText style="@style/edittext_full" - android:id="@+id/password" - android:hint="@string/init_password" - android:inputType="textPassword"/> - <Button style="@style/button_full" - android:id="@+id/log_me_in" - android:lines="2" - android:singleLine="false" - android:scrollHorizontally="false" - android:text="@string/init_login" /> -<!-- ** --> - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" - android:text="@string/init_oc" /> - </RelativeLayout> - <CheckBox android:id="@+id/oc_option" - style="@style/checkbox_full" - android:text="@string/init_oc_activate" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:padding="3dip" - android:textSize="14sp" - android:textColor="?text_color" - android:text="@string/init_oc_username_description" /> - <EditText style="@style/edittext_full" - android:id="@+id/oc_username" - android:hint="@string/init_oc_username" /> -<!-- ** --> - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" - android:text="@string/init_gcvote" /> - </RelativeLayout> - <EditText style="@style/edittext_full" - android:id="@+id/passvote" - android:hint="@string/init_passvote" - android:inputType="textPassword"/> -<!-- ** --> - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" - android:text="@string/init_twitter" /> - </RelativeLayout> - <TextView android:id="@+id/about_twitter" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:layout_gravity="left" - android:padding="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:textColorLink="?text_color_link" - android:linksClickable="true" - android:text="@string/about_twitter" /> - <Button style="@style/button_full" - android:id="@+id/authorize_twitter" - android:text="@string/init_twitter_authorize" /> - <CheckBox android:id="@+id/twitter_option" - style="@style/checkbox_full" - android:text="@string/init_twitter_publish" /> - - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" - android:text="@string/init_signature" /> - </RelativeLayout> - <EditText style="@style/edittext_full" - android:id="@+id/signature" - android:hint="@string/init_signature" - android:singleLine="false" - android:layout_height="wrap_content" - android:minLines="3" - android:inputType="textMultiLine|textCapSentences"/> - <LinearLayout android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > - <Button style="@style/button_full" - android:id="@+id/signature_template" - android:layout_width="wrap_content" - android:layout_weight="2" - android:textSize="14dip" - android:text="@string/init_signature_template_button" /> - <Button style="@style/button_full" - android:id="@+id/signature_help" - android:layout_width="wrap_content" - android:layout_weight="1" - android:textSize="14dip" - android:text="@string/init_signature_help_button" /> - </LinearLayout> - <CheckBox android:id="@+id/sigautoinsert" - style="@style/checkbox_full" - android:text="@string/init_sigautoinsert" /> + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <LinearLayout style="@style/action_bar" > + + <ImageView + style="@style/action_bar_action" + android:onClick="goHome" /> + + <View style="@style/action_bar_separator" /> + + <TextView style="@style/action_bar_title" /> + + <View style="@style/action_bar_separator" /> + + <ImageView + style="@style/action_bar_action" + android:onClick="goManual" + android:src="@drawable/actionbar_manual" /> + </LinearLayout> + + <ScrollView + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" + android:padding="4dip" > + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <!-- ** --> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/init_geocaching" /> + </RelativeLayout> + + <TextView + android:id="@+id/legal_note" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:linksClickable="true" + android:padding="3dip" + android:text="@string/legal_note" + android:textColor="?text_color" + android:textColorLink="?text_color_link" + android:textSize="14dip" /> + + <EditText + android:id="@+id/username" + style="@style/edittext_full" + android:hint="@string/init_username" /> + + <EditText + android:id="@+id/password" + style="@style/edittext_full" + android:hint="@string/init_password" + android:inputType="textPassword" /> + + <Button + android:id="@+id/log_me_in" + style="@style/button_full" + android:lines="2" + android:scrollHorizontally="false" + android:singleLine="false" + android:text="@string/init_login" /> + <!-- ** --> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/init_oc" /> + </RelativeLayout> + + <CheckBox + android:id="@+id/oc_option" + style="@style/checkbox_full" + android:text="@string/init_oc_activate" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:padding="3dip" + android:text="@string/init_oc_username_description" + android:textColor="?text_color" + android:textSize="14sp" /> + + <EditText + android:id="@+id/oc_username" + style="@style/edittext_full" + android:hint="@string/init_oc_username" /> + <!-- ** --> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/init_gcvote" /> + </RelativeLayout> + + <EditText + android:id="@+id/passvote" + style="@style/edittext_full" + android:hint="@string/init_passvote" + android:inputType="textPassword" /> + <!-- ** --> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/init_twitter" /> + </RelativeLayout> + + <TextView + android:id="@+id/about_twitter" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:linksClickable="true" + android:padding="3dip" + android:text="@string/about_twitter" + android:textColor="?text_color" + android:textColorLink="?text_color_link" + android:textSize="14dip" /> + + <Button + android:id="@+id/authorize_twitter" + style="@style/button_full" + android:text="@string/init_twitter_authorize" /> + + <CheckBox + android:id="@+id/twitter_option" + style="@style/checkbox_full" + android:text="@string/init_twitter_publish" /> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/init_signature" /> + </RelativeLayout> + + <EditText + android:id="@+id/signature" + style="@style/edittext_full" + android:layout_height="wrap_content" + android:hint="@string/init_signature" + android:inputType="textMultiLine|textCapSentences" + android:minLines="3" + android:singleLine="false" /> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <Button + android:id="@+id/signature_template" + style="@style/button_full" + android:layout_width="wrap_content" + android:layout_weight="2" + android:text="@string/init_signature_template_button" + android:textSize="14dip" /> + + <Button + android:id="@+id/signature_help" + style="@style/button_full" + android:layout_width="wrap_content" + android:layout_weight="1" + android:text="@string/init_signature_help_button" + android:textSize="14dip" /> + </LinearLayout> + + <CheckBox + android:id="@+id/sigautoinsert" + style="@style/checkbox_full" + android:text="@string/init_sigautoinsert" /> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/init_details" /> + </RelativeLayout> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_margin="3dip" + android:orientation="vertical" + android:padding="3dip" > + + <CheckBox + android:id="@+id/autoload" + style="@style/checkbox_full" + android:text="@string/init_autoload" /> + + <CheckBox + android:id="@+id/ratingwanted" + style="@style/checkbox_full" + android:text="@string/init_ratingwanted" /> + + <CheckBox + android:id="@+id/elevationwanted" + style="@style/checkbox_full" + android:text="@string/init_elevationwanted" /> + + <CheckBox + android:id="@+id/friendlogswanted" + style="@style/checkbox_full" + android:text="@string/init_friendlogswanted" /> + + <CheckBox + android:id="@+id/openlastdetailspage" + style="@style/checkbox_full" + android:text="@string/init_openlastdetailspage" /> + + <CheckBox + android:id="@+id/offline" + style="@style/checkbox_full" + android:text="@string/init_offline" /> + + <CheckBox + android:id="@+id/offline_wp" + style="@style/checkbox_full" + android:text="@string/init_offline_wp" /> + + <CheckBox + android:id="@+id/save_log_img" + style="@style/checkbox_full" + android:text="@string/init_save_log_img" /> + </LinearLayout> + <!-- ** --> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/init_other" /> + </RelativeLayout> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_margin="3dip" + android:orientation="vertical" + android:padding="3dip" > + + <CheckBox + android:id="@+id/skin" + style="@style/checkbox_full" + android:text="@string/init_skin" /> + + <CheckBox + android:id="@+id/address" + style="@style/checkbox_full" + android:text="@string/init_address" /> + + <CheckBox + android:id="@+id/captcha" + style="@style/checkbox_full" + android:text="@string/init_captcha" /> + + <CheckBox + android:id="@+id/livelist" + style="@style/checkbox_full" + android:text="@string/init_livelist" /> + + <CheckBox + android:id="@+id/loaddirectionimg" + style="@style/checkbox_full" + android:text="@string/init_loaddirectionimg" /> + + <CheckBox + android:id="@+id/useenglish" + style="@style/checkbox_full" + android:text="@string/init_useenglish" /> + + <CheckBox + android:id="@+id/units" + style="@style/checkbox_full" + android:text="@string/init_units" /> + + <CheckBox + android:id="@+id/exclude" + style="@style/checkbox_full" + android:text="@string/init_exclude" /> + + <CheckBox + android:id="@+id/disabled" + style="@style/checkbox_full" + android:text="@string/init_disabled" /> + + <CheckBox + android:id="@+id/trackautovisit" + style="@style/checkbox_full" + android:text="@string/init_trackautovisit" /> + + <CheckBox + android:id="@+id/log_offline" + style="@style/checkbox_full" + android:text="@string/init_log_offline" /> + + <CheckBox + android:id="@+id/choose_list" + style="@style/checkbox_full" + android:text="@string/init_choose_list" /> + + <CheckBox + android:id="@+id/trail" + style="@style/checkbox_full" + android:text="@string/init_maptrail" /> + + <CheckBox + android:id="@+id/plain_logs" + style="@style/checkbox_full" + android:text="@string/init_plain_logs" /> + + <CheckBox + android:id="@+id/use_native_ua" + style="@style/checkbox_full" + android:text="@string/init_use_native_ua" /> + </LinearLayout> + <!-- ** --> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/init_showwaypoints" /> + </RelativeLayout> + + <EditText + android:id="@+id/showwaypointsthreshold" + style="@style/edittext_full" + android:inputType="number" + android:lines="1" + android:scrollHorizontally="true" + android:singleLine="true" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:linksClickable="true" + android:padding="3dip" + android:text="@string/init_showwaypoint_description" + android:textColor="?text_color" + android:textColorLink="?text_color_link" + android:textSize="14dip" /> + <!-- maps --> + <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" - android:text="@string/init_details" /> - </RelativeLayout> - <LinearLayout - android:layout_margin="3dip" android:padding="3dip" android:layout_width="fill_parent" android:orientation="vertical" android:layout_height="fill_parent"> - <CheckBox android:id="@+id/autoload" - style="@style/checkbox_full" - android:text="@string/init_autoload" /> - <CheckBox android:id="@+id/ratingwanted" - style="@style/checkbox_full" - android:text="@string/init_ratingwanted" /> - <CheckBox android:id="@+id/elevationwanted" - style="@style/checkbox_full" - android:text="@string/init_elevationwanted" /> - <CheckBox android:id="@+id/friendlogswanted" - style="@style/checkbox_full" - android:text="@string/init_friendlogswanted" /> - <CheckBox android:id="@+id/openlastdetailspage" - style="@style/checkbox_full" - android:text="@string/init_openlastdetailspage" /> - <CheckBox android:id="@+id/offline" - style="@style/checkbox_full" - android:text="@string/init_offline" /> - <CheckBox android:id="@+id/offline_wp" - style="@style/checkbox_full" - android:text="@string/init_offline_wp" /> - <CheckBox android:id="@+id/save_log_img" - style="@style/checkbox_full" - android:text="@string/init_save_log_img" /> - </LinearLayout> -<!-- ** --> - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" - android:text="@string/init_other" /> - </RelativeLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_margin="3dip" - android:orientation="vertical" - android:padding="3dip" > - <CheckBox android:id="@+id/skin" - style="@style/checkbox_full" - android:text="@string/init_skin" /> - <CheckBox android:id="@+id/address" - style="@style/checkbox_full" - android:text="@string/init_address" /> - <CheckBox android:id="@+id/captcha" - style="@style/checkbox_full" - android:text="@string/init_captcha" /> - <CheckBox android:id="@+id/livelist" - style="@style/checkbox_full" - android:text="@string/init_livelist" /> - <CheckBox android:id="@+id/loaddirectionimg" - style="@style/checkbox_full" - android:text="@string/init_loaddirectionimg" /> - <CheckBox android:id="@+id/useenglish" - style="@style/checkbox_full" - android:text="@string/init_useenglish" /> - <CheckBox android:id="@+id/units" - style="@style/checkbox_full" - android:text="@string/init_units" /> - <CheckBox android:id="@+id/exclude" - style="@style/checkbox_full" - android:text="@string/init_exclude" /> - <CheckBox android:id="@+id/disabled" - style="@style/checkbox_full" - android:text="@string/init_disabled" /> - <CheckBox android:id="@+id/trackautovisit" - style="@style/checkbox_full" - android:text="@string/init_trackautovisit" /> - <CheckBox android:id="@+id/log_offline" - style="@style/checkbox_full" - android:text="@string/init_log_offline" /> - <CheckBox android:id="@+id/choose_list" - style="@style/checkbox_full" - android:text="@string/init_choose_list" /> - <CheckBox android:id="@+id/trail" - style="@style/checkbox_full" - android:text="@string/init_maptrail" /> - <CheckBox android:id="@+id/plain_logs" - style="@style/checkbox_full" - android:text="@string/init_plain_logs" /> - <CheckBox android:id="@+id/use_native_ua" - style="@style/checkbox_full" - android:text="@string/init_use_native_ua" /> - </LinearLayout> -<!-- ** --> - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" - android:text="@string/init_showwaypoints" /> - </RelativeLayout> - <EditText style="@style/edittext_full" - android:id="@+id/showwaypointsthreshold" - android:singleLine="true" - android:lines="1" - android:scrollHorizontally="true" - android:inputType="number" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:layout_gravity="left" - android:padding="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:textColorLink="?text_color_link" - android:linksClickable="true" - android:text="@string/init_showwaypoint_description" /> -<!-- maps --> - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" - android:text="@string/init_mapsources" /> - </RelativeLayout> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:layout_gravity="left" - android:padding="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:textColorLink="?text_color_link" - android:linksClickable="true" - android:autoLink="web" - android:text="@string/init_mapsources_description" /> - <Spinner android:id="@+id/mapsource" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:prompt="@string/init_mapsource_select" /> + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/init_mapsources" /> + </RelativeLayout> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:autoLink="web" + android:linksClickable="true" + android:padding="3dip" + android:text="@string/init_mapsources_description" + android:textColor="?text_color" + android:textColorLink="?text_color_link" + android:textSize="14dip" /> + + <Spinner + android:id="@+id/mapsource" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:prompt="@string/init_mapsource_select" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:autoLink="web" + android:linksClickable="true" + android:padding="3dip" + android:text="@string/init_map_directory_description" + android:textColor="?text_color" + android:textColorLink="?text_color_link" + android:textSize="14dip" /> + + <LinearLayout + android:id="@+id/init_mapdir_group" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <Button + android:id="@+id/select_map_directory" + style="@style/button_full" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:layout_gravity="left" - android:padding="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:textColorLink="?text_color_link" - android:linksClickable="true" - android:autoLink="web" - android:text="@string/init_map_directory_description" /> + android:text="@string/init_select_map_directory" /> + + <EditText + android:id="@+id/map_directory" + style="@style/edittext_full" + android:inputType="textNoSuggestions" + android:lines="1" + android:scrollHorizontally="true" + android:singleLine="true" /> + </LinearLayout> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:gravity="left" + android:padding="3dip" + android:text="@string/init_rendertheme_folder" + android:textColor="?text_color" + android:textSize="14dip" /> + <LinearLayout - android:id="@+id/init_mapdir_group" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > - <Button style="@style/button_full" - android:id="@+id/select_map_directory" - android:text="@string/init_select_map_directory" - android:layout_width="wrap_content" /> - <EditText style="@style/edittext_full" - android:id="@+id/map_directory" - android:singleLine="true" - android:lines="1" - android:scrollHorizontally="true" - android:inputType="textNoSuggestions" /> + android:id="@+id/init_themefilegroup" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <Button + android:id="@+id/select_themefolder" + style="@style/button_full" + android:layout_width="wrap_content" + android:text="@string/init_select_themefolder" /> + + <EditText + android:id="@+id/themefolder" + style="@style/edittext_full" + android:inputType="textNoSuggestions" + android:lines="1" + android:scrollHorizontally="true" + android:singleLine="true" /> </LinearLayout> + + <!-- GPX --> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/init_gpx_exportdir" /> + </RelativeLayout> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:autoLink="web" + android:linksClickable="true" + android:padding="3dip" + android:text="@string/init_gpx_exportdir_description" + android:textColor="?text_color" + android:textColorLink="?text_color_link" + android:textSize="14dip" /> + + <LinearLayout + android:id="@+id/init_gpx_export_group" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <Button + android:id="@+id/select_gpx_exportdir" + style="@style/button_full" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:layout_gravity="center_vertical" - android:gravity="left" - android:padding="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/init_rendertheme_folder" /> + android:text="@string/init_select_gpx_exportdir" /> + + <EditText + android:id="@+id/gpx_exportdir" + style="@style/edittext_full" + android:inputType="textNoSuggestions" + android:lines="1" + android:scrollHorizontally="true" + android:singleLine="true" /> + </LinearLayout> + <!-- ** --> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/init_gpx_importdir" /> + </RelativeLayout> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:autoLink="web" + android:linksClickable="true" + android:padding="3dip" + android:text="@string/init_gpx_importdir_description" + android:textColor="?text_color" + android:textColorLink="?text_color_link" + android:textSize="14dip" /> + <LinearLayout - android:id="@+id/init_themefilegroup" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > - <Button style="@style/button_full" - android:id="@+id/select_themefolder" - android:text="@string/init_select_themefolder" - android:layout_width="wrap_content" /> - <EditText style="@style/edittext_full" - android:id="@+id/themefolder" - android:singleLine="true" - android:lines="1" - android:scrollHorizontally="true" - android:inputType="textNoSuggestions" /> + android:id="@+id/init_gpx_import_group" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <Button + android:id="@+id/select_gpx_importdir" + style="@style/button_full" + android:layout_width="wrap_content" + android:text="@string/init_select_gpx_importdir" /> + + <EditText + android:id="@+id/gpx_importdir" + style="@style/edittext_full" + android:inputType="textNoSuggestions" + android:lines="1" + android:scrollHorizontally="true" + android:singleLine="true" /> </LinearLayout> - -<!-- GPX --> - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" - android:text="@string/init_gpx_exportdir" /> - </RelativeLayout> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:layout_gravity="left" - android:padding="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:textColorLink="?text_color_link" - android:linksClickable="true" - android:autoLink="web" - android:text="@string/init_gpx_exportdir_description" /> - <LinearLayout - android:id="@+id/init_gpx_export_group" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > - <Button style="@style/button_full" - android:id="@+id/select_gpx_exportdir" - android:text="@string/init_select_gpx_exportdir" - android:layout_width="wrap_content" /> - <EditText style="@style/edittext_full" - android:id="@+id/gpx_exportdir" - android:singleLine="true" - android:lines="1" - android:scrollHorizontally="true" - android:inputType="textNoSuggestions" /> - </LinearLayout> -<!-- ** --> - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" - android:text="@string/init_gpx_importdir" /> - </RelativeLayout> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:layout_gravity="left" - android:padding="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:textColorLink="?text_color_link" - android:linksClickable="true" - android:autoLink="web" - android:text="@string/init_gpx_importdir_description" /> - <LinearLayout - android:id="@+id/init_gpx_import_group" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > - <Button style="@style/button_full" - android:id="@+id/select_gpx_importdir" - android:text="@string/init_select_gpx_importdir" - android:layout_width="wrap_content" /> - <EditText style="@style/edittext_full" - android:id="@+id/gpx_importdir" - android:singleLine="true" - android:lines="1" - android:scrollHorizontally="true" - android:inputType="textNoSuggestions" /> - </LinearLayout> -<!-- ** --> - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" - android:text="@string/init_altitude" /> - </RelativeLayout> - <EditText style="@style/edittext_full" - android:id="@+id/altitude" - android:singleLine="true" - android:lines="1" - android:scrollHorizontally="true" - android:inputType="numberSigned" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:layout_gravity="left" - android:padding="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:textColorLink="?text_color_link" - android:linksClickable="true" - android:text="@string/init_altitude_description" /> -<!-- ** --> - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" - android:text="@string/init_default_navigation_tool" /> - </RelativeLayout> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:layout_gravity="left" - android:padding="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:textColorLink="?text_color_link" - android:linksClickable="true" - android:text="@string/init_default_navigation_tool_description" /> - <Spinner android:id="@+id/default_navigation_tool" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:prompt="@string/init_default_navigation_tool_select" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:layout_gravity="left" - android:padding="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:textColorLink="?text_color_link" - android:linksClickable="true" - android:text="@string/init_default_navigation_tool_2_description" /> - <Spinner android:id="@+id/default_navigation_tool_2" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:prompt="@string/init_default_navigation_tool_select" /> -<!-- ** --> - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" - android:text="@string/init_sendToCgeo" /> - </RelativeLayout> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:layout_gravity="left" - android:padding="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:textColorLink="?text_color_link" - android:linksClickable="true" - android:text="@string/init_sendToCgeo_name" /> - <EditText style="@style/edittext_full" - android:id="@+id/webDeviceName" - android:singleLine="true" - android:lines="1" - android:maxLength="15" - android:scrollHorizontally="true" - android:inputType="textNoSuggestions" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:layout_gravity="left" - android:padding="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:textColorLink="?text_color_link" - android:linksClickable="true" - android:autoLink="web" - android:text="@string/init_sendToCgeo_description" /> - <Button style="@style/button_full" - android:id="@+id/sendToCgeo_register" - android:text="@string/init_sendToCgeo_register" /> -<!-- ** --> - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" - android:text="@string/init_backup" /> - </RelativeLayout> - <TextView android:id="@+id/backup_last" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:layout_gravity="left" - android:padding="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:textColorLink="?text_color_link" - android:linksClickable="true" - android:text="@null" /> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_margin="3dip" - android:orientation="horizontal" - android:padding="3dip" > - <Button style="@style/button_full" - android:id="@+id/backup_backup" - android:layout_width="0dip" - android:layout_weight="1" - android:text="@string/init_backup_backup" - android:onClick="backup" /> - <Button style="@style/button_full" - android:id="@+id/backup_restore" - android:layout_width="0dip" - android:layout_weight="1" - android:text="@string/init_backup_restore" - android:onClick="restore" /> - </LinearLayout> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:layout_gravity="left" - android:padding="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:textColorLink="?text_color_link" - android:linksClickable="true" - android:text="@string/init_backup_note" /> -<!-- ** --> - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" - android:text="@string/init_dbonsdcard_title" /> - </RelativeLayout> - <TextView android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:layout_gravity="left" - android:padding="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:textColorLink="?text_color_link" - android:linksClickable="true" - android:text="@string/init_dbonsdcard_note" /> - <CheckBox android:id="@+id/dbonsdcard" - style="@style/checkbox_full" - android:text="@string/init_dbonsdcard" /> -<!-- ** --> - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView - style="@style/separator_horizontal_headline" - android:text="@string/init_debug_title" /> - </RelativeLayout> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:layout_gravity="left" - android:padding="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:textColorLink="?text_color_link" - android:linksClickable="true" - android:text="@string/init_debug_note" /> - <CheckBox android:id="@+id/debug" - style="@style/checkbox_full" - android:text="@string/init_debug" /> - </LinearLayout> - </ScrollView> -</LinearLayout> + <!-- ** --> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/init_altitude" /> + </RelativeLayout> + + <EditText + android:id="@+id/altitude" + style="@style/edittext_full" + android:inputType="numberSigned" + android:lines="1" + android:scrollHorizontally="true" + android:singleLine="true" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:linksClickable="true" + android:padding="3dip" + android:text="@string/init_altitude_description" + android:textColor="?text_color" + android:textColorLink="?text_color_link" + android:textSize="14dip" /> + <!-- ** --> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/init_default_navigation_tool" /> + </RelativeLayout> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:linksClickable="true" + android:padding="3dip" + android:text="@string/init_default_navigation_tool_description" + android:textColor="?text_color" + android:textColorLink="?text_color_link" + android:textSize="14dip" /> + + <Spinner + android:id="@+id/default_navigation_tool" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:prompt="@string/init_default_navigation_tool_select" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:linksClickable="true" + android:padding="3dip" + android:text="@string/init_default_navigation_tool_2_description" + android:textColor="?text_color" + android:textColorLink="?text_color_link" + android:textSize="14dip" /> + + <Spinner + android:id="@+id/default_navigation_tool_2" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:prompt="@string/init_default_navigation_tool_select" /> + <!-- ** --> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/init_sendToCgeo" /> + </RelativeLayout> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:linksClickable="true" + android:padding="3dip" + android:text="@string/init_sendToCgeo_name" + android:textColor="?text_color" + android:textColorLink="?text_color_link" + android:textSize="14dip" /> + + <EditText + android:id="@+id/webDeviceName" + style="@style/edittext_full" + android:inputType="textNoSuggestions" + android:lines="1" + android:maxLength="15" + android:scrollHorizontally="true" + android:singleLine="true" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:autoLink="web" + android:linksClickable="true" + android:padding="3dip" + android:text="@string/init_sendToCgeo_description" + android:textColor="?text_color" + android:textColorLink="?text_color_link" + android:textSize="14dip" /> + + <Button + android:id="@+id/sendToCgeo_register" + style="@style/button_full" + android:text="@string/init_sendToCgeo_register" /> + <!-- ** --> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/init_backup" /> + </RelativeLayout> + + <TextView + android:id="@+id/backup_last" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:linksClickable="true" + android:padding="3dip" + android:text="@null" + android:textColor="?text_color" + android:textColorLink="?text_color_link" + android:textSize="14dip" /> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_margin="3dip" + android:orientation="horizontal" + android:padding="3dip" > + + <Button + android:id="@+id/backup_backup" + style="@style/button_full" + android:layout_width="0dip" + android:layout_weight="1" + android:onClick="backup" + android:text="@string/init_backup_backup" /> + + <Button + android:id="@+id/backup_restore" + style="@style/button_full" + android:layout_width="0dip" + android:layout_weight="1" + android:onClick="restore" + android:text="@string/init_backup_restore" /> + </LinearLayout> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:linksClickable="true" + android:padding="3dip" + android:text="@string/init_backup_note" + android:textColor="?text_color" + android:textColorLink="?text_color_link" + android:textSize="14dip" /> + <!-- ** --> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/init_dbonsdcard_title" /> + </RelativeLayout> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:linksClickable="true" + android:padding="3dip" + android:text="@string/init_dbonsdcard_note" + android:textColor="?text_color" + android:textColorLink="?text_color_link" + android:textSize="14dip" /> + + <CheckBox + android:id="@+id/dbonsdcard" + style="@style/checkbox_full" + android:text="@string/init_dbonsdcard" /> + <!-- ** --> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/init_debug_title" /> + </RelativeLayout> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:linksClickable="true" + android:padding="3dip" + android:text="@string/init_debug_note" + android:textColor="?text_color" + android:textColorLink="?text_color_link" + android:textSize="14dip" /> + + <CheckBox + android:id="@+id/debug" + style="@style/checkbox_full" + android:text="@string/init_debug" /> + </LinearLayout> + </ScrollView> + +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/list_create_dialog.xml b/main/res/layout/list_create_dialog.xml index 7fcba77..27212ea 100644 --- a/main/res/layout/list_create_dialog.xml +++ b/main/res/layout/list_create_dialog.xml @@ -1,9 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > - <EditText style="@style/edittext_dialog" - android:id="@+id/text" - android:inputType="textNoSuggestions"/> + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <EditText + android:id="@+id/text" + style="@style/edittext_dialog" + android:inputType="textNoSuggestions" /> + </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/map_google.xml b/main/res/layout/map_google.xml index c969d4f..723b7157 100644 --- a/main/res/layout/map_google.xml +++ b/main/res/layout/map_google.xml @@ -1,48 +1,69 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical"> - <LinearLayout style="@style/action_bar"> - <ImageView style="@style/action_bar_action" - android:onClick="goHome" /> - <View style="@style/action_bar_separator" /> - <TextView style="@style/action_bar_title" /> - <ProgressBar style="@style/action_bar_progress" - android:visibility="gone" /> - <View style="@style/action_bar_separator" /> - <ImageSwitcher style="@style/action_bar_action" - android:id="@+id/my_position" /> - <View style="@style/action_bar_separator" /> - <ImageView style="@style/action_bar_action" - android:src="@drawable/actionbar_manual" - android:onClick="goManual" /> - </LinearLayout> - <include layout="@layout/filter_bar"/> - <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" > - <TextView android:id="@+id/number" - android:visibility="gone" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="5dip" - android:gravity="center_horizontal" - android:paddingLeft="5dip" - android:paddingRight="5dip" - android:lines="1" - android:singleLine="true" - android:scrollHorizontally="true" - android:ellipsize="marquee" - android:textSize="12dip" - android:textColor="@color/text_icon" - android:background="@drawable/icon_bcg" /> - <view class="cgeo.geocaching.maps.google.GoogleMapView" android:id="@+id/map" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:keepScreenOn="true" - android:enabled="true" - android:clickable="true" - android:apiKey="@string/maps_api_key" /> - </RelativeLayout> + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <LinearLayout style="@style/action_bar" > + + <ImageView + style="@style/action_bar_action" + android:onClick="goHome" /> + + <View style="@style/action_bar_separator" /> + + <TextView style="@style/action_bar_title" /> + + <ProgressBar + style="@style/action_bar_progress" + android:visibility="gone" /> + + <View style="@style/action_bar_separator" /> + + <ImageSwitcher + android:id="@+id/my_position" + style="@style/action_bar_action" /> + + <View style="@style/action_bar_separator" /> + + <ImageView + style="@style/action_bar_action" + android:onClick="goManual" + android:src="@drawable/actionbar_manual" /> + </LinearLayout> + + <include layout="@layout/filter_bar" /> + + <RelativeLayout + android:layout_width="fill_parent" + android:layout_height="fill_parent" > + + <TextView + android:id="@+id/number" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="5dip" + android:background="@drawable/icon_bcg" + android:ellipsize="marquee" + android:gravity="center_horizontal" + android:lines="1" + android:paddingLeft="5dip" + android:paddingRight="5dip" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="@color/text_icon" + android:textSize="12dip" + android:visibility="gone" /> + + <view + android:id="@+id/map" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + class="cgeo.geocaching.maps.google.GoogleMapView" + android:apiKey="@string/maps_api_key" + android:clickable="true" + android:enabled="true" + android:keepScreenOn="true" /> + </RelativeLayout> + </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/map_mapsforge.xml b/main/res/layout/map_mapsforge.xml index 97df488..f3b183e 100644 --- a/main/res/layout/map_mapsforge.xml +++ b/main/res/layout/map_mapsforge.xml @@ -1,47 +1,68 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical"> - <LinearLayout style="@style/action_bar"> - <ImageView style="@style/action_bar_action" - android:onClick="goHome" /> - <View style="@style/action_bar_separator" /> - <TextView style="@style/action_bar_title" /> - <ProgressBar style="@style/action_bar_progress" - android:visibility="gone" /> - <View style="@style/action_bar_separator" /> - <ImageSwitcher style="@style/action_bar_action" - android:id="@+id/my_position" /> - <View style="@style/action_bar_separator" /> - <ImageView style="@style/action_bar_action" - android:src="@drawable/actionbar_manual" - android:onClick="goManual" /> - </LinearLayout> - <include layout="@layout/filter_bar"/> - <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" > - <TextView android:id="@+id/number" - android:visibility="gone" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="5dip" - android:gravity="center_horizontal" - android:paddingLeft="5dip" - android:paddingRight="5dip" - android:lines="1" - android:singleLine="true" - android:scrollHorizontally="true" - android:ellipsize="marquee" - android:textSize="12dip" - android:textColor="@color/text_icon" - android:background="@drawable/icon_bcg" /> - <view class="cgeo.geocaching.maps.mapsforge.MapsforgeMapView" android:id="@+id/mfmap" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:keepScreenOn="true" - android:enabled="true" - android:clickable="true" /> - </RelativeLayout> + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <LinearLayout style="@style/action_bar" > + + <ImageView + style="@style/action_bar_action" + android:onClick="goHome" /> + + <View style="@style/action_bar_separator" /> + + <TextView style="@style/action_bar_title" /> + + <ProgressBar + style="@style/action_bar_progress" + android:visibility="gone" /> + + <View style="@style/action_bar_separator" /> + + <ImageSwitcher + android:id="@+id/my_position" + style="@style/action_bar_action" /> + + <View style="@style/action_bar_separator" /> + + <ImageView + style="@style/action_bar_action" + android:onClick="goManual" + android:src="@drawable/actionbar_manual" /> + </LinearLayout> + + <include layout="@layout/filter_bar" /> + + <RelativeLayout + android:layout_width="fill_parent" + android:layout_height="fill_parent" > + + <TextView + android:id="@+id/number" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="5dip" + android:background="@drawable/icon_bcg" + android:ellipsize="marquee" + android:gravity="center_horizontal" + android:lines="1" + android:paddingLeft="5dip" + android:paddingRight="5dip" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="@color/text_icon" + android:textSize="12dip" + android:visibility="gone" /> + + <view + android:id="@+id/mfmap" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + class="cgeo.geocaching.maps.mapsforge.MapsforgeMapView" + android:clickable="true" + android:enabled="true" + android:keepScreenOn="true" /> + </RelativeLayout> + </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/map_mapsforge_old.xml b/main/res/layout/map_mapsforge_old.xml index 0246a95..44b3387 100644 --- a/main/res/layout/map_mapsforge_old.xml +++ b/main/res/layout/map_mapsforge_old.xml @@ -1,47 +1,68 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical"> - <LinearLayout style="@style/action_bar"> - <ImageView style="@style/action_bar_action" - android:onClick="goHome" /> - <View style="@style/action_bar_separator" /> - <TextView style="@style/action_bar_title" /> - <ProgressBar style="@style/action_bar_progress" - android:visibility="gone" /> - <View style="@style/action_bar_separator" /> - <ImageSwitcher style="@style/action_bar_action" - android:id="@+id/my_position" /> - <View style="@style/action_bar_separator" /> - <ImageView style="@style/action_bar_action" - android:src="@drawable/actionbar_manual" - android:onClick="goManual" /> - </LinearLayout> - <include layout="@layout/filter_bar"/> - <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" > - <TextView android:id="@+id/number" - android:visibility="gone" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="5dip" - android:gravity="center_horizontal" - android:paddingLeft="5dip" - android:paddingRight="5dip" - android:lines="1" - android:singleLine="true" - android:scrollHorizontally="true" - android:ellipsize="marquee" - android:textSize="12dip" - android:textColor="@color/text_icon" - android:background="@drawable/icon_bcg" /> - <view class="cgeo.geocaching.maps.mapsforge.v024.MapsforgeMapView024" android:id="@+id/mfmap_old" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:keepScreenOn="true" - android:enabled="true" - android:clickable="true" /> - </RelativeLayout> + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <LinearLayout style="@style/action_bar" > + + <ImageView + style="@style/action_bar_action" + android:onClick="goHome" /> + + <View style="@style/action_bar_separator" /> + + <TextView style="@style/action_bar_title" /> + + <ProgressBar + style="@style/action_bar_progress" + android:visibility="gone" /> + + <View style="@style/action_bar_separator" /> + + <ImageSwitcher + android:id="@+id/my_position" + style="@style/action_bar_action" /> + + <View style="@style/action_bar_separator" /> + + <ImageView + style="@style/action_bar_action" + android:onClick="goManual" + android:src="@drawable/actionbar_manual" /> + </LinearLayout> + + <include layout="@layout/filter_bar" /> + + <RelativeLayout + android:layout_width="fill_parent" + android:layout_height="fill_parent" > + + <TextView + android:id="@+id/number" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="5dip" + android:background="@drawable/icon_bcg" + android:ellipsize="marquee" + android:gravity="center_horizontal" + android:lines="1" + android:paddingLeft="5dip" + android:paddingRight="5dip" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="@color/text_icon" + android:textSize="12dip" + android:visibility="gone" /> + + <view + android:id="@+id/mfmap_old" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + class="cgeo.geocaching.maps.mapsforge.v024.MapsforgeMapView024" + android:clickable="true" + android:enabled="true" + android:keepScreenOn="true" /> + </RelativeLayout> + </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/map_static.xml b/main/res/layout/map_static.xml index 0e4190d..ff0435c 100644 --- a/main/res/layout/map_static.xml +++ b/main/res/layout/map_static.xml @@ -1,23 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical"> - <LinearLayout style="@style/action_bar"> - <ImageView style="@style/action_bar_action" - android:onClick="goHome" /> - <View style="@style/action_bar_separator" /> - <TextView style="@style/action_bar_title" /> - </LinearLayout> - <ScrollView - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:padding="4dip" - android:orientation="vertical" > - <LinearLayout android:id="@+id/maps_list" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - </LinearLayout> - </ScrollView> + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <LinearLayout style="@style/action_bar" > + + <ImageView + style="@style/action_bar_action" + android:onClick="goHome" /> + + <View style="@style/action_bar_separator" /> + + <TextView style="@style/action_bar_title" /> + </LinearLayout> + + <ScrollView + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" + android:padding="4dip" > + + <LinearLayout + android:id="@+id/maps_list" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + </LinearLayout> + </ScrollView> + </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/map_static_item.xml b/main/res/layout/map_static_item.xml index 3416e65..1bac7f0 100644 --- a/main/res/layout/map_static_item.xml +++ b/main/res/layout/map_static_item.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <ImageView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/map_image" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_marginBottom="10dip" - android:scaleType="centerCrop" - android:padding="3dip" - android:gravity="center" />
\ No newline at end of file + android:id="@+id/map_image" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginBottom="10dip" + android:gravity="center" + android:padding="3dip" + android:scaleType="centerCrop" /> diff --git a/main/res/layout/point.xml b/main/res/layout/point.xml index 4fd020e..ec34f85 100644 --- a/main/res/layout/point.xml +++ b/main/res/layout/point.xml @@ -3,13 +3,19 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical" > + <LinearLayout style="@style/action_bar" > + <ImageView style="@style/action_bar_action" android:onClick="goHome" /> + <View style="@style/action_bar_separator" /> + <TextView style="@style/action_bar_title" /> + <View style="@style/action_bar_separator" /> + <ImageView style="@style/action_bar_action" android:onClick="goManual" @@ -20,9 +26,9 @@ android:id="@+id/historyList" android:layout_width="match_parent" android:layout_height="match_parent" + android:cacheColorHint="?background_color" android:footerDividersEnabled="false" - android:headerDividersEnabled="false" - android:cacheColorHint="?background_color" > + android:headerDividersEnabled="false" > </ListView> </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/point_controls.xml b/main/res/layout/point_controls.xml index 22d05c7..caf2e48 100644 --- a/main/res/layout/point_controls.xml +++ b/main/res/layout/point_controls.xml @@ -61,7 +61,7 @@ android:id="@+id/distanceUnit" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:entries="@array/distance_units" /> + android:entries="@array/distance_units" /> </LinearLayout> <RelativeLayout style="@style/separator_horizontal_layout" > diff --git a/main/res/layout/popup.xml b/main/res/layout/popup.xml index 9e66517..ff64c91 100644 --- a/main/res/layout/popup.xml +++ b/main/res/layout/popup.xml @@ -2,8 +2,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:orientation="vertical" - android:background="?background_color_transparent"> + android:background="?background_color_transparent" + android:orientation="vertical" > <LinearLayout style="@style/action_bar" > diff --git a/main/res/layout/recaptcha_dialog.xml b/main/res/layout/recaptcha_dialog.xml index 47a63ca..cbbbd0b 100644 --- a/main/res/layout/recaptcha_dialog.xml +++ b/main/res/layout/recaptcha_dialog.xml @@ -1,28 +1,34 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > - <ImageView android:id="@+id/image" - android:layout_width="220dip" - android:layout_height="42dip" - android:layout_marginTop="5dip" - android:layout_marginBottom="5dip" - android:layout_gravity="center" - android:gravity="center" - android:scaleType="fitXY" - android:src="@null" /> - <EditText style="@style/edittext_dialog" - android:id="@+id/text" - android:hint="@string/caches_recaptcha_hint" - android:inputType="textNoSuggestions" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="7dip" - android:layout_gravity="left" - android:paddingLeft="3dip" - android:textSize="12dip" - android:textColor="@color/text_grey_dark" - android:text="@string/caches_recaptcha_explanation" /> + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <ImageView + android:id="@+id/image" + android:layout_width="220dip" + android:layout_height="42dip" + android:layout_gravity="center" + android:layout_marginBottom="5dip" + android:layout_marginTop="5dip" + android:gravity="center" + android:scaleType="fitXY" + android:src="@null" /> + + <EditText + android:id="@+id/text" + style="@style/edittext_dialog" + android:hint="@string/caches_recaptcha_hint" + android:inputType="textNoSuggestions" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_margin="7dip" + android:paddingLeft="3dip" + android:text="@string/caches_recaptcha_explanation" + android:textColor="@color/text_grey_dark" + android:textSize="12dip" /> + </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/simple_dir_chooser.xml b/main/res/layout/simple_dir_chooser.xml index 32f8c00..d7d2322 100644 --- a/main/res/layout/simple_dir_chooser.xml +++ b/main/res/layout/simple_dir_chooser.xml @@ -1,51 +1,63 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_weight="2" + android:orientation="vertical" > + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/simple_dir_chooser_title" /> + </RelativeLayout> + + <EditText + android:id="@+id/simple_dir_chooser_path" + style="@style/edittext_full" + android:clickable="false" + android:cursorVisible="false" + android:focusable="false" + android:focusableInTouchMode="false" + android:inputType="textNoSuggestions" + android:lines="0" + android:scrollHorizontally="true" + android:singleLine="true" /> + </LinearLayout> + + <ListView + android:id="@+id/android:list" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:orientation="vertical"> + android:layout_weight="100" /> + <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:layout_weight="2"> - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" - android:text="@string/simple_dir_chooser_title" /> - </RelativeLayout> - <EditText - style="@style/edittext_full" - android:id="@+id/simple_dir_chooser_path" - android:singleLine="true" - android:lines="0" - android:clickable="false" - android:cursorVisible="false" - android:focusable="false" - android:focusableInTouchMode="false" - android:scrollHorizontally="true" - android:inputType="textNoSuggestions" /> - </LinearLayout> - <ListView - android:layout_height="fill_parent" - android:layout_width="fill_parent" - android:layout_weight="100" - android:id="@+id/android:list" /> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingTop="10dip" - android:layout_weight="1"> - <Button style="@style/button_full" - android:id="@+id/simple_dir_chooser_ok" - android:text="@android:string/ok" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - <Button style="@style/button_full" - android:id="@+id/simple_dir_chooser_cancel" - android:text="@android:string/cancel" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - </LinearLayout> -</LinearLayout> + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:orientation="horizontal" + android:paddingTop="10dip" > + + <Button + android:id="@+id/simple_dir_chooser_ok" + style="@style/button_full" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@android:string/ok" /> + + <Button + android:id="@+id/simple_dir_chooser_cancel" + style="@style/button_full" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@android:string/cancel" /> + </LinearLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/star.xml b/main/res/layout/star.xml index d370ace..919fedb 100644 --- a/main/res/layout/star.xml +++ b/main/res/layout/star.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <ImageView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="12dip" - android:layout_height="12dip" - android:layout_margin="1dip" - android:layout_gravity="center" - android:gravity="center" - android:scaleType="fitXY" - android:src="@drawable/star_off" /> + android:layout_width="12dip" + android:layout_height="12dip" + android:layout_gravity="center" + android:layout_margin="1dip" + android:gravity="center" + android:scaleType="fitXY" + android:src="@drawable/star_off" /> diff --git a/main/res/layout/touch.xml b/main/res/layout/touch.xml index 37f7332..065ef0e 100644 --- a/main/res/layout/touch.xml +++ b/main/res/layout/touch.xml @@ -1,80 +1,109 @@ <?xml version="1.0" encoding="UTF-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical"> - <LinearLayout style="@style/action_bar"> - <ImageView style="@style/action_bar_action" - android:onClick="goHome" /> - <View style="@style/action_bar_separator" /> - <TextView style="@style/action_bar_title" /> - <View style="@style/action_bar_separator" /> - <ProgressBar style="@style/action_bar_progress" - android:visibility="gone" /> - <ImageView style="@style/action_bar_action" - android:src="@drawable/actionbar_manual" - android:onClick="goManual" /> - </LinearLayout> - <ScrollView - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:padding="4dip" - android:orientation="vertical" > - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > - <Button style="@style/button_full" - android:id="@+id/type" - android:layout_width="0dip" - android:layout_weight="1"/> - <Button style="@style/button_full" - android:id="@+id/date" - android:layout_width="0dip" - android:layout_weight="1"/> - </LinearLayout> - <EditText style="@style/edittext_full" - android:id="@+id/tracking" - android:inputType="textCapCharacters" - android:hint="@string/trackable_code" /> - <EditText style="@style/edittext_full" - android:id="@+id/log" - android:hint="@string/log_new_log_text" - android:singleLine="false" - android:lines="5" - android:maxLength="4000" - android:inputType="textMultiLine|textCapSentences" /> - <LinearLayout android:id="@+id/tweet_box" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:visibility="gone" > - <CheckBox android:id="@+id/tweet" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/visit_tweet" /> - </LinearLayout> - <Button style="@style/button_full" - android:id="@+id/post" - android:text="@string/log_post" /> - </LinearLayout> - </ScrollView> -</LinearLayout> + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <LinearLayout style="@style/action_bar" > + + <ImageView + style="@style/action_bar_action" + android:onClick="goHome" /> + + <View style="@style/action_bar_separator" /> + + <TextView style="@style/action_bar_title" /> + + <View style="@style/action_bar_separator" /> + + <ProgressBar + style="@style/action_bar_progress" + android:visibility="gone" /> + + <ImageView + style="@style/action_bar_action" + android:onClick="goManual" + android:src="@drawable/actionbar_manual" /> + </LinearLayout> + + <ScrollView + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" + android:padding="4dip" > + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <Button + android:id="@+id/type" + style="@style/button_full" + android:layout_width="0dip" + android:layout_weight="1" /> + + <Button + android:id="@+id/date" + style="@style/button_full" + android:layout_width="0dip" + android:layout_weight="1" /> + </LinearLayout> + + <EditText + android:id="@+id/tracking" + style="@style/edittext_full" + android:hint="@string/trackable_code" + android:inputType="textCapCharacters" /> + + <EditText + android:id="@+id/log" + style="@style/edittext_full" + android:hint="@string/log_new_log_text" + android:inputType="textMultiLine|textCapSentences" + android:lines="5" + android:maxLength="4000" + android:singleLine="false" /> + + <LinearLayout + android:id="@+id/tweet_box" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:orientation="horizontal" + android:visibility="gone" > + + <CheckBox + android:id="@+id/tweet" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:gravity="center" + android:padding="1px" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:gravity="left" + android:paddingRight="3dip" + android:text="@string/visit_tweet" + android:textColor="?text_color" + android:textSize="14dip" /> + </LinearLayout> + + <Button + android:id="@+id/post" + style="@style/button_full" + android:text="@string/log_post" /> + </LinearLayout> + </ScrollView> + +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/trackable_details_view.xml b/main/res/layout/trackable_details_view.xml index 7213171..c4aac0e 100644 --- a/main/res/layout/trackable_details_view.xml +++ b/main/res/layout/trackable_details_view.xml @@ -3,7 +3,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical" - android:padding="4dip"> + android:padding="4dip" > <LinearLayout android:layout_width="fill_parent" diff --git a/main/res/layout/trackable_image.xml b/main/res/layout/trackable_image.xml index b1a685a..89955bc 100644 --- a/main/res/layout/trackable_image.xml +++ b/main/res/layout/trackable_image.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <ImageView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/trackable_image" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="center" - android:scaleType="center" - android:layout_marginBottom="3dip" />
\ No newline at end of file + android:id="@+id/trackable_image" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginBottom="3dip" + android:gravity="center" + android:scaleType="center" /> diff --git a/main/res/layout/trackable_logs_img.xml b/main/res/layout/trackable_logs_img.xml index 0e3fabc..aaed32b 100644 --- a/main/res/layout/trackable_logs_img.xml +++ b/main/res/layout/trackable_logs_img.xml @@ -1,15 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" > + <TextView - android:id="@+id/title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left|top" + android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left|top" android:drawableLeft="?log_img_icon" android:drawablePadding="3dip" - android:textSize="14dip" - android:textColor="?text_color"/> -</LinearLayout> + android:textColor="?text_color" + android:textSize="14dip" /> + +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/trackable_logs_item.xml b/main/res/layout/trackable_logs_item.xml index 77f057e..52a38a9 100644 --- a/main/res/layout/trackable_logs_item.xml +++ b/main/res/layout/trackable_logs_item.xml @@ -1,93 +1,110 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingTop="3dip" - android:paddingBottom="3dip" > - <TextView android:id="@+id/author" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentTop="true" - android:layout_gravity="left|top" - android:lines="1" - android:singleLine="true" - android:scrollHorizontally="true" - android:ellipsize="marquee" - android:textSize="18dip" - android:textColor="?text_color" /> - <LinearLayout - android:layout_width="102dip" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentTop="true" - android:layout_marginTop="22dip" - android:layout_gravity="left|top" - android:orientation="horizontal" > - <LinearLayout - android:layout_width="100dip" - android:layout_height="wrap_content" - android:layout_gravity="right|top" - android:padding="3dip" - android:orientation="vertical" > - <TextView android:id="@+id/added" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:gravity="left" - android:lines="1" - android:singleLine="true" - android:scrollHorizontally="true" - android:ellipsize="marquee" - android:textSize="14dip" - android:textColor="?text_color_headline" /> - <TextView android:id="@+id/type" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:gravity="left" - android:lines="1" - android:singleLine="true" - android:scrollHorizontally="true" - android:ellipsize="marquee" - android:textSize="14dip" - android:textColor="?text_color_headline" /> - <TextView android:id="@+id/location" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:gravity="left" - android:lines="1" - android:singleLine="true" - android:scrollHorizontally="true" - android:ellipsize="marquee" - android:textSize="14dip" - android:textColor="?text_color_headline" /> - </LinearLayout> - <ImageView android:id="@+id/log_mark" - android:layout_width="2dip" - android:layout_height="fill_parent" - android:layout_marginTop="2dip" - android:layout_marginBottom="2dip" - android:scaleType="fitXY" - android:src="@drawable/mark_green" /> - </LinearLayout> - <LinearLayout android:id="@+id/log_layout" - android:layout_height="wrap_content" - android:layout_width="fill_parent" - android:orientation="vertical" - android:padding="3dip" - android:textSize="14dip" - android:layout_marginLeft="102dip"> - <TextView android:id="@+id/log" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginTop="22dip" - android:layout_gravity="left" - android:gravity="left" - android:padding="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:autoLink="web" /> - </LinearLayout> + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingBottom="3dip" + android:paddingTop="3dip" > + + <TextView + android:id="@+id/author" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_alignParentTop="true" + android:layout_gravity="left|top" + android:ellipsize="marquee" + android:lines="1" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="?text_color" + android:textSize="18dip" /> + + <LinearLayout + android:layout_width="102dip" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_alignParentTop="true" + android:layout_gravity="left|top" + android:layout_marginTop="22dip" + android:orientation="horizontal" > + + <LinearLayout + android:layout_width="100dip" + android:layout_height="wrap_content" + android:layout_gravity="right|top" + android:orientation="vertical" + android:padding="3dip" > + + <TextView + android:id="@+id/added" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:ellipsize="marquee" + android:gravity="left" + android:lines="1" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="?text_color_headline" + android:textSize="14dip" /> + + <TextView + android:id="@+id/type" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:ellipsize="marquee" + android:gravity="left" + android:lines="1" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="?text_color_headline" + android:textSize="14dip" /> + + <TextView + android:id="@+id/location" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:ellipsize="marquee" + android:gravity="left" + android:lines="1" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="?text_color_headline" + android:textSize="14dip" /> + </LinearLayout> + + <ImageView + android:id="@+id/log_mark" + android:layout_width="2dip" + android:layout_height="fill_parent" + android:layout_marginBottom="2dip" + android:layout_marginTop="2dip" + android:scaleType="fitXY" + android:src="@drawable/mark_green" /> + </LinearLayout> + + <LinearLayout + android:id="@+id/log_layout" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="102dip" + android:orientation="vertical" + android:padding="3dip" + android:textSize="14dip" > + + <TextView + android:id="@+id/log" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginTop="22dip" + android:autoLink="web" + android:gravity="left" + android:padding="3dip" + android:textColor="?text_color" + android:textSize="14dip" /> + </LinearLayout> + </RelativeLayout>
\ No newline at end of file diff --git a/main/res/layout/twitter_authorization_activity.xml b/main/res/layout/twitter_authorization_activity.xml index 4238534..97c2236 100644 --- a/main/res/layout/twitter_authorization_activity.xml +++ b/main/res/layout/twitter_authorization_activity.xml @@ -9,7 +9,7 @@ <ImageView style="@style/action_bar_action" - android:onClick="goHome"/> + android:onClick="goHome" /> <View style="@style/action_bar_separator" /> diff --git a/main/res/layout/useful_apps.xml b/main/res/layout/useful_apps.xml index b95a7c2..a3d4f87 100644 --- a/main/res/layout/useful_apps.xml +++ b/main/res/layout/useful_apps.xml @@ -1,24 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical"> - <LinearLayout style="@style/action_bar"> - <ImageView style="@style/action_bar_action" - android:onClick="goHome" /> - <View style="@style/action_bar_separator" /> - <TextView style="@style/action_bar_title" /> - </LinearLayout> - <ScrollView - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:padding="4dip" - android:orientation="vertical" > - <LinearLayout - android:id="@+id/parent" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - </LinearLayout> - </ScrollView> -</LinearLayout> + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <LinearLayout style="@style/action_bar" > + + <ImageView + style="@style/action_bar_action" + android:onClick="goHome" /> + + <View style="@style/action_bar_separator" /> + + <TextView style="@style/action_bar_title" /> + </LinearLayout> + + <ScrollView + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" + android:padding="4dip" > + + <LinearLayout + android:id="@+id/parent" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + </LinearLayout> + </ScrollView> + +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/visit.xml b/main/res/layout/visit.xml index bca9851..70603c5 100644 --- a/main/res/layout/visit.xml +++ b/main/res/layout/visit.xml @@ -1,142 +1,193 @@ <?xml version="1.0" encoding="UTF-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical"> - <LinearLayout style="@style/action_bar"> - <ImageView style="@style/action_bar_action" - android:onClick="goHome" /> - <View style="@style/action_bar_separator" /> - <TextView style="@style/action_bar_title" /> - <View style="@style/action_bar_separator" /> - <ProgressBar style="@style/action_bar_progress" - android:visibility="gone" /> - <ImageView style="@style/action_bar_action" - android:src="@drawable/actionbar_manual" - android:onClick="goManual" /> - </LinearLayout> - <ScrollView - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:padding="4dip" - android:orientation="vertical" > - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginTop="10dip" - android:orientation="vertical" > - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > - <Button style="@style/button_full" - android:id="@+id/type" - android:layout_width="0dip" - android:layout_weight="1"/> - <Button style="@style/button_full" - android:id="@+id/date" - android:layout_width="0dip" - android:layout_weight="1"/> - </LinearLayout> - <EditText style="@style/edittext_full" - android:id="@+id/log" - android:hint="@string/log_new_log_text" - android:singleLine="false" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <LinearLayout style="@style/action_bar" > + + <ImageView + style="@style/action_bar_action" + android:onClick="goHome" /> + + <View style="@style/action_bar_separator" /> + + <TextView style="@style/action_bar_title" /> + + <View style="@style/action_bar_separator" /> + + <ProgressBar + style="@style/action_bar_progress" + android:visibility="gone" /> + + <ImageView + style="@style/action_bar_action" + android:onClick="goManual" + android:src="@drawable/actionbar_manual" /> + </LinearLayout> + + <ScrollView + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" + android:padding="4dip" > + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginTop="10dip" + android:orientation="vertical" > + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <Button + android:id="@+id/type" + style="@style/button_full" + android:layout_width="0dip" + android:layout_weight="1" /> + + <Button + android:id="@+id/date" + style="@style/button_full" + android:layout_width="0dip" + android:layout_weight="1" /> + </LinearLayout> + + <EditText + android:id="@+id/log" + style="@style/edittext_full" + android:layout_height="wrap_content" + android:hint="@string/log_new_log_text" + android:inputType="textMultiLine|textCapSentences" + android:maxLength="4000" + android:minLines="5" + android:singleLine="false" /> + + <LinearLayout + android:id="@+id/tweet_box" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:orientation="horizontal" + android:visibility="gone" > + + <CheckBox + android:id="@+id/tweet" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:minLines="5" - android:maxLength="4000" - android:inputType="textMultiLine|textCapSentences"/> - <LinearLayout android:id="@+id/tweet_box" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:visibility="gone" > - <CheckBox android:id="@+id/tweet" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/visit_tweet" /> - </LinearLayout> - <Button style="@style/button_full" - android:id="@+id/image_btn" - android:text="@string/log_image_attach" /> - <Button style="@style/button_full" - android:id="@+id/post" - android:text="@string/log_post" /> - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" - android:text="@string/cache_log_offline" /> - </RelativeLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > - <Button style="@style/button_full" - android:id="@+id/save" - android:layout_width="0dip" - android:layout_weight="1" - android:text="@string/log_save" /> - <Button style="@style/button_full" - android:id="@+id/clear" - android:layout_width="0dip" - android:layout_weight="1" - android:text="@string/log_clear" /> - </LinearLayout> - </LinearLayout> - <LinearLayout android:id="@+id/inventory_box" - android:visibility="gone" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginTop="10dip" - android:layout_marginBottom="10dip" - android:orientation="vertical" > - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" - android:text="@string/cache_inventory" /> - </RelativeLayout> - <LinearLayout android:id="@+id/inventory" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - </LinearLayout> - <LinearLayout android:id="@+id/inventory_changeall" - android:visibility="gone" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:gravity="right" - android:orientation="vertical" > - <Button style="@style/button_full" - android:id="@+id/changebutton" - android:layout_width="wrap_content" - android:layout_weight="1" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:gravity="right" - android:textSize="14dip" - android:text="@string/log_tb_changeall" - android:layout_height="0dp"/> - </LinearLayout> - </LinearLayout> - </LinearLayout> - </ScrollView> -</LinearLayout> + android:layout_gravity="left" + android:gravity="center" + android:padding="1px" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:gravity="left" + android:paddingRight="3dip" + android:text="@string/visit_tweet" + android:textColor="?text_color" + android:textSize="14dip" /> + </LinearLayout> + + <Button + android:id="@+id/image_btn" + style="@style/button_full" + android:text="@string/log_image_attach" /> + + <Button + android:id="@+id/post" + style="@style/button_full" + android:text="@string/log_post" /> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/cache_log_offline" /> + </RelativeLayout> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <Button + android:id="@+id/save" + style="@style/button_full" + android:layout_width="0dip" + android:layout_weight="1" + android:text="@string/log_save" /> + + <Button + android:id="@+id/clear" + style="@style/button_full" + android:layout_width="0dip" + android:layout_weight="1" + android:text="@string/log_clear" /> + </LinearLayout> + </LinearLayout> + + <LinearLayout + android:id="@+id/inventory_box" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="10dip" + android:layout_marginTop="10dip" + android:orientation="vertical" + android:visibility="gone" > + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/cache_inventory" /> + </RelativeLayout> + + <LinearLayout + android:id="@+id/inventory" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + </LinearLayout> + + <LinearLayout + android:id="@+id/inventory_changeall" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:gravity="right" + android:orientation="vertical" + android:visibility="gone" > + + <Button + android:id="@+id/changebutton" + style="@style/button_full" + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:layout_weight="1" + android:gravity="right" + android:text="@string/log_tb_changeall" + android:textSize="14dip" /> + </LinearLayout> + </LinearLayout> + </LinearLayout> + </ScrollView> + +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/waypoint_item.xml b/main/res/layout/waypoint_item.xml index e31da37..29106d8 100644 --- a/main/res/layout/waypoint_item.xml +++ b/main/res/layout/waypoint_item.xml @@ -8,40 +8,46 @@ <RelativeLayout android:layout_width="fill_parent" android:layout_height="fill_parent" - android:orientation="horizontal"> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:orientation="vertical"> - <TextView - android:id="@+id/name" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:textColor="?text_color" - android:textSize="18dp" /> - <TextView - android:id="@+id/info" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:layout_marginLeft="12dp" - android:ellipsize="marquee" - android:lines="1" - android:scrollHorizontally="true" - android:singleLine="true" - android:textColor="?text_color_headline" - android:textSize="14dp" - android:visibility="gone" /> - </LinearLayout> - <ImageView style="@style/action_bar_action" - android:id="@+id/wpDefaultNavigation" - android:src="?actionbar_compass" - android:layout_gravity="right" - android:layout_alignParentRight="true" - android:clickable="true" - android:longClickable="true" /> + android:orientation="horizontal" > + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:orientation="vertical" > + + <TextView + android:id="@+id/name" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:textColor="?text_color" + android:textSize="18dp" /> + + <TextView + android:id="@+id/info" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginLeft="12dp" + android:ellipsize="marquee" + android:lines="1" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="?text_color_headline" + android:textSize="14dp" + android:visibility="gone" /> + </LinearLayout> + + <ImageView + android:id="@+id/wpDefaultNavigation" + style="@style/action_bar_action" + android:layout_alignParentRight="true" + android:layout_gravity="right" + android:clickable="true" + android:longClickable="true" + android:src="?actionbar_compass" /> </RelativeLayout> + <TextView android:id="@+id/coordinates" android:layout_width="fill_parent" diff --git a/main/res/layout/waypoint_popup.xml b/main/res/layout/waypoint_popup.xml index 3dfcd66..869ffa0 100644 --- a/main/res/layout/waypoint_popup.xml +++ b/main/res/layout/waypoint_popup.xml @@ -1,62 +1,88 @@ <?xml version="1.0" encoding="UTF-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" - android:background="?background_color_transparent"> - <LinearLayout style="@style/action_bar"> - <TextView style="@style/action_bar_title" /> - <View style="@style/action_bar_separator" /> - <ImageView android:id="@+id/defaultNavigation" - style="@style/action_bar_action" - android:src="@drawable/actionbar_compass_dark" - android:onClick="goDefaultNavigation" - android:longClickable="true" /> - <View style="@style/action_bar_separator" - android:id="@+id/separator" - /> - <ImageView style="@style/action_bar_action" - android:src="@drawable/actionbar_manual" - android:onClick="goManual" /> - </LinearLayout> - <ScrollView android:id="@+id/details_list_box" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:padding="4dip" - android:orientation="vertical" > - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - <LinearLayout android:id="@+id/waypoint_details_list" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - </LinearLayout> - <LinearLayout android:id="@+id/edit_box" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - <Button style="@style/button_small" - android:id="@+id/edit" - android:text="@string/waypoint_edit" /> - </LinearLayout> - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - </RelativeLayout> - <LinearLayout android:id="@+id/details_list" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - </LinearLayout> - <LinearLayout android:id="@+id/more_details_box" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - <Button style="@style/button_small" - android:id="@+id/more_details" - android:text="@string/popup_more" /> - </LinearLayout> - </LinearLayout> - </ScrollView> + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="?background_color_transparent" + android:orientation="vertical" > + + <LinearLayout style="@style/action_bar" > + + <TextView style="@style/action_bar_title" /> + + <View style="@style/action_bar_separator" /> + + <ImageView + android:id="@+id/defaultNavigation" + style="@style/action_bar_action" + android:longClickable="true" + android:onClick="goDefaultNavigation" + android:src="@drawable/actionbar_compass_dark" /> + + <View + android:id="@+id/separator" + style="@style/action_bar_separator" /> + + <ImageView + style="@style/action_bar_action" + android:onClick="goManual" + android:src="@drawable/actionbar_manual" /> + </LinearLayout> + + <ScrollView + android:id="@+id/details_list_box" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" + android:padding="4dip" > + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <LinearLayout + android:id="@+id/waypoint_details_list" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + </LinearLayout> + + <LinearLayout + android:id="@+id/edit_box" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <Button + android:id="@+id/edit" + style="@style/button_small" + android:text="@string/waypoint_edit" /> + </LinearLayout> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + </RelativeLayout> + + <LinearLayout + android:id="@+id/details_list" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + </LinearLayout> + + <LinearLayout + android:id="@+id/more_details_box" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <Button + android:id="@+id/more_details" + style="@style/button_small" + android:text="@string/popup_more" /> + </LinearLayout> + </LinearLayout> + </ScrollView> + </LinearLayout>
\ No newline at end of file |