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

Merge branch 'master' of https://github.com/Bars107/osmand

Browse source
This commit is contained in:
Denis 2014-12-18 11:32:12 +02:00
commit 7cd601ebbc
21 changed files with 142 additions and 159 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/res/layout-land/dash_search_fragment.xml
View file

@ -3,7 +3,6 @@
android:id="@+id/search" android:id="@+id/search"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:background="@drawable/bg_cardui" android:background="@drawable/bg_cardui"
android:orientation="vertical" > android:orientation="vertical" >

11
OsmAnd/res/layout-large-land/dashboard.xml
View file

@ -8,7 +8,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:padding="6dp" > android:padding="@dimen/dashPadding" >
<LinearLayout android:orientation="horizontal" <LinearLayout android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -34,18 +34,21 @@
<fragment <fragment
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:name="net.osmand.plus.dashboard.DashFavoritesFragment" android:name="net.osmand.plus.dashboard.DashFavoritesFragment"
android:layout_marginTop="@dimen/dashCardMargin"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<fragment <fragment
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:name="net.osmand.plus.dashboard.DashUpdatesFragment" android:name="net.osmand.plus.dashboard.DashUpdatesFragment"
android:layout_marginTop="@dimen/dashCardMargin"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<fragment <fragment
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:name="net.osmand.plus.dashboard.DashDownloadMapsFragment" android:name="net.osmand.plus.dashboard.DashDownloadMapsFragment"
android:layout_marginTop="@dimen/dashCardMargin"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
@ -66,12 +69,14 @@
<fragment <fragment
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:name="net.osmand.plus.dashboard.DashAudioVideoNotesFragment" android:name="net.osmand.plus.dashboard.DashAudioVideoNotesFragment"
android:layout_marginTop="@dimen/dashCardMargin"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<fragment <fragment
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:name="net.osmand.plus.dashboard.DashPluginsFragment" android:name="net.osmand.plus.dashboard.DashPluginsFragment"
android:layout_marginTop="@dimen/dashCardMargin"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
@ -84,7 +89,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="gone" android:visibility="gone"
android:padding="6dp" android:padding="@dimen/dashPadding"
android:baselineAligned="false"> android:baselineAligned="false">
<LinearLayout <LinearLayout
@ -99,7 +104,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="start|bottom" android:layout_gravity="start|bottom"
android:text="@string/about_settings" android:text="@string/about_settings"
android:textSize="20sp" /> android:textSize="@dimen/dashAboutTextSize" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

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

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
</LinearLayout>

3
OsmAnd/res/layout/dash_audio_video_notes_plugin.xml
View file

@ -3,13 +3,12 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/main_notes" android:id="@+id/main_notes"
android:background="@drawable/bg_cardui" android:background="@drawable/bg_cardui"
android:layout_marginBottom="4dp"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout android:orientation="horizontal" <LinearLayout android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="40dp"> android:layout_height="@dimen/dashHeaderHeight">
<TextView android:id="@+id/notes_text" <TextView android:id="@+id/notes_text"
android:text="@string/map_widget_av_notes" android:text="@string/map_widget_av_notes"
style="@style/DashboardSubHeader"/> style="@style/DashboardSubHeader"/>

4
OsmAnd/res/layout/dash_download_maps_fragment.xml
View file

@ -7,7 +7,7 @@
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView android:id="@+id/message" <TextView android:id="@+id/message"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="12dp" android:padding="@dimen/dashFavIconMargin"
android:layout_width="match_parent" android:layout_width="match_parent"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:textColor="@color/dashboard_black" android:textColor="@color/dashboard_black"
@ -17,7 +17,7 @@
android:layout_height="1dp"/> android:layout_height="1dp"/>
<LinearLayout android:layout_width="fill_parent" <LinearLayout android:layout_width="fill_parent"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_height="40dp"> android:layout_height="@dimen/dashHeaderHeight">
<Button android:id="@+id/local_downloads" <Button android:id="@+id/local_downloads"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"

