From 7402b73ffedda9c115ad94aa586306d9b51c3eb1 Mon Sep 17 00:00:00 2001
From: Arty Bishop <bishop.arty@gmail.com>
Date: Sat, 12 Sep 2020 14:12:39 +0100
Subject: [PATCH] Added proper menu entry and strings for OSM fragment

---
 app/src/main/res/menu/drawer_menu.xml     |  8 ++++----
 app/src/main/res/navigation/nav_graph.xml | 11 ++++++-----
 app/src/main/res/values-ru/strings.xml    |  1 +
 app/src/main/res/values/strings.xml       |  1 +
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/menu/drawer_menu.xml b/app/src/main/res/menu/drawer_menu.xml
index 3dde480b..0755c453 100644
--- a/app/src/main/res/menu/drawer_menu.xml
+++ b/app/src/main/res/menu/drawer_menu.xml
@@ -31,6 +31,10 @@
             android:id="@+id/nav_map_view"
             android:icon="@drawable/ic_world_map"
             android:title="@string/menu_map_view" />
+        <item
+            android:id="@+id/nav_map_osm"
+            android:icon="@drawable/ic_world_map"
+            android:title="@string/menu_map_osm" />
         <item
             android:id="@+id/nav_settings"
             android:icon="@drawable/ic_settings"
@@ -39,9 +43,5 @@
             android:id="@+id/nav_about"
             android:icon="@drawable/ic_about"
             android:title="@string/menu_about" />
-        <item
-            android:id="@+id/nav_map_osm"
-            android:icon="@drawable/ic_world_map"
-            android:title="@string/placeholder" />
     </group>
 </menu>
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index d6557887..3715c312 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -53,6 +53,12 @@
         android:label="@string/menu_map_view"
         tools:layout="@layout/fragment_map_view" />
 
+    <fragment
+        android:id="@+id/nav_map_osm"
+        android:name="com.rtbishop.look4sat.ui.fragments.MapOsmFragment"
+        android:label="@string/menu_map_osm"
+        tools:layout="@layout/fragment_map_osm" />
+
     <fragment
         android:id="@+id/nav_settings"
         android:name="com.rtbishop.look4sat.ui.fragments.PreferencesFragment"
@@ -64,10 +70,5 @@
         android:label="@string/menu_about"
         tools:layout="@layout/fragment_about" />
 
-    <fragment
-        android:id="@+id/nav_map_osm"
-        android:name="com.rtbishop.look4sat.ui.fragments.MapOsmFragment"
-        android:label="@string/placeholder"
-        tools:layout="@layout/fragment_map_osm" />
 
 </navigation>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 7f04e73e..f8c6a12a 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -34,6 +34,7 @@
 
     <string name="menu_pass_list">Список пролетов</string>
     <string name="menu_map_view">Карта мира</string>
+    <string name="menu_map_osm">Карта мира (Демо)</string>
     <string name="menu_settings">Настройки</string>
     <string name="menu_about">О приложении</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 877e2199..ecd0c145 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -37,6 +37,7 @@
     <string name="menu_pass_list">List of Passes</string>
     <string name="menu_polar_view" translatable="false">Polar View</string>
     <string name="menu_map_view">World Map View</string>
+    <string name="menu_map_osm">World Map Demo</string>
     <string name="menu_settings">Settings</string>
     <string name="menu_about">About the App</string>