From d0c5cf1f448059c0322d820267e356bb6f84c579 Mon Sep 17 00:00:00 2001 From: Pau Date: Tue, 13 May 2025 21:10:01 +0200 Subject: [PATCH] More informative R context --- .../{activities => activity}/AddNewPlaceActivity.java | 4 ++-- .../acloc/{activities => activity}/AddReportActivity.java | 4 ++-- .../acloc/{activities => activity}/LoginActivity.java | 6 +++--- .../{activities => activity}/ManageRolesActivity.java | 4 ++-- .../{activities => activity}/PlaceDetailActivity.java | 4 ++-- .../acloc/{activities => activity}/RegisterActivity.java | 4 ++-- .../java/com/example/acloc/adapter/FavoriteAdapter.java | 8 +++----- .../java/com/example/acloc/adapter/MyReportsAdapter.java | 4 ++-- .../com/example/acloc/adapter/PlaceReportsAdapter.java | 2 +- .../main/java/com/example/acloc/adapter/UserAdapter.java | 4 ++-- .../example/acloc/dialog/AlertChangePasswordDialog.java | 2 +- .../example/acloc/dialog/AlertViewAddNewPlaceDialog.java | 2 +- .../acloc/dialog/AlertViewOrUpdateProfileDialog.java | 2 +- .../com/example/acloc/fragments/FavoriteFragment.java | 2 +- .../java/com/example/acloc/fragments/MapFragment.java | 6 +++--- .../com/example/acloc/fragments/MyReportsFragment.java | 2 +- .../main/java/com/example/acloc/utility/DialogUtils.java | 4 ++-- 17 files changed, 31 insertions(+), 33 deletions(-) rename app/src/main/java/com/example/acloc/{activities => activity}/AddNewPlaceActivity.java (99%) rename app/src/main/java/com/example/acloc/{activities => activity}/AddReportActivity.java (99%) rename app/src/main/java/com/example/acloc/{activities => activity}/LoginActivity.java (97%) rename app/src/main/java/com/example/acloc/{activities => activity}/ManageRolesActivity.java (99%) rename app/src/main/java/com/example/acloc/{activities => activity}/PlaceDetailActivity.java (99%) rename app/src/main/java/com/example/acloc/{activities => activity}/RegisterActivity.java (98%) diff --git a/app/src/main/java/com/example/acloc/activities/AddNewPlaceActivity.java b/app/src/main/java/com/example/acloc/activity/AddNewPlaceActivity.java similarity index 99% rename from app/src/main/java/com/example/acloc/activities/AddNewPlaceActivity.java rename to app/src/main/java/com/example/acloc/activity/AddNewPlaceActivity.java index b907eb1..3b25855 100644 --- a/app/src/main/java/com/example/acloc/activities/AddNewPlaceActivity.java +++ b/app/src/main/java/com/example/acloc/activity/AddNewPlaceActivity.java @@ -1,4 +1,4 @@ -package com.example.acloc.activities; +package com.example.acloc.activity; import android.annotation.SuppressLint; import android.app.Dialog; @@ -16,7 +16,7 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.AppCompatButton; import androidx.appcompat.widget.Toolbar; -import com.example.acloc.R; +import com.ieslamar.acloc.R; import com.example.acloc.api.ApiClient; import com.example.acloc.interfaces.ApiService; import com.example.acloc.model.Place; diff --git a/app/src/main/java/com/example/acloc/activities/AddReportActivity.java b/app/src/main/java/com/example/acloc/activity/AddReportActivity.java similarity index 99% rename from app/src/main/java/com/example/acloc/activities/AddReportActivity.java rename to app/src/main/java/com/example/acloc/activity/AddReportActivity.java index 55b8966..113aeb3 100644 --- a/app/src/main/java/com/example/acloc/activities/AddReportActivity.java +++ b/app/src/main/java/com/example/acloc/activity/AddReportActivity.java @@ -1,4 +1,4 @@ -package com.example.acloc.activities; +package com.example.acloc.activity; import android.app.Dialog; import android.content.Context; @@ -18,7 +18,6 @@ import androidx.appcompat.widget.AppCompatButton; import androidx.appcompat.widget.Toolbar; import androidx.core.content.ContextCompat; -import com.example.acloc.R; import com.example.acloc.api.ApiClient; import com.example.acloc.interfaces.ApiService; import com.example.acloc.model.Place; @@ -27,6 +26,7 @@ import com.example.acloc.utility.Constants; import com.example.acloc.utility.DialogUtils; import com.example.acloc.utility.Helper; import com.example.acloc.utility.SharedPref; +import com.ieslamar.acloc.R; import com.google.android.material.textfield.TextInputEditText; import com.google.gson.JsonObject; diff --git a/app/src/main/java/com/example/acloc/activities/LoginActivity.java b/app/src/main/java/com/example/acloc/activity/LoginActivity.java similarity index 97% rename from app/src/main/java/com/example/acloc/activities/LoginActivity.java rename to app/src/main/java/com/example/acloc/activity/LoginActivity.java index e814eaa..189d975 100644 --- a/app/src/main/java/com/example/acloc/activities/LoginActivity.java +++ b/app/src/main/java/com/example/acloc/activity/LoginActivity.java @@ -1,4 +1,4 @@ -package com.example.acloc.activities; +package com.example.acloc.activity; import android.content.Context; import android.os.Bundle; @@ -12,13 +12,13 @@ import androidx.appcompat.widget.AppCompatButton; import androidx.appcompat.widget.Toolbar; import com.example.acloc.MainActivity; -import com.example.acloc.R; import com.example.acloc.api.ApiClient; import com.example.acloc.interfaces.ApiService; import com.example.acloc.model.User; import com.example.acloc.utility.DialogUtils; import com.example.acloc.utility.Helper; import com.example.acloc.utility.SharedPref; +import com.ieslamar.acloc.R; import com.google.android.material.textfield.TextInputEditText; import com.google.gson.JsonObject; @@ -193,7 +193,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList DialogUtils.dismissDialog(); Log.e(TAG, "Login API call failed", t); // Helper.makeSnackBar(rlLogin, getString(R.string.Something_went_wrong)); - Helper.makeSnackBar(rlLogin, "API Failure: " + t.toString() + " Try again"); + Helper.makeSnackBar(rlLogin, "Server error: " + t.toString() + " Try again"); } }); } diff --git a/app/src/main/java/com/example/acloc/activities/ManageRolesActivity.java b/app/src/main/java/com/example/acloc/activity/ManageRolesActivity.java similarity index 99% rename from app/src/main/java/com/example/acloc/activities/ManageRolesActivity.java rename to app/src/main/java/com/example/acloc/activity/ManageRolesActivity.java index 7607ea7..ac5dba7 100644 --- a/app/src/main/java/com/example/acloc/activities/ManageRolesActivity.java +++ b/app/src/main/java/com/example/acloc/activity/ManageRolesActivity.java @@ -1,4 +1,4 @@ -package com.example.acloc.activities; +package com.example.acloc.activity; import android.annotation.SuppressLint; import android.content.Context; @@ -14,7 +14,6 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import androidx.recyclerview.widget.RecyclerView; -import com.example.acloc.R; import com.example.acloc.adapter.UserAdapter; import com.example.acloc.api.ApiClient; import com.example.acloc.interfaces.ApiService; @@ -22,6 +21,7 @@ import com.example.acloc.model.User; import com.example.acloc.utility.DialogUtils; import com.example.acloc.utility.Helper; import com.example.acloc.utility.SharedPref; +import com.ieslamar.acloc.R; import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; import com.google.gson.JsonElement; diff --git a/app/src/main/java/com/example/acloc/activities/PlaceDetailActivity.java b/app/src/main/java/com/example/acloc/activity/PlaceDetailActivity.java similarity index 99% rename from app/src/main/java/com/example/acloc/activities/PlaceDetailActivity.java rename to app/src/main/java/com/example/acloc/activity/PlaceDetailActivity.java index 494ad16..92c61c3 100644 --- a/app/src/main/java/com/example/acloc/activities/PlaceDetailActivity.java +++ b/app/src/main/java/com/example/acloc/activity/PlaceDetailActivity.java @@ -1,4 +1,4 @@ -package com.example.acloc.activities; +package com.example.acloc.activity; import android.app.Dialog; import android.content.Context; @@ -14,7 +14,7 @@ import androidx.appcompat.widget.AppCompatButton; import androidx.appcompat.widget.Toolbar; import androidx.recyclerview.widget.RecyclerView; -import com.example.acloc.R; +import com.ieslamar.acloc.R; import com.example.acloc.adapter.PlaceReportsAdapter; import com.example.acloc.api.ApiClient; import com.example.acloc.interfaces.ApiService; diff --git a/app/src/main/java/com/example/acloc/activities/RegisterActivity.java b/app/src/main/java/com/example/acloc/activity/RegisterActivity.java similarity index 98% rename from app/src/main/java/com/example/acloc/activities/RegisterActivity.java rename to app/src/main/java/com/example/acloc/activity/RegisterActivity.java index 0e3ec8e..52b8893 100644 --- a/app/src/main/java/com/example/acloc/activities/RegisterActivity.java +++ b/app/src/main/java/com/example/acloc/activity/RegisterActivity.java @@ -1,4 +1,4 @@ -package com.example.acloc.activities; +package com.example.acloc.activity; import android.content.Context; import android.os.Bundle; @@ -11,7 +11,7 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.AppCompatButton; import androidx.appcompat.widget.Toolbar; -import com.example.acloc.R; +import com.ieslamar.acloc.R; import com.example.acloc.api.ApiClient; import com.example.acloc.interfaces.ApiService; import com.example.acloc.model.User; diff --git a/app/src/main/java/com/example/acloc/adapter/FavoriteAdapter.java b/app/src/main/java/com/example/acloc/adapter/FavoriteAdapter.java index 4e2e086..d988289 100644 --- a/app/src/main/java/com/example/acloc/adapter/FavoriteAdapter.java +++ b/app/src/main/java/com/example/acloc/adapter/FavoriteAdapter.java @@ -14,8 +14,8 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.example.acloc.R; -import com.example.acloc.activities.PlaceDetailActivity; +import com.ieslamar.acloc.R; +import com.example.acloc.activity.PlaceDetailActivity; import com.example.acloc.api.ApiClient; import com.example.acloc.interfaces.ApiService; import com.example.acloc.model.Favorite; @@ -73,9 +73,7 @@ public class FavoriteAdapter extends RecyclerView.Adapter { - removePlaceFromFavorites(SharedPref.getUserUid(context), favorite.getPlaceUuid(), favorite.getUuid()); - }); + holder.ivFavorite.setOnClickListener(v -> removePlaceFromFavorites(SharedPref.getUserUid(context), favorite.getPlaceUuid(), favorite.getUuid())); holder.itemView.setOnClickListener(v -> getPlaceByUuid(favorite.getPlaceUuid())); } diff --git a/app/src/main/java/com/example/acloc/adapter/MyReportsAdapter.java b/app/src/main/java/com/example/acloc/adapter/MyReportsAdapter.java index 8d05c56..c6f4ebf 100644 --- a/app/src/main/java/com/example/acloc/adapter/MyReportsAdapter.java +++ b/app/src/main/java/com/example/acloc/adapter/MyReportsAdapter.java @@ -15,8 +15,8 @@ import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; -import com.example.acloc.R; -import com.example.acloc.activities.AddReportActivity; +import com.ieslamar.acloc.R; +import com.example.acloc.activity.AddReportActivity; import com.example.acloc.api.ApiClient; import com.example.acloc.interfaces.ApiService; import com.example.acloc.model.Report; diff --git a/app/src/main/java/com/example/acloc/adapter/PlaceReportsAdapter.java b/app/src/main/java/com/example/acloc/adapter/PlaceReportsAdapter.java index 10f097e..336213f 100644 --- a/app/src/main/java/com/example/acloc/adapter/PlaceReportsAdapter.java +++ b/app/src/main/java/com/example/acloc/adapter/PlaceReportsAdapter.java @@ -12,7 +12,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.example.acloc.R; +import com.ieslamar.acloc.R; import com.example.acloc.model.Report; import java.util.List; diff --git a/app/src/main/java/com/example/acloc/adapter/UserAdapter.java b/app/src/main/java/com/example/acloc/adapter/UserAdapter.java index 4edfefc..66bd53f 100644 --- a/app/src/main/java/com/example/acloc/adapter/UserAdapter.java +++ b/app/src/main/java/com/example/acloc/adapter/UserAdapter.java @@ -14,8 +14,8 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.example.acloc.R; -import com.example.acloc.activities.ManageRolesActivity; +import com.ieslamar.acloc.R; +import com.example.acloc.activity.ManageRolesActivity; import com.example.acloc.api.ApiClient; import com.example.acloc.interfaces.ApiService; import com.example.acloc.model.User; diff --git a/app/src/main/java/com/example/acloc/dialog/AlertChangePasswordDialog.java b/app/src/main/java/com/example/acloc/dialog/AlertChangePasswordDialog.java index 0920695..091bac8 100644 --- a/app/src/main/java/com/example/acloc/dialog/AlertChangePasswordDialog.java +++ b/app/src/main/java/com/example/acloc/dialog/AlertChangePasswordDialog.java @@ -12,7 +12,7 @@ import android.view.ViewGroup; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.widget.AppCompatButton; -import com.example.acloc.R; +import com.ieslamar.acloc.R; import com.example.acloc.api.ApiClient; import com.example.acloc.interfaces.ApiService; import com.example.acloc.utility.DialogUtils; diff --git a/app/src/main/java/com/example/acloc/dialog/AlertViewAddNewPlaceDialog.java b/app/src/main/java/com/example/acloc/dialog/AlertViewAddNewPlaceDialog.java index 3722e30..001d890 100644 --- a/app/src/main/java/com/example/acloc/dialog/AlertViewAddNewPlaceDialog.java +++ b/app/src/main/java/com/example/acloc/dialog/AlertViewAddNewPlaceDialog.java @@ -14,7 +14,7 @@ import androidx.appcompat.app.AlertDialog; import androidx.appcompat.widget.AppCompatButton; import com.example.acloc.MainActivity; -import com.example.acloc.R; +import com.ieslamar.acloc.R; import com.example.acloc.api.ApiClient; import com.example.acloc.interfaces.ApiService; import com.example.acloc.model.Place; diff --git a/app/src/main/java/com/example/acloc/dialog/AlertViewOrUpdateProfileDialog.java b/app/src/main/java/com/example/acloc/dialog/AlertViewOrUpdateProfileDialog.java index 2871041..ba504df 100644 --- a/app/src/main/java/com/example/acloc/dialog/AlertViewOrUpdateProfileDialog.java +++ b/app/src/main/java/com/example/acloc/dialog/AlertViewOrUpdateProfileDialog.java @@ -12,7 +12,7 @@ import android.view.ViewGroup; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.widget.AppCompatButton; -import com.example.acloc.R; +import com.ieslamar.acloc.R; import com.example.acloc.api.ApiClient; import com.example.acloc.interfaces.ApiService; import com.example.acloc.model.User; diff --git a/app/src/main/java/com/example/acloc/fragments/FavoriteFragment.java b/app/src/main/java/com/example/acloc/fragments/FavoriteFragment.java index 2873184..0a2a248 100644 --- a/app/src/main/java/com/example/acloc/fragments/FavoriteFragment.java +++ b/app/src/main/java/com/example/acloc/fragments/FavoriteFragment.java @@ -15,7 +15,7 @@ import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.TextView; -import com.example.acloc.R; +import com.ieslamar.acloc.R; import com.example.acloc.adapter.FavoriteAdapter; import com.example.acloc.api.ApiClient; import com.example.acloc.interfaces.ApiService; 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 919e503..d0a2781 100644 --- a/app/src/main/java/com/example/acloc/fragments/MapFragment.java +++ b/app/src/main/java/com/example/acloc/fragments/MapFragment.java @@ -25,9 +25,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.RelativeLayout; -import com.example.acloc.R; -import com.example.acloc.activities.AddNewPlaceActivity; -import com.example.acloc.activities.PlaceDetailActivity; +import com.ieslamar.acloc.R; +import com.example.acloc.activity.AddNewPlaceActivity; +import com.example.acloc.activity.PlaceDetailActivity; import com.example.acloc.interfaces.ApiService; import com.example.acloc.model.Place; import com.example.acloc.utility.Constants; diff --git a/app/src/main/java/com/example/acloc/fragments/MyReportsFragment.java b/app/src/main/java/com/example/acloc/fragments/MyReportsFragment.java index 9ec16d6..d613f65 100644 --- a/app/src/main/java/com/example/acloc/fragments/MyReportsFragment.java +++ b/app/src/main/java/com/example/acloc/fragments/MyReportsFragment.java @@ -16,7 +16,7 @@ import android.widget.FrameLayout; import android.widget.TextView; import com.example.acloc.MainActivity; -import com.example.acloc.R; +import com.ieslamar.acloc.R; import com.example.acloc.adapter.MyReportsAdapter; import com.example.acloc.api.ApiClient; import com.example.acloc.interfaces.ApiService; diff --git a/app/src/main/java/com/example/acloc/utility/DialogUtils.java b/app/src/main/java/com/example/acloc/utility/DialogUtils.java index f105ccf..536039a 100644 --- a/app/src/main/java/com/example/acloc/utility/DialogUtils.java +++ b/app/src/main/java/com/example/acloc/utility/DialogUtils.java @@ -10,8 +10,8 @@ import android.graphics.drawable.ColorDrawable; import android.view.Window; import android.widget.TextView; -import com.example.acloc.R; -import com.example.acloc.activities.LoginActivity; +import com.ieslamar.acloc.R; +import com.example.acloc.activity.LoginActivity; public class DialogUtils { private static Dialog dialog;