4
OsmAnd/res/layout/dash_error_fragment.xml
View file

@ -7,7 +7,7 @@
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView android:id="@+id/error_header" <TextView android:id="@+id/error_header"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="12dp" android:padding="@dimen/dashFavIconMargin"
android:layout_width="match_parent" android:layout_width="match_parent"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:textColor="@color/dashboard_black" android:textColor="@color/dashboard_black"
@ -17,7 +17,7 @@
android:layout_height="1dp"/> android:layout_height="1dp"/>
<LinearLayout android:layout_width="fill_parent" <LinearLayout android:layout_width="fill_parent"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_height="40dp"> android:layout_height="@dimen/dashHeaderHeight">
<Button android:id="@+id/error_btn" <Button android:id="@+id/error_btn"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"

39
OsmAnd/res/layout/dash_fav_list.xml
View file

@ -1,39 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:background="@drawable/dashboard_button"
android:layout_height="50dp">
<View android:layout_width="match_parent"
android:background="@color/dashboard_divider"
android:layout_height="1dp"/>
<LinearLayout android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView android:id="@+id/icon"
android:layout_gravity="center_vertical"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:layout_width="28dp"
android:layout_height="28dp"/>
<LinearLayout android:orientation="vertical"
android:layout_gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView android:id="@+id/name"
android:textSize="16sp"
android:textColor="@color/dashboard_black"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView android:id="@+id/distance"
android:textSize="12sp"
android:textColor="@color/dashboard_blue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>

3
OsmAnd/res/layout/dash_favorites_fragment.xml
View file

@ -3,13 +3,12 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/main_fav" android:id="@+id/main_fav"
android:background="@drawable/bg_cardui" android:background="@drawable/bg_cardui"
android:layout_marginBottom="4dp"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout android:orientation="horizontal" <LinearLayout android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="40dp"> android:layout_height="@dimen/dashHeaderHeight">
<TextView android:id="@+id/fav_text" <TextView android:id="@+id/fav_text"
android:text="@string/my_data_Button" android:text="@string/my_data_Button"
style="@style/DashboardSubHeader"/> style="@style/DashboardSubHeader"/>

26
OsmAnd/res/layout/dash_favorites_item.xml
View file

@ -4,7 +4,7 @@
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:background="@drawable/dashboard_button" android:background="@drawable/dashboard_button"
android:layout_height="50dp"> android:layout_height="@dimen/dashListItemHeight">
<View android:layout_width="match_parent" <View android:layout_width="match_parent"
android:background="@color/dashboard_divider" android:background="@color/dashboard_divider"
android:layout_height="1dp"/> android:layout_height="1dp"/>
@ -13,18 +13,17 @@
android:layout_height="match_parent"> android:layout_height="match_parent">
<ImageView android:id="@+id/icon" <ImageView android:id="@+id/icon"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="12dp" android:layout_marginLeft="@dimen/dashFavIconMargin"
android:layout_marginRight="12dp" android:layout_marginRight="@dimen/dashFavIconMargin"
android:layout_width="28dp" android:layout_width="wrap_content"
android:layout_height="28dp"/> android:layout_height="fill_parent"/>
<LinearLayout android:orientation="vertical" <LinearLayout android:orientation="vertical"
android:layout_weight="1" android:layout_weight="1"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView android:id="@+id/name" <TextView android:id="@+id/name"
android:textSize="16sp" android:textSize="@dimen/dashFavNameTextSize"
android:textColor="@color/dashboard_black" android:textColor="@color/dashboard_black"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
@ -34,10 +33,10 @@
<ImageView android:visibility="gone" <ImageView android:visibility="gone"
android:id="@+id/direction" android:id="@+id/direction"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_width="10dp" android:layout_width="@dimen/dashFavDirectionSize"
android:layout_height="10dp"/> android:layout_height="@dimen/dashFavDirectionSize"/>
<TextView android:id="@+id/distance" <TextView android:id="@+id/distance"
android:textSize="12sp" android:textSize="@dimen/showAllButtonTextSize"
android:textColor="@color/dashboard_blue" android:textColor="@color/dashboard_blue"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
@ -46,11 +45,12 @@
</LinearLayout> </LinearLayout>
<ImageButton android:id="@+id/navigate_to" <ImageButton android:id="@+id/navigate_to"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_action_gdirections_light" android:src="@drawable/ic_action_gdirections_light"
android:background="@drawable/dashboard_button" android:background="@drawable/dashboard_button"
android:layout_marginLeft="12dp" android:layout_marginLeft="@dimen/dashFavIconMargin"
android:layout_width="50dp" android:layout_width="@dimen/dashListItemHeight"
android:layout_height="50dp"/> android:layout_height="@dimen/dashListItemHeight"/>
</LinearLayout> </LinearLayout>

