Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Change layout a bit

Browse source
This commit is contained in:
Victor Shcherb 2011-06-09 22:37:17 +02:00
parent 40120b6a4c
commit 6a681cdd8e
31 changed files with 50 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
OsmAnd/res/drawable-hdpi/button_icon_favorites.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
OsmAnd/res/drawable-hdpi/button_icon_map.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 20 KiB

BIN
OsmAnd/res/drawable-hdpi/button_icon_search.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 23 KiB

BIN
OsmAnd/res/drawable-hdpi/button_icon_settings.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 16 KiB

BIN
OsmAnd/res/drawable-land-hdpi/button_icon_favorites.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
OsmAnd/res/drawable-land-hdpi/button_icon_map.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
OsmAnd/res/drawable-land-hdpi/button_icon_search.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
OsmAnd/res/drawable-land-hdpi/button_icon_settings.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

BIN
OsmAnd/res/drawable-land/button_icon_favorites.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.2 KiB

BIN
OsmAnd/res/drawable-land/button_icon_map.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 7.7 KiB

BIN
OsmAnd/res/drawable-land/button_icon_search.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 6.5 KiB

BIN
OsmAnd/res/drawable-land/button_icon_settings.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.9 KiB

BIN
OsmAnd/res/drawable-large-land/button_icon_favorites.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
OsmAnd/res/drawable-large-land/button_icon_map.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
OsmAnd/res/drawable-large-land/button_icon_search.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
OsmAnd/res/drawable-large-land/button_icon_settings.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

BIN
OsmAnd/res/drawable-large/button_icon_favorites.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
OsmAnd/res/drawable-large/button_icon_map.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 20 KiB

BIN
OsmAnd/res/drawable-large/button_icon_search.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 23 KiB

BIN
OsmAnd/res/drawable-large/button_icon_settings.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 16 KiB

BIN
OsmAnd/res/drawable/button_icon_favorites.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
OsmAnd/res/drawable/button_icon_map.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
OsmAnd/res/drawable/button_icon_search.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
OsmAnd/res/drawable/button_icon_settings.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

32
OsmAnd/res/layout-land/menu.xml
View file

@ -12,10 +12,10 @@
<ImageView android:src="@drawable/headline_osmand_icon"
android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="8dp"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/AppName"
android:layout_marginLeft="0dp" android:layout_weight="1" android:layout_marginTop="5dp"
android:layout_marginLeft="0dp" android:layout_weight="1" android:layout_marginTop="3dp"
android:text="OsmAnd+" android:textColor="#000000" android:typeface="serif" android:textSize="20sp"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginTop="3dp"
android:text="0.5.1 beta(b6)" android:textColor="#000000" android:typeface="serif" android:id="@+id/TextVersion"
android:textSize="13sp"/>
<ImageView android:src="@drawable/headliner_close" android:layout_marginRight="10dp" android:id="@+id/CloseButton"
@ -31,14 +31,13 @@
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="15dp" android:layout_marginBottom="5dp"
android:text="@string/map_Button" android:textColor="#000000"
android:text="@string/map_Button" android:textColor="#000000" android:typeface="serif"
android:layout_weight="1"
android:textSize="16sp"/>
<ImageView
android:src="@drawable/button_icon_map"
android:scaleType="center"
android:layout_gravity="top|right"
android:layout_marginRight="30dp"
android:layout_gravity="center|right"
android:layout_marginRight="45dp" android:layout_marginBottom="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
@ -48,10 +47,9 @@
android:layout_width="240dp" android:layout_height="121dp">
<ImageView
android:src="@drawable/button_icon_search"
android:scaleType="center"
android:layout_gravity="top|left"
android:layout_gravity="center|left"
android:layout_width="wrap_content"
android:layout_marginLeft="35dp"
android:layout_marginLeft="45dp" android:layout_marginBottom="5dp"
android:layout_height="wrap_content"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
@ -59,7 +57,7 @@
android:layout_weight="1"
android:layout_marginLeft="5dp"
android:layout_marginRight="15dp" android:layout_marginBottom="5dp"
android:text="@string/search_button" android:textColor="#000000"
android:text="@string/search_button" android:textColor="#000000" android:typeface="serif"
android:textSize="16sp"/>
</LinearLayout>
</TableRow>
@ -69,14 +67,13 @@
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginLeft="15dp" android:layout_marginBottom="5dp"
android:layout_gravity="center_vertical|left"
android:text="@string/favorites_Button" android:textColor="#000000"
android:text="@string/favorites_Button" android:textColor="#000000" android:typeface="serif"
android:layout_weight="1"
android:textSize="16sp"/>
<ImageView
android:src="@drawable/button_icon_favorites"
android:scaleType="center"
android:layout_gravity="top|right"
android:layout_marginRight="30dp"
android:layout_gravity="center|right"
android:layout_marginRight="45dp" android:layout_marginBottom="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
@ -85,9 +82,8 @@
android:layout_width="240dp" android:layout_height="121dp">
<ImageView
android:src="@drawable/button_icon_settings"
android:scaleType="center"
android:layout_gravity="top|left"
android:layout_marginLeft="35dp"
android:layout_gravity="center|left"
android:layout_marginLeft="45dp" android:layout_marginBottom="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
@ -96,7 +92,7 @@
android:layout_weight="1"
android:layout_marginLeft="5dp"
android:layout_marginRight="15dp" android:layout_marginBottom="5dp"
android:text="@string/settings_Button" android:textColor="#000000"
android:text="@string/settings_Button" android:textColor="#000000" android:typeface="serif"
android:textSize="16sp"/>
</LinearLayout>
</TableRow>

