aboutsummaryrefslogtreecommitdiffstats
path: root/main/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'main/res/layout')
-rw-r--r--main/res/layout/about_help_page.xml16
-rw-r--r--main/res/layout/actionbar_maps.xml2
-rw-r--r--main/res/layout/addresslist_activity.xml6
-rw-r--r--main/res/layout/cachelist_spinneritem.xml6
-rw-r--r--main/res/layout/coordinatesinput_dialog.xml320
-rw-r--r--main/res/layout/logcache_activity.xml60
-rw-r--r--main/res/layout/logs_page.xml4
-rw-r--r--main/res/layout/main_activity.xml4
-rw-r--r--main/res/layout/simple_dir_chooser.xml4
-rw-r--r--main/res/layout/text_preference.xml15
-rw-r--r--main/res/layout/usefulapps_activity.xml4
-rw-r--r--main/res/layout/wp_threshold_preference.xml16
12 files changed, 211 insertions, 246 deletions
diff --git a/main/res/layout/about_help_page.xml b/main/res/layout/about_help_page.xml
index 8444094..0439e22 100644
--- a/main/res/layout/about_help_page.xml
+++ b/main/res/layout/about_help_page.xml
@@ -27,22 +27,6 @@
android:textSize="14sp" />
<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:text="@string/nutshellmanual"
- android:textColor="?text_color"
- android:textColorLink="?text_color_link"
- android:textSize="14sp" />
-
- <TextView
android:id="@+id/website"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/main/res/layout/actionbar_maps.xml b/main/res/layout/actionbar_maps.xml
index 348342c..0e3dc0e 100644
--- a/main/res/layout/actionbar_maps.xml
+++ b/main/res/layout/actionbar_maps.xml
@@ -13,7 +13,7 @@
<ImageView
style="@style/action_bar_action"
android:layout_marginLeft="-13dp"
- android:onClick="goHome" />
+ android:onClick="navigateUp" />
<View style="@style/action_bar_separator" />
diff --git a/main/res/layout/addresslist_activity.xml b/main/res/layout/addresslist_activity.xml
index e5c6491..6bcbf79 100644
--- a/main/res/layout/addresslist_activity.xml
+++ b/main/res/layout/addresslist_activity.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >
- <include layout="@layout/actionbar_maps" />
-
<ListView
android:id="@android:id/list"
android:layout_width="fill_parent"
@@ -14,6 +13,7 @@
android:background="?background_color"
android:cacheColorHint="?background_color"
android:dividerHeight="1dip"
- android:padding="0dip" />
+ android:padding="0dip"
+ tools:listitem="@layout/addresslist_item" />
</LinearLayout> \ No newline at end of file
diff --git a/main/res/layout/cachelist_spinneritem.xml b/main/res/layout/cachelist_spinneritem.xml
index c8a589f..58e070e 100644
--- a/main/res/layout/cachelist_spinneritem.xml
+++ b/main/res/layout/cachelist_spinneritem.xml
@@ -5,18 +5,18 @@
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="?attr/dropdownListPreferredItemHeight"
android:minHeight="?attr/dropdownListPreferredItemHeight"
- style="?attr/spinnerDropDownItemStyle"
android:layout_gravity="left|center_vertical"
+ style="?attr/spinnerDropDownItemStyle"
>
<TextView
android:id="@android:id/text1"
- android:textAppearance="?android:attr/textAppearanceMedium"
tools:text="This is the title"
android:singleLine="true"
android:ellipsize="marquee"
android:layout_width="match_parent"
+ style="?attr/titleTextStyle"
android:layout_height="wrap_content" />
@@ -25,7 +25,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="marquee"
- android:textAppearance="?android:attr/textAppearanceSmall"
+ style="?attr/subtitleTextStyle"
tools:text="This is the subtitle"
android:id="@android:id/text2" />
diff --git a/main/res/layout/coordinatesinput_dialog.xml b/main/res/layout/coordinatesinput_dialog.xml
index 4603360..9b5cb8d 100644
--- a/main/res/layout/coordinatesinput_dialog.xml
+++ b/main/res/layout/coordinatesinput_dialog.xml
@@ -1,175 +1,161 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/linearLayout1"
+ android:id="@+id/scroller"
android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical" >
+ android:layout_height="fill_parent"
+ android:fillViewport="true" >
- <LinearLayout style="@style/action_bar" >
+ <LinearLayout
+ android:id="@+id/scroller_child"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical" >
- <TextView
- style="@style/action_bar_title"
- android:text="@string/cache_coordinates" />
- </LinearLayout>
+ <Spinner
+ android:id="@+id/spinnerCoordinateFormats"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content" />
- <ScrollView
- android:id="@+id/scroller"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:fillViewport="true" >
+ <TableLayout
+ android:id="@+id/coordTable"
+ android:layout_width="fill_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:stretchColumns="0,1,3,5,7" >
+
+ <TableRow android:id="@+id/tableRow1" >
+
+ <Button
+ android:id="@+id/ButtonLat"
+ style="@style/button_full" />
+
+ <EditText
+ android:id="@+id/EditTextLatDeg"
+ style="@style/edittext_full"
+ android:gravity="right"
+ android:inputType="number"
+ android:selectAllOnFocus="true" />
+
+ <TextView
+ android:id="@+id/LatSeparator1"
+ android:text="°"
+ tools:ignore="HardcodedText" />
+
+ <EditText
+ android:id="@+id/EditTextLatMin"
+ style="@style/edittext_full"
+ android:gravity="right"
+ android:inputType="number"
+ android:selectAllOnFocus="true" />
+
+ <TextView
+ android:id="@+id/LatSeparator2"
+ android:text=","
+ tools:ignore="HardcodedText" />
+
+ <EditText
+ android:id="@+id/EditTextLatSec"
+ style="@style/edittext_full"
+ android:gravity="right"
+ android:inputType="number"
+ android:selectAllOnFocus="true" />
+
+ <TextView
+ android:id="@+id/LatSeparator3"
+ android:text=","
+ tools:ignore="HardcodedText" />
+
+ <EditText
+ android:id="@+id/EditTextLatSecFrac"
+ style="@style/edittext_full"
+ android:inputType="number"
+ android:selectAllOnFocus="true" />
+ </TableRow>
+
+ <TableRow android:id="@+id/tableRow2" >
+
+ <Button
+ android:id="@+id/ButtonLon"
+ style="@style/button_full" />
+
+ <EditText
+ android:id="@+id/EditTextLonDeg"
+ style="@style/edittext_full"
+ android:gravity="right"
+ android:inputType="number"
+ android:selectAllOnFocus="true" />
+
+ <TextView
+ android:id="@+id/LonSeparator1"
+ android:text="°"
+ tools:ignore="HardcodedText" />
+
+ <EditText
+ android:id="@+id/EditTextLonMin"
+ style="@style/edittext_full"
+ android:gravity="right"
+ android:inputType="number"
+ android:selectAllOnFocus="true" />
+
+ <TextView
+ android:id="@+id/LonSeparator2"
+ android:text=","
+ tools:ignore="HardcodedText" />
+
+ <EditText
+ android:id="@+id/EditTextLonSec"
+ style="@style/edittext_full"
+ android:gravity="right"
+ android:inputType="number"
+ android:selectAllOnFocus="true" />
+
+ <TextView
+ android:id="@+id/LonSeparator3"
+ android:text=","
+ tools:ignore="HardcodedText" />
+
+ <EditText
+ android:id="@+id/EditTextLonSecFrac"
+ style="@style/edittext_full"
+ android:inputType="number"
+ android:selectAllOnFocus="true" />
+ </TableRow>
+ </TableLayout>
+
+ <EditText
+ android:id="@+id/latitude"
+ style="@style/edittext_full"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/latitude" />
+
+ <EditText
+ android:id="@+id/longitude"
+ style="@style/edittext_full"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/longitude" />
- <LinearLayout
- android:id="@+id/scroller_child"
+ <Button
+ android:id="@+id/current"
+ style="@style/button_full"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:orientation="vertical" >
-
- <Spinner
- android:id="@+id/spinnerCoordinateFormats"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content" />
-
- <TableLayout
- android:id="@+id/coordTable"
- android:layout_width="fill_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:stretchColumns="0,1,3,5,7" >
-
- <TableRow android:id="@+id/tableRow1" >
-
- <Button
- android:id="@+id/ButtonLat"
- style="@style/button_full" />
-
- <EditText
- android:id="@+id/EditTextLatDeg"
- style="@style/edittext_full"
- android:gravity="right"
- android:inputType="number"
- android:selectAllOnFocus="true" />
-
- <TextView
- android:id="@+id/LatSeparator1"
- android:text="°"
- tools:ignore="HardcodedText" />
-
- <EditText
- android:id="@+id/EditTextLatMin"
- style="@style/edittext_full"
- android:gravity="right"
- android:inputType="number"
- android:selectAllOnFocus="true" />
-
- <TextView
- android:id="@+id/LatSeparator2"
- android:text=","
- tools:ignore="HardcodedText" />
-
- <EditText
- android:id="@+id/EditTextLatSec"
- style="@style/edittext_full"
- android:gravity="right"
- android:inputType="number"
- android:selectAllOnFocus="true" />
-
- <TextView
- android:id="@+id/LatSeparator3"
- android:text=","
- tools:ignore="HardcodedText" />
-
- <EditText
- android:id="@+id/EditTextLatSecFrac"
- style="@style/edittext_full"
- android:inputType="number"
- android:selectAllOnFocus="true" />
- </TableRow>
-
- <TableRow android:id="@+id/tableRow2" >
-
- <Button
- android:id="@+id/ButtonLon"
- style="@style/button_full" />
-
- <EditText
- android:id="@+id/EditTextLonDeg"
- style="@style/edittext_full"
- android:gravity="right"
- android:inputType="number"
- android:selectAllOnFocus="true" />
-
- <TextView
- android:id="@+id/LonSeparator1"
- android:text="°"
- tools:ignore="HardcodedText" />
-
- <EditText
- android:id="@+id/EditTextLonMin"
- style="@style/edittext_full"
- android:gravity="right"
- android:inputType="number"
- android:selectAllOnFocus="true" />
-
- <TextView
- android:id="@+id/LonSeparator2"
- android:text=","
- tools:ignore="HardcodedText" />
-
- <EditText
- android:id="@+id/EditTextLonSec"
- style="@style/edittext_full"
- android:gravity="right"
- android:inputType="number"
- android:selectAllOnFocus="true" />
-
- <TextView
- android:id="@+id/LonSeparator3"
- android:text=","
- tools:ignore="HardcodedText" />
-
- <EditText
- android:id="@+id/EditTextLonSecFrac"
- style="@style/edittext_full"
- android:inputType="number"
- android:selectAllOnFocus="true" />
- </TableRow>
- </TableLayout>
-
- <EditText
- android:id="@+id/latitude"
- style="@style/edittext_full"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:hint="@string/latitude" />
-
- <EditText
- android:id="@+id/longitude"
- style="@style/edittext_full"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:hint="@string/longitude" />
-
- <Button
- android:id="@+id/current"
- style="@style/button_full"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="@string/waypoint_my_coordinates" />
-
- <Button
- android:id="@+id/cache"
- style="@style/button_full"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="@string/waypoint_cache_coordinates" />
-
- <Button
- android:id="@+id/done"
- style="@style/button_full"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="@string/waypoint_done" />
- </LinearLayout>
- </ScrollView>
-
-</LinearLayout> \ No newline at end of file
+ android:text="@string/waypoint_my_coordinates" />
+
+ <Button
+ android:id="@+id/cache"
+ style="@style/button_full"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/waypoint_cache_coordinates" />
+
+ <Button
+ android:id="@+id/done"
+ style="@style/button_full"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/waypoint_done" />
+ </LinearLayout>
+
+</ScrollView> \ No newline at end of file
diff --git a/main/res/layout/logcache_activity.xml b/main/res/layout/logcache_activity.xml
index b08bb02..5445285 100644
--- a/main/res/layout/logcache_activity.xml
+++ b/main/res/layout/logcache_activity.xml
@@ -70,6 +70,27 @@
android:singleLine="true" />
</LinearLayout>
+ <RatingBar
+ android:id="@+id/gcvoteRating"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:max="5"
+ android:numStars="5"
+ android:stepSize="0.5"
+ android:visibility="gone" />
+
+ <TextView
+ android:id="@+id/gcvoteLabel"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_horizontal"
+ android:padding="10dip"
+ android:text="@string/log_no_rating"
+ android:textColor="?text_color"
+ android:textSize="12sp"
+ android:visibility="gone" />
+
<LinearLayout
android:id="@+id/tweet_box"
android:layout_width="fill_parent"
@@ -98,45 +119,6 @@
android:textColor="?text_color"
android:textSize="14sp" />
</LinearLayout>
-
- <Button
- android:id="@+id/image_btn"
- style="@style/button_full"
- android:text="@string/log_image_attach" />
-
- <Button
- android:id="@+id/post"
- style="@style/button_full"
- android:text="@string/log_post" />
-
- <RelativeLayout style="@style/separator_horizontal_layout" >
-
- <View style="@style/separator_horizontal" />
-
- <TextView
- style="@style/separator_horizontal_headline"
- android:text="@string/cache_log_offline" />
- </RelativeLayout>
-
- <LinearLayout
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal" >
-
- <Button
- android:id="@+id/save"
- style="@style/button_full"
- android:layout_width="0dip"
- android:layout_weight="1"
- android:text="@string/log_save" />
-
- <Button
- android:id="@+id/clear"
- style="@style/button_full"
- android:layout_width="0dip"
- android:layout_weight="1"
- android:text="@string/log_clear" />
- </LinearLayout>
</LinearLayout>
<LinearLayout
diff --git a/main/res/layout/logs_page.xml b/main/res/layout/logs_page.xml
index 9aafd83..f0a5d31 100644
--- a/main/res/layout/logs_page.xml
+++ b/main/res/layout/logs_page.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:cacheColorHint="?background_color"
@@ -8,6 +9,7 @@
android:focusable="false"
android:footerDividersEnabled="false"
android:headerDividersEnabled="false"
- android:listSelector="?background_color" >
+ android:listSelector="?background_color"
+ tools:listitem="@layout/logs_item" >
</ListView> \ No newline at end of file
diff --git a/main/res/layout/main_activity.xml b/main/res/layout/main_activity.xml
index 29a445f..d2bd025 100644
--- a/main/res/layout/main_activity.xml
+++ b/main/res/layout/main_activity.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/mainscreen"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
@@ -13,7 +14,8 @@
android:layout_alignParentTop="true"
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip"
- android:layout_marginTop="60dip" />
+ android:layout_marginTop="60dip"
+ tools:layout="@layout/status" />
<!-- ** -->
<LinearLayout
diff --git a/main/res/layout/simple_dir_chooser.xml b/main/res/layout/simple_dir_chooser.xml
index 77b1950..1bf9a2d 100644
--- a/main/res/layout/simple_dir_chooser.xml
+++ b/main/res/layout/simple_dir_chooser.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="?background_color"
@@ -63,6 +64,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_above="@id/buttonLayout"
- android:layout_below="@+id/headerLayout" />
+ android:layout_below="@+id/headerLayout"
+ tools:listitem="@layout/simple_dir_item" />
</RelativeLayout> \ No newline at end of file
diff --git a/main/res/layout/text_preference.xml b/main/res/layout/text_preference.xml
index 818b2f3..174a6d1 100644
--- a/main/res/layout/text_preference.xml
+++ b/main/res/layout/text_preference.xml
@@ -1,22 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
+ android:orientation="vertical"
android:paddingLeft="16dp"
android:paddingRight="16dp"
- android:orientation="vertical" >
+ tools:context=".settings.SettingsActivity" >
- <TextView
+ <TextView
android:id="@+id/textPreferenceText"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall" />
- <TextView
+
+ <TextView
android:id="@+id/textPreferenceSummary"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
- android:visibility="gone"
- android:textAppearance="?android:attr/textAppearanceSmall" />
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:visibility="gone" />
-</LinearLayout>
+</LinearLayout> \ No newline at end of file
diff --git a/main/res/layout/usefulapps_activity.xml b/main/res/layout/usefulapps_activity.xml
index fa2112e..e15cd7a 100644
--- a/main/res/layout/usefulapps_activity.xml
+++ b/main/res/layout/usefulapps_activity.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="?background_color"
@@ -15,7 +16,8 @@
android:footerDividersEnabled="false"
android:headerDividersEnabled="false"
android:listSelector="?background_color"
- android:padding="4dip" >
+ android:padding="4dip"
+ tools:listitem="@layout/usefulapps_item" >
</ListView>
</LinearLayout> \ No newline at end of file
diff --git a/main/res/layout/wp_threshold_preference.xml b/main/res/layout/wp_threshold_preference.xml
index 22ffe9a..f3cbc86 100644
--- a/main/res/layout/wp_threshold_preference.xml
+++ b/main/res/layout/wp_threshold_preference.xml
@@ -1,26 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="16dp"
android:paddingRight="16dp"
- android:paddingTop="8dp" >
-
+ android:paddingTop="8dp"
+ tools:context=".settings.SettingsActivity" >
+
<SeekBar
android:id="@+id/wp_threshold_seekbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:paddingRight="8dp"
- android:layout_weight="1" />
+ android:layout_weight="1"
+ android:paddingRight="8dp" />
<TextView
android:id="@+id/wp_threshold_value_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:gravity="center"
- android:layout_weight="5" />
+ android:layout_weight="5"
+ android:gravity="center" />
-</LinearLayout>
+</LinearLayout> \ No newline at end of file