19
OsmAnd/res/layout/dash_map_fragment.xml
View file

@ -3,12 +3,11 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:background="@drawable/bg_cardui" android:background="@drawable/bg_cardui"
android:layout_marginBottom="4dp"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<LinearLayout android:orientation="horizontal" <LinearLayout android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="40dp"> android:layout_height="@dimen/dashHeaderHeight">
<TextView android:id="@+id/map_text" <TextView android:id="@+id/map_text"
android:text="@string/map_Button" android:text="@string/map_Button"
style="@style/DashboardSubHeader"/> style="@style/DashboardSubHeader"/>
@ -17,10 +16,12 @@
style="@style/DashboardGeneralButton"/> style="@style/DashboardGeneralButton"/>
</LinearLayout> </LinearLayout>
<RelativeLayout android:layout_width="wrap_content" android:layout_height="wrap_content"> <RelativeLayout android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/subHeaderPadding">
<LinearLayout android:id="@+id/loading" <LinearLayout android:id="@+id/loading"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="110dp" android:layout_height="@dimen/dashMapHeight"
android:gravity="center_vertical|center_horizontal" android:gravity="center_vertical|center_horizontal"
android:orientation="horizontal"> android:orientation="horizontal">
@ -35,16 +36,16 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxLines="3" android:maxLines="3"
android:text="@string/loading_data" android:text="@string/loading_data"
android:textSize="18sp" /> android:textSize="@dimen/dashProgressTextSize" />
</LinearLayout> </LinearLayout>
<net.osmand.plus.views.OsmAndMapSurfaceView <net.osmand.plus.views.OsmAndMapSurfaceView
android:id="@+id/MapView" android:id="@+id/MapView"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="110dp" android:layout_height="@dimen/dashMapHeight"
android:layout_marginLeft="2dp" android:layout_marginLeft="@dimen/dashMapMargin"
android:layout_marginRight="2dp" android:layout_marginRight="@dimen/dashMapMargin"
android:layout_marginBottom="2dp" android:layout_marginBottom="@dimen/dashMapMargin"
android:contentDescription="@string/map_view" android:contentDescription="@string/map_view"
android:visibility="gone"/> android:visibility="gone"/>
</RelativeLayout> </RelativeLayout>

20
OsmAnd/res/layout/dash_note_item.xml
View file