16
OsmAnd/res/layout-large-land/menu.xml
View file

@ -37,8 +37,8 @@
<ImageView
android:src="@drawable/button_icon_map"
android:scaleType="center"
android:layout_gravity="top|right"
android:layout_marginRight="45dp"
android:layout_gravity="center|right"
android:layout_marginRight="67dp" android:layout_marginBottom="7dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
@ -49,9 +49,9 @@
<ImageView
android:src="@drawable/button_icon_search"
android:scaleType="center"
android:layout_gravity="top|left"
android:layout_gravity="center|left"
android:layout_marginLeft="67dp" android:layout_marginBottom="7dp"
android:layout_width="wrap_content"
android:layout_marginLeft="53dp"
android:layout_height="wrap_content"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
@ -75,8 +75,8 @@
<ImageView
android:src="@drawable/button_icon_favorites"
android:scaleType="center"
android:layout_gravity="top|right"
android:layout_marginRight="45dp"
android:layout_gravity="center|right"
android:layout_marginRight="67dp" android:layout_marginBottom="7dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
@ -86,8 +86,8 @@
<ImageView
android:src="@drawable/button_icon_settings"
android:scaleType="center"
android:layout_gravity="top|left"
android:layout_marginLeft="53dp"
android:layout_gravity="center|left"
android:layout_marginLeft="67dp" android:layout_marginBottom="7dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>

8
OsmAnd/res/layout-large/menu.xml
View file

@ -31,7 +31,7 @@
<ImageView
android:src="@drawable/button_icon_map"
android:scaleType="center"
android:layout_gravity="center_vertical"
android:layout_gravity="center" android:layout_marginRight="30dp" android:layout_marginTop="30dp"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
@ -47,7 +47,7 @@
<ImageView
android:src="@drawable/button_icon_search"
android:scaleType="center"
android:layout_gravity="center_vertical|right"
android:layout_gravity="center" android:layout_marginLeft="30dp" android:layout_marginTop="30dp"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
@ -65,7 +65,7 @@
<ImageView
android:src="@drawable/button_icon_favorites"
android:scaleType="center"
android:layout_gravity="top"
android:layout_gravity="center" android:layout_marginRight="30dp" android:layout_marginTop="30dp"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
@ -81,7 +81,7 @@
<ImageView
android:src="@drawable/button_icon_settings"
android:scaleType="center"
android:layout_gravity="top|right"
android:layout_gravity="center" android:layout_marginLeft="30dp" android:layout_marginTop="30dp"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>

24
OsmAnd/res/layout-small-land/menu.xml
View file

@ -31,14 +31,14 @@
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="15dp" android:layout_marginBottom="5dp"
android:text="@string/map_Button" android:textColor="#000000"
android:text="@string/map_Button" android:textColor="#000000" android:typeface="serif"
android:layout_weight="1"
android:textSize="16sp"/>
<ImageView
android:src="@drawable/button_icon_map"
android:scaleType="center"
android:layout_gravity="top|right"
android:layout_marginRight="30dp"
android:layout_gravity="center|right"
android:layout_marginRight="45dp" android:layout_marginBottom="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
@ -49,9 +49,9 @@
<ImageView
android:src="@drawable/button_icon_search"
android:scaleType="center"
android:layout_gravity="top|left"
android:layout_gravity="center|left"
android:layout_marginLeft="45dp" android:layout_marginBottom="5dp"
android:layout_width="wrap_content"
android:layout_marginLeft="35dp"
android:layout_height="wrap_content"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
@ -59,7 +59,7 @@
android:layout_weight="1"
android:layout_marginLeft="5dp"
android:layout_marginRight="15dp" android:layout_marginBottom="5dp"
android:text="@string/search_button" android:textColor="#000000"
android:text="@string/search_button" android:textColor="#000000" android:typeface="serif"
android:textSize="16sp"/>
</LinearLayout>
</TableRow>
@ -69,14 +69,14 @@
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginLeft="15dp" android:layout_marginBottom="5dp"
android:layout_gravity="center_vertical|left"
android:text="@string/favorites_Button" android:textColor="#000000"
android:text="@string/favorites_Button" android:textColor="#000000" android:typeface="serif"
android:layout_weight="1"
android:textSize="16sp"/>
<ImageView
android:src="@drawable/button_icon_favorites"
android:scaleType="center"
android:layout_gravity="top|right"
android:layout_marginRight="30dp"
android:layout_gravity="center|right"
android:layout_marginRight="45dp" android:layout_marginBottom="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
@ -86,8 +86,8 @@
<ImageView
android:src="@drawable/button_icon_settings"
android:scaleType="center"
android:layout_gravity="top|left"
android:layout_marginLeft="35dp"
android:layout_gravity="center|left"
android:layout_marginLeft="45dp" android:layout_marginBottom="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
@ -96,7 +96,7 @@
android:layout_weight="1"
android:layout_marginLeft="5dp"
android:layout_marginRight="15dp" android:layout_marginBottom="5dp"
android:text="@string/settings_Button" android:textColor="#000000"
android:text="@string/settings_Button" android:textColor="#000000" android:typeface="serif"
android:textSize="16sp"/>
</LinearLayout>
</TableRow>

