From 52cd86f1370ca8014ed10dd34ceb39c1a367fa37 Mon Sep 17 00:00:00 2001
From: alex <asytnyk0@gmail.com>
Date: Thu, 9 Nov 2017 17:18:25 +0200
Subject: [PATCH] Add application mode indication

---
 .../fragment_direction_indication_dialog.xml  | 44 ++++++++++++++-----
 .../DirectionIndicationDialogFragment.java    |  8 +++-
 2 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_direction_indication_dialog.xml b/OsmAnd/res/layout/fragment_direction_indication_dialog.xml
index 08d0c1b19b..c69010e7cb 100644
--- a/OsmAnd/res/layout/fragment_direction_indication_dialog.xml
+++ b/OsmAnd/res/layout/fragment_direction_indication_dialog.xml
@@ -18,16 +18,40 @@
         app:contentInsetLeft="54dp"
         app:contentInsetStart="54dp">
 
-        <net.osmand.plus.widgets.TextViewEx
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:maxLines="1"
-            android:text="@string/shared_string_settings"
-            android:textColor="@color/color_white"
-            android:textSize="@dimen/dialog_header_text_size"
-            osmand:typeface="@string/font_roboto_medium"/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <net.osmand.plus.widgets.TextViewEx
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:ellipsize="end"
+                android:gravity="center_vertical"
+                android:maxLines="1"
+                android:text="@string/shared_string_settings"
+                android:textColor="@color/color_white"
+                android:textSize="@dimen/dialog_header_text_size"
+                osmand:typeface="@string/font_roboto_medium"/>
+
+            <net.osmand.plus.widgets.TextViewEx
+                android:id="@+id/app_mode_text_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginEnd="@dimen/content_padding"
+                android:layout_marginRight="@dimen/content_padding"
+                android:drawablePadding="6dp"
+                android:ellipsize="end"
+                android:gravity="center_vertical"
+                android:maxLines="1"
+                android:textAllCaps="true"
+                android:textColor="@color/color_white"
+                android:textSize="@dimen/default_desc_text_size"
+                tools:drawableRight="@drawable/ic_action_car_dark"
+                tools:text="car"/>
+        </LinearLayout>
+
     </android.support.v7.widget.Toolbar>
 
     <ScrollView
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java
index a1dc3532b5..0233ea8824 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java
@@ -21,6 +21,7 @@ import android.widget.ImageView;
 import android.widget.RadioButton;
 import android.widget.TextView;
 
+import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.OsmandSettings.MapMarkersMode;
 import net.osmand.plus.OsmandSettings.OsmandPreference;
@@ -50,7 +51,7 @@ public class DirectionIndicationDialogFragment extends BaseOsmAndDialogFragment
 
 		mainView = inflater.inflate(R.layout.fragment_direction_indication_dialog, container);
 
-		Toolbar toolbar = mainView.findViewById(R.id.toolbar);
+		Toolbar toolbar = (Toolbar) mainView.findViewById(R.id.toolbar);
 		toolbar.setNavigationIcon(getIconsCache().getIcon(R.drawable.ic_arrow_back));
 		toolbar.setNavigationOnClickListener(new View.OnClickListener() {
 			@Override
@@ -59,6 +60,11 @@ public class DirectionIndicationDialogFragment extends BaseOsmAndDialogFragment
 			}
 		});
 
+		TextView appModeTv = (TextView) mainView.findViewById(R.id.app_mode_text_view);
+		ApplicationMode appMode = settings.APPLICATION_MODE.get();
+		appModeTv.setText(appMode.getStringResource());
+		appModeTv.setCompoundDrawablesWithIntrinsicBounds(null, null, getIconsCache().getIcon(appMode.getSmallIconDark()), null);
+
 		updateHelpImage();
 
 		final TextView menuTv = (TextView) mainView.findViewById(R.id.active_markers_text_view);