diff options
Diffstat (limited to 'main/res/layout')
71 files changed, 610 insertions, 1818 deletions
diff --git a/main/res/layout/about_activity.xml b/main/res/layout/about_activity.xml index f6d20da..f6ce1b8 100644 --- a/main/res/layout/about_activity.xml +++ b/main/res/layout/about_activity.xml @@ -5,16 +5,7 @@ android:background="?background_color" 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> + <include layout="@layout/actionbar" /> <ScrollView android:layout_width="fill_parent" @@ -51,7 +42,7 @@ android:layout_marginTop="5dip" android:text="@string/quote" android:textColor="?text_color" - android:textSize="14dip" /> + android:textSize="14sp" /> <TextView android:layout_width="wrap_content" @@ -62,7 +53,7 @@ android:layout_marginRight="10dip" android:text="@string/powered_by" android:textColor="?text_color" - android:textSize="14dip" /> + android:textSize="14sp" /> </LinearLayout> <RelativeLayout style="@style/separator_horizontal_layout" > @@ -84,7 +75,7 @@ android:layout_marginRight="10dip" android:textColor="?text_color" android:textIsSelectable="true" - android:textSize="14dip" + android:textSize="14sp" android:textStyle="bold" /> <RelativeLayout style="@style/separator_horizontal_layout" > @@ -105,9 +96,9 @@ <Button style="@style/button_full" + android:id="@+id/donate" android:layout_width="280dip" android:lines="2" - android:onClick="donate" android:singleLine="false" android:text="@string/about_donation_more" /> </LinearLayout> @@ -132,11 +123,10 @@ android:clickable="true" android:focusable="true" android:linksClickable="false" - android:onClick="support" android:text="@string/support" android:textColor="?text_color" android:textColorLink="?text_color_link" - android:textSize="14dip" /> + android:textSize="14sp" /> <TextView android:id="@+id/website" @@ -149,11 +139,10 @@ android:clickable="true" android:focusable="true" android:linksClickable="false" - android:onClick="website" android:text="@string/website" android:textColor="?text_color" android:textColorLink="?text_color_link" - android:textSize="14dip" /> + android:textSize="14sp" /> <TextView android:id="@+id/facebook" @@ -166,11 +155,10 @@ android:clickable="true" android:focusable="true" android:linksClickable="false" - android:onClick="facebook" android:text="@string/facebook" android:textColor="?text_color" android:textColorLink="?text_color_link" - android:textSize="14dip" /> + android:textSize="14sp" /> <TextView android:id="@+id/twitter" @@ -183,11 +171,10 @@ android:clickable="true" android:focusable="true" android:linksClickable="false" - android:onClick="twitter" android:text="@string/twitter" android:textColor="?text_color" android:textColorLink="?text_color_link" - android:textSize="14dip" /> + android:textSize="14sp" /> <TextView android:id="@+id/nutshellmanual" @@ -200,11 +187,26 @@ android:clickable="true" android:focusable="true" android:linksClickable="false" - android:onClick="nutshellmanual" android:text="@string/nutshellmanual" android:textColor="?text_color" android:textColorLink="?text_color_link" - android:textSize="14dip" /> + android:textSize="14sp" /> + + <TextView + android:id="@+id/market" + 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:clickable="true" + android:focusable="true" + android:linksClickable="false" + android:text="@string/market" + android:textColor="?text_color" + android:textColorLink="?text_color_link" + android:textSize="14sp" /> <RelativeLayout style="@style/separator_horizontal_layout" > @@ -239,7 +241,7 @@ android:text="@string/changelog_release" android:textColor="?text_color" android:textColorLink="?text_color_link" - android:textSize="12dip" /> + android:textSize="12sp" /> <RelativeLayout style="@style/separator_horizontal_layout" > @@ -261,7 +263,7 @@ android:text="@string/contributors" android:textColor="?text_color" android:textColorLink="?text_color_link" - android:textSize="14dip" /> + android:textSize="14sp" /> </LinearLayout> </ScrollView> diff --git a/main/res/layout/actionbar.xml b/main/res/layout/actionbar.xml new file mode 100644 index 0000000..098120c --- /dev/null +++ b/main/res/layout/actionbar.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/action_bar" > + + <include layout="@layout/actionbar_title" /> + +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/actionbar_button_compass.xml b/main/res/layout/actionbar_button_compass.xml new file mode 100644 index 0000000..932444b --- /dev/null +++ b/main/res/layout/actionbar_button_compass.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<merge xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" > + + <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" /> + +</merge>
\ No newline at end of file diff --git a/main/res/layout/actionbar_button_map.xml b/main/res/layout/actionbar_button_map.xml new file mode 100644 index 0000000..9b2138a --- /dev/null +++ b/main/res/layout/actionbar_button_map.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<merge xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" > + + <View style="@style/action_bar_separator" /> + + <ImageView + style="@style/action_bar_action" + android:onClick="goMap" + android:src="@drawable/actionbar_map" /> + +</merge>
\ No newline at end of file diff --git a/main/res/layout/actionbar_button_myposition.xml b/main/res/layout/actionbar_button_myposition.xml new file mode 100644 index 0000000..1e91419 --- /dev/null +++ b/main/res/layout/actionbar_button_myposition.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<merge xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" > + + <View style="@style/action_bar_separator" /> + + <ImageSwitcher + android:id="@+id/my_position" + style="@style/action_bar_action" /> + +</merge>
\ No newline at end of file diff --git a/main/res/layout/actionbar_button_search.xml b/main/res/layout/actionbar_button_search.xml new file mode 100644 index 0000000..2aa1a50 --- /dev/null +++ b/main/res/layout/actionbar_button_search.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<merge xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" > + + <View style="@style/action_bar_separator" /> + + <ImageView + style="@style/action_bar_action" + android:onClick="goSearch" + android:src="@drawable/actionbar_search" /> + +</merge>
\ No newline at end of file diff --git a/main/res/layout/actionbar_progress.xml b/main/res/layout/actionbar_progress.xml new file mode 100644 index 0000000..54b5875 --- /dev/null +++ b/main/res/layout/actionbar_progress.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/actionbar_progress" + style="@style/action_bar_progress" + android:visibility="gone" /> diff --git a/main/res/layout/actionbar_title.xml b/main/res/layout/actionbar_title.xml new file mode 100644 index 0000000..4fa5348 --- /dev/null +++ b/main/res/layout/actionbar_title.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<merge xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" > + + <ImageView + style="@style/action_bar_action" + android:onClick="goHome" /> + + <View style="@style/action_bar_separator" /> + + <TextView + android:id="@+id/actionbar_title" + style="@style/action_bar_title" /> + +</merge>
\ No newline at end of file diff --git a/main/res/layout/actionbar_title_no_home.xml b/main/res/layout/actionbar_title_no_home.xml new file mode 100644 index 0000000..6295bdc --- /dev/null +++ b/main/res/layout/actionbar_title_no_home.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<merge xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" > + + <TextView + android:id="@+id/actionbar_title" + style="@style/action_bar_title" /> + +</merge>
\ No newline at end of file diff --git a/main/res/layout/addresses.xml b/main/res/layout/addresslist_activity.xml index 2be131d..c48c28f 100644 --- a/main/res/layout/addresses.xml +++ b/main/res/layout/addresslist_activity.xml @@ -4,16 +4,7 @@ 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> + <include layout="@layout/actionbar" /> <ListView android:id="@android:id/list" diff --git a/main/res/layout/addresses_item.xml b/main/res/layout/addresslist_item.xml index 3ea27ff..dac1768 100644 --- a/main/res/layout/addresses_item.xml +++ b/main/res/layout/addresslist_item.xml @@ -21,7 +21,7 @@ android:singleLine="false" android:textColor="?text_color" android:textIsSelectable="false" - android:textSize="22dip" /> + android:textSize="22sp" /> <TextView android:id="@+id/distance" @@ -34,6 +34,6 @@ android:singleLine="true" android:textColor="?text_color" android:textIsSelectable="false" - android:textSize="12dip" /> + android:textSize="12sp" /> </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/attribute_descriptions.xml b/main/res/layout/attribute_descriptions.xml index 45dd3cd..1e67f72 100644 --- a/main/res/layout/attribute_descriptions.xml +++ b/main/res/layout/attribute_descriptions.xml @@ -13,6 +13,6 @@ android:textColor="?text_color" android:textColorLink="?text_color_link" android:textIsSelectable="false" - android:textSize="14dip" /> + android:textSize="14sp" /> </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/twitter_authorization_activity.xml b/main/res/layout/authorization_activity.xml index 97c2236..771592d 100644 --- a/main/res/layout/twitter_authorization_activity.xml +++ b/main/res/layout/authorization_activity.xml @@ -5,16 +5,7 @@ android:orientation="vertical" android:visibility="visible" > - <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> + <include layout="@layout/actionbar" /> <ScrollView android:layout_width="fill_parent" @@ -28,6 +19,7 @@ android:orientation="vertical" > <TextView + android:id="@+id/auth_1" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_gravity="left|center_vertical" @@ -37,11 +29,11 @@ android:drawableLeft="@drawable/cgeo" android:drawablePadding="15dip" android:gravity="left|center_vertical" - android:text="@string/about_auth_1" android:textColor="?text_color" android:textSize="14sp" /> <TextView + android:id="@+id/auth_2" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="left|center_vertical" @@ -49,7 +41,6 @@ android:layout_marginLeft="10dip" android:layout_marginRight="10dip" android:gravity="left|center_vertical" - android:text="@string/about_auth_2" android:textColor="?text_color" android:textSize="14sp" /> @@ -61,20 +52,17 @@ <Button android:id="@+id/start" - style="@style/button_full" - android:text="@string/auth_authorize" /> + style="@style/button_full" /> <EditText android:id="@+id/pin" style="@style/edittext_full" - android:hint="@string/auth_pin_hint" android:inputType="number" android:visibility="gone" /> <Button android:id="@+id/pin_button" style="@style/button_full" - android:text="@string/auth_finish" android:visibility="visible" /> </LinearLayout> </LinearLayout> diff --git a/main/res/layout/cache_image_item.xml b/main/res/layout/cache_image_item.xml index 7ed4782..85ab106 100644 --- a/main/res/layout/cache_image_item.xml +++ b/main/res/layout/cache_image_item.xml @@ -24,7 +24,13 @@ android:layout_gravity="left" android:padding="3dip" android:textColor="?text_color" - android:textSize="14dip" + android:textSize="14sp" android:visibility="gone" /> + <ProgressBar + android:id="@+id/progress_bar" + style="@android:style/Widget.ProgressBar.Small" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/cache_information_item.xml b/main/res/layout/cache_information_item.xml index e9df7f5..5d53340 100644 --- a/main/res/layout/cache_information_item.xml +++ b/main/res/layout/cache_information_item.xml @@ -21,7 +21,7 @@ android:text="@null" android:textColor="?text_color_headline" android:textIsSelectable="false" - android:textSize="12dip" /> + android:textSize="12sp" /> <TextView android:id="@+id/value" @@ -33,7 +33,7 @@ android:gravity="center_vertical" android:textColor="?text_color" android:textIsSelectable="false" - android:textSize="14dip" /> + android:textSize="14sp" /> <LinearLayout android:id="@+id/stars" @@ -57,7 +57,7 @@ android:gravity="center_vertical" android:textColor="?text_color_grey" android:textIsSelectable="false" - android:textSize="11dip" + android:textSize="12sp" android:visibility="gone" /> </RelativeLayout>
\ No newline at end of file diff --git a/main/res/layout/cacheview.xml b/main/res/layout/cachedetail_activity.xml index 89d7152..3afe5f6 100644 --- a/main/res/layout/cacheview.xml +++ b/main/res/layout/cachedetail_activity.xml @@ -8,29 +8,9 @@ <LinearLayout style="@style/action_bar" >
- <ImageView
- style="@style/action_bar_action"
- android:onClick="goHome" />
+ <include layout="@layout/actionbar_title" />
- <View style="@style/action_bar_separator" />
-
- <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="startDefaultNavigation"
- android:src="@drawable/actionbar_compass_dark" />
-
- <View style="@style/action_bar_separator" />
-
- <ImageView
- style="@style/action_bar_action"
- android:onClick="goManual"
- android:src="@drawable/actionbar_manual" />
+ <include layout="@layout/actionbar_button_compass" />
</LinearLayout>
<android.support.v4.view.ViewPager
@@ -47,6 +27,6 @@ app:footerColor="#ff888888"
app:footerIndicatorHeight="3dp"
app:footerIndicatorStyle="underline"
- app:textSize="16dp" />
+ app:textSize="16sp" />
</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/cacheview_description.xml b/main/res/layout/cachedetail_description_page.xml index 732ab91..dba6789 100644 --- a/main/res/layout/cacheview_description.xml +++ b/main/res/layout/cachedetail_description_page.xml @@ -11,7 +11,7 @@ <!-- Short description -->
- <TextView
+ <cgeo.geocaching.ui.IndexOutOfBoundsAvoidingTextView
android:id="@+id/shortdesc"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -20,12 +20,12 @@ android:linksClickable="true"
android:textColor="?text_color"
android:textColorLink="?text_color_link"
- android:textSize="14dip"
+ android:textSize="14sp"
android:visibility="gone" />
<!-- Long description -->
- <TextView
+ <cgeo.geocaching.ui.IndexOutOfBoundsAvoidingTextView
android:id="@+id/longdesc"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -34,7 +34,7 @@ android:linksClickable="true"
android:textColor="?text_color"
android:textColorLink="?text_color_link"
- android:textSize="14dip"
+ android:textSize="14sp"
android:visibility="gone" />
<Button
@@ -88,7 +88,7 @@ android:linksClickable="true"
android:textColor="?text_color"
android:textColorLink="?text_color_link"
- android:textSize="14dip" />
+ android:textSize="14sp" />
<TextView
android:id="@+id/hint_spoilerlink"
@@ -100,7 +100,7 @@ android:drawablePadding="3dip"
android:text="@string/cache_menu_spoilers"
android:textColor="?text_color"
- android:textSize="14dip" />
+ android:textSize="14sp" />
</LinearLayout>
<!-- Personal note box -->
@@ -128,12 +128,16 @@ android:linksClickable="true"
android:textColor="?text_color"
android:textColorLink="?text_color_link"
- android:textSize="14dip" />
+ android:textSize="14sp" />
<Button
android:id="@+id/edit_personalnote"
style="@style/button_small"
android:text="@string/cache_personal_note_edit" />
+ <Button
+ android:id="@+id/upload_personalnote"
+ style="@style/button_small"
+ android:text="@string/cache_personal_note_upload" />
</LinearLayout>
</LinearLayout>
diff --git a/main/res/layout/cacheview_details.xml b/main/res/layout/cachedetail_details_page.xml index 54d4719..484385e 100644 --- a/main/res/layout/cacheview_details.xml +++ b/main/res/layout/cachedetail_details_page.xml @@ -72,7 +72,7 @@ android:layout_marginRight="130dip"
android:paddingRight="3dip"
android:textColor="?text_color"
- android:textSize="14dip" />
+ android:textSize="14sp" />
<Button
android:id="@+id/offline_refresh"
@@ -112,7 +112,7 @@ android:layout_marginRight="130dip"
android:paddingRight="3dip"
android:textColor="?text_color"
- android:textSize="14dip" />
+ android:textSize="14sp" />
<Button
android:id="@+id/change_list"
@@ -150,7 +150,7 @@ android:layout_marginRight="130dip"
android:paddingRight="3dip"
android:textColor="?text_color"
- android:textSize="14dip" />
+ android:textSize="14sp" />
<Button
android:id="@+id/add_to_watchlist"
@@ -196,7 +196,7 @@ android:layout_marginRight="130dip"
android:paddingRight="3dip"
android:textColor="?text_color"
- android:textSize="14dip" />
+ android:textSize="14sp" />
<Button
android:id="@+id/add_to_favpoint"
@@ -241,7 +241,7 @@ android:padding="3dip"
android:textColor="?text_color"
android:textColorLink="?text_color_link"
- android:textSize="14dip" />
+ android:textSize="14sp" />
</LinearLayout>
<!-- Map Preview Box -->
diff --git a/main/res/layout/caches_images.xml b/main/res/layout/cachedetail_images_page.xml index 2360dd0..2360dd0 100644 --- a/main/res/layout/caches_images.xml +++ b/main/res/layout/cachedetail_images_page.xml diff --git a/main/res/layout/cacheview_inventory.xml b/main/res/layout/cachedetail_inventory_page.xml index 9acbba4..9acbba4 100644 --- a/main/res/layout/cacheview_inventory.xml +++ b/main/res/layout/cachedetail_inventory_page.xml diff --git a/main/res/layout/cacheview_waypoints.xml b/main/res/layout/cachedetail_waypoints_page.xml index 8a24aa8..8a24aa8 100644 --- a/main/res/layout/cacheview_waypoints.xml +++ b/main/res/layout/cachedetail_waypoints_page.xml diff --git a/main/res/layout/caches.xml b/main/res/layout/cacheslist_activity.xml index 147a596..5c3abbc 100644 --- a/main/res/layout/caches.xml +++ b/main/res/layout/cacheslist_activity.xml @@ -6,34 +6,11 @@ <LinearLayout style="@style/action_bar" > - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> + <include layout="@layout/actionbar_title" /> - <View style="@style/action_bar_separator" /> + <include layout="@layout/actionbar_progress" /> - <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" /> + <include layout="@layout/actionbar_button_map" /> </LinearLayout> <include layout="@layout/filter_bar" /> diff --git a/main/res/layout/caches_footer.xml b/main/res/layout/cacheslist_footer.xml index 7182488..ed2de18 100644 --- a/main/res/layout/caches_footer.xml +++ b/main/res/layout/cacheslist_footer.xml @@ -13,4 +13,4 @@ android:singleLine="true" android:text="@string/caches_no_cache" android:textColor="@color/just_white" - android:textSize="16dip" /> + android:textSize="16sp" /> diff --git a/main/res/layout/caches_item.xml b/main/res/layout/cacheslist_item.xml index 8ea0221..3bd556b 100644 --- a/main/res/layout/caches_item.xml +++ b/main/res/layout/cacheslist_item.xml @@ -49,7 +49,7 @@ android:singleLine="true" android:textColor="?text_color" android:textIsSelectable="false" - android:textSize="18dip" /> + android:textSize="18sp" /> <!-- cache attributes and other info --> @@ -70,7 +70,7 @@ android:singleLine="true" android:textColor="?text_color_grey" android:textIsSelectable="false" - android:textSize="12dip" /> + android:textSize="12sp" /> <!-- real text based direction and distance --> @@ -96,7 +96,7 @@ android:scrollHorizontally="true" android:singleLine="true" android:textColor="?text_color" - android:textSize="16dip" /> + android:textSize="16sp" /> <view android:id="@+id/direction" @@ -109,8 +109,8 @@ android:gravity="center" android:minHeight="28px" android:minWidth="28px" - cc:skin="?compass" - android:visibility="gone" /> + android:visibility="gone" + cc:skin="?compass" /> <ImageView android:id="@+id/dirimg" @@ -147,14 +147,14 @@ android:src="@drawable/trackable_all" /> <TextView - android:id="@+id/favourite" + android:id="@+id/favorite" android:layout_width="35dip" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" android:layout_gravity="center" android:layout_marginTop="22dip" - android:background="?favourite" + android:background="?favorite" android:ellipsize="marquee" android:gravity="center" android:lines="1" @@ -165,7 +165,7 @@ android:singleLine="true" android:textColor="?text_color" android:textIsSelectable="false" - android:textSize="12dip" + android:textSize="12sp" android:textStyle="bold" /> </RelativeLayout> diff --git a/main/res/layout/cacheview_logs_item.xml b/main/res/layout/cacheview_logs_item.xml deleted file mode 100644 index b54446e..0000000 --- a/main/res/layout/cacheview_logs_item.xml +++ /dev/null @@ -1,120 +0,0 @@ -<?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: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/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/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/compass_activity.xml b/main/res/layout/compass_activity.xml new file mode 100644 index 0000000..b994b70 --- /dev/null +++ b/main/res/layout/compass_activity.xml @@ -0,0 +1,115 @@ +<?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="fill_parent" + android:background="?background_color" + android:orientation="vertical" > + + <LinearLayout + android:id="@+id/info1" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <TextView + android:id="@+id/destination" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:textColor="?text_color" + android:textSize="14sp" /> + + <TextView + android:id="@+id/cacheinfo" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:textColor="?text_color" + android:textSize="14sp" /> + + <RelativeLayout + android:layout_width="fill_parent" + android:layout_height="30dip" > + + <TextView + android:id="@+id/heading" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_gravity="left" + android:layout_marginLeft="3dip" + android:text="@null" + android:textColor="?text_color" + android:textSize="26sp" /> + + <TextView + android:id="@+id/distance" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_gravity="right" + android:layout_marginRight="3dip" + android:text="@null" + android:textColor="?text_color" + android:textSize="26sp" /> + </RelativeLayout> + </LinearLayout> + + <LinearLayout + android:id="@+id/info2" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_marginLeft="6dip" + android:layout_marginRight="6dip" + android:orientation="vertical" > + + <TextView + android:id="@+id/nav_location" + style="@style/location_current" + android:text="@string/loc_trying" /> + + <RelativeLayout + android:layout_width="fill_parent" + android:layout_height="16dip" > + + <TextView + android:id="@+id/nav_type" + style="@style/location_current_type" + android:textColor="?text_color_grey" + android:textIsSelectable="false" /> + + <TextView + android:id="@+id/nav_accuracy" + style="@style/location_current_accuracy" + android:textColor="?text_color_grey" + android:textIsSelectable="false" /> + + <TextView + android:id="@+id/nav_satellites" + style="@style/location_current_satellites" + android:textColor="?text_color_grey" + android:textIsSelectable="false" /> + </RelativeLayout> + </LinearLayout> + + <view + android:id="@+id/rose" + android:layout_width="fill_parent" + android:layout_height="295dip" + android:layout_above="@id/info2" + android:layout_below="@id/info1" + android:layout_centerInParent="true" + android:layout_gravity="center_horizontal" + android:layout_marginBottom="1dip" + android:layout_marginLeft="1dip" + android:layout_marginRight="1dip" + android:layout_marginTop="6dip" + class="cgeo.geocaching.ui.CompassView" + android:gravity="center" + android:keepScreenOn="true" + android:minHeight="289dip" + android:minWidth="289dip" + android:padding="4dip" /> + +</RelativeLayout>
\ No newline at end of file diff --git a/main/res/layout/coords.xml b/main/res/layout/coordinatesinput_dialog.xml index ddb2f4e..4603360 100644 --- a/main/res/layout/coords.xml +++ b/main/res/layout/coordinatesinput_dialog.xml @@ -10,13 +10,6 @@ <TextView style="@style/action_bar_title" android:text="@string/cache_coordinates" /> - - <View style="@style/action_bar_separator" /> - - <ImageView - android:id="@+id/actionBarManualbutton" - style="@style/action_bar_action" - android:src="@drawable/actionbar_manual" /> </LinearLayout> <ScrollView diff --git a/main/res/layout/editor.xml b/main/res/layout/editor.xml deleted file mode 100644 index d556836..0000000 --- a/main/res/layout/editor.xml +++ /dev/null @@ -1,25 +0,0 @@ -<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" > - - <EditText - android:id="@+id/editorEditText" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:inputType="textMultiLine" - android:scrollbars="vertical" > - - <requestFocus /> - </EditText> - - <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/edit_waypoint_activity.xml b/main/res/layout/editwaypoint_activity.xml index 3fbd19e..cd0b46c 100644 --- a/main/res/layout/edit_waypoint_activity.xml +++ b/main/res/layout/editwaypoint_activity.xml @@ -5,23 +5,7 @@ android:background="?background_color" 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> + <include layout="@layout/actionbar" /> <ScrollView android:layout_width="fill_parent" @@ -37,12 +21,14 @@ <Button android:id="@+id/buttonLatitude" style="@style/button_full" - android:hint="@string/latitude" /> + android:hint="@string/latitude" + android:freezesText="true" /> <Button android:id="@+id/buttonLongitude" style="@style/button_full" - android:hint="@string/longitude" /> + android:hint="@string/longitude" + android:freezesText="true" /> <EditText android:id="@+id/bearing" @@ -78,7 +64,8 @@ <Spinner android:id="@+id/type" android:layout_width="fill_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:visibility="gone" /> <EditText android:id="@+id/note" diff --git a/main/res/layout/fragment_edit_note.xml b/main/res/layout/fragment_edit_note.xml new file mode 100644 index 0000000..1e9fbf9 --- /dev/null +++ b/main/res/layout/fragment_edit_note.xml @@ -0,0 +1,15 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/edit_note" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:orientation="vertical" > + + <EditText + android:id="@+id/note" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:inputType="textMultiLine" + android:lines="8" /> + +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/gpx.xml b/main/res/layout/gpx.xml index 2be131d..c48c28f 100644 --- a/main/res/layout/gpx.xml +++ b/main/res/layout/gpx.xml @@ -4,16 +4,7 @@ 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> + <include layout="@layout/actionbar" /> <ListView android:id="@android:id/list" diff --git a/main/res/layout/gpx_item.xml b/main/res/layout/gpx_item.xml index df735bc..f0a0647 100644 --- a/main/res/layout/gpx_item.xml +++ b/main/res/layout/gpx_item.xml @@ -22,7 +22,7 @@ android:singleLine="true" android:textColor="?text_color_grey" android:textIsSelectable="false" - android:textSize="12dip" /> + android:textSize="12sp" /> <TextView android:id="@+id/filename" @@ -35,6 +35,6 @@ android:singleLine="true" android:textColor="?text_color" android:textIsSelectable="false" - android:textSize="22dip" /> + android:textSize="22sp" /> </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/images_activity.xml b/main/res/layout/images_activity.xml new file mode 100644 index 0000000..ccd8499 --- /dev/null +++ b/main/res/layout/images_activity.xml @@ -0,0 +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:background="?background_color" + android:orientation="vertical" > + + <include layout="@layout/actionbar" /> + + <include layout="@layout/cachedetail_images_page" /> + +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/visit_image.xml b/main/res/layout/imageselect_activity.xml index 7997406..fd8eaea 100644 --- a/main/res/layout/visit_image.xml +++ b/main/res/layout/imageselect_activity.xml @@ -7,24 +7,9 @@ <LinearLayout style="@style/action_bar" > - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> + <include layout="@layout/actionbar_title" /> - <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" /> + <include layout="@layout/actionbar_progress" /> </LinearLayout> <ScrollView @@ -98,6 +83,13 @@ android:minLines="5" android:singleLine="false" /> + <Spinner + android:id="@+id/logImageScale" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:entries="@array/log_image_scales" + android:prompt="@string/log_image_scale" /> + <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" diff --git a/main/res/layout/init.xml b/main/res/layout/init.xml deleted file mode 100644 index 26137fc..0000000 --- a/main/res/layout/init.xml +++ /dev/null @@ -1,843 +0,0 @@ -<?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:background="?background_color" - 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_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: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_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: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_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> - <!-- ** --> - - <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/livemapinfo.xml b/main/res/layout/livemapinfo.xml index 5dd8ccd..1b1e9ea 100644 --- a/main/res/layout/livemapinfo.xml +++ b/main/res/layout/livemapinfo.xml @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:text="@string/live_map_notification" android:textColor="?text_color" - android:textSize="14dip" /> + android:textSize="14sp" /> <CheckBox android:id="@+id/live_map_hint_hide" diff --git a/main/res/layout/log_signature_preference_dialog.xml b/main/res/layout/log_signature_preference_dialog.xml new file mode 100644 index 0000000..a5048a4 --- /dev/null +++ b/main/res/layout/log_signature_preference_dialog.xml @@ -0,0 +1,33 @@ +<?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="wrap_content" + android:padding="8dp" + android:orientation="vertical" > + + <TextView + android:text="@string/init_signature_help_text" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingBottom="8dp" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + <EditText + android:id="@+id/signature_dialog_text" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/init_signature" + android:inputType="textMultiLine|textCapSentences" + android:gravity="top|left" + android:minLines="3" + android:singleLine="false" /> + + <Button + android:id="@+id/signature_templates" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingTop="8dp" + android:layout_gravity="right" + android:text="@string/init_signature_template_button" /> + +</LinearLayout> diff --git a/main/res/layout/visit.xml b/main/res/layout/logcache_activity.xml index 43a3308..4bbb441 100644 --- a/main/res/layout/visit.xml +++ b/main/res/layout/logcache_activity.xml @@ -7,24 +7,9 @@ <LinearLayout style="@style/action_bar" > - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> + <include layout="@layout/actionbar_title" /> - <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" /> + <include layout="@layout/actionbar_progress" /> </LinearLayout> <ScrollView @@ -73,6 +58,29 @@ android:singleLine="false" /> <LinearLayout + android:id="@+id/log_password_box" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="5dip" + android:orientation="vertical" + android:visibility="gone" > + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:gravity="left" + android:padding="10dip" + android:text="@string/log_password_title" + android:textColor="?text_color" + android:textSize="22sp" /> + <EditText + android:id="@+id/log_password" + style="@style/edittext_full" + android:hint="@string/log_hint_log_password" + android:inputType="text" + android:singleLine="true" /> + </LinearLayout> + + <LinearLayout android:id="@+id/tweet_box" android:layout_width="fill_parent" android:layout_height="wrap_content" @@ -88,7 +96,7 @@ android:layout_height="wrap_content" android:layout_gravity="left" android:gravity="center" - android:padding="1px" /> + android:padding="2sp" /> <TextView android:layout_width="wrap_content" @@ -98,7 +106,7 @@ android:paddingRight="3dip" android:text="@string/visit_tweet" android:textColor="?text_color" - android:textSize="14dip" /> + android:textSize="14sp" /> </LinearLayout> <Button @@ -185,7 +193,7 @@ android:layout_weight="1" android:gravity="right" android:text="@string/log_tb_changeall" - android:textSize="14dip" /> + android:textSize="14sp" /> </LinearLayout> </LinearLayout> </LinearLayout> diff --git a/main/res/layout/visit_trackable.xml b/main/res/layout/logcache_trackable_item.xml index 360e553..1eab116 100644 --- a/main/res/layout/visit_trackable.xml +++ b/main/res/layout/logcache_trackable_item.xml @@ -27,7 +27,7 @@ android:singleLine="true" android:textColor="?text_color" android:textIsSelectable="false" - android:textSize="14dip" /> + android:textSize="14sp" /> <TextView android:id="@+id/trackcode" @@ -41,7 +41,7 @@ android:singleLine="true" android:textColor="?text_color" android:textIsSelectable="false" - android:textSize="14dip" /> + android:textSize="14sp" /> </LinearLayout> <TextView @@ -57,6 +57,6 @@ android:singleLine="true" android:textColor="?text_color" android:textIsSelectable="false" - android:textSize="14dip" /> + android:textSize="14sp" /> </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/logs_item.xml b/main/res/layout/logs_item.xml new file mode 100644 index 0000000..6bfe30a --- /dev/null +++ b/main/res/layout/logs_item.xml @@ -0,0 +1,79 @@ +<?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:paddingBottom="3dip" + android:paddingTop="3dip" > + + <TextView + android:id="@+id/author" + style="@style/logitem_author" /> + + <LinearLayout + android:id="@+id/detail_box" + android:layout_width="102dip" + 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="100dip" + android:layout_height="wrap_content" + android:layout_gravity="right|top" + android:orientation="vertical" + android:padding="3dip" > + + <TextView + android:id="@+id/added" + style="@style/logitem_property" /> + + <TextView + android:id="@+id/type" + style="@style/logitem_property" /> + + <TextView + android:id="@+id/count_or_location" + style="@style/logitem_property" /> + </LinearLayout> + + <ImageView + android:id="@+id/log_mark" + style="@style/logitem_mark" /> + </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="14sp" > + + <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:linksClickable="true" + android:textColor="?text_color" + android:textSize="14sp" /> + + <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="14sp" /> + </LinearLayout> + +</RelativeLayout>
\ No newline at end of file diff --git a/main/res/layout/cacheview_logs.xml b/main/res/layout/logs_page.xml index 9aafd83..9aafd83 100644 --- a/main/res/layout/cacheview_logs.xml +++ b/main/res/layout/logs_page.xml diff --git a/main/res/layout/touch.xml b/main/res/layout/logtrackable_activity.xml index 09a8033..7791409 100644 --- a/main/res/layout/touch.xml +++ b/main/res/layout/logtrackable_activity.xml @@ -7,24 +7,9 @@ <LinearLayout style="@style/action_bar" > - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> + <include layout="@layout/actionbar_title" /> - <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" /> + <include layout="@layout/actionbar_progress" /> </LinearLayout> <ScrollView @@ -87,7 +72,7 @@ android:layout_height="wrap_content" android:layout_gravity="left" android:gravity="center" - android:padding="1px" /> + android:padding="2sp" /> <TextView android:layout_width="wrap_content" @@ -97,7 +82,7 @@ android:paddingRight="3dip" android:text="@string/visit_tweet" android:textColor="?text_color" - android:textSize="14dip" /> + android:textSize="14sp" /> </LinearLayout> <Button diff --git a/main/res/layout/main.xml b/main/res/layout/main_activity.xml index 0f9aff0..581dab4 100644 --- a/main/res/layout/main.xml +++ b/main/res/layout/main_activity.xml @@ -13,19 +13,7 @@ <TextView style="@style/action_bar_title" /> - <View style="@style/action_bar_separator" /> - - <ImageView - style="@style/action_bar_action" - android:onClick="goSearch" - android:src="@drawable/actionbar_search" /> - - <View style="@style/action_bar_separator" /> - - <ImageView - style="@style/action_bar_action" - android:onClick="goManual" - android:src="@drawable/actionbar_manual" /> + <include layout="@layout/actionbar_button_search" /> </LinearLayout> <fragment @@ -48,20 +36,13 @@ android:orientation="vertical" > <LinearLayout - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:layout_margin="4dip" - android:gravity="center_horizontal" - android:orientation="horizontal" > + style="@style/icon_mainscreen_row" > <LinearLayout - android:layout_width="74dip" - android:layout_height="wrap_content" - android:layout_margin="4dip" - android:onClick="cgeoFindOnMap" - android:orientation="vertical" > + style="@style/icon_mainscreen_cell" + android:onClick="cgeoFindOnMap" > - <View + <ImageView android:id="@+id/map" style="@style/icon_mainscreen" android:background="@drawable/main_live" /> @@ -72,12 +53,9 @@ </LinearLayout> <LinearLayout - android:layout_width="74dip" - android:layout_height="wrap_content" - android:layout_margin="4dip" - android:orientation="vertical" > + style="@style/icon_mainscreen_cell" > - <View + <ImageView android:id="@+id/nearest" style="@style/icon_mainscreen" android:background="@drawable/main_nearby_disabled" /> @@ -99,12 +77,9 @@ android:textIsSelectable="false" /> <LinearLayout - android:layout_width="74dip" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:orientation="vertical" > + style="@style/icon_mainscreen_cell_counter" > - <View + <ImageView android:id="@+id/search_offline" style="@style/icon_mainscreen" android:background="@drawable/main_stored" /> @@ -117,20 +92,13 @@ </LinearLayout> <LinearLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_margin="4dip" - android:gravity="center_horizontal" - android:orientation="horizontal" > + style="@style/icon_mainscreen_row" > <LinearLayout - android:layout_width="74dip" - android:layout_height="wrap_content" - android:layout_margin="4dip" - android:onClick="cgeoSearch" - android:orientation="vertical" > + style="@style/icon_mainscreen_cell" + android:onClick="cgeoSearch" > - <View + <ImageView android:id="@+id/advanced_button" style="@style/icon_mainscreen" android:background="@drawable/main_search" /> @@ -141,13 +109,10 @@ </LinearLayout> <LinearLayout - android:layout_width="74dip" - android:layout_height="wrap_content" - android:layout_margin="4dip" - android:onClick="cgeoPoint" - android:orientation="vertical" > + style="@style/icon_mainscreen_cell" + android:onClick="cgeoPoint" > - <View + <ImageView android:id="@+id/any_button" style="@style/icon_mainscreen" android:background="@drawable/main_any" /> @@ -158,13 +123,10 @@ </LinearLayout> <LinearLayout - android:layout_width="74dip" - android:layout_height="wrap_content" - android:layout_margin="4dip" - android:onClick="cgeoFilter" - android:orientation="vertical" > + style="@style/icon_mainscreen_cell" + android:onClick="cgeoFilter" > - <View + <ImageView android:id="@+id/filter_button" style="@style/icon_mainscreen" android:background="@drawable/main_filter" /> @@ -178,41 +140,6 @@ </LinearLayout> <!-- ** --> - <RelativeLayout - android:id="@+id/helper" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_marginBottom="64dip" - android:layout_marginLeft="16dip" - android:layout_marginRight="16dip" - android:background="@drawable/helper_bcg" - android:visibility="gone" > - - <ImageView - android:layout_width="32dip" - android:layout_height="32dip" - android:layout_alignParentLeft="true" - android:layout_gravity="center" - android:layout_margin="4dip" - android:gravity="center" - android:scaleType="center" - android:src="@drawable/actionbar_manual" /> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_gravity="center" - android:layout_marginLeft="34dip" - android:gravity="center" - android:padding="4dip" - android:text="@string/helper" - android:textColor="@color/text_icon" - android:textSize="14dip" /> - </RelativeLayout> - <!-- ** --> - <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" @@ -222,10 +149,11 @@ android:onClick="cgeoNavSettings" android:orientation="vertical" > - <TextView - android:id="@+id/user_info" - style="@style/location_current" - android:text="@string/init_login_popup_working" /> + <LinearLayout + android:id="@+id/info_area" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" /> <TextView android:id="@+id/nav_location" diff --git a/main/res/layout/main_activity_connectorstatus.xml b/main/res/layout/main_activity_connectorstatus.xml new file mode 100644 index 0000000..33c4d79 --- /dev/null +++ b/main/res/layout/main_activity_connectorstatus.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<TextView xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/location_current" + android:text="@string/init_login_popup_working" /> diff --git a/main/res/layout/map_google.xml b/main/res/layout/map_google.xml index 723b7157..5e4d82d 100644 --- a/main/res/layout/map_google.xml +++ b/main/res/layout/map_google.xml @@ -6,30 +6,11 @@ <LinearLayout style="@style/action_bar" > - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> + <include layout="@layout/actionbar_title" /> - <View style="@style/action_bar_separator" /> + <include layout="@layout/actionbar_progress" /> - <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" /> + <include layout="@layout/actionbar_button_myposition" /> </LinearLayout> <include layout="@layout/filter_bar" /> @@ -52,7 +33,7 @@ android:scrollHorizontally="true" android:singleLine="true" android:textColor="@color/text_icon" - android:textSize="12dip" + android:textSize="12sp" android:visibility="gone" /> <view diff --git a/main/res/layout/map_mapsforge.xml b/main/res/layout/map_mapsforge.xml index f3b183e..f05ddb0 100644 --- a/main/res/layout/map_mapsforge.xml +++ b/main/res/layout/map_mapsforge.xml @@ -6,30 +6,11 @@ <LinearLayout style="@style/action_bar" > - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> + <include layout="@layout/actionbar_title" /> - <View style="@style/action_bar_separator" /> + <include layout="@layout/actionbar_progress" /> - <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" /> + <include layout="@layout/actionbar_button_myposition" /> </LinearLayout> <include layout="@layout/filter_bar" /> @@ -52,7 +33,7 @@ android:scrollHorizontally="true" android:singleLine="true" android:textColor="@color/text_icon" - android:textSize="12dip" + android:textSize="12sp" android:visibility="gone" /> <view diff --git a/main/res/layout/map_mapsforge_old.xml b/main/res/layout/map_mapsforge_old.xml index 44b3387..ff2b9af 100644 --- a/main/res/layout/map_mapsforge_old.xml +++ b/main/res/layout/map_mapsforge_old.xml @@ -6,30 +6,11 @@ <LinearLayout style="@style/action_bar" > - <ImageView - style="@style/action_bar_action" - android:onClick="goHome" /> + <include layout="@layout/actionbar_title" /> - <View style="@style/action_bar_separator" /> + <include layout="@layout/actionbar_progress" /> - <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" /> + <include layout="@layout/actionbar_button_myposition" /> </LinearLayout> <include layout="@layout/filter_bar" /> @@ -52,7 +33,7 @@ android:scrollHorizontally="true" android:singleLine="true" android:textColor="@color/text_icon" - android:textSize="12dip" + android:textSize="12sp" android:visibility="gone" /> <view diff --git a/main/res/layout/mapfile_item.xml b/main/res/layout/mapfile_item.xml index c30315a..c665894 100644 --- a/main/res/layout/mapfile_item.xml +++ b/main/res/layout/mapfile_item.xml @@ -22,7 +22,7 @@ android:singleLine="true" android:textColor="?text_color_grey" android:textIsSelectable="false" - android:textSize="12dip" /> + android:textSize="12sp" /> <TextView android:id="@+id/mapfilename" @@ -35,6 +35,6 @@ android:singleLine="true" android:textColor="?text_color" android:textIsSelectable="false" - android:textSize="22dip" /> + android:textSize="22sp" /> </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/navigate.xml b/main/res/layout/navigate.xml deleted file mode 100644 index 0c95958..0000000 --- a/main/res/layout/navigate.xml +++ /dev/null @@ -1,134 +0,0 @@ -<?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:background="?background_color" - 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> - - <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" > - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - - <TextView - android:id="@+id/destination" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:textColor="?text_color" - android:textSize="14dip" /> - - <TextView - android:id="@+id/cacheinfo" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:textColor="?text_color" - android:textSize="14dip" /> - - <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="30dip" > - - <TextView - android:id="@+id/heading" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="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_gravity="right" - android:layout_marginRight="3dip" - android:text="@null" - android:textColor="?text_color" - android:textSize="26dip" /> - </RelativeLayout> - </LinearLayout> - - <view - android:id="@+id/rose" - android:layout_width="fill_parent" - android:layout_height="295dip" - android:layout_centerInParent="true" - android:layout_gravity="center_horizontal" - android:layout_marginBottom="1dip" - android:layout_marginLeft="1dip" - android:layout_marginRight="1dip" - android:layout_marginTop="6dip" - class="cgeo.geocaching.ui.CompassView" - android:gravity="center" - android:keepScreenOn="true" - android:minHeight="289dip" - android:minWidth="289dip" - android:padding="4dip" /> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_marginLeft="6dip" - android:layout_marginRight="6dip" - android:orientation="vertical" > - - <TextView - android:id="@+id/nav_location" - style="@style/location_current" - android:text="@string/loc_trying" /> - - <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="16dip" > - - <TextView - android:id="@+id/nav_type" - style="@style/location_current_type" - android:textColor="?text_color_grey" - android:textIsSelectable="false" /> - - <TextView - android:id="@+id/nav_accuracy" - style="@style/location_current_accuracy" - android:textColor="?text_color_grey" - android:textIsSelectable="false" /> - - <TextView - android:id="@+id/nav_satellites" - style="@style/location_current_satellites" - android:textColor="?text_color_grey" - android:textIsSelectable="false" /> - </RelativeLayout> - </LinearLayout> - </RelativeLayout> - -</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/point.xml b/main/res/layout/navigateanypoint_activity.xml index 3c133d8..baa568c 100644 --- a/main/res/layout/point.xml +++ b/main/res/layout/navigateanypoint_activity.xml @@ -5,23 +5,7 @@ android:background="?background_color" 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> + <include layout="@layout/actionbar" /> <ListView android:id="@+id/historyList" diff --git a/main/res/layout/point_controls.xml b/main/res/layout/navigateanypoint_header.xml index caf2e48..caf2e48 100644 --- a/main/res/layout/point_controls.xml +++ b/main/res/layout/navigateanypoint_header.xml diff --git a/main/res/layout/popup.xml b/main/res/layout/popup.xml index ff64c91..584eb58 100644 --- a/main/res/layout/popup.xml +++ b/main/res/layout/popup.xml @@ -7,25 +7,9 @@ <LinearLayout style="@style/action_bar" > - <TextView style="@style/action_bar_title" /> + <include layout="@layout/actionbar_title_no_home" /> - <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" /> + <include layout="@layout/actionbar_button_compass" /> </LinearLayout> <ScrollView @@ -75,7 +59,7 @@ android:paddingRight="3dip" android:textColor="?text_color" android:textIsSelectable="false" - android:textSize="14dip" /> + android:textSize="14sp" /> <Button android:id="@+id/offline_refresh" diff --git a/main/res/layout/recaptcha_dialog.xml b/main/res/layout/recaptcha_dialog.xml index cbbbd0b..ac9f746 100644 --- a/main/res/layout/recaptcha_dialog.xml +++ b/main/res/layout/recaptcha_dialog.xml @@ -29,6 +29,6 @@ android:paddingLeft="3dip" android:text="@string/caches_recaptcha_explanation" android:textColor="@color/text_grey_dark" - android:textSize="12dip" /> + android:textSize="12sp" /> </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/search.xml b/main/res/layout/search_activity.xml index 6d0bf91..a0a699d 100644 --- a/main/res/layout/search.xml +++ b/main/res/layout/search_activity.xml @@ -6,23 +6,7 @@ android:background="?background_color" 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> + <include layout="@layout/actionbar" /> <ScrollView android:layout_width="fill_parent" diff --git a/main/res/layout/spoilers.xml b/main/res/layout/spoilers.xml deleted file mode 100644 index 233972a..0000000 --- a/main/res/layout/spoilers.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?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:background="?background_color" - 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> - - <include layout="@layout/caches_images" /> - -</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/star.xml b/main/res/layout/star_image.xml index 919fedb..919fedb 100644 --- a/main/res/layout/star.xml +++ b/main/res/layout/star_image.xml diff --git a/main/res/layout/map_static.xml b/main/res/layout/staticmaps_activity.xml index ff0435c..2ffa70d 100644 --- a/main/res/layout/map_static.xml +++ b/main/res/layout/staticmaps_activity.xml @@ -4,16 +4,7 @@ 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> + <include layout="@layout/actionbar" /> <ScrollView android:layout_width="fill_parent" diff --git a/main/res/layout/map_static_item.xml b/main/res/layout/staticmaps_activity_item.xml index 1bac7f0..1bac7f0 100644 --- a/main/res/layout/map_static_item.xml +++ b/main/res/layout/staticmaps_activity_item.xml diff --git a/main/res/layout/status.xml b/main/res/layout/status.xml index 4b1d55f..ef2a57a 100644 --- a/main/res/layout/status.xml +++ b/main/res/layout/status.xml @@ -24,6 +24,6 @@ android:padding="4dip" android:textColor="@color/text_icon" android:textIsSelectable="false" - android:textSize="14dip" /> + android:textSize="14sp" /> </RelativeLayout>
\ No newline at end of file diff --git a/main/res/layout/text_preference.xml b/main/res/layout/text_preference.xml new file mode 100644 index 0000000..818b2f3 --- /dev/null +++ b/main/res/layout/text_preference.xml @@ -0,0 +1,22 @@ +<?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:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="vertical" > + + <TextView + android:id="@+id/textPreferenceText" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceSmall" /> + <TextView + android:id="@+id/textPreferenceSummary" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingTop="8dp" + android:visibility="gone" + android:textAppearance="?android:attr/textAppearanceSmall" /> + +</LinearLayout> diff --git a/main/res/layout/trackable_activity.xml b/main/res/layout/trackable_activity.xml index fe61409..14120e0 100644 --- a/main/res/layout/trackable_activity.xml +++ b/main/res/layout/trackable_activity.xml @@ -6,23 +6,7 @@ android:background="?background_color"
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>
+ <include layout="@layout/actionbar" />
<android.support.v4.view.ViewPager
android:id="@+id/viewpager"
@@ -38,6 +22,6 @@ app:footerColor="#ff888888"
app:footerIndicatorHeight="3dp"
app:footerIndicatorStyle="underline"
- app:textSize="16dp" />
+ app:textSize="16sp" />
</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 c4aac0e..07f4e4e 100644 --- a/main/res/layout/trackable_details_view.xml +++ b/main/res/layout/trackable_details_view.xml @@ -41,7 +41,7 @@ android:linksClickable="true" android:textColor="?text_color" android:textColorLink="?text_color_link" - android:textSize="14dip" + android:textSize="14sp" android:visibility="gone" /> </LinearLayout> @@ -69,7 +69,7 @@ android:linksClickable="true" android:textColor="?text_color" android:textColorLink="?text_color_link" - android:textSize="14dip" + android:textSize="14sp" android:visibility="gone" /> </LinearLayout> diff --git a/main/res/layout/trackable_logs_img.xml b/main/res/layout/trackable_logs_img.xml deleted file mode 100644 index aaed32b..0000000 --- a/main/res/layout/trackable_logs_img.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?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" > - - <TextView - 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: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 deleted file mode 100644 index 52a38a9..0000000 --- a/main/res/layout/trackable_logs_item.xml +++ /dev/null @@ -1,110 +0,0 @@ -<?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: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/trackable_logs_view.xml b/main/res/layout/trackable_logs_view.xml deleted file mode 100644 index 0f89c31..0000000 --- a/main/res/layout/trackable_logs_view.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ListView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:cacheColorHint="?background_color" - android:divider="?background_color" - android:fastScrollEnabled="true" - android:focusable="false" - android:footerDividersEnabled="false" - android:headerDividersEnabled="false" - android:listSelector="?background_color" > - -</ListView>
\ No newline at end of file diff --git a/main/res/layout/useful_apps.xml b/main/res/layout/useful_apps.xml deleted file mode 100644 index 2a3d14e..0000000 --- a/main/res/layout/useful_apps.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?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:background="?background_color" - 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/usefulapps_activity.xml b/main/res/layout/usefulapps_activity.xml new file mode 100644 index 0000000..84bcf39 --- /dev/null +++ b/main/res/layout/usefulapps_activity.xml @@ -0,0 +1,23 @@ +<?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:background="?background_color" + android:orientation="vertical" > + + <include layout="@layout/actionbar" /> + + <ListView + android:id="@+id/apps_list" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:cacheColorHint="?background_color" + android:divider="?background_color" + android:fastScrollEnabled="true" + android:footerDividersEnabled="false" + android:headerDividersEnabled="false" + android:listSelector="?background_color" + android:padding="4dip" > + </ListView> + +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/useful_apps_item.xml b/main/res/layout/usefulapps_item.xml index 5c8f6f0..70e7baf 100644 --- a/main/res/layout/useful_apps_item.xml +++ b/main/res/layout/usefulapps_item.xml @@ -4,6 +4,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginBottom="10dip" + android:descendantFocusability="blocksDescendants" android:orientation="vertical" > <RelativeLayout style="@style/separator_horizontal_layout" > @@ -43,7 +44,7 @@ android:textColor="?text_color" android:textColorLink="?text_color_link" android:textIsSelectable="false" - android:textSize="14dip" /> + android:textSize="14sp" /> </LinearLayout> </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/waypoint_item.xml b/main/res/layout/waypoint_item.xml index 29106d8..17690ff 100644 --- a/main/res/layout/waypoint_item.xml +++ b/main/res/layout/waypoint_item.xml @@ -21,7 +21,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:textColor="?text_color" - android:textSize="18dp" /> + android:textSize="18sp" /> <TextView android:id="@+id/info" @@ -34,7 +34,7 @@ android:scrollHorizontally="true" android:singleLine="true" android:textColor="?text_color_headline" - android:textSize="14dp" + android:textSize="14sp" android:visibility="gone" /> </LinearLayout> @@ -59,7 +59,7 @@ android:scrollHorizontally="true" android:singleLine="true" android:textColor="?text_color_headline" - android:textSize="14dp" + android:textSize="14sp" android:visibility="gone" /> <TextView @@ -68,7 +68,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="12dp" android:textColor="?text_color" - android:textSize="14dp" + android:textSize="14sp" android:visibility="gone" /> <View diff --git a/main/res/layout/waypoint_popup.xml b/main/res/layout/waypoint_popup.xml index 869ffa0..c8b257c 100644 --- a/main/res/layout/waypoint_popup.xml +++ b/main/res/layout/waypoint_popup.xml @@ -7,25 +7,9 @@ <LinearLayout style="@style/action_bar" > - <TextView style="@style/action_bar_title" /> + <include layout="@layout/actionbar_title_no_home" /> - <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" /> + <include layout="@layout/actionbar_button_compass" /> </LinearLayout> <ScrollView diff --git a/main/res/layout/wp_threshold_preference.xml b/main/res/layout/wp_threshold_preference.xml new file mode 100644 index 0000000..22ffe9a --- /dev/null +++ b/main/res/layout/wp_threshold_preference.xml @@ -0,0 +1,26 @@ +<?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="wrap_content" + android:orientation="horizontal" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingTop="8dp" > + + <SeekBar + android:id="@+id/wp_threshold_seekbar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:paddingRight="8dp" + android:layout_weight="1" /> + + <TextView + android:id="@+id/wp_threshold_value_view" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:gravity="center" + android:layout_weight="5" /> + +</LinearLayout> |