8
OsmAnd/res/layout-small/menu.xml
View file

@ -32,7 +32,7 @@
<ImageView
android:src="@drawable/button_icon_map"
android:scaleType="center"
android:layout_gravity="center_vertical"
android:layout_gravity="center" android:layout_marginRight="20dp" android:layout_marginTop="15dp"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
@ -48,7 +48,7 @@
<ImageView
android:src="@drawable/button_icon_search"
android:scaleType="center"
android:layout_gravity="center_vertical|right"
android:layout_gravity="center" android:layout_marginLeft="20dp" android:layout_marginTop="15dp"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
@ -66,7 +66,7 @@
<ImageView
android:src="@drawable/button_icon_favorites"
android:scaleType="center"
android:layout_gravity="top"
android:layout_gravity="center" android:layout_marginRight="20dp" android:layout_marginTop="15dp"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
@ -82,7 +82,7 @@
<ImageView
android:src="@drawable/button_icon_settings"
android:scaleType="center"
android:layout_gravity="top|right"
android:layout_gravity="center" android:layout_marginLeft="20dp" android:layout_marginTop="15dp"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>

12
OsmAnd/res/layout/menu.xml
View file

@ -12,10 +12,10 @@
<ImageView android:src="@drawable/headline_osmand_icon"
android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="8dp"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/AppName"
android:layout_marginLeft="0dp" android:layout_weight="1" android:layout_marginTop="5dp"
android:layout_marginLeft="0dp" android:layout_weight="1" android:layout_marginTop="3dp"
android:text="OsmAnd+" android:textColor="#000000" android:typeface="serif" android:textSize="20sp"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginTop="3dp"
android:text="0.5.1 beta(b6)" android:textColor="#000000" android:typeface="serif" android:id="@+id/TextVersion"
android:textSize="13sp"/>
<ImageView android:layout_marginRight="12dp" android:clickable="true" android:id="@+id/CloseButton"
@ -31,7 +31,7 @@
<ImageView
android:src="@drawable/button_icon_map"
android:scaleType="center"
android:layout_gravity="center_vertical"
android:layout_gravity="center" android:layout_marginRight="20dp" android:layout_marginTop="20dp"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
@ -47,7 +47,7 @@
<ImageView
android:src="@drawable/button_icon_search"
android:scaleType="center"
android:layout_gravity="center_vertical|right"
android:layout_gravity="center" android:layout_marginLeft="20dp" android:layout_marginTop="20dp"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
@ -65,7 +65,7 @@
<ImageView
android:src="@drawable/button_icon_favorites"
android:scaleType="center"
android:layout_gravity="top"
android:layout_gravity="center" android:layout_marginRight="20dp" android:layout_marginTop="20dp"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
@ -81,7 +81,7 @@
<ImageView
android:src="@drawable/button_icon_settings"
android:scaleType="center"
android:layout_gravity="top|right"
android:layout_gravity="center" android:layout_marginLeft="20dp" android:layout_marginTop="20dp"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>

2
OsmAnd/src/net/osmand/plus/activities/TipsAndTricksActivity.java
View file

@ -138,6 +138,7 @@ public class TipsAndTricksActivity {
historyInd[0] ++;
dlg.setTitle(getTipName(toShow.get(historyInd[0])));
tipDescription.setText(getTipDescription(toShow.get(historyInd[0])));
tipDescription.scrollTo(0, 0);
prevButton.setEnabled(historyInd[0] > 0);
nextButton.setEnabled(historyInd[0] < getNumberOfTips() - 1);
@ -151,6 +152,7 @@ public class TipsAndTricksActivity {
historyInd[0] --;
dlg.setTitle(getTipName(toShow.get(historyInd[0])));
tipDescription.setText(getTipDescription(toShow.get(historyInd[0])));
tipDescription.scrollTo(0, 0);
}
prevButton.setEnabled(historyInd[0] > 0);
nextButton.setEnabled(historyInd[0] < getNumberOfTips() - 1);