Merge pull request #7074 from seadowg/info-text

Update info in geoshape/trace

Author: grzesiek2010

geo/src/main/java/org/odk/collect/geo/geopoly/InfoDialog.kt

@@ -11,7 +11,6 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.Backspace
-import androidx.compose.material.icons.automirrored.filled.DirectionsWalk
 import androidx.compose.material.icons.filled.AddLocation
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.TouchApp
@@ -81,15 +80,12 @@ fun InfoContent(
         GeoPolyViewModel.RecordingMode.MANUAL, GeoPolyViewModel.RecordingMode.AUTOMATIC -> {
             if (fromSnackbar) {
                 listOf(
-                    InfoDialog.InfoItem(Icons.AutoMirrored.Filled.DirectionsWalk, stringResource(string.physically_move_to_correct_info_item)),
                     InfoDialog.InfoItem(Icons.Filled.TouchApp, stringResource(string.long_press_to_move_point_info_item)),
                     InfoDialog.InfoItem(Icons.AutoMirrored.Filled.Backspace, stringResource(string.remove_last_point_info_item)),
                     InfoDialog.InfoItem(Icons.Filled.Delete, stringResource(string.delete_entire_shape_info_item)),
                 )
             } else {
                 listOf(
-                    InfoDialog.InfoItem(Icons.Filled.AddLocation, stringResource(string.tap_to_add_a_point_info_item)),
-                    InfoDialog.InfoItem(Icons.AutoMirrored.Filled.DirectionsWalk, stringResource(string.physically_move_to_correct_info_item)),
                     InfoDialog.InfoItem(Icons.Filled.TouchApp, stringResource(string.long_press_to_move_point_info_item)),
                     InfoDialog.InfoItem(Icons.AutoMirrored.Filled.Backspace, stringResource(string.remove_last_point_info_item)),
                     InfoDialog.InfoItem(Icons.Filled.Delete, stringResource(string.delete_entire_shape_info_item))

geo/src/main/res/layout/geopoly_layout.xml

@@ -41,7 +41,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_standard"
         android:layout_marginEnd="@dimen/margin_standard"
-        android:contentDescription="@string/show_how_to_modify_map"
+        android:contentDescription="@string/show_my_location"
         android:theme="@style/Theme.Geo.ForceLightSurface.Overlay"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/location_status"
@@ -67,7 +67,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_standard"
         android:layout_marginEnd="@dimen/margin_standard"
-        android:contentDescription="@string/layer_data_file"
+        android:contentDescription="@string/show_how_to_modify_map"
         android:theme="@style/Theme.Geo.ForceLightSurface.Overlay"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/layers"

geo/src/test/java/org/odk/collect/geo/geopoly/InfoContentTest.kt

@@ -76,7 +76,6 @@ class InfoContentTest {
 
         assertInfo(
             listOf(
-                org.odk.collect.strings.R.string.physically_move_to_correct_info_item,
                 org.odk.collect.strings.R.string.long_press_to_move_point_info_item,
                 org.odk.collect.strings.R.string.remove_last_point_info_item,
                 org.odk.collect.strings.R.string.delete_entire_shape_info_item,
@@ -96,8 +95,6 @@ class InfoContentTest {
 
         assertInfo(
             listOf(
-                org.odk.collect.strings.R.string.tap_to_add_a_point_info_item,
-                org.odk.collect.strings.R.string.physically_move_to_correct_info_item,
                 org.odk.collect.strings.R.string.long_press_to_move_point_info_item,
                 org.odk.collect.strings.R.string.remove_last_point_info_item,
                 org.odk.collect.strings.R.string.delete_entire_shape_info_item,
@@ -117,7 +114,6 @@ class InfoContentTest {
 
         assertInfo(
             listOf(
-                org.odk.collect.strings.R.string.physically_move_to_correct_info_item,
                 org.odk.collect.strings.R.string.long_press_to_move_point_info_item,
                 org.odk.collect.strings.R.string.remove_last_point_info_item,
                 org.odk.collect.strings.R.string.delete_entire_shape_info_item,
@@ -137,8 +133,6 @@ class InfoContentTest {
 
         assertInfo(
             listOf(
-                org.odk.collect.strings.R.string.tap_to_add_a_point_info_item,
-                org.odk.collect.strings.R.string.physically_move_to_correct_info_item,
                 org.odk.collect.strings.R.string.long_press_to_move_point_info_item,
                 org.odk.collect.strings.R.string.remove_last_point_info_item,
                 org.odk.collect.strings.R.string.delete_entire_shape_info_item,

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

@@ -710,9 +710,6 @@
     <!-- Instruction in a list on how to delete the entire shape -->
     <string name="delete_entire_shape_info_item">Delete entire shape</string>
 
-    <!-- Instruction in a list on how to correct map features -->
-    <string name="physically_move_to_correct_info_item">Physically move to correct</string>
-
     <!-- Button text to close the instructions dialog -->
     <string name="done">Done</string>