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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-05-03 23:22:51 +02:00
commit 1be70f7f9f
24 changed files with 61 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/drawable/bg_card_dark.xml → OsmAnd/res/drawable/bg_card.xml
View file

@ -6,7 +6,7 @@
<item>
<shape>
<solid
android:color="@color/card_bg_color_dark" />
android:color="?attr/bg_color" />
<corners
android:radius="2dp" />
</shape>

14
OsmAnd/res/drawable/bg_card_light.xml
View file

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<nine-patch android:src="@drawable/bg_card_shadow" />
</item>
<item>
<shape>
<solid
android:color="@color/card_bg_color_light" />
<corners
android:radius="2dp" />
</shape>
</item>
</layer-list>

4
OsmAnd/res/drawable/dashboard_button_dark.xml
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="@color/list_item_background_dark_pressed"
android:drawable="@color/list_item_dark_pressed"
android:state_selected="true"/>
<item
android:drawable="@color/list_item_background_dark_pressed"
android:drawable="@color/list_item_dark_pressed"
android:state_pressed="true"/>
</selector>

6
OsmAnd/res/drawable/expandable_list_item_background_dark.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/list_item_background_dark_pressed" android:state_pressed="true"/>
<item android:drawable="@color/list_item_background_dark_pressed" android:state_focused="true"/>
<item android:drawable="@color/list_item_background_dark"/>
<item android:drawable="@color/list_item_dark_pressed" android:state_pressed="true"/>
<item android:drawable="@color/list_item_dark_pressed" android:state_focused="true"/>
<item android:drawable="@color/list_item_dark"/>
</selector>

2
OsmAnd/res/layout-land/dashboard_over_map.xml
View file

@ -56,7 +56,7 @@
android:id="@+id/dash_list_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/card_bg_color"
android:background="?attr/bg_color"
android:fadeScrollbars="true" >
</com.github.ksoichiro.android.observablescrollview.ObservableListView>
</FrameLayout>

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

@ -8,7 +8,7 @@
android:id="@+id/current_track"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/card_bg"
android:background="@drawable/bg_card"
android:orientation="vertical">
<include

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

@ -4,7 +4,7 @@
android:id="@+id/main_fav"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="?attr/card_bg"
android:background="@drawable/bg_card"
android:layout_marginTop="@dimen/dash_margin"
android:layout_marginBottom="@dimen/dash_margin"
android:layout_marginLeft="@dimen/dash_margin_h"

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

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/card_bg"
android:background="@drawable/bg_card"
android:layout_marginTop="@dimen/dash_margin"
android:layout_marginBottom="@dimen/dash_margin"
android:layout_marginLeft="@dimen/dash_margin_h"

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

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/card_bg"
android:background="@drawable/bg_card"
android:layout_marginLeft="@dimen/dash_margin_h"
android:layout_marginRight="@dimen/dash_margin_h"
android:layout_marginTop="@dimen/dash_margin"

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

@ -3,7 +3,7 @@
xmlns:osmand="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/card_bg"
android:background="@drawable/bg_card"
android:layout_marginTop="@dimen/dash_margin"
android:layout_marginBottom="@dimen/dash_margin"
android:layout_marginLeft="@dimen/dash_margin_h"

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

@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/card_bg"
android:background="@drawable/bg_card"
android:layout_marginTop="@dimen/dash_margin"
android:layout_marginBottom="@dimen/dash_margin"
android:layout_marginLeft="@dimen/dash_margin_h"

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

@ -86,7 +86,7 @@
android:paddingLeft="9.5dp"
android:paddingRight="9.5dp"
android:paddingTop="8dp"
android:textColor="@color/get_button_text"
android:textColor="@color/color_white"
android:text="@string/get_plugin"
android:textSize="@dimen/default_sub_text_size"
android:lines="1"

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

@ -4,7 +4,7 @@
android:id="@+id/search"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/card_bg"
android:background="@drawable/bg_card"
android:layout_marginTop="@dimen/dash_margin"
android:layout_marginBottom="@dimen/dash_margin"
android:layout_marginLeft="@dimen/dash_margin_h"

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

