diff options
| author | rsudev <rasch@munin-soft.de> | 2013-06-23 22:45:05 +0200 |
|---|---|---|
| committer | rsudev <rasch@munin-soft.de> | 2013-06-23 22:45:45 +0200 |
| commit | f38e587364e95b0fd44eaf81d9c45ca64aa6e4bd (patch) | |
| tree | 0d366b4ff84da77abb959c8a7a9e3e9f1bab3658 | |
| parent | e733eb45200b16ed4b59b87c113a3044c52316ca (diff) | |
| download | cgeo-f38e587364e95b0fd44eaf81d9c45ca64aa6e4bd.zip cgeo-f38e587364e95b0fd44eaf81d9c45ca64aa6e4bd.tar.gz cgeo-f38e587364e95b0fd44eaf81d9c45ca64aa6e4bd.tar.bz2 | |
Refactor main activity layout, remove duplicates
| -rw-r--r-- | main/res/layout/main_activity.xml | 50 | ||||
| -rw-r--r-- | main/res/values/styles.xml | 15 |
2 files changed, 27 insertions, 38 deletions
diff --git a/main/res/layout/main_activity.xml b/main/res/layout/main_activity.xml index 11827a4..aff24e1 100644 --- a/main/res/layout/main_activity.xml +++ b/main/res/layout/main_activity.xml @@ -36,18 +36,11 @@ android:orientation="vertical" > <LinearLayout - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:layout_margin="4dip" - android:gravity="center_horizontal" - android:orientation="horizontal" > + style="@style/icon_mainscreen_row" > <LinearLayout - android:layout_width="74dip" - android:layout_height="wrap_content" - android:layout_margin="4dip" - android:onClick="cgeoFindOnMap" - android:orientation="vertical" > + style="@style/icon_mainscreen_cell" + android:onClick="cgeoFindOnMap" > <ImageView android:id="@+id/map" @@ -60,10 +53,7 @@ </LinearLayout> <LinearLayout - android:layout_width="74dip" - android:layout_height="wrap_content" - android:layout_margin="4dip" - android:orientation="vertical" > + style="@style/icon_mainscreen_cell" > <ImageView android:id="@+id/nearest" @@ -87,10 +77,7 @@ android:textIsSelectable="false" /> <LinearLayout - android:layout_width="74dip" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:orientation="vertical" > + style="@style/icon_mainscreen_cell_counter" > <ImageView android:id="@+id/search_offline" @@ -105,18 +92,11 @@ </LinearLayout> <LinearLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_margin="4dip" - android:gravity="center_horizontal" - android:orientation="horizontal" > + style="@style/icon_mainscreen_row" > <LinearLayout - android:layout_width="74dip" - android:layout_height="wrap_content" - android:layout_margin="4dip" - android:onClick="cgeoSearch" - android:orientation="vertical" > + style="@style/icon_mainscreen_cell" + android:onClick="cgeoSearch" > <ImageView android:id="@+id/advanced_button" @@ -129,11 +109,8 @@ </LinearLayout> <LinearLayout - android:layout_width="74dip" - android:layout_height="wrap_content" - android:layout_margin="4dip" - android:onClick="cgeoPoint" - android:orientation="vertical" > + style="@style/icon_mainscreen_cell" + android:onClick="cgeoPoint" > <ImageView android:id="@+id/any_button" @@ -146,11 +123,8 @@ </LinearLayout> <LinearLayout - android:layout_width="74dip" - android:layout_height="wrap_content" - android:layout_margin="4dip" - android:onClick="cgeoFilter" - android:orientation="vertical" > + style="@style/icon_mainscreen_cell" + android:onClick="cgeoFilter" > <ImageView android:id="@+id/filter_button" diff --git a/main/res/values/styles.xml b/main/res/values/styles.xml index da60d0c..fed8e1e 100644 --- a/main/res/values/styles.xml +++ b/main/res/values/styles.xml @@ -193,6 +193,21 @@ <item name="android:background">@drawable/count_bcg</item> <item name="android:text"></item> </style> + <style name="icon_mainscreen_cell_counter"> + <item name="android:layout_width">74dip</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:orientation">vertical</item> + </style> + <style name="icon_mainscreen_cell" parent="icon_mainscreen_cell_counter"> + <item name="android:layout_margin">4dip</item> + </style> + <style name="icon_mainscreen_row"> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">fill_parent</item> + <item name="android:layout_margin">4dip</item> + <item name="android:gravity">center_horizontal</item> + <item name="android:orientation">horizontal</item> + </style> <!-- current location --> <style name="location_current"> |