@ -4,7 +4,7 @@
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:background="@drawable/dashboard_button" android:background="@drawable/dashboard_button"
android:layout_height="50dp"> android:layout_height="@dimen/dashHeaderHeight">
<View android:layout_width="match_parent" <View android:layout_width="match_parent"
android:background="@color/dashboard_divider" android:background="@color/dashboard_divider"
android:layout_height="1dp"/> android:layout_height="1dp"/>
@ -13,10 +13,10 @@
android:layout_height="match_parent"> android:layout_height="match_parent">
<ImageView android:id="@+id/icon" <ImageView android:id="@+id/icon"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="12dp" android:layout_marginLeft="@dimen/dashFavIconMargin"
android:layout_marginRight="12dp" android:layout_marginRight="@dimen/dashFavIconMargin"
android:layout_width="28dp" android:layout_width="@dimen/dashNoteIconSize"
android:layout_height="28dp"/> android:layout_height="@dimen/dashNoteIconSize"/>
<LinearLayout android:orientation="vertical" <LinearLayout android:orientation="vertical"
android:layout_weight="1" android:layout_weight="1"
@ -24,7 +24,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView android:id="@+id/name" <TextView android:id="@+id/name"
android:textSize="16sp" android:textSize="@dimen/dashFavNameTextSize"
android:lines="1" android:lines="1"
android:ellipsize="end" android:ellipsize="end"
android:textColor="@color/dashboard_black" android:textColor="@color/dashboard_black"
@ -32,7 +32,7 @@
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<TextView android:id="@+id/descr" <TextView android:id="@+id/descr"
android:textSize="12sp" android:textSize="@dimen/showAllButtonTextSize"
android:lines="1" android:lines="1"
android:ellipsize="end" android:ellipsize="end"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -43,9 +43,9 @@
<ImageButton android:id="@+id/play" <ImageButton android:id="@+id/play"
android:src="@drawable/ic_play_light" android:src="@drawable/ic_play_light"
android:background="@drawable/dashboard_button" android:background="@drawable/dashboard_button"
android:layout_marginLeft="12dp" android:layout_marginLeft="@dimen/dashFavIconMargin"
android:layout_width="50dp" android:layout_width="@dimen/dashHeaderHeight"
android:layout_height="50dp"/> android:layout_height="@dimen/dashHeaderHeight"/>
</LinearLayout> </LinearLayout>

8
OsmAnd/res/layout/dash_plugin_item.xml
View file

@ -12,9 +12,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="12dp" android:paddingLeft="@dimen/dashFavIconMargin"
android:paddingBottom="4dp" android:paddingBottom="@dimen/dashPluginPadding"
android:paddingRight="12dp" > android:paddingRight="@dimen/dashFavIconMargin" >
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
@ -27,7 +27,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginLeft="@dimen/dashPluginMargin"
android:ellipsize="end" android:ellipsize="end"
android:lines="1" android:lines="1"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"

2
OsmAnd/res/layout/dash_plugins_fragment.xml
View file

@ -7,7 +7,7 @@
android:layout_height="match_parent"> android:layout_height="match_parent">
<LinearLayout android:orientation="horizontal" <LinearLayout android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="40dp"> android:layout_height="@dimen/dashHeaderHeight">
<TextView android:id="@+id/plugin_text" <TextView android:id="@+id/plugin_text"
android:text="@string/prefs_plugins" android:text="@string/prefs_plugins"
style="@style/DashboardSubHeader"/> style="@style/DashboardSubHeader"/>

7
OsmAnd/res/layout/dash_search_fragment.xml
View file

@ -3,7 +3,6 @@
android:id="@+id/search" android:id="@+id/search"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:background="@drawable/bg_cardui" android:background="@drawable/bg_cardui"
android:orientation="vertical" > android:orientation="vertical" >
@ -14,7 +13,7 @@
android:id="@+id/search_for" android:id="@+id/search_for"
style="@style/DashboardSubHeader" style="@style/DashboardSubHeader"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="40dp" android:layout_height="@dimen/dashHeaderHeight"
android:text="@string/search_for" /> android:text="@string/search_for" />
</LinearLayout> </LinearLayout>
@ -25,7 +24,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="90dp" android:layout_height="@dimen/dashSearchBtnHeight"
android:orientation="horizontal" > android:orientation="horizontal" >
<Button <Button
@ -64,7 +63,7 @@
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="90dp" android:layout_height="@dimen/dashSearchBtnHeight"
android:orientation="horizontal" > android:orientation="horizontal" >
<Button <Button

3
OsmAnd/res/layout/dash_updates_fragment.xml
View file

