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

Updated first time card

Browse source
This commit is contained in:
Bars107 2015-04-11 15:51:46 +03:00
parent 6001a488e3
commit ef0e9ecd49
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_distance"
android:background="@color/osmand_orange"
android:orientation="vertical"
android:paddingBottom="@dimen/list_content_padding"
android:paddingLeft="@dimen/list_content_padding"
@ -56,17 +56,22 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingBottom="12dp"
android:paddingTop="12dp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/welcome_select_region"/>
android:text="@string/welcome_select_region"
android:textSize="@dimen/download_descr_text_size"/>
<TextView
android:id="@+id/region"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/dash_parking_big_text_size"
android:layout_marginTop="@dimen/dashPadding"
tools:text="@string/driving_region"/>
</LinearLayout>

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

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="osmand_orange">#ff8f00</color>
<color name="app_mode_icon_color">#33B4E4</color>
<color name="dash_search_icon_light">#536DFE</color>

6
OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
View file

@ -101,7 +101,8 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks {
private int mFlexibleSpaceImageHeight;
private int mFlexibleBlurSpaceHeight;
private boolean portrait;
int baseColor;
private WaypointDialogHelper waypointDialogHelper;
private final int[] running = new int[] { -1 };
@ -125,6 +126,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks {
public void createDashboardView() {
baseColor = mapActivity.getResources().getColor(R.color.osmand_orange);
waypointDialogHelper = new WaypointDialogHelper(mapActivity);
landscape = !ScreenOrientationHelper.isOrientationPortrait(mapActivity);
dashboardView = (FrameLayout) mapActivity.findViewById(R.id.dashboard);
@ -807,7 +809,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks {
float sh = mFlexibleSpaceImageHeight - mFlexibleBlurSpaceHeight;
float t = sh == 0 ? 1 : (1 - Math.max(0, -scrollY + sh) / sh);
t = Math.max(0, t);
int baseColor = 0xff8f00;
int alpha = (int) (t * 255);
// in order to have proper fast scroll down
int malpha = t == 1 ? alpha = 0 : alpha;