map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

UI for turn instructions.

Browse source
This commit is contained in:
Dmitry Yunitsky 2014-11-28 15:33:49 +03:00 • committed by Alex Zolotarev
parent 1043f4e8de
commit 751822d526
5 changed files with 30 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
android/res/layout-sw600dp/map.xml
View file

@ -21,16 +21,14 @@
android:id="@+id/rl__routing_box"
android:layout_width="match_parent"
android:layout_height="@dimen/routing_pp_height"
android:background="@android:color/transparent"
android:padding="@dimen/margin_micro">
android:background="@color/bg_top_panels">
<RelativeLayout
android:id="@+id/rl__routing_go"
android:layout_width="wrap_content"
android:layout_height="@dimen/routing_button_height"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/iv__routing_close"
android:background="@drawable/ic_route_bg">
android:layout_height="match_parent"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@+id/iv__routing_close">
<TextView
android:id="@+id/tv__routing_go"
@ -61,7 +59,6 @@
android:layout_height="@dimen/routing_button_height"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/ic_route_bg"
android:padding="@dimen/margin_medium"
android:scaleType="center"
android:src="@drawable/ic_close_routing"/>
@ -72,7 +69,6 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/routing_button_height"
android:layout_centerVertical="true"
android:background="@drawable/ic_route_bg"
android:gravity="bottom"
android:includeFontPadding="false"
android:paddingBottom="1dp"
@ -112,8 +108,8 @@
android:layout_width="@dimen/bottom_button_width"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="56dp"
android:layout_alignParentRight="true"/>
android:layout_alignParentRight="true"
android:layout_marginBottom="56dp"/>
<include
android:id="@+id/map_bottom_vertical_toolbar"

7
android/res/layout/map.xml
View file

@ -28,14 +28,13 @@
android:layout_width="match_parent"
android:layout_height="@dimen/routing_pp_height"
android:layout_below="@id/search_box"
android:background="@drawable/ic_route_bg"
android:padding="@dimen/margin_micro">
android:background="@color/bg_top_panels">
<RelativeLayout
android:id="@+id/rl__routing_go"
android:layout_width="wrap_content"
android:layout_height="@dimen/routing_button_height"
android:layout_centerVertical="true"
android:layout_height="match_parent"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@+id/iv__routing_close">
<TextView

5
android/res/layout/map_turn_instructions.xml
View file

@ -8,14 +8,18 @@
<TextView
android:id="@+id/tv__total_distance"
style="@style/TextAppearance.AppCompat.Large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_medium"/>
<TextView
android:id="@+id/tv__total_time"
style="@style/TextAppearance.AppCompat.Large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#99000000"
android:textSize="14sp"
android:layout_alignLeft="@id/tv__total_distance"
android:layout_below="@id/tv__total_distance"/>
@ -34,6 +38,7 @@
<TextView
android:id="@+id/tv__turn_distance"
style="@style/TextAppearance.AppCompat.Large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_turn_blue"/>

8
android/res/values/dimens.xml
View file

@ -16,6 +16,14 @@
<dimen name="margin_medium">16dp</dimen>
<dimen name="margin_large">32dp</dimen>
<dimen name="neg_margin_micro">-2dp</dimen>
<dimen name="neg_margin_tiny">-4dp</dimen>
<dimen name="neg_margin_tiny_and_half">-6dp</dimen>
<dimen name="neg_margin_small">-8dp</dimen>
<dimen name="neg_margin_small_and_half">-12dp</dimen>
<dimen name="neg_margin_medium">-16dp</dimen>
<dimen name="neg_margin_large">-32dp</dimen>
<dimen name="dp_x_1">4dp</dimen>
<dimen name="dp_x_2">8dp</dimen>
<dimen name="dp_x_3">12dp</dimen>

14
android/src/com/mapswithme/maps/MWMActivity.java
View file

@ -27,6 +27,7 @@ import android.telephony.TelephonyManager;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.TextUtils;
import android.text.format.DateUtils;
import android.text.style.AbsoluteSizeSpan;
import android.util.Log;
import android.view.KeyEvent;
@ -1150,18 +1151,20 @@ public class MWMActivity extends NvEventQueueActivity
builder.setSpan(new AbsoluteSizeSpan(34, true), 0, info.mDistToTarget.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
builder.setSpan(new AbsoluteSizeSpan(10, true), info.mDistToTarget.length(), builder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
mTvRoutingDistance.setText(builder);
builder.setSpan(new AbsoluteSizeSpan(25, true), 0, info.mDistToTarget.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
builder.setSpan(new AbsoluteSizeSpan(15, true), info.mDistToTarget.length(), builder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
mTvTotalDistance.setText(builder);
mIvTurn.setImageResource(getTurnImageResource(info));
if (LocationState.RoutingInfo.TurnDirection.isRightTurn(info.mTurnDirection))
if (LocationState.RoutingInfo.TurnDirection.isLeftTurn(info.mTurnDirection))
ViewHelper.setScaleX(mIvTurn, -1); // right turns are displayed as mirrored left turns.
else
ViewHelper.setScaleX(mIvTurn, 1);
mTvTotalTime.setText(DateUtils.formatElapsedTime(info.mTotalTimeInSeconds));
builder = new SpannableStringBuilder(info.mDistToTurn).append(" ").append(info.mTurnUnitsSuffix.toUpperCase());
builder.setSpan(new AbsoluteSizeSpan(34, true), 0, info.mDistToTurn.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
builder.setSpan(new AbsoluteSizeSpan(10, true), info.mDistToTurn.length(), builder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
mTvTurnDistance.setText(builder.toString());
builder.setSpan(new AbsoluteSizeSpan(40, true), 0, info.mDistToTurn.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
builder.setSpan(new AbsoluteSizeSpan(15, true), info.mDistToTurn.length(), builder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
mTvTurnDistance.setText(builder);
}
}
@ -1733,7 +1736,6 @@ public class MWMActivity extends NvEventQueueActivity
private void closeRouting()
{
Log.d("TEST", "Close routing.");
mInfoView.bringToFront();
mRlRoutingBox.clearAnimation();
UiUtils.hide(mRlRoutingBox, mPbRoutingProgress, mRlTurnByTurnBox);