Skip to content

Commit

Permalink
Adds links to the user manual and messaging docs in the Nav menu
Browse files Browse the repository at this point in the history
  • Loading branch information
christianrowlands committed Nov 9, 2023
1 parent 0a1bceb commit 54582a7
Show file tree
Hide file tree
Showing 13 changed files with 68 additions and 2 deletions.
17 changes: 17 additions & 0 deletions networksurvey/src/main/res/drawable-anydpi/ic_schema.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="#FFFFFF"
android:alpha="0.8">
<group
android:scaleX="1.0909091"
android:scaleY="1.0909091"
android:translateX="-2.1818182"
android:translateY="-1.0909091">
<path
android:fillColor="@android:color/white"
android:pathData="M14,9v2h-3V9H8.5V7H11V1H4v6h2.5v2H4v6h2.5v2H4v6h7v-6H8.5v-2H11v-2h3v2h7V9H14z" />
</group>
</vector>
27 changes: 27 additions & 0 deletions networksurvey/src/main/res/drawable-anydpi/ic_user_manual.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="#FFFFFF"
android:alpha="0.8"
android:autoMirrored="true">
<group
android:scaleX="1.0909091"
android:scaleY="1.0909091"
android:translateX="-1.0909091"
android:translateY="-2.1818182">
<path
android:fillColor="@android:color/white"
android:pathData="M21,5c-1.11,-0.35 -2.33,-0.5 -3.5,-0.5c-1.95,0 -4.05,0.4 -5.5,1.5c-1.45,-1.1 -3.55,-1.5 -5.5,-1.5S2.45,4.9 1,6v14.65c0,0.25 0.25,0.5 0.5,0.5c0.1,0 0.15,-0.05 0.25,-0.05C3.1,20.45 5.05,20 6.5,20c1.95,0 4.05,0.4 5.5,1.5c1.35,-0.85 3.8,-1.5 5.5,-1.5c1.65,0 3.35,0.3 4.75,1.05c0.1,0.05 0.15,0.05 0.25,0.05c0.25,0 0.5,-0.25 0.5,-0.5V6C22.4,5.55 21.75,5.25 21,5zM21,18.5c-1.1,-0.35 -2.3,-0.5 -3.5,-0.5c-1.7,0 -4.15,0.65 -5.5,1.5V8c1.35,-0.85 3.8,-1.5 5.5,-1.5c1.2,0 2.4,0.15 3.5,0.5V18.5z" />
<path
android:fillColor="@android:color/white"
android:pathData="M17.5,10.5c0.88,0 1.73,0.09 2.5,0.26V9.24C19.21,9.09 18.36,9 17.5,9c-1.7,0 -3.24,0.29 -4.5,0.83v1.66C14.13,10.85 15.7,10.5 17.5,10.5z" />
<path
android:fillColor="@android:color/white"
android:pathData="M13,12.49v1.66c1.13,-0.64 2.7,-0.99 4.5,-0.99c0.88,0 1.73,0.09 2.5,0.26V11.9c-0.79,-0.15 -1.64,-0.24 -2.5,-0.24C15.8,11.66 14.26,11.96 13,12.49z" />
<path
android:fillColor="@android:color/white"
android:pathData="M17.5,14.33c-1.7,0 -3.24,0.29 -4.5,0.83v1.66c1.13,-0.64 2.7,-0.99 4.5,-0.99c0.88,0 1.73,0.09 2.5,0.26v-1.52C19.21,14.41 18.36,14.33 17.5,14.33z" />
</group>
</vector>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions networksurvey/src/main/res/menu/navigation_drawer_menu.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@
android:icon="@drawable/ic_settings"
android:title="@string/settings" />

<item
android:id="@+id/nav_user_manual_activity"
android:icon="@drawable/ic_user_manual"
android:title="@string/manual" />

<item
android:id="@+id/nav_messaging_activity"
android:icon="@drawable/ic_schema"
android:title="@string/messaging_docs" />

</group>

</menu>
10 changes: 10 additions & 0 deletions networksurvey/src/main/res/navigation/nav_graph.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,14 @@
</action>
</fragment>

<activity
android:id="@+id/nav_user_manual_activity"
app:action="android.intent.action.VIEW"
app:data="https://networksurvey.app/" />

<activity
android:id="@+id/nav_messaging_activity"
app:action="android.intent.action.VIEW"
app:data="https://messaging.networksurvey.app/" />

</navigation>
6 changes: 4 additions & 2 deletions networksurvey/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ setting), which you can find on your device. Remember:\n
- Toggle <b>Cellular</b>, <b>Wi-Fi</b>, <b>Bluetooth</b>, <b>GNSS</b>, and/or <b>CDR</b> under File Logging Control to save this data locally.\n
- Logging is completely optional and does not affect MQTT Streaming.\n
\n
<b>MQTT Connection Status:</b>\n
<b>MQTT Connection:</b>\n
MQTT streaming lets you send your data in real-time to a remote server. No local storage is needed for this:\n
\n
- First, configure the broker connection settings.\n
Expand Down Expand Up @@ -118,7 +118,7 @@ but work independently, so you have full control over how you handle your data.<

<!-- Dashboard Constants -->
<string name="card_title_logging_details">File Logging Control</string>
<string name="card_title_mqtt_details">MQTT Connection Status</string>
<string name="card_title_mqtt_details">MQTT Connection</string>
<string name="cellular_title">Cellular</string>
<string name="wifi_title">Wi-Fi</string>
<string name="bluetooth_title">Bluetooth</string>
Expand Down Expand Up @@ -210,6 +210,8 @@ but work independently, so you have full control over how you handle your data.<
<string name="cellular_details">Cellular Details</string>
<string name="cellular_calculators">Cellular Calculators</string>
<string name="settings">Settings</string>
<string name="manual">User Manual</string>
<string name="messaging_docs">Messaging Docs</string>

<string name="network_survey_service_description">The Network Survey Service runs when the app needs to do work in the background such as write to the log file or stream data out over active connection</string>
<string name="connection_service_description">The Connection Service handles managing the connection to a remote server to stream Network Survey data</string>
Expand Down

0 comments on commit 54582a7

Please sign in to comment.