@ -8,7 +8,7 @@
android:layout_marginLeft="@dimen/dash_margin_h"
android:layout_marginRight="@dimen/dash_margin_h"
android:layout_marginTop="@dimen/dash_margin"
android:background="?attr/card_bg"
android:background="@drawable/bg_card"
android:orientation="vertical" >
<LinearLayout

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

@ -4,7 +4,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/card_bg"
android:background="@drawable/bg_card"
android:layout_marginTop="@dimen/dash_margin"
android:layout_marginBottom="@dimen/dash_margin"
android:layout_marginLeft="@dimen/dash_margin_h"

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

@ -59,7 +59,7 @@
android:id="@+id/dash_list_background"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/card_bg_color" />
android:background="?attr/bg_color" />
<com.github.ksoichiro.android.observablescrollview.ObservableListView
android:id="@+id/dash_list_view"

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

@ -3,7 +3,7 @@
android:id="@+id/plan_route_info"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="?attr/card_bg_color"
android:background="?attr/bg_color"
android:orientation="vertical" >
<LinearLayout

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

@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="?attr/card_bg_color"
android:background="?attr/bg_color"
android:orientation="vertical" >
<LinearLayout

9
OsmAnd/res/layout/plugin.xml
View file

@ -27,7 +27,7 @@
android:id="@+id/plugin_header"
android:layout_width="match_parent"
android:layout_height="66dp"
android:background="?attr/plugin_details_header_bg"
android:background="?attr/expandable_list_item_background"
android:paddingLeft="16dp"
android:paddingRight="16dp">
@ -86,7 +86,7 @@
android:paddingLeft="9.5dp"
android:paddingRight="9.5dp"
android:paddingTop="8dp"
android:textColor="@color/get_button_text"
android:textColor="@color/color_white"
android:text="@string/get_plugin"
android:textSize="@dimen/default_sub_text_size"
android:visibility="gone"
@ -120,7 +120,7 @@
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:textColor="?attr/plugin_description_header_text_color"
android:textColor="?android:textColorSecondary"
android:text="@string/plugin_install_needs_network"
osmand:typeface="@string/font_roboto_regular"/>
</LinearLayout>
@ -132,8 +132,8 @@
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
android:text="@string/plugin_description_title"
android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_desc_text_size"
android:textColor="?attr/plugin_description_header_text_color"
osmand:textAllCapsCompat="true"
osmand:typeface="@string/font_roboto_medium"/>
@ -144,6 +144,7 @@
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="14dp"
android:text="HHHE"
android:textSize="@dimen/default_list_text_size"
android:textColor="?android:textColorPrimary"
osmand:typeface="@string/font_roboto_regular"

20
OsmAnd/res/values/attrs.xml
View file

@ -4,25 +4,27 @@
<attr name="maxVisibleWidth" format="dimension"/>
</declare-styleable>
<declare-styleable name="OsmAndTheme">
<!-- list colors -->
<attr name="list_divider" format="color"/>
<attr name="btn_flat_bg" format="reference" />
<attr name="expandable_list_item_background" format="color"/>
<attr name="expandable_list_background" format="color"/>
<attr name="bg_color" format="reference" />
<attr name="dashboard_divider" format="reference" />
<attr name="dashboard_button" format="reference" />
<attr name="expandable_category_color" format="reference"/>
<attr name="bottomToolBarColor" format="color" />
<attr name="downloadButtonBackground" format="reference" />
<attr name="card_bg" format="reference" />
<attr name="btn_flat_bg" format="reference" />
<attr name="card_bg_color" format="reference" />
<attr name="spinnerItemTextColor" format="reference" />
<attr name="dashboard_divider" format="reference" />
<attr name="dashboard_button" format="reference" />
<attr name="search_background" format="reference" />
<attr name="switch_ex_background" format="reference" />
<attr name="switch_ex_text_color" format="color|reference" />
<attr name="bg_plugin_logo_disabled" format="reference" />
<attr name="plugin_details_header_bg" format="color|reference" />
<attr name="plugin_details_install_header_bg" format="color|reference" />
<attr name="plugin_description_header_text_color" format="color|reference" />
<attr name="expandable_list_item_background" format="color"/>
<attr name="expandable_list_background" format="color"/>
<attr name="size_progress_bar" format="reference"/>
<attr name="dash_parking_bg" format="reference"/>
<attr name="osmo_header_background" format="color"/>

