kopia lustrzana https://github.com/rt-bishop/Look4Sat
Added proper menu entry and strings for OSM fragment
rodzic
0f23855ffe
commit
7402b73ffe
|
|
@ -31,6 +31,10 @@
|
||||||
android:id="@+id/nav_map_view"
|
android:id="@+id/nav_map_view"
|
||||||
android:icon="@drawable/ic_world_map"
|
android:icon="@drawable/ic_world_map"
|
||||||
android:title="@string/menu_map_view" />
|
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
|
<item
|
||||||
android:id="@+id/nav_settings"
|
android:id="@+id/nav_settings"
|
||||||
android:icon="@drawable/ic_settings"
|
android:icon="@drawable/ic_settings"
|
||||||
|
|
@ -39,9 +43,5 @@
|
||||||
android:id="@+id/nav_about"
|
android:id="@+id/nav_about"
|
||||||
android:icon="@drawable/ic_about"
|
android:icon="@drawable/ic_about"
|
||||||
android:title="@string/menu_about" />
|
android:title="@string/menu_about" />
|
||||||
<item
|
|
||||||
android:id="@+id/nav_map_osm"
|
|
||||||
android:icon="@drawable/ic_world_map"
|
|
||||||
android:title="@string/placeholder" />
|
|
||||||
</group>
|
</group>
|
||||||
</menu>
|
</menu>
|
||||||
|
|
|
||||||
|
|
@ -53,6 +53,12 @@
|
||||||
android:label="@string/menu_map_view"
|
android:label="@string/menu_map_view"
|
||||||
tools:layout="@layout/fragment_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
|
<fragment
|
||||||
android:id="@+id/nav_settings"
|
android:id="@+id/nav_settings"
|
||||||
android:name="com.rtbishop.look4sat.ui.fragments.PreferencesFragment"
|
android:name="com.rtbishop.look4sat.ui.fragments.PreferencesFragment"
|
||||||
|
|
@ -64,10 +70,5 @@
|
||||||
android:label="@string/menu_about"
|
android:label="@string/menu_about"
|
||||||
tools:layout="@layout/fragment_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>
|
</navigation>
|
||||||
|
|
|
||||||
|
|
@ -34,6 +34,7 @@
|
||||||
|
|
||||||
<string name="menu_pass_list">Список пролетов</string>
|
<string name="menu_pass_list">Список пролетов</string>
|
||||||
<string name="menu_map_view">Карта мира</string>
|
<string name="menu_map_view">Карта мира</string>
|
||||||
|
<string name="menu_map_osm">Карта мира (Демо)</string>
|
||||||
<string name="menu_settings">Настройки</string>
|
<string name="menu_settings">Настройки</string>
|
||||||
<string name="menu_about">О приложении</string>
|
<string name="menu_about">О приложении</string>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -37,6 +37,7 @@
|
||||||
<string name="menu_pass_list">List of Passes</string>
|
<string name="menu_pass_list">List of Passes</string>
|
||||||
<string name="menu_polar_view" translatable="false">Polar View</string>
|
<string name="menu_polar_view" translatable="false">Polar View</string>
|
||||||
<string name="menu_map_view">World Map 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_settings">Settings</string>
|
||||||
<string name="menu_about">About the App</string>
|
<string name="menu_about">About the App</string>
|
||||||
|
|
||||||
|
|
|
||||||
Ładowanie…
Reference in New Issue