@ -4,13 +4,12 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:background="@drawable/bg_cardui" android:background="@drawable/bg_cardui"
android:layout_marginBottom="4dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<LinearLayout <LinearLayout
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp"> android:layout_height="@dimen/dashHeaderHeight">
<TextView android:text="@string/map_update" <TextView android:text="@string/map_update"
android:id="@+id/header" android:id="@+id/header"
style="@style/DashboardSubHeader"/> style="@style/DashboardSubHeader"/>

18
OsmAnd/res/layout/dash_updates_item.xml
View file

@ -3,14 +3,14 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_marginLeft="12dp" android:layout_marginLeft="@dimen/dashFavIconMargin"
android:layout_marginRight="12dp" android:layout_marginRight="@dimen/dashFavIconMargin"
android:layout_height="50dp"> android:layout_height="@dimen/dashListItemHeight">
<View android:layout_width="match_parent" <View android:layout_width="match_parent"
android:background="@color/dashboard_divider" android:background="@color/dashboard_divider"
android:layout_height="1dp"/> android:layout_height="1dp"/>
<LinearLayout android:orientation="horizontal" <LinearLayout android:orientation="horizontal"
android:layout_marginLeft="15dp" android:layout_marginLeft="@dimen/subHeaderMarginLeft"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent"> android:layout_height="fill_parent">
<LinearLayout android:orientation="vertical" <LinearLayout android:orientation="vertical"
@ -20,6 +20,7 @@
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView android:id="@+id/map_name" <TextView android:id="@+id/map_name"
android:textColor="@color/dashboard_black" android:textColor="@color/dashboard_black"
android:textSize="@dimen/dashFavNameTextSize"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<TextView android:id="@+id/map_descr" <TextView android:id="@+id/map_descr"
@ -30,16 +31,15 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:src="@drawable/download_button" android:src="@drawable/download_button"
android:background="@drawable/dashboard_button" android:background="@drawable/dashboard_button"
android:layout_width="50dp" android:layout_width="@dimen/dashListItemHeight"
android:layout_height="50dp"/> android:layout_height="@dimen/dashListItemHeight"/>
</LinearLayout> </LinearLayout>
<ProgressBar android:id="@+id/ProgressBar" <ProgressBar android:id="@+id/ProgressBar"
android:layout_marginLeft="12dp" android:layout_marginLeft="@dimen/dashFavIconMargin"
android:layout_marginRight="12dp" android:layout_marginRight="@dimen/dashFavIconMargin"
android:visibility="gone" android:visibility="gone"
style="?android:attr/progressBarStyleHorizontal" style="?android:attr/progressBarStyleHorizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
</LinearLayout> </LinearLayout>

44
OsmAnd/res/layout/dashboard.xml
View file

@ -8,7 +8,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:padding="6dp" > android:padding="@dimen/dashPadding" >
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -28,42 +28,42 @@
<fragment <fragment
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:name="net.osmand.plus.dashboard.DashSearchFragment" android:name="net.osmand.plus.dashboard.DashSearchFragment"
android:layout_marginTop="4dp" android:layout_marginTop="@dimen/dashCardMargin"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<fragment <fragment
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:name="net.osmand.plus.dashboard.DashFavoritesFragment" android:name="net.osmand.plus.dashboard.DashFavoritesFragment"
android:layout_marginTop="4dp" android:layout_marginTop="@dimen/dashCardMargin"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<fragment <fragment
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:name="net.osmand.plus.dashboard.DashAudioVideoNotesFragment" android:name="net.osmand.plus.dashboard.DashAudioVideoNotesFragment"
android:layout_marginTop="4dp" android:layout_marginTop="@dimen/dashCardMargin"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<fragment <fragment
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:name="net.osmand.plus.dashboard.DashUpdatesFragment" android:name="net.osmand.plus.dashboard.DashUpdatesFragment"
android:layout_marginTop="4dp" android:layout_marginTop="@dimen/dashCardMargin"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<fragment <fragment
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:name="net.osmand.plus.dashboard.DashDownloadMapsFragment" android:name="net.osmand.plus.dashboard.DashDownloadMapsFragment"
android:layout_marginTop="4dp" android:layout_marginTop="@dimen/dashCardMargin"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<fragment <fragment
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:name="net.osmand.plus.dashboard.DashPluginsFragment" android:name="net.osmand.plus.dashboard.DashPluginsFragment"
android:layout_marginTop="4dp" android:layout_marginTop="@dimen/dashCardMargin"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
</LinearLayout> </LinearLayout>
@ -73,7 +73,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="gone" android:visibility="gone"
android:padding="6dp" android:padding="@dimen/dashPadding"
android:baselineAligned="false"> android:baselineAligned="false">
<LinearLayout <LinearLayout
@ -88,35 +88,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="start|bottom" android:layout_gravity="start|bottom"
android:text="@string/about_settings" android:text="@string/about_settings"
android:textSize="20sp" /> android:textSize="@dimen/dashAboutTextSize" />
</LinearLayout> </LinearLayout>
<!-- All Copyright notes and links have been put on the 'About' screen
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:orientation="vertical" >
<TextView
android:id="@+id/Copyright"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:gravity="end"
android:textSize="14sp" />
<TextView
android:id="@+id/OpenStreetMaps"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginTop="5dp"
android:gravity="end"
android:text="@string/openstreetmap_copyright"
android:textSize="14sp" />
</LinearLayout>
-->
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