31
OsmAnd/res/values/colors.xml
View file

@ -16,15 +16,22 @@
<color name="dashboard_parking_light_color">#009688</color>
<color name="dashboard_parking_dark_color">#54778c</color>
<color name="dashboard_parking_dark_selected">#446072</color>
<color name="plugin_details_install_header_bg_light">#dbdbdb</color>
<color name="plugin_details_install_header_bg_dark">#2d3438</color>
<color name="list_divider_dark">#1f2326</color>
<color name="list_divider_light">@color/color_white</color>
<color name="list_background_dark">#292f33</color>
<color name="list_sub_menu_background_dark">#475259</color>
<color name="list_item_light">@color/color_white</color>
<!-- <color name="list_item_light">@color/color_white</color>
<color name="list_item_background_dark">#333b40</color> -->
<color name="list_item_light">#00000000</color>
<color name="list_item_dark">#00000000</color>
<color name="list_item_light_pressed">#8cd0d0d0</color>
<color name="list_item_background_dark">#333b40</color>
<color name="list_item_background_dark_pressed">#be39464d</color>
<color name="list_item_dark_pressed">#be39464d</color>
<color name="bg_color_light">#ffffff</color>
<color name="bg_color_dark">#333b40</color>
<color name="map_widget_icon_color">#ff8f00</color>
<color name="map_widget_stroke">#4C000000</color>
@ -114,7 +121,6 @@
<color name="gpx_track">#B4B319FF</color>
<color name="gpx_track_fluorescent">#B400FFFF</color>
<!-- <color name="gpx_track_fluorescent">#B4FF00FF</color> Magenta is alternate track color for cyan but less contrast in many situations: -->
<color name="nav_track">#CCaa0088</color>
<color name="nav_track_fluorescent">#CC00ddff</color>
@ -136,19 +142,8 @@
<color name="shadow_color">#33888888</color>
<color name="sherpafy_selection">#ff33b5e5</color>
<color name="sherpafy_add_text">#b9b9b9</color>
<color name="dark_drawer_bg_color">#303030</color>
<color name="card_bg_color_light">#ffffff</color>
<color name="card_bg_color_dark">#333b40</color>
<color name="get_button_text">#ffffff</color>
<color name="plugin_details_header_bg_light">#ffffff</color>
<color name="plugin_details_install_header_bg_light">#dbdbdb</color>
<color name="plugin_details_install_header_bg_dark">#2d3438</color>
</resources>

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

