From 83a02ba6ed663dab9aae457832750aaca4e5c3c2 Mon Sep 17 00:00:00 2001 From: Pau Date: Fri, 23 May 2025 00:29:53 +0200 Subject: [PATCH] Updated string resources --- .../acloc/activity/AddNewPlaceActivity.java | 9 ++--- .../acloc/activity/AddReportActivity.java | 7 ++-- .../example/acloc/fragments/MapFragment.java | 4 +-- app/src/main/res/values-es/strings.xml | 5 +++ app/src/main/res/values/strings.xml | 35 +++++++++++-------- 5 files changed, 33 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/com/example/acloc/activity/AddNewPlaceActivity.java b/app/src/main/java/com/example/acloc/activity/AddNewPlaceActivity.java index 4187696..1e5193c 100644 --- a/app/src/main/java/com/example/acloc/activity/AddNewPlaceActivity.java +++ b/app/src/main/java/com/example/acloc/activity/AddNewPlaceActivity.java @@ -203,17 +203,15 @@ public class AddNewPlaceActivity extends AppCompatActivity implements View.OnCli String filename = json.getJSONObject("file").getString("filename"); imageUrl = BASE_URL + "public/" + filename; jsonString = "[\"" + imageUrl + "\"]"; - Helper.makeSnackBar(rlAddPlace, "Image uploaded successfully"); + Helper.makeSnackBar(rlAddPlace, getString(R.string.image_uploaded_successfully)); btnSubmit.setClickable(true); } else { - Helper.makeSnackBar(rlAddPlace, "Upload failed"); + Helper.makeSnackBar(rlAddPlace, getString(R.string.upload_failed)); btnSubmit.setClickable(true); - Log.d(TAG, "btnSubmit : TRUE"); } } catch (JSONException e) { - Helper.makeSnackBar(rlAddPlace, "Response parsing error"); + Helper.makeSnackBar(rlAddPlace, getString(R.string.response_parsing_error)); btnSubmit.setClickable(true); - Log.d(TAG, "btnSubmit : TRUE"); Log.e(TAG, "Failed to parse JSON", e); } } @@ -222,7 +220,6 @@ public class AddNewPlaceActivity extends AppCompatActivity implements View.OnCli public void onError(String message) { Helper.makeSnackBar(rlAddPlace, "Upload failed: " + message); btnSubmit.setClickable(true); - Log.d(TAG, "btnSubmit : TRUE"); Log.e(TAG, "Upload error:" + message); } }); diff --git a/app/src/main/java/com/example/acloc/activity/AddReportActivity.java b/app/src/main/java/com/example/acloc/activity/AddReportActivity.java index fcb964a..48ed373 100644 --- a/app/src/main/java/com/example/acloc/activity/AddReportActivity.java +++ b/app/src/main/java/com/example/acloc/activity/AddReportActivity.java @@ -227,16 +227,15 @@ public class AddReportActivity extends AppCompatActivity implements View.OnClick String filename = json.getJSONObject("file").getString("filename"); imageUrl = BASE_URL + "public/" + filename; jsonString = "[\"" + imageUrl + "\"]"; - Helper.makeSnackBar(rlAddReport, "Image uploaded successfully"); + Helper.makeSnackBar(rlAddReport, getString(R.string.image_uploaded_successfully)); btnSubmit.setClickable(true); } else { - Helper.makeSnackBar(rlAddReport, "Upload failed"); + Helper.makeSnackBar(rlAddReport, getString(R.string.upload_failed)); btnSubmit.setClickable(true); } } catch (JSONException e) { - Helper.makeSnackBar(rlAddReport, "Response parsing error"); + Helper.makeSnackBar(rlAddReport, getString(R.string.response_parsing_error)); btnSubmit.setClickable(true); - Log.d(TAG, "btnSubmit : TRUE"); Log.e(TAG, "Failed to parse JSON", e); } } diff --git a/app/src/main/java/com/example/acloc/fragments/MapFragment.java b/app/src/main/java/com/example/acloc/fragments/MapFragment.java index 2027df4..fa2cb89 100644 --- a/app/src/main/java/com/example/acloc/fragments/MapFragment.java +++ b/app/src/main/java/com/example/acloc/fragments/MapFragment.java @@ -450,11 +450,11 @@ public class MapFragment extends Fragment { } else { // No close places found if (isAdded() && getContext() != null) { - Helper.makeSnackBar(rlMap, "No places found near this location"); + Helper.makeSnackBar(rlMap, getString(R.string.no_places_found_near_this_location)); } } } else { - Helper.makeSnackBar(rlMap, "Location not found"); + Helper.makeSnackBar(rlMap, getString(R.string.location_not_found)); } } catch (IOException e) { Log.d(TAG, getString(R.string.Something_went_wrong_Try_again)); diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index ec27311..e191eaa 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -165,6 +165,11 @@ Toca para añadir foto Más información Más información + Imagen subida con éxito + Subida de archivo fallida + Error de análisis + Ningún lugar encontrado cerca de esta dirección + Lugar no encontrado \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 79d2104..2749725 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -76,64 +76,64 @@ Login failed Invalid Credentials. Please try again. Login Successful - Please wait... + Please wait… "User already exists. Please login. Profile Updated Successfully! Registration Successful Try again later Update Failed Something went wrong. Try again. - Updating... + Updating… Invalid old password Network error. Try again. - Changing password... + Changing password… Password updated successfully! Password update failed. - Verifying old password... + Verifying old password… change Role to - Updating Roles... + Updating Roles… User Role updated successfully! Update failed. Server error. Try again Rating: BAD Rating: AVERAGE Rating: GOOD Delete report - Removing Report... + Removing Report… Report removed! Failed to remove report - Removing from favorites... + Removing from favorites… Favorite removed Failed to remove Favorite - Loading favorites... + Loading favorites… No Favorite found. Failed to load favorite. Try again. Location permission is required Failed to load places - Loading reports... + Loading reports… No reports found. Failed to load reports. Try again. Place updated successfully! - Updating place... + Updating place… Place inserted successfully! Failed to extract place.Try again Insert failed. Server error. Report submission failed. Try again Report submitted successfully! Please select rating! - Updating report... + Updating report… Report updated successfully! Failed to load users. Try again. No users found - Loading users... - Adding to favorites... + Loading users… + Adding to favorites… Place added to favorites! Failed to add favorite. Server error. - Restoring favorite... + Restoring favorite… Place restored to favorites! Failed to restore favorite. Removed from favorites Failed to remove from favorites - Checking favorite status... + Checking favorite status… @@ -168,6 +168,11 @@ No reports about this place yet Details Add to favorites + Image uploaded successfully + Upload failed + Response parsing error + No places found near this location + Location not found \ No newline at end of file