29
OsmAnd/res/values-large/sizes.xml Normal file
View file

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="dashHeaderHeight">60dp</dimen>
<dimen name="subHeaderPadding">3dp</dimen>
<dimen name="subHeaderMarginLeft">22dp</dimen>
<dimen name="showAllButtonMarginRight">21dp</dimen>
<dimen name="showAllButtonHeight">54dp</dimen>
<dimen name="dashListItemHeight">75dp</dimen>
<dimen name="dashFavIconSize">42dp</dimen>
<dimen name="dashFavIconMargin">18dp</dimen>
<dimen name="dashFavDirectionSize">15dp</dimen>
<dimen name="dashMapHeight">165dp</dimen>
<dimen name="dashMapMargin">3dp</dimen>
<dimen name="dashProgressTextSize">27sp</dimen>
<dimen name="dashNoteIconSize">42dp</dimen>
<dimen name="dashPluginPadding">6dp</dimen>
<dimen name="dashPluginMargin">12dp</dimen>
<dimen name="dashSearchBtnHeight">135dp</dimen>
<dimen name="dashSearchPaddingTop">25dp</dimen>
<dimen name="dashSearchPaddingBot">15dp</dimen>
<dimen name="dashPadding">9dp</dimen>
<dimen name="dashAboutTextSize">30sp</dimen>
<dimen name="dashCardMargin">6dp</dimen>
<!-- TextSizes -->
<dimen name="showAllButtonTextSize">18sp</dimen>
<dimen name="subHeaderTextSize">21sp</dimen>
<dimen name="dashFavNameTextSize">24sp</dimen>
</resources>

30
OsmAnd/res/values/sizes.xml Normal file
View file

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="dashHeaderHeight">40dp</dimen>
<dimen name="subHeaderPadding">2dp</dimen>
<dimen name="subHeaderMarginLeft">15dp</dimen>
<dimen name="showAllButtonMarginRight">14dp</dimen>
<dimen name="showAllButtonHeight">36dp</dimen>
<dimen name="dashListItemHeight">50dp</dimen>
<dimen name="dashFavIconSize">28dp</dimen>
<dimen name="dashFavIconMargin">12dp</dimen>
<dimen name="dashFavDirectionSize">10dp</dimen>
<dimen name="dashMapHeight">110dp</dimen>
<dimen name="dashMapMargin">2dp</dimen>
<dimen name="dashNoteIconSize">28dp</dimen>
<dimen name="dashPluginPadding">4dp</dimen>
<dimen name="dashPluginMargin">8dp</dimen>
<dimen name="dashSearchBtnHeight">90dp</dimen>
<dimen name="dashSearchPaddingTop">17dp</dimen>
<dimen name="dashSearchPaddingBot">11dp</dimen>
<dimen name="dashPadding">6dp</dimen>
<dimen name="dashAboutTextSize">20sp</dimen>
<dimen name="dashCardMargin">4dp</dimen>
<!-- TextSizes -->
<dimen name="showAllButtonTextSize">12sp</dimen>
<dimen name="subHeaderTextSize">14sp</dimen>
<dimen name="dashFavNameTextSize">16sp</dimen>
<dimen name="dashProgressTextSize">18sp</dimen>
</resources>