@ -63,8 +63,7 @@
<item name="android:windowContentOverlay">@null</item>
<item name="actionModeBackground">@color/actionbar_light_color</item>
<item name="actionBarStyle">@style/Widget.Styled.ActionBarLight</item>
<item name="card_bg_color">@color/card_bg_color_light</item>
<item name="card_bg">@drawable/bg_card_light</item>
<item name="bg_color">@color/bg_color_light</item>
<item name="dashboard_divider">@color/dashboard_divider_light</item>
<item name="dashboard_button">@drawable/dashboard_button_light</item>
<item name="search_background">@color/search_background_dark</item>
@ -74,11 +73,9 @@
<item name="switch_ex_background">@drawable/switch_ex_background_light</item>
<item name="switch_ex_text_color">@color/switch_ex_button_text_light</item>
<item name="bg_plugin_logo_disabled">@drawable/bg_plugin_logo_disabled_light</item>
<item name="plugin_details_header_bg">@color/plugin_details_header_bg_light</item>
<item name="plugin_details_install_header_bg">@color/plugin_details_install_header_bg_light</item>
<item name="plugin_description_header_text_color">#727272</item>
<item name="expandable_list_item_background">@drawable/expandable_list_item_background_light</item>
<item name="expandable_list_background">@color/color_white</item>
<item name="expandable_list_background">@color/list_item_light</item>
<item name="size_progress_bar">@drawable/size_progressbar_light</item>
<item name="dash_parking_bg">@drawable/dash_parking_light</item>
<item name="osmo_header_background">@color/osmo_header_light</item>
@ -107,19 +104,16 @@
<item name="btn_flat_bg">@drawable/btn_flat_night</item>
<item name="actionModeBackground">@color/actionbar_dark_color</item>
<item name="actionBarStyle">@style/Widget.Styled.ActionBarDark</item>
<item name="card_bg">@drawable/bg_card_dark</item>
<item name="card_bg_color">@color/card_bg_color_dark</item>
<item name="bg_color">@color/bg_color_dark</item>
<item name="dashboard_divider">@color/dashboard_divider_dark</item>
<item name="dashboard_button">@drawable/dashboard_button_dark</item>
<item name="search_background">@color/color_white</item>
<item name="switch_ex_background">@drawable/switch_ex_background_dark</item>
<item name="switch_ex_text_color">@color/switch_ex_button_text_dark</item>
<item name="bg_plugin_logo_disabled">@drawable/bg_plugin_logo_disabled_dark</item>
<item name="plugin_details_header_bg">@color/list_item_background_dark</item>
<item name="plugin_details_install_header_bg">@color/plugin_details_install_header_bg_dark</item>
<item name="plugin_description_header_text_color">#70818c</item>
<item name="expandable_list_item_background">@drawable/expandable_list_item_background_dark</item>
<item name="expandable_list_background">@color/list_background_dark</item>
<item name="expandable_list_background">@color/list_item_dark</item>
<item name="size_progress_bar">@drawable/size_progressbar_dark</item>
<item name="dash_parking_bg">@drawable/dash_parking_dark</item>
<item name="osmo_header_background">@color/osmo_header_dark</item>

4
OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
View file

@ -144,9 +144,9 @@ public class ContextMenuAdapter {
public int getBackgroundColor(Context ctx, boolean holoLight) {
if (holoLight) {
return ctx.getResources().getColor(R.color.color_white);
return ctx.getResources().getColor(R.color.bg_color_light);
} else {
return ctx.getResources().getColor(R.color.list_background_dark);
return ctx.getResources().getColor(R.color.bg_color_dark);
}
}

10
OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
View file

@ -666,7 +666,11 @@ public class RouteProvider {
ctx.leftSideNavigation = params.leftSide;
ctx.calculationProgress = params.calculationProgress;
if(params.previousToRecalculate != null && params.onlyStartPointChanged) {
ctx.previouslyCalculatedRoute = params.previousToRecalculate.getOriginalRoute();
int currentRoute = params.previousToRecalculate.getCurrentRoute();
List<RouteSegmentResult> originalRoute = params.previousToRecalculate.getOriginalRoute();
if(originalRoute != null && currentRoute < originalRoute.size()) {
ctx.previouslyCalculatedRoute = originalRoute.subList(currentRoute, originalRoute.size());
}
}
if(complex && router.getRecalculationEnd(ctx) != null) {
complex = false;
@ -676,9 +680,7 @@ public class RouteProvider {
RouteCalculationMode.COMPLEX);
complexCtx.calculationProgress = params.calculationProgress;
complexCtx.leftSideNavigation = params.leftSide;
if(params.previousToRecalculate != null && params.onlyStartPointChanged) {
complexCtx.previouslyCalculatedRoute = params.previousToRecalculate.getOriginalRoute();
}
complexCtx.previouslyCalculatedRoute = ctx.previouslyCalculatedRoute;
}
LatLon st = new LatLon(params.start.getLatitude(), params.start.getLongitude());