Merge branch 'main' into test/e2e4

HikeMate · Dec 19, 2024 · 1333b9c · 1333b9c
2 parents a90bd1f + 3de5e8e
commit 1333b9c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/app/src/main/java/ch/hikemate/app/ui/auth/SignInScreen.kt b/app/src/main/java/ch/hikemate/app/ui/auth/SignInScreen.kt
@@ -71,7 +71,7 @@ fun SignInScreen(
           contract = ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
             Toast.makeText(
                     context,
-                    context.getString(R.string.google_account_created_confirmation),
+                    context.getString(R.string.google_account_connection_ended_or_cancelled),
                     Toast.LENGTH_LONG)
                 .show()
             // startAddAccountIntentLauncher is null, since it is only called when the user has no

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -128,16 +128,11 @@
     <string name="hike_difficulty_moderate">Moderate</string>
     <string name="hike_difficulty_difficult">Difficult</string>
 
-
     <!-- Saved Hikes Screen -->
     <string name="saved_hikes_saved_label">Saved</string>
     <string name="saved_hikes_planned_label">Planned</string>
 
     <string name="saved_hikes_screen_loading_message">Loading saved hikes…</string>
-    <string name="saved_hikes_screen_generic_error">
-        An error occurred while loading saved hikes.
-        Please check your Internet connection and try again.
-    </string>
     <string name="saved_hikes_screen_refresh_button_action">Refresh</string>
     <string name="saved_hikes_screen_saved_section_title">Saved hikes</string>
     <string name="saved_hikes_screen_saved_section_empty_message">No saved hikes to display</string>
@@ -187,6 +182,7 @@
     <string name="background_image_content_description">Nature image, blurred</string>
     <string name="sign_in_with_email">Sign in with Email</string>
     <string name="sign_in_with_google">Sign in with Google</string>
+    <string name="google_account_connection_ended_or_cancelled">Retry Google sign-in</string>
 
     <string name="sign_in_with_email_title">Sign in</string>
     <string name="sign_in_with_email_email_label">Email</string>
@@ -229,12 +225,10 @@
     <string name="error_deleting_user_profile_and_saved_hikes">Error deleting user profile and saved hikes</string>
     <string name="error_re_authenticating_the_user">Error re-authenticating the user</string>
     <string name="no_user_is_currently_signed_in">No user is currently signed in</string>
+    <string name="delete_account_button_label">Delete Account</string>
 
     <!-- Error handling -->
     <string name="retry">Retry</string>
 
-
-    <string name="delete_account_button_label">Delete Account</string>
-    <string name="google_account_created_confirmation">Connected Google Account to your device successfully. Please wait while we retry the signup.</string>
     <string name="generic_error_message_internet_connection">An error occurred. Check your internet connection. The operation might not be saved.</string>
-</resources>
+</resources>