18
OsmAnd/res/values/styles.xml
View file

@ -12,33 +12,33 @@
<item name="android:layout_width">0dp</item> <item name="android:layout_width">0dp</item>
<item name="android:layout_weight">1</item> <item name="android:layout_weight">1</item>
<item name="android:layout_height">fill_parent</item> <item name="android:layout_height">fill_parent</item>
<item name="android:paddingBottom">2dp</item> <item name="android:paddingBottom">@dimen/subHeaderPadding</item>
<item name="android:gravity">center_vertical</item> <item name="android:gravity">center_vertical</item>
<item name="android:textColor">@color/dashboard_black</item> <item name="android:textColor">@color/dashboard_black</item>
<item name="android:layout_marginLeft">15dp</item>ll <item name="android:layout_marginLeft">@dimen/subHeaderMarginLeft</item>
<item name="android:textSize">14sp</item> <item name="android:textSize">@dimen/subHeaderTextSize</item>
</style> </style>
<style name="DashboardGeneralButton"> <style name="DashboardGeneralButton">
<item name="android:layout_marginRight">14dp</item> <item name="android:layout_marginRight">@dimen/showAllButtonMarginRight</item>
<item name="android:layout_width">wrap_content</item> <item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">36dp</item> <item name="android:layout_height">@dimen/showAllButtonHeight</item>
<item name="android:layout_gravity">center_vertical</item> <item name="android:layout_gravity">center_vertical</item>
<item name="android:textSize">12sp</item> <item name="android:textSize">@dimen/showAllButtonTextSize</item>
<item name="android:textColor">@color/dashboard_blue</item> <item name="android:textColor">@color/dashboard_blue</item>
<item name="android:background">@drawable/dashboard_button</item> <item name="android:background">@drawable/dashboard_button</item>
</style> </style>
<style name="DashboardSearchButton"> <style name="DashboardSearchButton">
<item name="android:paddingTop">17dp</item> <item name="android:paddingTop">@dimen/dashSearchPaddingTop</item>
<item name="android:layout_width">0dp</item> <item name="android:layout_width">0dp</item>
<item name="android:layout_height">match_parent</item> <item name="android:layout_height">match_parent</item>
<item name="android:layout_weight">1</item> <item name="android:layout_weight">1</item>
<item name="android:textSize">12sp</item> <item name="android:textSize">@dimen/showAllButtonTextSize</item>
<item name="android:textColor">@color/dashboard_black</item> <item name="android:textColor">@color/dashboard_black</item>
<item name="android:background">@drawable/dashboard_button</item> <item name="android:background">@drawable/dashboard_button</item>
<item name="android:gravity">bottom|center_horizontal</item> <item name="android:gravity">bottom|center_horizontal</item>
<item name="android:paddingBottom">11dp</item> <item name="android:paddingBottom">@dimen/dashSearchPaddingBot</item>
</style> </style>
<style name="ListText"> <style name="ListText">

4
OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
View file

@ -148,10 +148,6 @@ public class DashFavoritesFragment extends DashBaseFragment {
MapActivity.launchMapActivityMoveToTop(getActivity()); MapActivity.launchMapActivityMoveToTop(getActivity());
} }
}); });
int height = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 50, getResources().getDisplayMetrics());
LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, height);
view.setLayoutParams(lp);
favorites.addView(view); favorites.addView(view);
} }
} }