diff options
Diffstat (limited to 'main/res/layout')
| -rw-r--r-- | main/res/layout/about_activity.xml | 2 | ||||
| -rw-r--r-- | main/res/layout/actionbar.xml | 3 | ||||
| -rw-r--r-- | main/res/layout/actionbar_button_myposition.xml | 8 | ||||
| -rw-r--r-- | main/res/layout/actionbar_progress.xml | 3 | ||||
| -rw-r--r-- | main/res/layout/addresses.xml | 2 | ||||
| -rw-r--r-- | main/res/layout/authorization_activity.xml | 2 | ||||
| -rw-r--r-- | main/res/layout/cache_image_item.xml | 4 | ||||
| -rw-r--r-- | main/res/layout/caches_item.xml | 4 | ||||
| -rw-r--r-- | main/res/layout/cacheview_logs_item.xml | 2 | ||||
| -rw-r--r-- | main/res/layout/fragment_edit_note.xml | 20 | ||||
| -rw-r--r-- | main/res/layout/gpx.xml | 2 | ||||
| -rw-r--r-- | main/res/layout/init.xml | 21 | ||||
| -rw-r--r-- | main/res/layout/map_static.xml | 2 | ||||
| -rw-r--r-- | main/res/layout/navigate.xml | 12 | ||||
| -rw-r--r-- | main/res/layout/spoilers.xml | 2 |
15 files changed, 45 insertions, 44 deletions
diff --git a/main/res/layout/about_activity.xml b/main/res/layout/about_activity.xml index 743630d..c13b4b4 100644 --- a/main/res/layout/about_activity.xml +++ b/main/res/layout/about_activity.xml @@ -5,7 +5,7 @@ android:background="?background_color" android:orientation="vertical" > - <include layout="@layout/actionbar"/> + <include layout="@layout/actionbar" /> <ScrollView android:layout_width="fill_parent" diff --git a/main/res/layout/actionbar.xml b/main/res/layout/actionbar.xml index 9a3efa0..098120c 100644 --- a/main/res/layout/actionbar.xml +++ b/main/res/layout/actionbar.xml @@ -2,5 +2,6 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/action_bar" > - <include layout="@layout/actionbar_title"/> + <include layout="@layout/actionbar_title" /> + </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/actionbar_button_myposition.xml b/main/res/layout/actionbar_button_myposition.xml index 3604345..1e91419 100644 --- a/main/res/layout/actionbar_button_myposition.xml +++ b/main/res/layout/actionbar_button_myposition.xml @@ -3,10 +3,10 @@ android:layout_width="match_parent" android:layout_height="match_parent" > - <View style="@style/action_bar_separator" /> + <View style="@style/action_bar_separator" /> - <ImageSwitcher - android:id="@+id/my_position" - style="@style/action_bar_action" /> + <ImageSwitcher + android:id="@+id/my_position" + style="@style/action_bar_action" /> </merge>
\ No newline at end of file diff --git a/main/res/layout/actionbar_progress.xml b/main/res/layout/actionbar_progress.xml index a39d103..54b5875 100644 --- a/main/res/layout/actionbar_progress.xml +++ b/main/res/layout/actionbar_progress.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <ProgressBar xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/actionbar_progress" style="@style/action_bar_progress" - android:visibility="gone" android:id="@+id/actionbar_progress"/>
\ No newline at end of file + android:visibility="gone" /> diff --git a/main/res/layout/addresses.xml b/main/res/layout/addresses.xml index 08f5bc1..c48c28f 100644 --- a/main/res/layout/addresses.xml +++ b/main/res/layout/addresses.xml @@ -4,7 +4,7 @@ android:layout_height="fill_parent" android:orientation="vertical" > - <include layout="@layout/actionbar"/> + <include layout="@layout/actionbar" /> <ListView android:id="@android:id/list" diff --git a/main/res/layout/authorization_activity.xml b/main/res/layout/authorization_activity.xml index 931441d..771592d 100644 --- a/main/res/layout/authorization_activity.xml +++ b/main/res/layout/authorization_activity.xml @@ -5,7 +5,7 @@ android:orientation="vertical" android:visibility="visible" > - <include layout="@layout/actionbar"/> + <include layout="@layout/actionbar" /> <ScrollView android:layout_width="fill_parent" diff --git a/main/res/layout/cache_image_item.xml b/main/res/layout/cache_image_item.xml index f0e8963..85ab106 100644 --- a/main/res/layout/cache_image_item.xml +++ b/main/res/layout/cache_image_item.xml @@ -29,8 +29,8 @@ <ProgressBar android:id="@+id/progress_bar" + style="@android:style/Widget.ProgressBar.Small" android:layout_width="wrap_content" - android:layout_height="wrap_content" - style="@android:style/Widget.ProgressBar.Small"/> + android:layout_height="wrap_content" /> </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/caches_item.xml b/main/res/layout/caches_item.xml index 44c0fb3..3bd556b 100644 --- a/main/res/layout/caches_item.xml +++ b/main/res/layout/caches_item.xml @@ -109,8 +109,8 @@ android:gravity="center" android:minHeight="28px" android:minWidth="28px" - cc:skin="?compass" - android:visibility="gone" /> + android:visibility="gone" + cc:skin="?compass" /> <ImageView android:id="@+id/dirimg" diff --git a/main/res/layout/cacheview_logs_item.xml b/main/res/layout/cacheview_logs_item.xml index 99822d3..7bb12d2 100644 --- a/main/res/layout/cacheview_logs_item.xml +++ b/main/res/layout/cacheview_logs_item.xml @@ -100,8 +100,8 @@ android:layout_height="wrap_content" android:layout_gravity="left" android:layout_marginTop="22dip" - android:linksClickable="true" android:gravity="left" + android:linksClickable="true" android:textColor="?text_color" android:textSize="14sp" /> diff --git a/main/res/layout/fragment_edit_note.xml b/main/res/layout/fragment_edit_note.xml index 68e2b2c..1ed5e84 100644 --- a/main/res/layout/fragment_edit_note.xml +++ b/main/res/layout/fragment_edit_note.xml @@ -1,15 +1,15 @@ -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/edit_note" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_gravity="center" - android:orientation="vertical"> + android:orientation="vertical" > - <EditText - android:id="@+id/note" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:inputType="text" - android:imeOptions="actionDone"/> -</LinearLayout> + <EditText + android:id="@+id/note" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:imeOptions="actionDone" + android:inputType="text" /> + +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/gpx.xml b/main/res/layout/gpx.xml index 08f5bc1..c48c28f 100644 --- a/main/res/layout/gpx.xml +++ b/main/res/layout/gpx.xml @@ -4,7 +4,7 @@ android:layout_height="fill_parent" android:orientation="vertical" > - <include layout="@layout/actionbar"/> + <include layout="@layout/actionbar" /> <ListView android:id="@android:id/list" diff --git a/main/res/layout/init.xml b/main/res/layout/init.xml index e784b21..ae70fa7 100644 --- a/main/res/layout/init.xml +++ b/main/res/layout/init.xml @@ -28,32 +28,33 @@ style="@style/separator_horizontal_headline" android:text="@string/init_geocaching" /> </RelativeLayout> - + <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="3dip" android:orientation="horizontal" android:padding="3dip" > - - <CheckBox android:id="@+id/gc_option" + + <CheckBox + android:id="@+id/gc_option" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="left" - android:padding="1dip" - android:gravity="center" /> - + android:gravity="center" + android:padding="1dip" /> + <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:gravity="left" android:paddingRight="3dip" - android:textSize="14sp" + android:text="@string/init_gc_activate" android:textColor="?text_color" - android:text="@string/init_gc_activate" /> + android:textSize="14sp" /> </LinearLayout> - + <TextView android:id="@+id/legal_note" android:layout_width="wrap_content" @@ -849,4 +850,4 @@ </LinearLayout> </ScrollView> -</LinearLayout> +</LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/map_static.xml b/main/res/layout/map_static.xml index edf6c6e..2ffa70d 100644 --- a/main/res/layout/map_static.xml +++ b/main/res/layout/map_static.xml @@ -4,7 +4,7 @@ android:layout_height="fill_parent" android:orientation="vertical" > - <include layout="@layout/actionbar"/> + <include layout="@layout/actionbar" /> <ScrollView android:layout_width="fill_parent" diff --git a/main/res/layout/navigate.xml b/main/res/layout/navigate.xml index 9843b2a..b994b70 100644 --- a/main/res/layout/navigate.xml +++ b/main/res/layout/navigate.xml @@ -6,10 +6,10 @@ android:orientation="vertical" > <LinearLayout - android:id="@+id/info1" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > + android:id="@+id/info1" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > <TextView android:id="@+id/destination" @@ -55,7 +55,6 @@ </RelativeLayout> </LinearLayout> - <LinearLayout android:id="@+id/info2" android:layout_width="fill_parent" @@ -98,8 +97,8 @@ android:id="@+id/rose" android:layout_width="fill_parent" android:layout_height="295dip" - android:layout_below="@id/info1" android:layout_above="@id/info2" + android:layout_below="@id/info1" android:layout_centerInParent="true" android:layout_gravity="center_horizontal" android:layout_marginBottom="1dip" @@ -113,5 +112,4 @@ android:minWidth="289dip" android:padding="4dip" /> - </RelativeLayout>
\ No newline at end of file diff --git a/main/res/layout/spoilers.xml b/main/res/layout/spoilers.xml index 2027b7a..29ad570 100644 --- a/main/res/layout/spoilers.xml +++ b/main/res/layout/spoilers.xml @@ -5,7 +5,7 @@ android:background="?background_color" android:orientation="vertical" > - <include layout="@layout/actionbar"/> + <include layout="@layout/actionbar" /> <include layout="@layout/caches_images" /> |
