diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2013-01-28 07:10:49 +0100 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2013-01-28 07:10:49 +0100 |
| commit | 9b382b09a4586022183c749ff603285b6b732711 (patch) | |
| tree | 9c79eda8d0dc1202a6d7e78c64054acfc8a08245 /main/res | |
| parent | af6345031c90b20f0434992c58827f84de080755 (diff) | |
| download | cgeo-9b382b09a4586022183c749ff603285b6b732711.zip cgeo-9b382b09a4586022183c749ff603285b6b732711.tar.gz cgeo-9b382b09a4586022183c749ff603285b6b732711.tar.bz2 | |
lint cleanups
* unused resources
* textIsSelectable
Diffstat (limited to 'main/res')
32 files changed, 1253 insertions, 1014 deletions
diff --git a/main/res/layout/about.xml b/main/res/layout/about.xml index 39ad8ff..15862e6 100644 --- a/main/res/layout/about.xml +++ b/main/res/layout/about.xml @@ -1,205 +1,256 @@ <?xml version="1.0" encoding="UTF-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" - android:background="?background_color" > - <LinearLayout style="@style/action_bar"> - <ImageView style="@style/action_bar_action" - android:onClick="goHome" /> - <View style="@style/action_bar_separator" /> - <TextView style="@style/action_bar_title" /> - </LinearLayout> - <ScrollView - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:padding="4dip" - android:orientation="vertical" > - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginTop="10dip" - android:orientation="vertical" > - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_marginTop="10dip" - android:orientation="vertical" > - <ImageView - android:layout_width="200dip" - android:layout_height="200dip" - android:layout_margin="10dip" - android:layout_gravity="center" - android:gravity="center" - android:scaleType="fitXY" - android:src="@drawable/cgeo_logo" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginTop="5dip" - android:layout_gravity="left" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/quote" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:layout_gravity="right" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/powered_by" /> - </LinearLayout> - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" - android:text="@string/about_version" /> - </RelativeLayout> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:layout_gravity="left" - android:textSize="14dip" - android:textStyle="bold" - android:textColor="?text_color" - android:id="@+id/about_version_string" /> - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" - android:text="@string/about_donate" /> - </RelativeLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginTop="10dip" - android:orientation="horizontal" - android:gravity="center_horizontal" > - <Button style="@style/button_full" - android:layout_width="280dip" - android:singleLine="false" - android:lines="2" - android:onClick="donate" - android:text="@string/about_donation_more" /> - </LinearLayout> - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" - android:text="@string/about_detail" /> - </RelativeLayout> - <TextView android:id="@+id/support" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:layout_gravity="left" - android:textSize="14dip" - android:textColor="?text_color" - android:textColorLink="?text_color_link" - android:linksClickable="false" - android:focusable="true" - android:clickable="true" - android:onClick="support" - android:text="@string/support" /> - <TextView android:id="@+id/website" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:layout_gravity="left" - android:textSize="14dip" - android:textColor="?text_color" - android:textColorLink="?text_color_link" - android:linksClickable="false" - android:focusable="true" - android:clickable="true" - android:onClick="website" - android:text="@string/website" /> - <TextView android:id="@+id/facebook" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:layout_gravity="left" - android:textSize="14dip" - android:textColor="?text_color" - android:textColorLink="?text_color_link" - android:linksClickable="false" - android:focusable="true" - android:clickable="true" - android:onClick="facebook" - android:text="@string/facebook" /> - <TextView android:id="@+id/twitter" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:layout_gravity="left" - android:textSize="14dip" - android:textColor="?text_color" - android:textColorLink="?text_color_link" - android:linksClickable="false" - android:focusable="true" - android:clickable="true" - android:onClick="twitter" - android:text="@string/twitter" /> - <TextView android:id="@+id/nutshellmanual" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:layout_gravity="left" - android:textSize="14dip" - android:textColor="?text_color" - android:textColorLink="?text_color_link" - android:linksClickable="false" - android:focusable="true" - android:clickable="true" - android:onClick="nutshellmanual" - android:text="@string/nutshellmanual" /> - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" - android:text="@string/about_changelog" /> - </RelativeLayout> - <TextView android:id="@+id/changelog" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="7dip" - android:layout_gravity="left" - android:paddingLeft="3dip" - android:textSize="12dip" - android:linksClickable="true" - android:textColorLink="?text_color_link" - android:textColor="?text_color" - android:text="@string/changelog" /> - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" - android:text="@string/about_contributors" /> - </RelativeLayout> - <TextView android:id="@+id/contributors" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="7dip" - android:layout_gravity="left" - android:paddingLeft="3dip" - android:textSize="14dip" - android:linksClickable="true" - android:textColorLink="?text_color_link" - android:textColor="?text_color" - android:text="@string/contributors" /> - </LinearLayout> - </ScrollView> -</LinearLayout> + 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:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginTop="10dip" + android:orientation="vertical" > + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_marginTop="10dip" + android:orientation="vertical" > + + <ImageView + android:layout_width="200dip" + android:layout_height="200dip" + android:layout_gravity="center" + android:layout_margin="10dip" + android:gravity="center" + android:scaleType="fitXY" + android:src="@drawable/cgeo_logo" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:layout_marginTop="5dip" + android:text="@string/quote" + android:textColor="?text_color" + android:textSize="14dip" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:layout_marginBottom="5dip" + android:layout_marginLeft="10dip" + android:layout_marginRight="10dip" + android:text="@string/powered_by" + android:textColor="?text_color" + android:textSize="14dip" /> + </LinearLayout> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/about_version" /> + </RelativeLayout> + + <TextView + android:id="@+id/about_version_string" + 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:textColor="?text_color" + android:textIsSelectable="true" + android:textSize="14dip" + android:textStyle="bold" /> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/about_donate" /> + </RelativeLayout> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginTop="10dip" + android:gravity="center_horizontal" + android:orientation="horizontal" > + + <Button + style="@style/button_full" + android:layout_width="280dip" + android:lines="2" + android:onClick="donate" + android:singleLine="false" + android:text="@string/about_donation_more" /> + </LinearLayout> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/about_detail" /> + </RelativeLayout> + + <TextView + android:id="@+id/support" + 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:onClick="support" + android:text="@string/support" + android:textColor="?text_color" + android:textColorLink="?text_color_link" + android:textSize="14dip" /> + + <TextView + android:id="@+id/website" + 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:onClick="website" + android:text="@string/website" + android:textColor="?text_color" + android:textColorLink="?text_color_link" + android:textSize="14dip" /> + + <TextView + android:id="@+id/facebook" + 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:onClick="facebook" + android:text="@string/facebook" + android:textColor="?text_color" + android:textColorLink="?text_color_link" + android:textSize="14dip" /> + + <TextView + android:id="@+id/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: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" /> + + <TextView + android:id="@+id/nutshellmanual" + 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:onClick="nutshellmanual" + android:text="@string/nutshellmanual" + 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/about_changelog" /> + </RelativeLayout> + + <TextView + android:id="@+id/changelog" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_margin="7dip" + android:linksClickable="true" + android:paddingLeft="3dip" + android:text="@string/changelog" + android:textColor="?text_color" + android:textColorLink="?text_color_link" + android:textSize="12dip" /> + + <RelativeLayout style="@style/separator_horizontal_layout" > + + <View style="@style/separator_horizontal" /> + + <TextView + style="@style/separator_horizontal_headline" + android:text="@string/about_contributors" /> + </RelativeLayout> + + <TextView + android:id="@+id/contributors" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_margin="7dip" + android:linksClickable="true" + android:paddingLeft="3dip" + android:text="@string/contributors" + android:textColor="?text_color" + android:textColorLink="?text_color_link" + android:textSize="14dip" /> + </LinearLayout> + </ScrollView> + +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/addresses_item.xml b/main/res/layout/addresses_item.xml index 0699a6f..3ea27ff 100644 --- a/main/res/layout/addresses_item.xml +++ b/main/res/layout/addresses_item.xml @@ -1,32 +1,39 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/button_map" - android:layout_height="wrap_content" - android:layout_width="fill_parent" - android:layout_margin="3dip" - android:paddingLeft="5dip" - android:paddingRight="5dip" - android:paddingBottom="7dip" - android:paddingTop="7dip" - android:orientation="vertical" - android:background="?background_color" > - <TextView android:id="@+id/label" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:scrollHorizontally="true" - android:textSize="22dip" - android:gravity="left" - android:singleLine="false" - android:ellipsize="marquee" - android:textColor="?text_color" /> - <TextView android:id="@+id/distance" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:scrollHorizontally="true" - android:textSize="12dip" - android:gravity="left" - android:lines="1" - android:singleLine="true" - android:ellipsize="marquee" - android:textColor="?text_color" /> + android:id="@+id/button_map" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_margin="3dip" + android:background="?background_color" + android:orientation="vertical" + android:paddingBottom="7dip" + android:paddingLeft="5dip" + android:paddingRight="5dip" + android:paddingTop="7dip" > + + <TextView + android:id="@+id/label" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:ellipsize="marquee" + android:gravity="left" + android:scrollHorizontally="true" + android:singleLine="false" + android:textColor="?text_color" + android:textIsSelectable="false" + android:textSize="22dip" /> + + <TextView + android:id="@+id/distance" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:ellipsize="marquee" + android:gravity="left" + android:lines="1" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="?text_color" + android:textIsSelectable="false" + android:textSize="12dip" /> + </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/attribute_descriptions.xml b/main/res/layout/attribute_descriptions.xml index 1d2459f..45dd3cd 100644 --- a/main/res/layout/attribute_descriptions.xml +++ b/main/res/layout/attribute_descriptions.xml @@ -1,14 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/attribute_descriptions" - android:layout_width="fill_parent" - android:layout_height="wrap_content" > - <TextView android:id="@+id/attribute_descriptions_textview" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:textSize="14dip" - android:textColor="?text_color" - android:textColorLink="?text_color_link" - android:linksClickable="true" /> -</LinearLayout> + android:id="@+id/attribute_descriptions" + android:layout_width="fill_parent" + android:layout_height="wrap_content" > + + <TextView + android:id="@+id/attribute_descriptions_textview" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:linksClickable="true" + android:textColor="?text_color" + android:textColorLink="?text_color_link" + android:textIsSelectable="false" + android:textSize="14dip" /> + +</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 new file mode 100644 index 0000000..e9df7f5 --- /dev/null +++ b/main/res/layout/cache_information_item.xml @@ -0,0 +1,63 @@ +<?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:layout_marginBottom="3dip" > + + <TextView + android:id="@+id/name" + android:layout_width="80dip" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_alignParentTop="false" + android:layout_centerVertical="true" + android:layout_gravity="left|top" + android:layout_marginRight="4dip" + android:ellipsize="end" + android:gravity="right" + android:lines="1" + android:scrollHorizontally="true" + android:singleLine="true" + android:text="@null" + android:textColor="?text_color_headline" + android:textIsSelectable="false" + android:textSize="12dip" /> + + <TextView + android:id="@+id/value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_marginRight="5dip" + android:layout_toRightOf="@+id/name" + android:gravity="center_vertical" + android:textColor="?text_color" + android:textIsSelectable="false" + android:textSize="14dip" /> + + <LinearLayout + android:id="@+id/stars" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toRightOf="@+id/value" + android:baselineAligned="false" + android:gravity="center_vertical" + android:orientation="horizontal" + android:visibility="gone" > + </LinearLayout> + + <TextView + android:id="@+id/addition" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_marginLeft="5dip" + android:layout_toRightOf="@+id/stars" + android:gravity="center_vertical" + android:textColor="?text_color_grey" + android:textIsSelectable="false" + android:textSize="11dip" + android:visibility="gone" /> + +</RelativeLayout>
\ No newline at end of file diff --git a/main/res/layout/cache_layout.xml b/main/res/layout/cache_layout.xml deleted file mode 100644 index 256026c..0000000 --- a/main/res/layout/cache_layout.xml +++ /dev/null @@ -1,43 +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:layout_marginBottom="3dip" > - <TextView android:id="@+id/name" - android:layout_width="80dip" - android:layout_height="wrap_content" - android:layout_alignParentTop="false" - android:layout_alignParentLeft="true" - android:layout_gravity="left|top" - android:layout_marginRight="4dip" - android:gravity="right" - android:lines="1" - android:singleLine="true" - android:scrollHorizontally="true" - android:ellipsize="end" - android:textSize="12dip" - android:textColor="?text_color_headline" - android:text="@null" android:layout_centerVertical="true"/> - <TextView android:id="@+id/value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginRight="5dip" - android:textSize="14dip" - android:textColor="?text_color" android:gravity="center_vertical" android:layout_toRightOf="@+id/name" - android:layout_centerVertical="true"/> - <LinearLayout - android:orientation="horizontal" - android:layout_width="wrap_content" - android:layout_height="wrap_content" android:id="@+id/stars" android:layout_toRightOf="@+id/value" - android:layout_centerVertical="true" android:visibility="gone" android:baselineAligned="false" - android:gravity="center_vertical"> - </LinearLayout> - <TextView android:id="@+id/addition" - android:visibility="gone" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="5dip" - android:textSize="11dip" - android:textColor="?text_color_grey" android:gravity="center_vertical" - android:layout_centerVertical="true" android:layout_toRightOf="@+id/stars"/> -</RelativeLayout>
\ No newline at end of file diff --git a/main/res/layout/caches_item.xml b/main/res/layout/caches_item.xml index db2bcbd..e3b861c 100644 --- a/main/res/layout/caches_item.xml +++ b/main/res/layout/caches_item.xml @@ -1,164 +1,184 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cc="http://schemas.android.com/apk/res/cgeo.geocaching" - android:id="@+id/one_cache" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:background="?background_color" > - +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cc="http://schemas.android.com/apk/res/cgeo.geocaching" + android:id="@+id/one_cache" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:background="?background_color" > + <!-- selection mode checkbox --> - - <CheckBox android:id="@+id/checkbox" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_alignParentLeft="true" - android:layout_gravity="left" - android:paddingRight="5dip" - android:gravity="left|center_horizontal" - android:visibility="gone" /> - - <!-- "found" marker, vertical green/red line --> - - <ImageView android:id="@+id/log_status_mark" - android:layout_width="2dip" - android:layout_height="30dip" - android:layout_centerVertical="true" - android:layout_toRightOf="@id/checkbox" - android:layout_marginRight="4dip" - android:scaleType="fitXY" - android:visibility="gone" - android:src="@drawable/mark_green" /> - - <!-- cache name and icon --> - - <TextView android:id="@+id/text" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginRight="110dip" - android:layout_toRightOf="@+id/log_status_mark" - android:layout_gravity="left" - android:paddingTop="5dip" - android:paddingRight="3dip" - android:lines="1" - android:singleLine="true" - android:scrollHorizontally="true" - android:ellipsize="marquee" - android:textSize="18dip" - android:textColor="?text_color" /> - - <!-- cache attributes and other info --> - - <TextView android:id="@+id/info" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginTop="30dip" - android:layout_marginRight="110dip" - android:layout_alignParentBottom="true" - android:layout_toRightOf="@id/log_status_mark" - android:layout_gravity="left" - android:paddingRight="3dip" - android:paddingBottom="5dip" - android:lines="1" - android:singleLine="true" - android:scrollHorizontally="true" - android:ellipsize="marquee" - android:textSize="12dip" - android:textColor="?text_color_grey" /> - - <!-- real text based direction and distance --> - - <RelativeLayout android:id="@+id/direction_layout" - android:visibility="gone" - android:layout_width="78dip" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_alignParentRight="true" - android:layout_marginTop="1dip" - android:layout_marginBottom="1dip" - android:layout_marginRight="30dip" > - <view class="cgeo.geocaching.ui.DistanceView" - android:id="@+id/distance" - android:layout_width="78dip" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_gravity="center" - android:lines="1" - android:singleLine="true" - android:scrollHorizontally="true" - android:ellipsize="marquee" - android:textSize="16dip" - android:textColor="?text_color" - android:gravity="center" /> - <view class="cgeo.geocaching.ui.CompassMiniView" - android:id="@+id/direction" - android:layout_width="78dip" - android:layout_height="28px" - android:layout_marginTop="21dip" - android:layout_centerHorizontal="true" - android:layout_gravity="center" - android:minWidth="28px" - android:minHeight="28px" - android:gravity="center" - cc:skin="?compass" /> - </RelativeLayout> - - <!-- image based direction and distance --> - - <RelativeLayout android:id="@+id/dirimg_layout" - android:visibility="gone" - android:layout_width="78dip" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_alignParentRight="true" - android:layout_marginTop="1dip" - android:layout_marginBottom="1dip" - android:layout_marginRight="30dip" > - <ImageView android:id="@+id/dirimg" - android:layout_width="55dip" - android:layout_height="30dip" - android:layout_centerInParent="true" - android:layout_gravity="center" - android:gravity="center" - android:scaleType="fitXY" - android:src="@null" /> - </RelativeLayout> - - <!-- inventory and favorites --> - - <RelativeLayout - android:layout_width="35dip" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_alignParentRight="true" - android:layout_marginTop="1dip" - android:layout_marginBottom="1dip"> - - <ImageView android:id="@+id/inventory" - android:layout_width="35dip" - android:layout_height="22dip" - android:layout_gravity="center_vertical|center_horizontal" - android:layout_alignParentTop="true" - android:scaleType="center" - android:src="@drawable/trackable_all" - android:background="?inventory"/> - <TextView android:id="@+id/favourite" - android:layout_width="35dip" - android:layout_height="wrap_content" - android:layout_marginTop="22dip" - android:layout_centerHorizontal="true" - android:layout_alignParentBottom="true" - android:layout_gravity="center" - android:gravity="center" - android:paddingLeft="3dip" - android:paddingRight="3dip" - android:paddingBottom="1dip" - android:lines="1" - android:singleLine="true" - android:scrollHorizontally="true" - android:ellipsize="marquee" - android:textSize="12dip" - android:textStyle="bold" - android:background="?favourite" - android:textColor="?text_color" /> - </RelativeLayout> + + <CheckBox + android:id="@+id/checkbox" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:layout_gravity="left" + android:gravity="left|center_horizontal" + android:paddingRight="5dip" + android:visibility="gone" /> + + <!-- "found" marker, vertical green/red line --> + + <ImageView + android:id="@+id/log_status_mark" + android:layout_width="2dip" + android:layout_height="30dip" + android:layout_centerVertical="true" + android:layout_marginRight="4dip" + android:layout_toRightOf="@id/checkbox" + android:scaleType="fitXY" + android:src="@drawable/mark_green" + android:visibility="gone" /> + + <!-- cache name and icon --> + + <TextView + android:id="@+id/text" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:layout_marginRight="110dip" + android:layout_toRightOf="@+id/log_status_mark" + android:ellipsize="marquee" + android:lines="1" + android:paddingRight="3dip" + android:paddingTop="5dip" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="?text_color" + android:textIsSelectable="false" + android:textSize="18dip" /> + + <!-- cache attributes and other info --> + + <TextView + android:id="@+id/info" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_gravity="left" + android:layout_marginRight="110dip" + android:layout_marginTop="30dip" + android:layout_toRightOf="@id/log_status_mark" + android:ellipsize="marquee" + android:lines="1" + android:paddingBottom="5dip" + android:paddingRight="3dip" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="?text_color_grey" + android:textIsSelectable="false" + android:textSize="12dip" /> + + <!-- real text based direction and distance --> + + <RelativeLayout + android:id="@+id/direction_layout" + android:layout_width="78dip" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:layout_marginBottom="1dip" + android:layout_marginRight="30dip" + android:layout_marginTop="1dip" + android:visibility="gone" > + + <view + android:id="@+id/distance" + android:layout_width="78dip" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_gravity="center" + class="cgeo.geocaching.ui.DistanceView" + android:ellipsize="marquee" + android:gravity="center" + android:lines="1" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="?text_color" + android:textSize="16dip" /> + + <view + android:id="@+id/direction" + android:layout_width="78dip" + android:layout_height="28px" + android:layout_centerHorizontal="true" + android:layout_gravity="center" + android:layout_marginTop="21dip" + class="cgeo.geocaching.ui.CompassMiniView" + android:gravity="center" + android:minHeight="28px" + android:minWidth="28px" + cc:skin="?compass" /> + </RelativeLayout> + + <!-- image based direction and distance --> + + <RelativeLayout + android:id="@+id/dirimg_layout" + android:layout_width="78dip" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:layout_marginBottom="1dip" + android:layout_marginRight="30dip" + android:layout_marginTop="1dip" + android:visibility="gone" > + + <ImageView + android:id="@+id/dirimg" + android:layout_width="55dip" + android:layout_height="30dip" + android:layout_centerInParent="true" + android:layout_gravity="center" + android:gravity="center" + android:scaleType="fitXY" + android:src="@null" /> + </RelativeLayout> + + <!-- inventory and favorites --> + + <RelativeLayout + android:layout_width="35dip" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:layout_marginBottom="1dip" + android:layout_marginTop="1dip" > + + <ImageView + android:id="@+id/inventory" + android:layout_width="35dip" + android:layout_height="22dip" + android:layout_alignParentTop="true" + android:layout_gravity="center_vertical|center_horizontal" + android:background="?inventory" + android:scaleType="center" + android:src="@drawable/trackable_all" /> + + <TextView + android:id="@+id/favourite" + 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:ellipsize="marquee" + android:gravity="center" + android:lines="1" + android:paddingBottom="1dip" + android:paddingLeft="3dip" + android:paddingRight="3dip" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="?text_color" + android:textIsSelectable="false" + android:textSize="12dip" + android:textStyle="bold" /> + </RelativeLayout> + </RelativeLayout>
\ No newline at end of file diff --git a/main/res/layout/filter_bar.xml b/main/res/layout/filter_bar.xml index 9df8f84..6d12ae1 100644 --- a/main/res/layout/filter_bar.xml +++ b/main/res/layout/filter_bar.xml @@ -14,6 +14,7 @@ <TextView android:id="@+id/filter_text" - style="@style/filter_bar_text" /> + style="@style/filter_bar_text" + android:textIsSelectable="false" /> </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/gpx_item.xml b/main/res/layout/gpx_item.xml index 8c0ac7b..df735bc 100644 --- a/main/res/layout/gpx_item.xml +++ b/main/res/layout/gpx_item.xml @@ -1,33 +1,40 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/button_map" - android:layout_height="wrap_content" - android:layout_width="fill_parent" - android:layout_margin="3dip" - android:paddingLeft="5dip" - android:paddingRight="5dip" - android:paddingBottom="7dip" - android:paddingTop="7dip" - android:orientation="vertical" - android:background="?background_color" > - <TextView android:id="@+id/filepath" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:scrollHorizontally="true" - android:textSize="12dip" - android:gravity="right" - android:lines="1" - android:singleLine="true" - android:ellipsize="marquee" - android:textColor="?text_color_grey" /> - <TextView android:id="@+id/filename" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:scrollHorizontally="true" - android:textSize="22dip" - android:gravity="left" - android:lines="1" - android:singleLine="true" - android:ellipsize="marquee" - android:textColor="?text_color" /> + android:id="@+id/button_map" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_margin="3dip" + android:background="?background_color" + android:orientation="vertical" + android:paddingBottom="7dip" + android:paddingLeft="5dip" + android:paddingRight="5dip" + android:paddingTop="7dip" > + + <TextView + android:id="@+id/filepath" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:ellipsize="marquee" + android:gravity="right" + android:lines="1" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="?text_color_grey" + android:textIsSelectable="false" + android:textSize="12dip" /> + + <TextView + android:id="@+id/filename" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:ellipsize="marquee" + android:gravity="left" + android:lines="1" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="?text_color" + android:textIsSelectable="false" + android:textSize="22dip" /> + </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/main.xml b/main/res/layout/main.xml index 32b1d30..0f9aff0 100644 --- a/main/res/layout/main.xml +++ b/main/res/layout/main.xml @@ -1,198 +1,256 @@ <?xml version="1.0" encoding="UTF-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/mainscreen" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_gravity="center" > - <LinearLayout style="@style/action_bar"> - <ImageView style="@style/action_bar_icon_cgeo" - android:onClick="showAbout" /> - <TextView style="@style/action_bar_title" /> - <View style="@style/action_bar_separator" /> - <ImageView style="@style/action_bar_action" - android:src="@drawable/actionbar_search" - android:onClick="goSearch" /> - <View style="@style/action_bar_separator" /> - <ImageView style="@style/action_bar_action" - android:src="@drawable/actionbar_manual" - android:onClick="goManual" /> - </LinearLayout> - <fragment android:id="@+id/status" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_marginLeft="16dip" - android:layout_marginRight="16dip" - android:layout_marginTop="60dip" - android:name="cgeo.geocaching.StatusFragment" /> -<!-- ** --> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginTop="45dip" - android:layout_centerInParent="true" - android:gravity="center" - 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" > - <LinearLayout - android:layout_width="74dip" - android:layout_height="wrap_content" - android:layout_margin="4dip" - android:orientation="vertical" - android:onClick="cgeoFindOnMap" > - <View - android:id="@+id/map" - style="@style/icon_mainscreen" - android:background="@drawable/main_live" /> - <TextView - style="@style/icon_mainscreen_text" - android:text="@string/live_map_button" /> - </LinearLayout> - <LinearLayout - android:layout_width="74dip" - android:layout_height="wrap_content" - android:layout_margin="4dip" - android:orientation="vertical"> - <View - android:id="@+id/nearest" - style="@style/icon_mainscreen" - android:background="@drawable/main_nearby_disabled" /> - <TextView - style="@style/icon_mainscreen_text" - android:text="@string/caches_nearby_button" /> - </LinearLayout> - <RelativeLayout - android:layout_width="74dip" - android:layout_height="wrap_content" - android:layout_margin="4dip" - android:onClick="cgeoFindByOffline" > - <TextView android:id="@+id/offline_count" - style="@style/icon_mainscreen_count" /> - <LinearLayout - android:layout_width="74dip" - android:layout_height="wrap_content" - android:orientation="vertical" - android:layout_alignParentTop="true" > - <View - android:id="@+id/search_offline" - style="@style/icon_mainscreen" - android:background="@drawable/main_stored" /> - <TextView - style="@style/icon_mainscreen_text" - android:text="@string/stored_caches_button" /> - </LinearLayout> - </RelativeLayout> - </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_margin="4dip" - android:gravity="center_horizontal" - android:orientation="horizontal" > - <LinearLayout - android:layout_width="74dip" - android:layout_height="wrap_content" - android:layout_margin="4dip" - android:orientation="vertical" - android:onClick="cgeoSearch" > - <View - android:id="@+id/advanced_button" - style="@style/icon_mainscreen" - android:background="@drawable/main_search" /> - <TextView - style="@style/icon_mainscreen_text" - android:text="@string/advanced_search_button" /> - </LinearLayout> - <LinearLayout - android:layout_width="74dip" - android:layout_height="wrap_content" - android:layout_margin="4dip" - android:orientation="vertical" - android:onClick="cgeoPoint" > - <View - android:id="@+id/any_button" - style="@style/icon_mainscreen" - android:background="@drawable/main_any" /> - <TextView - style="@style/icon_mainscreen_text" - android:text="@string/any_button" /> - </LinearLayout> - <LinearLayout - android:layout_width="74dip" - android:layout_height="wrap_content" - android:layout_margin="4dip" - android:orientation="vertical" - android:onClick="cgeoFilter" > - <View - android:id="@+id/filter_button" - style="@style/icon_mainscreen" - android:background="@drawable/main_filter" /> - <TextView android:id="@+id/filter_button_title" - style="@style/icon_mainscreen_text" - android:text="@null" /> - </LinearLayout> - </LinearLayout> - </LinearLayout> -<!-- ** --> - <RelativeLayout android:id="@+id/helper" - android:visibility="gone" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_marginLeft="16dip" - android:layout_marginRight="16dip" - android:layout_marginBottom="64dip" - android:background="@drawable/helper_bcg" > - <ImageView - android:layout_width="32dip" - android:layout_height="32dip" - android:layout_alignParentLeft="true" - android:layout_gravity="center" - android:gravity="center" - android:layout_margin="4dip" - 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_marginLeft="34dip" - android:layout_gravity="center" - android:gravity="center" - android:padding="4dip" - android:textSize="14dip" - android:textColor="@color/text_icon" - android:text="@string/helper" /> - </RelativeLayout> -<!-- ** --> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_marginRight="6dip" - android:layout_marginLeft="6dip" - android:orientation="vertical" - android:onClick="cgeoNavSettings"> - <TextView android:id="@+id/user_info" - style="@style/location_current" - android:text="@string/init_login_popup_working"/> - <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" /> - <TextView android:id="@+id/nav_accuracy" - style="@style/location_current_accuracy" /> - <TextView android:id="@+id/nav_satellites" - style="@style/location_current_satellites" /> - </RelativeLayout> - </LinearLayout> -</RelativeLayout> + android:id="@+id/mainscreen" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_gravity="center" > + + <LinearLayout style="@style/action_bar" > + + <ImageView + style="@style/action_bar_icon_cgeo" + android:onClick="showAbout" /> + + <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" /> + </LinearLayout> + + <fragment + android:id="@+id/status" + android:name="cgeo.geocaching.StatusFragment" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_marginLeft="16dip" + android:layout_marginRight="16dip" + android:layout_marginTop="60dip" /> + <!-- ** --> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:layout_marginTop="45dip" + android:gravity="center" + 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" > + + <LinearLayout + android:layout_width="74dip" + android:layout_height="wrap_content" + android:layout_margin="4dip" + android:onClick="cgeoFindOnMap" + android:orientation="vertical" > + + <View + android:id="@+id/map" + style="@style/icon_mainscreen" + android:background="@drawable/main_live" /> + + <TextView + style="@style/icon_mainscreen_text" + android:text="@string/live_map_button" /> + </LinearLayout> + + <LinearLayout + android:layout_width="74dip" + android:layout_height="wrap_content" + android:layout_margin="4dip" + android:orientation="vertical" > + + <View + android:id="@+id/nearest" + style="@style/icon_mainscreen" + android:background="@drawable/main_nearby_disabled" /> + + <TextView + style="@style/icon_mainscreen_text" + android:text="@string/caches_nearby_button" /> + </LinearLayout> + + <RelativeLayout + android:layout_width="74dip" + android:layout_height="wrap_content" + android:layout_margin="4dip" + android:onClick="cgeoFindByOffline" > + + <TextView + android:id="@+id/offline_count" + style="@style/icon_mainscreen_count" + android:textIsSelectable="false" /> + + <LinearLayout + android:layout_width="74dip" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:orientation="vertical" > + + <View + android:id="@+id/search_offline" + style="@style/icon_mainscreen" + android:background="@drawable/main_stored" /> + + <TextView + style="@style/icon_mainscreen_text" + android:text="@string/stored_caches_button" /> + </LinearLayout> + </RelativeLayout> + </LinearLayout> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_margin="4dip" + android:gravity="center_horizontal" + android:orientation="horizontal" > + + <LinearLayout + android:layout_width="74dip" + android:layout_height="wrap_content" + android:layout_margin="4dip" + android:onClick="cgeoSearch" + android:orientation="vertical" > + + <View + android:id="@+id/advanced_button" + style="@style/icon_mainscreen" + android:background="@drawable/main_search" /> + + <TextView + style="@style/icon_mainscreen_text" + android:text="@string/advanced_search_button" /> + </LinearLayout> + + <LinearLayout + android:layout_width="74dip" + android:layout_height="wrap_content" + android:layout_margin="4dip" + android:onClick="cgeoPoint" + android:orientation="vertical" > + + <View + android:id="@+id/any_button" + style="@style/icon_mainscreen" + android:background="@drawable/main_any" /> + + <TextView + style="@style/icon_mainscreen_text" + android:text="@string/any_button" /> + </LinearLayout> + + <LinearLayout + android:layout_width="74dip" + android:layout_height="wrap_content" + android:layout_margin="4dip" + android:onClick="cgeoFilter" + android:orientation="vertical" > + + <View + android:id="@+id/filter_button" + style="@style/icon_mainscreen" + android:background="@drawable/main_filter" /> + + <TextView + android:id="@+id/filter_button_title" + style="@style/icon_mainscreen_text" + android:text="@null" /> + </LinearLayout> + </LinearLayout> + </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" + android:layout_alignParentBottom="true" + android:layout_marginLeft="6dip" + android:layout_marginRight="6dip" + android:onClick="cgeoNavSettings" + android:orientation="vertical" > + + <TextView + android:id="@+id/user_info" + style="@style/location_current" + android:text="@string/init_login_popup_working" /> + + <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:textIsSelectable="false" /> + + <TextView + android:id="@+id/nav_accuracy" + style="@style/location_current_accuracy" + android:textIsSelectable="false" /> + + <TextView + android:id="@+id/nav_satellites" + style="@style/location_current_satellites" + android:textIsSelectable="false" /> + </RelativeLayout> + </LinearLayout> + +</RelativeLayout>
\ No newline at end of file diff --git a/main/res/layout/mapfile_item.xml b/main/res/layout/mapfile_item.xml index a024b81..c30315a 100644 --- a/main/res/layout/mapfile_item.xml +++ b/main/res/layout/mapfile_item.xml @@ -1,33 +1,40 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/mapfile_item" - android:layout_height="wrap_content" - android:layout_width="fill_parent" - android:layout_margin="3dip" - android:paddingLeft="5dip" - android:paddingRight="5dip" - android:paddingBottom="7dip" - android:paddingTop="7dip" - android:orientation="vertical" - android:background="?background_color" > - <TextView android:id="@+id/mapfilepath" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:scrollHorizontally="true" - android:textSize="12dip" - android:gravity="right" - android:lines="1" - android:singleLine="true" - android:ellipsize="marquee" - android:textColor="?text_color_grey" /> - <TextView android:id="@+id/mapfilename" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:scrollHorizontally="true" - android:textSize="22dip" - android:gravity="left" - android:lines="1" - android:singleLine="true" - android:ellipsize="marquee" - android:textColor="?text_color" /> + android:id="@+id/mapfile_item" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_margin="3dip" + android:background="?background_color" + android:orientation="vertical" + android:paddingBottom="7dip" + android:paddingLeft="5dip" + android:paddingRight="5dip" + android:paddingTop="7dip" > + + <TextView + android:id="@+id/mapfilepath" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:ellipsize="marquee" + android:gravity="right" + android:lines="1" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="?text_color_grey" + android:textIsSelectable="false" + android:textSize="12dip" /> + + <TextView + android:id="@+id/mapfilename" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:ellipsize="marquee" + android:gravity="left" + android:lines="1" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="?text_color" + android:textIsSelectable="false" + android:textSize="22dip" /> + </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/navigate.xml b/main/res/layout/navigate.xml index 61cfe2a..0c95958 100644 --- a/main/res/layout/navigate.xml +++ b/main/res/layout/navigate.xml @@ -1,99 +1,134 @@ <?xml version="1.0" encoding="UTF-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" - android:background="?background_color" > - <LinearLayout style="@style/action_bar"> - <ImageView style="@style/action_bar_action" - android:onClick="goHome" /> - <View style="@style/action_bar_separator" /> - <TextView style="@style/action_bar_title" /> - <View style="@style/action_bar_separator" /> - <ImageView style="@style/action_bar_action" - android:src="@drawable/actionbar_manual" - android:onClick="goManual" /> - </LinearLayout> - <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" > + 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_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:orientation="vertical"> - <TextView android:id="@+id/destination" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:textSize="14dip" - android:textColor="?text_color"/> - <TextView android:id="@+id/cacheinfo" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:textSize="14dip" - android:textColor="?text_color"/> + 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_marginLeft="3dip" - android:layout_alignParentLeft="true" - android:layout_gravity="left" - android:textSize="26dip" - android:textColor="?text_color" - android:text="@null" /> - <TextView android:id="@+id/distance" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginRight="3dip" - android:layout_alignParentRight="true" - android:layout_gravity="right" - android:textSize="26dip" - android:textColor="?text_color" - android:text="@null" /> - </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> - <view class="cgeo.geocaching.ui.CompassView" - android:id="@+id/rose" - android:layout_width="fill_parent" - android:layout_height="295dip" - android:layout_marginTop="6dip" - android:layout_marginBottom="1dip" - android:layout_marginRight="1dip" - android:layout_marginLeft="1dip" - android:layout_gravity="center_horizontal" - android:layout_centerInParent="true" - android:keepScreenOn="true" - android:gravity="center" - android:padding="4dip" - android:minWidth="289dip" - android:minHeight="289dip" /> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_marginRight="6dip" - android:layout_marginLeft="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" /> - <TextView android:id="@+id/nav_accuracy" - style="@style/location_current_accuracy" - android:textColor="?text_color_grey" /> - <TextView android:id="@+id/nav_satellites" - style="@style/location_current_satellites" - android:textColor="?text_color_grey" /> - </RelativeLayout> - </LinearLayout> - </RelativeLayout> + </RelativeLayout> + </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/popup.xml b/main/res/layout/popup.xml index 201b9e6..ff64c91 100644 --- a/main/res/layout/popup.xml +++ b/main/res/layout/popup.xml @@ -1,70 +1,99 @@ <?xml version="1.0" encoding="UTF-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" - android:background="?background_color_transparent" > - <LinearLayout style="@style/action_bar"> - <TextView style="@style/action_bar_title" /> - <View style="@style/action_bar_separator" /> - <ImageView android:id="@+id/defaultNavigation" - style="@style/action_bar_action" - android:src="@drawable/actionbar_compass_dark" - android:onClick="goDefaultNavigation" - android:longClickable="true" /> - <View style="@style/action_bar_separator" - android:id="@+id/separator" - /> - <ImageView style="@style/action_bar_action" - android:src="@drawable/actionbar_manual" - android:onClick="goManual" /> - </LinearLayout> - <ScrollView android:id="@+id/details_list_box" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:padding="4dip" - android:orientation="vertical" > - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - <LinearLayout android:id="@+id/details_list" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - </LinearLayout> - <Button style="@style/button_small" android:id="@+id/more_details" android:text="@string/popup_more" - android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_gravity="center_horizontal"/> + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="?background_color_transparent" + android:orientation="vertical" > + + <LinearLayout style="@style/action_bar" > + + <TextView style="@style/action_bar_title" /> + + <View style="@style/action_bar_separator" /> + + <ImageView + android:id="@+id/defaultNavigation" + style="@style/action_bar_action" + android:longClickable="true" + android:onClick="goDefaultNavigation" + android:src="@drawable/actionbar_compass_dark" /> + + <View + android:id="@+id/separator" + style="@style/action_bar_separator" /> + + <ImageView + style="@style/action_bar_action" + android:onClick="goManual" + android:src="@drawable/actionbar_manual" /> + </LinearLayout> + + <ScrollView + android:id="@+id/details_list_box" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" + android:padding="4dip" > + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <LinearLayout + android:id="@+id/details_list" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + </LinearLayout> + + <Button + android:id="@+id/more_details" + style="@style/button_small" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:text="@string/popup_more" /> + <RelativeLayout style="@style/separator_horizontal_layout" > + <View style="@style/separator_horizontal" /> </RelativeLayout> + <RelativeLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" > + + <TextView + android:id="@+id/offline_text" android:layout_width="fill_parent" - android:layout_height="wrap_content" > - <TextView android:id="@+id/offline_text" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="6dip" - android:layout_marginRight="130dip" - android:layout_alignParentLeft="true" - android:layout_gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" /> - <Button style="@style/button_small" - android:id="@+id/offline_refresh" - android:visibility="gone" - android:layout_width="60dip" - android:layout_marginRight="71dip" - android:layout_alignParentRight="true" - android:text="@string/cache_offline_refresh" /> - <Button style="@style/button_small" - android:id="@+id/offline_store" - android:layout_width="60dip" - android:layout_alignParentRight="true" - android:text="@string/cache_offline_store" /> + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_gravity="left" + android:layout_marginLeft="6dip" + android:layout_marginRight="130dip" + android:paddingRight="3dip" + android:textColor="?text_color" + android:textIsSelectable="false" + android:textSize="14dip" /> + + <Button + android:id="@+id/offline_refresh" + style="@style/button_small" + android:layout_width="60dip" + android:layout_alignParentRight="true" + android:layout_marginRight="71dip" + android:text="@string/cache_offline_refresh" + android:visibility="gone" /> + + <Button + android:id="@+id/offline_store" + style="@style/button_small" + android:layout_width="60dip" + android:layout_alignParentRight="true" + android:text="@string/cache_offline_store" /> </RelativeLayout> - </LinearLayout> - </ScrollView> + </LinearLayout> + </ScrollView> + </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/simple_dir_item.xml b/main/res/layout/simple_dir_item.xml index 6261127..e268943 100644 --- a/main/res/layout/simple_dir_item.xml +++ b/main/res/layout/simple_dir_item.xml @@ -1,21 +1,26 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="horizontal" - android:background="?background_color" > - <CheckBox android:text="" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="?background_color" + android:orientation="horizontal" > + + <CheckBox android:id="@+id/CheckBox" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:checked="false"/> - <TextView - android:id="@+id/TextView01" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:textStyle="bold" - android:layout_marginTop="5dip" - android:layout_marginLeft="5dip" - android:textColor="?text_color"/> -</LinearLayout> + android:checked="false" + android:text="" /> + + <TextView + android:id="@+id/TextView01" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="5dip" + android:layout_marginTop="5dip" + android:singleLine="true" + android:textColor="?text_color" + android:textIsSelectable="false" + android:textStyle="bold" /> + +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/simple_list_item_1.xml b/main/res/layout/simple_list_item_1.xml index 039b0c1..4e8898d 100644 --- a/main/res/layout/simple_list_item_1.xml +++ b/main/res/layout/simple_list_item_1.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2006 The Android Open Source Project +<!-- + Copyright (C) 2006 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -18,9 +19,9 @@ android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge" android:gravity="center_vertical" - android:paddingLeft="6dip" android:minHeight="?android:attr/listPreferredItemHeight" + android:paddingLeft="6dip" + android:textAppearance="?android:attr/textAppearanceLarge" android:textColor="?text_color" -/> + android:textIsSelectable="false" /> diff --git a/main/res/layout/simple_way_point.xml b/main/res/layout/simple_way_point.xml index a1b7f33..88f76e7 100644 --- a/main/res/layout/simple_way_point.xml +++ b/main/res/layout/simple_way_point.xml @@ -1,25 +1,54 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/linearLayout1" android:layout_width="wrap_content" - android:layout_height="wrap_content"> - <ImageView android:layout_width="wrap_content" android:src="@drawable/waypoint_waypoint" - android:id="@+id/imageView1" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_marginLeft="10dp"></ImageView> - <RelativeLayout android:layout_height="wrap_content" - android:id="@+id/relativeLayout1" android:layout_width="match_parent"> - <TextView android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" - android:id="@+id/simple_way_point_latitude" android:layout_width="wrap_content" - android:layout_alignParentLeft="true" android:layout_alignParentTop="true" - android:text="@string/latitude" android:layout_marginLeft="10dp"></TextView> - <TextView android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" - android:id="@+id/simple_way_point_longitude" android:layout_width="wrap_content" - android:layout_below="@+id/simple_way_point_latitude" android:text="@string/longitude" - android:layout_marginLeft="10dp"></TextView> - <TextView android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" - android:id="@+id/date" android:layout_width="wrap_content" - android:layout_alignParentRight="true" android:layout_alignParentTop="true" - android:layout_marginRight="10dp"></TextView> - </RelativeLayout> -</LinearLayout> + android:id="@+id/linearLayout1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" > + + <ImageView + android:id="@+id/imageView1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginLeft="10dp" + android:src="@drawable/waypoint_waypoint" > + </ImageView> + + <RelativeLayout + android:id="@+id/relativeLayout1" + android:layout_width="match_parent" + android:layout_height="wrap_content" > + + <TextView + android:id="@+id/simple_way_point_latitude" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_alignParentTop="true" + android:layout_marginLeft="10dp" + android:text="@string/latitude" + android:textAppearance="?android:attr/textAppearanceSmall" > + </TextView> + + <TextView + android:id="@+id/simple_way_point_longitude" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@+id/simple_way_point_latitude" + android:layout_marginLeft="10dp" + android:text="@string/longitude" + android:textAppearance="?android:attr/textAppearanceSmall" > + </TextView> + + <TextView + android:id="@+id/date" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" + android:layout_marginRight="10dp" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textIsSelectable="false" > + </TextView> + </RelativeLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/status.xml b/main/res/layout/status.xml index 01b4333..4b1d55f 100644 --- a/main/res/layout/status.xml +++ b/main/res/layout/status.xml @@ -1,23 +1,29 @@ <?xml version="1.0" encoding="utf-8"?> - -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/status" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/status" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:background="@drawable/helper_bcg" - android:visibility="invisible"> - <ImageView android:id="@+id/status_icon" + android:background="@drawable/helper_bcg" + android:visibility="invisible" > + + <ImageView + android:id="@+id/status_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_centerVertical="true" android:layout_margin="4dip" /> - <TextView android:id="@+id/status_message" + + <TextView + android:id="@+id/status_message" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_toRightOf="@id/status_icon" android:layout_centerVertical="true" + android:layout_toRightOf="@id/status_icon" android:gravity="center" android:padding="4dip" - android:textSize="14dip" - android:textColor="@color/text_icon" /> + android:textColor="@color/text_icon" + android:textIsSelectable="false" + android:textSize="14dip" /> + </RelativeLayout>
\ No newline at end of file diff --git a/main/res/layout/useful_apps_item.xml b/main/res/layout/useful_apps_item.xml index 7dcb777..5c8f6f0 100644 --- a/main/res/layout/useful_apps_item.xml +++ b/main/res/layout/useful_apps_item.xml @@ -12,7 +12,8 @@ <TextView android:id="@+id/title" - style="@style/separator_horizontal_headline" /> + style="@style/separator_horizontal_headline" + android:textIsSelectable="true" /> </RelativeLayout> <LinearLayout @@ -41,6 +42,7 @@ android:padding="3dip" android:textColor="?text_color" android:textColorLink="?text_color_link" + android:textIsSelectable="false" android:textSize="14dip" /> </LinearLayout> diff --git a/main/res/layout/visit_trackable.xml b/main/res/layout/visit_trackable.xml index b4750cf..360e553 100644 --- a/main/res/layout/visit_trackable.xml +++ b/main/res/layout/visit_trackable.xml @@ -1,50 +1,62 @@ <?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:layout_marginBottom="5dip" - android:paddingLeft="10dip" - android:paddingRight="10dip" - android:paddingBottom="10dip" - android:orientation="horizontal" > - <LinearLayout android:id="@+id/info" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="2" - android:orientation="vertical" > - <TextView android:id="@+id/name" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:gravity="left" - android:lines="1" - android:singleLine="true" - android:scrollHorizontally="true" - android:ellipsize="marquee" - android:textSize="14dip" - android:textColor="?text_color" /> - <TextView android:id="@+id/trackcode" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:gravity="left" - android:lines="1" - android:singleLine="true" - android:scrollHorizontally="true" - android:ellipsize="marquee" - android:textSize="14dip" - android:textColor="?text_color" /> - </LinearLayout> - <TextView android:id="@+id/action" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_gravity="right" - android:gravity="right" - android:lines="1" - android:singleLine="true" - android:scrollHorizontally="true" - android:ellipsize="marquee" - android:textSize="14dip" - android:textColor="?text_color" /> -</LinearLayout> + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="5dip" + android:orientation="horizontal" + android:paddingBottom="10dip" + android:paddingLeft="10dip" + android:paddingRight="10dip" > + + <LinearLayout + android:id="@+id/info" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="2" + android:orientation="vertical" > + + <TextView + android:id="@+id/name" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:ellipsize="marquee" + android:gravity="left" + android:lines="1" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="?text_color" + android:textIsSelectable="false" + android:textSize="14dip" /> + + <TextView + android:id="@+id/trackcode" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:ellipsize="marquee" + android:gravity="left" + android:lines="1" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="?text_color" + android:textIsSelectable="false" + android:textSize="14dip" /> + </LinearLayout> + + <TextView + android:id="@+id/action" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:layout_weight="1" + android:ellipsize="marquee" + android:gravity="right" + android:lines="1" + android:scrollHorizontally="true" + android:singleLine="true" + android:textColor="?text_color" + android:textIsSelectable="false" + android:textSize="14dip" /> + +</LinearLayout>
\ No newline at end of file diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml index 7ee4362..4e9766f 100644 --- a/main/res/values-cs/strings.xml +++ b/main/res/values-cs/strings.xml @@ -115,7 +115,6 @@ <string name="err_detail_cache_find_any">c:geo nemůže najít žádnou keš.</string> <string name="err_detail_cache_find_next">c:geo nemůže najít další keš.</string> <string name="err_detail_cache_forgot">c:geo zapomnělo, jakou keš chcete zobrazit.</string> - <string name="err_detail_cache_forgot_visit">c:geo zapomělo, jakou keš jste pohlížel.</string> <string name="err_detail_no_spoiler">c:geo nenašlo žádný obrázek pro tuto keš.</string> <string name="err_detail_no_map_static">c:geo nenašlo žádnou statickou mapu pro tuto keš.</string> <string name="err_application_no">c:geo nemůže najít žádnou použitelnou aplikaci.</string> @@ -526,15 +525,12 @@ <string name="waypoint_reset_cache_coords">Obnovit původní souřadnice keše</string> <string name="waypoint_coordinates_has_been_reset_on_website">Souřadnice keše byly obnoveny na webu.</string> <string name="waypoint_coordinates_being_reset_on_website">Souřadnice keše se obnovují na webu.</string> - <string name="waypoint_reset_cache_coords_info">Možnosti obnovy</string> <string name="waypoint_reset">Obnova</string> <string name="waypoint_localy_reset_cache_coords">Obnovit souřadnice keše v zařízení</string> <string name="waypoint_coordinates_couldnt_be_modified_on_website">Souřadnice keše nemohou být změněny na webu.</string> <string name="waypoint_coordinates_upload_error">Při nahrávání souřadnic na web se vyskytla chyba.</string> <string name="waypoint_coordinates_uploading_to_website">Nahrávám %s na web</string> - <string name="waypoint_coordinates_reseting_on_website">Obnovuji původní souřadnice keše na webu.</string> <string name="waypoint_coordinates_has_been_modified_on_website">Souřadnice keše na webu byly změněny na %s.</string> - <string name="waypoint_coordinates_has_been_set_as_cache_coordinates">Souřadnice keše byly v zařízení změněny na: %s.</string> <!-- visit --> <string name="visit_tweet">informovat o nálezu na twitteru</string> diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml index cf46201..72b5596 100644 --- a/main/res/values-de/strings.xml +++ b/main/res/values-de/strings.xml @@ -146,7 +146,6 @@ <string name="err_detail_cache_find_any">c:geo konnte keine Caches finden.</string> <string name="err_detail_cache_find_next">c:geo konnte die nächsten Caches nicht finden.</string> <string name="err_detail_cache_forgot">c:geo hat vergessen, welcher Cache aufgerufen werden sollte.</string> - <string name="err_detail_cache_forgot_visit">c:geo hat vergessen, welcher Cache besucht werden sollte.</string> <string name="err_detail_google_maps_limit_reached">c:geo kann die statischen Karten nicht herunterladen. Google Maps Limit könnte erreicht sein.</string> <string name="err_detail_no_spoiler">c:geo hat kein Hinweisbild für diesen Cache gefunden.</string> <string name="err_detail_no_map_static">c:geo hat keine statische Karte für diesen Cache gefunden.</string> @@ -668,16 +667,13 @@ <string name="waypoint_reset_cache_coords">Zurücksetzen</string> <string name="waypoint_coordinates_has_been_reset_on_website">Koordinaten auf Webseite zurückgesetzt</string> <string name="waypoint_coordinates_being_reset_on_website">Koordinaten werden zurückgesetzt</string> - <string name="waypoint_reset_cache_coords_info">Rücksetz-Optionen</string> <string name="waypoint_reset">Zurücksetzen</string> <string name="waypoint_localy_reset_cache_coords">Koodinaten lokal zurücksetzen</string> <string name="waypoint_reset_local_and_remote_cache_coords">Koordinaten lokal und auf Webseite zurücksetzen</string> <string name="waypoint_coordinates_couldnt_be_modified_on_website">Cache-Koordinaten auf der Webseite konnten nicht zurückgesetzt werden</string> <string name="waypoint_coordinates_upload_error">Fehler beim Hochladen der Koordinaten zur Webseite</string> <string name="waypoint_coordinates_uploading_to_website">Setze %s auf der Webseite</string> - <string name="waypoint_coordinates_reseting_on_website">Setze Koordinaten auf der Webseite zurück</string> <string name="waypoint_coordinates_has_been_modified_on_website">Koordinaten wurden auf der Webseite geändert: %s</string> - <string name="waypoint_coordinates_has_been_set_as_cache_coordinates">Koordinaten wurden lokal geändert: %s</string> <string name="waypoint_done">Fertig</string> <string name="waypoint_duplicate">Duplizieren</string> <string name="waypoint_copy_of">Kopie von</string> @@ -723,7 +719,6 @@ <string name="map_strategy_auto">Geschwindigkeitsabhängig</string> <string name="map_strategy_detailed">Detailliert</string> <string name="live_map_notification">Auf der neuen Live-Karte sind die Koordinaten nicht immer genau. Eventuell ungenaue Koordinaten sind mit einem orangen Kreis markiert.\nDas Öffnen der Cache-Details oder das Speichern des Cache liefert immer genaue Koordinaten.\n\nMehr Informationen über alle Änderungen befinden sich auf der \"Über c:geo\"-Seite in der App.</string> - <string name="live_map_note_close">Schließen</string> <string name="live_map_note_dontshow">Nicht mehr anzeigen</string> <!-- search --> diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml index f0fe8e1..632d4cb 100644 --- a/main/res/values-es/strings.xml +++ b/main/res/values-es/strings.xml @@ -125,7 +125,6 @@ <string name="err_detail_cache_find_any">Lo siento, c:geo no puede encontrar algunos escondites.</string> <string name="err_detail_cache_find_next">Lo siento, c:geo no puede encontrar los siguientes escondites.</string> <string name="err_detail_cache_forgot">Lo siento, c:geo ha olvidado el escondite que quieres.</string> - <string name="err_detail_cache_forgot_visit">Lo siento, c:geo ha olvidado que escondite has visitado.</string> <string name="err_detail_no_spoiler">c:geo no ha encontrado imágenes/pista para este escondite.</string> <string name="err_detail_no_map_static">c:geo no ha encontrado mapas estáticos para este escondite.</string> <string name="err_detail_not_load_map_static">Lo siento, c:geo no ha podido cargar mapas estáticos.</string> diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml index d75d8b4..f8c4996 100644 --- a/main/res/values-fr/strings.xml +++ b/main/res/values-fr/strings.xml @@ -143,7 +143,6 @@ <string name="err_detail_cache_find_any">c:geo ne peut pas trouver de caches.</string> <string name="err_detail_cache_find_next">c:geo ne peut pas trouver les caches suivantes.</string> <string name="err_detail_cache_forgot">c:geo a oublié la cache demandée.</string> - <string name="err_detail_cache_forgot_visit">c:geo a oublié la cache que vous avez visité.</string> <string name="err_detail_google_maps_limit_reached">c:geo n\'a pas pu charger les cartes statiques. La limite de Google Maps est peut être temporairement atteinte.</string> <string name="err_detail_no_spoiler">c:geo n\'a pas trouvé d\'image indice pour cette cache.</string> <string name="err_detail_no_map_static">c:geo n\'a pas trouvé de cartes statiques pour cette cache.</string> @@ -663,7 +662,6 @@ <string name="map_strategy_auto">En fonction du déplacement</string> <string name="map_strategy_detailed">Détaillée</string> <string name="live_map_notification">Lors de l\'affichage de la carte active, certaines coordonnées de géocaches peuvent être imprécises et sont indiquées par un cercle orange.\nDemander les détails d\'une géocache ou la sauver pour une utilisation hors-ligne récupérera les coordonnées exactes.\n\nVous trouverez plus d\'informations sur les changements sur la page \"À propos de c:geo\".</string> - <string name="live_map_note_close">Fermer</string> <string name="live_map_note_dontshow">Ne plus afficher</string> <!-- search --> diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml index 94da99f..7a81748 100644 --- a/main/res/values-hu/strings.xml +++ b/main/res/values-hu/strings.xml @@ -143,7 +143,6 @@ <string name="err_detail_cache_find_any">Sajnáljuk, a c:geo nem talál geoládákat.</string> <string name="err_detail_cache_find_next">Sajnáljuk, a c:geo nem találja a következő geoládákat.</string> <string name="err_detail_cache_forgot">Sajnáljuk, a c:geo elfelejtette melyik geoládát szeretnéd.</string> - <string name="err_detail_cache_forgot_visit">Sajnáljuk, a c:geo elfelejtette melyik geoládát látogattad meg.</string> <string name="err_detail_google_maps_limit_reached">A c:geonak nem sikerült letölteni a statikus térképeket. Lehet hogy elérted a Google Maps limitjét.</string> <string name="err_detail_no_spoiler">A c:geo nem talált spoiler képeket ehhez a ládához.</string> <string name="err_detail_no_map_static">A c:geo nem talált statikus térképeket ehhez a ládához.</string> @@ -698,7 +697,6 @@ <string name="map_strategy_auto">Sebességfüggő</string> <string name="map_strategy_detailed">Részletes</string> <string name="live_map_notification">A koordináták az élő térképen nem mindig pontosak. A vélhetően pontatlan koordinátákat narancssárga kör jelöli.\nA geoláda részleteinek megnyitása vagy a geoláda mentése mindig pontos koordinátákkal történik.\n\nTovábbi információ az összes változásról a \"A c:georól\" oldalon található az appon belül.</string> - <string name="live_map_note_close">Bezárás</string> <string name="live_map_note_dontshow">Ne mutasd újra</string> diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml index 4d6ce59..6049e48 100644 --- a/main/res/values-it/strings.xml +++ b/main/res/values-it/strings.xml @@ -147,7 +147,6 @@ <string name="err_detail_cache_find_any">c:geo non trova nessun geocache.</string> <string name="err_detail_cache_find_next">c:geo non trova il prossimo geocache.</string> <string name="err_detail_cache_forgot">c:geo ha dimenticato quale geocache hai richiesto.</string> - <string name="err_detail_cache_forgot_visit">c:geo ha dimenticato quale cache hai visitato.</string> <string name="err_detail_google_maps_limit_reached">c:geo non riesce a scaricare le mappe statiche. Forse raggiunto il limite di google map. Riprova domani.</string> <string name="err_detail_no_spoiler">c:geo non trova alcuna immagine spoiler per questo cache.</string> <string name="err_detail_no_map_static">c:geo non trova alcuna mappa statica per questo cache.</string> @@ -551,8 +550,6 @@ <string name="cache_menu_visit_offline">Scrivi Log offline</string> <string name="cache_menu_spoilers">Immagini spoiler</string> <string name="cache_menu_around">Cache qui intorno</string> - <string name="cache_menu_set_as_cache_coords">Setta come coordinate cache</string> - <string name="cache_menu_upload_wpt_to_gc_com">Setta come coordinate cache e carica il waypoint su Geocaching.com</string> <string name="cache_menu_event">Aggiungi al calendario</string> <string name="cache_menu_details">Dettagli</string> <string name="cache_menu_share">Condividi cache</string> @@ -666,16 +663,13 @@ <string name="waypoint_save_and_modify_on_website">Setta come coordinate cache in c:geo e su web</string> <string name="waypoint_reset_cache_coords">Resetta le coordinate cache</string> <string name="waypoint_coordinates_being_reset_on_website">Le coordinate sono in fase di reset su web</string> - <string name="waypoint_reset_cache_coords_info">Opzioni di reset</string> <string name="waypoint_reset">Reset</string> <string name="waypoint_localy_reset_cache_coords">Resetta in c:geo</string> <string name="waypoint_reset_local_and_remote_cache_coords">Resetta in c:geo e su web.</string> <string name="waypoint_coordinates_couldnt_be_modified_on_website">Il sito web non supporta la modifica delle coordinate</string> <string name="waypoint_coordinates_upload_error">Errore durante il caricamento delle coordinate su web</string> <string name="waypoint_coordinates_uploading_to_website">Caricamento delle coordinate %s su web</string> - <string name="waypoint_coordinates_reseting_on_website">Reset alle coordinate originali su web</string> <string name="waypoint_coordinates_has_been_modified_on_website">Le coordinate cache su web sono state modificate in: %s.</string> - <string name="waypoint_coordinates_has_been_set_as_cache_coordinates">Le coordinate cache sono state modificate in c:geo in: %s.</string> <string name="waypoint_done">Fatto</string> <string name="waypoint_duplicate">Duplicato</string> <string name="waypoint_copy_of">Copia di</string> @@ -721,7 +715,6 @@ <string name="map_strategy_auto">In base alla tua velocità</string> <string name="map_strategy_detailed">Dettagliata</string> <string name="live_map_notification">Nella nuova Mappa Live le coordinate potrebbero non essere sempre precise. Coordinate possibilmente imprecise sono marcate da un cerchio arancione.\nAprendo i dettagli del cache o salvando il cache per uso offline farà calcolare sempre coordinate precise.\n\nInformazioni addizionali su tutte le modifiche si possono trovare nel menu \"Info c:geo\" sulla pagina principale di questa app.</string> - <string name="live_map_note_close">Chiudi</string> <string name="live_map_note_dontshow">Non mostrare ancora</string> <!-- search --> diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml index c29c782..ad5752b 100644 --- a/main/res/values-ja/strings.xml +++ b/main/res/values-ja/strings.xml @@ -148,7 +148,6 @@ <string name="err_detail_cache_find_any">キャッシュ情報が一つも見つかりません。</string> <string name="err_detail_cache_find_next">次のキャッシュ情報が見つかりません。</string> <string name="err_detail_cache_forgot">c:geo forgot which geocache you want.</string> - <string name="err_detail_cache_forgot_visit">c:geo forgot which cache you visited.</string> <string name="err_detail_google_maps_limit_reached">オフライン用の地図のダウンロードに失敗しました。大量のデータをダウンロードしたと判断されGoogleマップ側に制限されたかもしれません。</string> <string name="err_detail_no_spoiler">このキャッシュのスポイラー画像を見つけることができませんでした。</string> <string name="err_detail_no_map_static">このキャッシュのオフライン地図を見つけることができませんでした。</string> @@ -563,8 +562,6 @@ <string name="cache_menu_visit_offline">ログを書く(オフライン)</string> <string name="cache_menu_spoilers">スポイラー画像</string> <string name="cache_menu_around">近くのキャッシュ</string> - <string name="cache_menu_set_as_cache_coords">キャッシュの座標として登録</string> - <string name="cache_menu_upload_wpt_to_gc_com">キャッシュの座標として登録し、ウェイポイントをGeocaching.comにアップロード</string> <string name="cache_menu_event">カレンダーに登録</string> <string name="cache_menu_details">詳細</string> <string name="cache_menu_share">キャッシュを共有</string> @@ -680,7 +677,6 @@ <string name="waypoint_reset_cache_coords">キャッシュ座標をリセット</string> <string name="waypoint_coordinates_has_been_reset_on_website">Webサイトでのキャッシュ座標をリセットしました。</string> <string name="waypoint_coordinates_being_reset_on_website">Webサイトでのキャッシュ座標をリセットしています…</string> - <string name="waypoint_reset_cache_coords_info">座標リセットオプション</string> <string name="waypoint_reset">リセット</string> <string name="waypoint_localy_reset_cache_coords">c:geo内部のみでリセット</string> <string name="waypoint_reset_local_and_remote_cache_coords">c:geo内部とWebサイトでリセット</string> @@ -688,9 +684,7 @@ <string name="waypoint_coordinates_couldnt_be_modified_on_website">Webサイトではキャッシュ座標の修正に対応していません。</string> <string name="waypoint_coordinates_upload_error">Webサイトで座標の修正中にエラーが起こりました。</string> <string name="waypoint_coordinates_uploading_to_website">Webサイトに座標 %s をアップロードしています。</string> - <string name="waypoint_coordinates_reseting_on_website">Webサイトの初公開時の座標をリセットしています。</string> <string name="waypoint_coordinates_has_been_modified_on_website">Webサイトのキャッシュ座標は %s に修正されました。</string> - <string name="waypoint_coordinates_has_been_set_as_cache_coordinates">c:geo内部のキャッシュ座標は %s に変更されました。</string> <string name="waypoint_done">決定</string> <string name="waypoint_duplicate">複製</string> <string name="waypoint_copy_of">コピー ～ </string> @@ -736,7 +730,6 @@ <string name="map_strategy_auto">自動(移動速度に依存)</string> <string name="map_strategy_detailed">詳細(「速い」+詳細)</string> <string name="live_map_notification">現バージョンではオンライン地図の座標は正確とは限りません。不正確と思われる座標のキャッシュはオレンジ色の丸で表示されます。\nキャッシュの詳細を表示したりオフライン用に保存する際には正確な座標を取得します。\n\n詳しくはアプリ内の「c:geoについて」の変更履歴(英語)をご覧ください。</string> - <string name="live_map_note_close">閉じる</string> <string name="live_map_note_dontshow">再び表示しない</string> diff --git a/main/res/values-nb/strings.xml b/main/res/values-nb/strings.xml index b10871e..78b2608 100644 --- a/main/res/values-nb/strings.xml +++ b/main/res/values-nb/strings.xml @@ -98,7 +98,6 @@ <string name="err_detail_cache_find_any">Beklager, c:geo klarte ikke finne geocacher..</string> <string name="err_detail_cache_find_next">Beklager, c:geo klarte ikke å finne den neste geocachen.</string> <string name="err_detail_cache_forgot">Beklager, c:geo glemte hvilken cache du ønsket.</string> - <string name="err_detail_cache_forgot_visit">Beklager, c:geo glemte hvilken cache du fant.</string> <string name="err_detail_no_spoiler">c:geo fant ingen bilder for denne cachen.</string> <string name="err_detail_no_map_static">c:geo fant ingen statiske kart for denne cachen.</string> <string name="err_application_no">c:geo klarte ikke å finne en passende applikasjon.</string> diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml index 48de4aa..f22db65 100644 --- a/main/res/values-nl/strings.xml +++ b/main/res/values-nl/strings.xml @@ -140,7 +140,6 @@ <string name="err_detail_cache_find_any">Sorry, c:geo kan geen enkele geocache vinden.</string> <string name="err_detail_cache_find_next">Sorry, c:geo kan de volgende cache niet vinden.</string> <string name="err_detail_cache_forgot">Sorry, c:geo is kwijt welke geocache je wilde openen.</string> - <string name="err_detail_cache_forgot_visit">Sorry, c:geo is vergeten welke cache je bezocht.</string> <string name="err_detail_no_spoiler">c:geo Heeft geen spoiler images gevonden voor deze cache.</string> <string name="err_detail_no_map_static">c:geo Heeft geen statische kaarten gevonden voor deze cache.</string> <string name="err_detail_not_load_map_static">Sorry, c:geo kon de statische kaart niet laden.</string> diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml index e8c4b63..9d53e97 100644 --- a/main/res/values-pl/strings.xml +++ b/main/res/values-pl/strings.xml @@ -146,7 +146,6 @@ <string name="err_detail_cache_find_any">c:geo nie mógł znaleźć żadnej skrzynki.</string> <string name="err_detail_cache_find_next">c:geo nie mógł znaleźć następnych skrzynek.</string> <string name="err_detail_cache_forgot">c:geo zapomniał którą skrzynkę chcesz obejrzeć.</string> - <string name="err_detail_cache_forgot_visit">c:geo zapomniał którą skrzynkę odwiedziłeś.</string> <string name="err_detail_google_maps_limit_reached">c:geo nie był w stanie pobrać map statycznych. Może limit map Google został wyczerpany.</string> <string name="err_detail_no_spoiler">c:geo nie znalazł zdjęcia spoilera dla tej skrzynki.</string> <string name="err_detail_no_map_static">c:geo nie znalazł map statycznych dla tej skrzynki.</string> @@ -555,8 +554,6 @@ <string name="cache_menu_visit_offline">Wpisz wizytę offline</string> <string name="cache_menu_spoilers">Zdjęcia spoiler</string> <string name="cache_menu_around">Skrzynki w okręgu</string> - <string name="cache_menu_set_as_cache_coords">Ustaw jako współrzędne skrzynki</string> - <string name="cache_menu_upload_wpt_to_gc_com">Ustaw jako współrzędne skrzynki i wyślij punkt nawigacji do Geocaching.com</string> <string name="cache_menu_event">Dodaj do kalendarza</string> <string name="cache_menu_details">Szczegóły</string> <string name="cache_menu_share">Podziel się skrzynką</string> @@ -670,16 +667,13 @@ <string name="waypoint_reset_cache_coords">Ustaw ponownie współrzędne skrzynki</string> <string name="waypoint_coordinates_has_been_reset_on_website">Współrzędne skrzynki zostały ustawione ponownie na stronie WWW.</string> <string name="waypoint_coordinates_being_reset_on_website">Ponowne ustawianie współrzędnych skrzynki na na stronie WWW…</string> - <string name="waypoint_reset_cache_coords_info">Opcje ponownego ustawiania współrzędnych</string> <string name="waypoint_reset">Ponowne ustawianie</string> <string name="waypoint_localy_reset_cache_coords">Ponowne ustawianie w c:geo</string> <string name="waypoint_reset_local_and_remote_cache_coords">Ponowne ustawianie w c:geo i na stronie WWW</string> <string name="waypoint_coordinates_couldnt_be_modified_on_website">Strona WWW nie wspiera zmiany współrzędnych skrzynki.</string> <string name="waypoint_coordinates_upload_error">Wystąpił błąd podczas modyfikacji współrzędnych na stronie WWW.</string> <string name="waypoint_coordinates_uploading_to_website">Wysyłanie współrzędnych %s do strony WWW.</string> - <string name="waypoint_coordinates_reseting_on_website">Powracanie do oryginalnych współrzędnych na stronie WWW.</string> <string name="waypoint_coordinates_has_been_modified_on_website">Współrzędne skrzynki zostały zmienione na stronie WWW na: %s.</string> - <string name="waypoint_coordinates_has_been_set_as_cache_coordinates">Współrzędne skrzynki zostały zmieonone w c:geo na: %s.</string> <string name="waypoint_done">Wykonane</string> <string name="waypoint_duplicate">Duplikat</string> <string name="waypoint_copy_of">Kopia</string> @@ -725,7 +719,6 @@ <string name="map_strategy_auto">Zależna od prędkości</string> <string name="map_strategy_detailed">Szczegółowa</string> <string name="live_map_notification">Na nowej mapie live, współrzędnie nie zawsze muszą być dokładne. Prawdopodobne niedokładne współrzędne są zaznaczane za pomocą pomarańczowych okręgów.\nOtworzenie współrzędnych skrzynki lub zapisanie skrzynki do użytku offline zawsze używa precyzyjnych współrzędnych.\n\nWięcej informacji na temat wszystkich zmian można odnaleźć na stronie \"O c:geo\" wewnątrz programu.</string> - <string name="live_map_note_close">Zamknij</string> <string name="live_map_note_dontshow">Nie pokazuj ponownie</string> <!-- search --> diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml index d8acac3..f8a0a12 100644 --- a/main/res/values-pt/strings.xml +++ b/main/res/values-pt/strings.xml @@ -144,7 +144,6 @@ <string name="err_detail_cache_find_any">O c:geo não encontra qualquer geocache.</string> <string name="err_detail_cache_find_next">O c:geo não encontra as próximas geocaches.</string> <string name="err_detail_cache_forgot">O c:geo esqueceu a geocache pretendida.</string> - <string name="err_detail_cache_forgot_visit">O c:geo esqueceu a cache que visitou.</string> <string name="err_detail_google_maps_limit_reached">O c:geo falhou no download dos mapas. Talvez o tenha atingido o limite do Google Maps.</string> <string name="err_detail_no_spoiler">O c:geo não encontrou images spoiler para esta cache.</string> <string name="err_detail_no_map_static">O c:geo não encontrou mapas estáticos para esta cache.</string> @@ -695,7 +694,6 @@ <string name="map_strategy_auto">Dependente da velocidade</string> <string name="map_strategy_detailed">Detalhado</string> <string name="live_map_notification">No novo mapa ao vivo as coordenadas podem nem sempre ser precisas. As coordenadas possivelmente imprecisas são marcadas com um círculo cor de laranja.\nAbrindo os detalhes da cache or gravando a cache para utilização offline fará com que obtenha as coordenadas precisas.\n\nMais informações em todas as alterações podem ser encontradas na página \"Sobre c:geo\" na aplicação.</string> - <string name="live_map_note_close">Fechar</string> <string name="live_map_note_dontshow">Não mostrar novamente</string> diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml index 0593da5..e54af92 100644 --- a/main/res/values-sk/strings.xml +++ b/main/res/values-sk/strings.xml @@ -143,7 +143,6 @@ <string name="err_detail_cache_find_any">Prepáčte, c:geo nemôže nájsť žiadnu skrýšu.</string> <string name="err_detail_cache_find_next">Prepáčte, c:geo nemôže nájsť ďalšiu skrýšu.</string> <string name="err_detail_cache_forgot">Prepáčte, c:geo zabudlo, akú skrýšu chcete zobraziť.</string> - <string name="err_detail_cache_forgot_visit">Prepáčte, c:geo zabudlo, akú skrýšu ste prezerali.</string> <string name="err_detail_google_maps_limit_reached">c:geo sa nepodarilo prevziať statické mapy. Je možné, že bol dosiahnutý limit Google mapy.</string> <string name="err_detail_no_spoiler">c:geo nenašla pre túto skrýšu žiaden spoilerový obrázok.</string> <string name="err_detail_no_map_static">c:geo nenašla žiadnu statickú mapu pre túto skrýšu.</string> @@ -700,7 +699,6 @@ <string name="map_strategy_auto">Podľa rýchlosti</string> <string name="map_strategy_detailed">Podrobná</string> <string name="live_map_notification">Na novej aktívnej mape nemusia byť súradnice vždy presné. Súradnice, ktoré môžu byť nepresné, sú označené oranžovým krúžkom.\nPo otvorení detailu skrýše, alebo po jej uložení pre použitie offline, sú získané vždy presné súradnice.\n\nViac informácií ku všetkým zmenám sa nachádzajú na stránke „O c:geo“ v aplikácii.</string> - <string name="live_map_note_close">Zatvoriť</string> <string name="live_map_note_dontshow">Nabudúce nezobrazovať</string> diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml index 1f968d2..2305cdc 100644 --- a/main/res/values-sv/strings.xml +++ b/main/res/values-sv/strings.xml @@ -147,7 +147,6 @@ <string name="err_detail_cache_find_any">Tyvärr kan c:geo inte hitta någon geocache.</string> <string name="err_detail_cache_find_next">Tyvärr kan c:geo inte hitta nästa geocache.</string> <string name="err_detail_cache_forgot">Tyvärr glömde c:geo vilken geocache du ville se.</string> - <string name="err_detail_cache_forgot_visit">Tyvärr glömde c:geo vilken cache tittade på.</string> <string name="err_detail_google_maps_limit_reached">c:geo kunde inte hämta kartor. Eventuellt kan Google Maps gräns ha uppnåtts.</string> <string name="err_detail_no_spoiler">c:geo hittade inga spoiler bilder för den här cachen.</string> <string name="err_detail_no_map_static">c:geo hittade inga sparade kartor för denna cache.</string> @@ -561,8 +560,6 @@ <string name="cache_menu_visit_offline">Logga besök offline</string> <string name="cache_menu_spoilers">Spoiler bilder</string> <string name="cache_menu_around">Cacher i närheten</string> - <string name="cache_menu_set_as_cache_coords">Sätt som cachens koordinater</string> - <string name="cache_menu_upload_wpt_to_gc_com">Sätt som cachens koordinater och ladda upp waypoint till Geocaching.com</string> <string name="cache_menu_event">Lägg till i kalender</string> <string name="cache_menu_details">Detaljer</string> <string name="cache_menu_share">Skicka länk</string> @@ -677,16 +674,13 @@ <string name="waypoint_reset_cache_coords">Återställ cachens koordinater</string> <string name="waypoint_coordinates_has_been_reset_on_website">Cachens koordinater har återställts på hemsidan.</string> <string name="waypoint_coordinates_being_reset_on_website">Återställer cachens koordinater på hemsidan…</string> - <string name="waypoint_reset_cache_coords_info">Återställningsalternativ</string> <string name="waypoint_reset">Återställ</string> <string name="waypoint_localy_reset_cache_coords">Återställ koordinaterna i c:geo</string> <string name="waypoint_reset_local_and_remote_cache_coords">Återställ i c:geo och på hemsidan</string> <string name="waypoint_coordinates_couldnt_be_modified_on_website">Hemsidan kan inte hantera att ändra cachens koordinater.</string> <string name="waypoint_coordinates_upload_error">Ett fel inträffade när koordinaterna skulle ändras på hemsidan.</string> <string name="waypoint_coordinates_uploading_to_website">Laddar upp koordinaterna %s till hemsidan.</string> - <string name="waypoint_coordinates_reseting_on_website">Återställer till ursprungliga koordinaterna på hemsidan.</string> <string name="waypoint_coordinates_has_been_modified_on_website">Cachens koordinater på hemsidan har ändrats till: %s.</string> - <string name="waypoint_coordinates_has_been_set_as_cache_coordinates">Cachens koordinater har ändrats i c:geo till: %s.</string> <string name="waypoint_done">Klar</string> <string name="waypoint_duplicate">Duplicera</string> <string name="waypoint_copy_of">Kopia av</string> @@ -725,7 +719,6 @@ <string name="map_strategy_auto">Hastighetsberoende (gps)</string> <string name="map_strategy_detailed">Exakta positioner</string> <string name="live_map_notification">I den nya Live kartan så är koordinaterna inte alltid exakta. En cache med potentiellt oexakta koordinater är markerad med en orange cirkel.\nGenom att visa detaljer för cachen eller genom att spara cachen för offline kommer alltid exakta koordinater att hämtas.\n\nMer information om alla förändringar finns på \"Om c:geo\" sidan, som kan nås från c:geo\'s startsida.</string> - <string name="live_map_note_close">Stäng</string> <string name="live_map_note_dontshow">Visa inte mer</string> <!-- search --> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 95fa47c..cd8aaec 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -148,7 +148,6 @@ <string name="err_detail_cache_find_any">c:geo can\'t find any geocache.</string> <string name="err_detail_cache_find_next">c:geo can\'t find next geocaches.</string> <string name="err_detail_cache_forgot">c:geo forgot which geocache you want.</string> - <string name="err_detail_cache_forgot_visit">c:geo forgot which cache you visited.</string> <string name="err_detail_google_maps_limit_reached">c:geo failed to download static maps. Maybe google maps limit is reached.</string> <string name="err_detail_no_spoiler">c:geo found no spoiler images for this cache.</string> <string name="err_detail_no_map_static">c:geo found no static maps for this cache.</string> @@ -563,8 +562,6 @@ <string name="cache_menu_visit_offline">Log Visit offline</string> <string name="cache_menu_spoilers">Spoiler images</string> <string name="cache_menu_around">Caches around</string> - <string name="cache_menu_set_as_cache_coords">Set as cache coords</string> - <string name="cache_menu_upload_wpt_to_gc_com">Set as cache coords and upload waypoint to Geocaching.com</string> <string name="cache_menu_event">Add to calendar</string> <string name="cache_menu_details">Details</string> <string name="cache_menu_share">Share cache</string> @@ -680,7 +677,6 @@ <string name="waypoint_reset_cache_coords">Reset cache coordinates</string> <string name="waypoint_coordinates_has_been_reset_on_website">Cache coordinates have been reset on website.</string> <string name="waypoint_coordinates_being_reset_on_website">Resetting cache coordinates on website…</string> - <string name="waypoint_reset_cache_coords_info">Coordinate reset options</string> <string name="waypoint_reset">Reset</string> <string name="waypoint_localy_reset_cache_coords">Reset in c:geo</string> <string name="waypoint_reset_local_and_remote_cache_coords">Reset in c:geo and on website</string> @@ -688,9 +684,7 @@ <string name="waypoint_coordinates_couldnt_be_modified_on_website">Website doesn\'t support modifying cache coordinates.</string> <string name="waypoint_coordinates_upload_error">Error occurred while modifying coordinates on website.</string> <string name="waypoint_coordinates_uploading_to_website">Uploading coordinates %s to website.</string> - <string name="waypoint_coordinates_reseting_on_website">Resetting to original coordinates on website.</string> <string name="waypoint_coordinates_has_been_modified_on_website">Cache coordinates on website have been modified to: %s.</string> - <string name="waypoint_coordinates_has_been_set_as_cache_coordinates">Cache coordinates have been changed in c:geo to: %s.</string> <string name="waypoint_done">Done</string> <string name="waypoint_duplicate">Duplicate</string> <string name="waypoint_copy_of">Copy of</string> @@ -736,7 +730,6 @@ <string name="map_strategy_auto">Speed dependent</string> <string name="map_strategy_detailed">Detailed</string> <string name="live_map_notification">On the new live map coordinates may not always be precise. Possibly imprecise coordinates are marked by an orange circle.\nOpening the cache details or saving the cache for offline use will always obtain precise coordinates.\n\nMore information on all changes can be found on the \"About c:geo\" page inside the app.</string> - <string name="live_map_note_close">Close</string> <string name="live_map_note_dontshow">Do not show again</string> |