Merge branch 'feature/50-add-button-to-go-through-onboarding-a' into develop

Author: sds100

app/src/androidTest/java/com/mapcode/map/MapScreenTest.kt

@@ -32,6 +32,7 @@ import assertk.assertions.prop
 import com.mapcode.Mapcode
 import com.mapcode.Territory
 import com.mapcode.destinations.FavouritesScreenDestination
+import com.mapcode.destinations.OnboardingScreenDestination
 import com.mapcode.favourites.Favourite
 import com.mapcode.util.Location
 import com.ramcosta.composedestinations.navigation.DestinationsNavigator
@@ -785,6 +786,14 @@ class MapScreenTest {
         composeTestRule.onNodeWithText("Save a location first!").assertIsDisplayed()
     }
 
+    @Test
+    fun navigate_to_onboarding_screen_when_click_view_tutorial() {
+        setMapScreenAsContent()
+        composeTestRule.onNodeWithContentDescription("More").performClick()
+        composeTestRule.onNodeWithText("Tutorial").performClick()
+        verify(mockDestinationsNavigator).navigate(OnboardingScreenDestination.route)
+    }
+
     private fun setMapScreenAsContent() {
         composeTestRule.setContent {
             MapScreen(

app/src/main/java/com/mapcode/map/MapScreen.kt

@@ -49,6 +49,7 @@ import com.google.maps.android.compose.*
 import com.mapcode.BuildConfig
 import com.mapcode.R
 import com.mapcode.destinations.FavouritesScreenDestination
+import com.mapcode.destinations.OnboardingScreenDestination
 import com.mapcode.favourites.CreateFavouriteDialog
 import com.mapcode.favourites.Favourite
 import com.mapcode.theme.Green600
@@ -523,6 +524,9 @@ private fun MapControls(
                 },
                 onDismiss = {
                     showMoreDropdown = false
+                },
+                onViewOnboardingClick = {
+                    navigator.navigate(OnboardingScreenDestination.route)
                 }
             )
         }
@@ -643,6 +647,7 @@ private fun MoreDropdownMenu(
     onAboutClick: () -> Unit,
     onShareMapcodeClick: () -> Unit,
     onDirectionsClick: () -> Unit,
+    onViewOnboardingClick: () -> Unit,
     onDismiss: () -> Unit
 ) {
     DropdownMenu(
@@ -661,6 +666,14 @@ private fun MoreDropdownMenu(
         DropdownMenuItem(onClick = onDirectionsClick) {
             Text(text = stringResource(R.string.directions_menu_item))
         }
+
+        DropdownMenuItem(onClick = onDirectionsClick) {
+            Text(text = stringResource(R.string.directions_menu_item))
+        }
+
+        DropdownMenuItem(onClick = onViewOnboardingClick) {
+            Text(text = stringResource(R.string.view_onboarding_menu_item))
+        }
     }
 }
 

app/src/main/res/values/strings.xml

@@ -41,6 +41,7 @@
     <string name="about_menu_item">About this app</string>
     <string name="more_content_description">More</string>
     <string name="directions_menu_item">Directions</string>
+    <string name="view_onboarding_menu_item">Tutorial</string>
     <string name="about_dialog_title">About Mapcode %s</string>
     <string name="close_dialog_button">Close</string>
     <string name="website_button">Website</string>