Merge branch 'main' into test/e2e4

HikeMate · Dec 19, 2024 · e47e314 · e47e314
2 parents 0158762 + 49db7c9
commit e47e314
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -3,9 +3,4 @@
     <color name="blue">#FF3B9DE8</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
-    <color name="red">#FFE83B3D</color>
-
-    <color name="hike_difficulty_easy">#1B9E4D</color>
-    <color name="hike_difficulty_moderate">#FCCA03</color>
-    <color name="hike_difficulty_difficult">#F74E05</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -31,7 +31,6 @@
     <string name="hike_card_no_data_label">No data</string>
 
     <!-- Map Screen -->
-    <string name="map_screen_menu_button_content_description">Menu</string>
     <string name="map_screen_search_button_text">Search hikes here</string>
     <string name="map_screen_search_button_text_short">Search here</string>
     <string name="map_screen_error_while_searching_hikes">Error while searching for hikes</string>
@@ -85,9 +84,6 @@
     <string name="loading_hike_elevation_retrieval_error">An error was encountered while loading the hike\'s elevation.</string>
 
     <!-- Hike Details Screen -->
-    <string name="hike_details_screen_obtaining_osm_data">Loading hike data…</string>
-    <string name="hike_details_screen_obtaining_elevation">Loading hike elevation…</string>
-    <string name="hike_details_screen_computing_details">Last computations…</string>
     <string name="hike_detail_screen_bookmark_hint_on_isSaved_true">Unsave hike</string>
     <string name="hike_detail_screen_bookmark_hint_on_isSaved_false">Save hike</string>
     <string name="hike_detail_screen_label_distance">Distance</string>