pauher
/
AcLoc_app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue with favorite selection

This commit is contained in:
Pau 2025-05-21 20:34:45 +02:00
parent ebfc1f8f74
commit 4c189a0724
3 changed files with 49 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -57,7 +57,7 @@
<meta-data
android:name="com.google.android.geo.API_KEY"
android:value="@string/google_maps_api_key" />
android:value="AIzaSyCzcuZhHd-GqadewAiCbh4NuaBhO2AcPOY" />
</application>
</manifest>

47
app/src/main/java/com/example/acloc/dialog/PlaceBottomSheetDialog.java
View File

@ -75,8 +75,27 @@ public class PlaceBottomSheetDialog extends BottomSheetDialogFragment {
View bottomSheet = bottomSheetDialog.findViewById(com.google.android.material.R.id.design_bottom_sheet);
if (bottomSheet != null) {
behavior = BottomSheetBehavior.from(bottomSheet);
//Set initial state to half expanded
behavior.setPeekHeight(getResources().getDisplayMetrics().heightPixels / 2);
behavior.setState(BottomSheetBehavior.STATE_HALF_EXPANDED);
//Add callback to update expand/collapse icon
behavior.addBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
@Override
public void onStateChanged(@NonNull View bottomSheet, int newState) {
if (newState == BottomSheetBehavior.STATE_EXPANDED) {
ivExpand.setImageResource(R.drawable.ic_expand_more);
} else {
ivExpand.setImageResource(R.drawable.ic_expand_less);
}
}
@Override
public void onSlide(@NonNull View bottomSheet, float slideOffset) {
// animation based on slide position - do nothing for now
}
});
}
});
@ -109,7 +128,6 @@ public class PlaceBottomSheetDialog extends BottomSheetDialogFragment {
btnAddReport = view.findViewById(R.id.btnAddReport);
rvReports = view.findViewById(R.id.rvReports);
// Set up RecyclerView
rvReports.setLayoutManager(new LinearLayoutManager(context));
}
@ -175,14 +193,7 @@ public class PlaceBottomSheetDialog extends BottomSheetDialogFragment {
reportList.clear();
for (JsonElement element : data.getAsJsonArray("reports")) {
JsonObject reportObject = element.getAsJsonObject();
Report report = new Report();
report.setUuid(reportObject.get("uuid").getAsString());
report.setReportRating(reportObject.get("rating").getAsInt());
report.setDescription(reportObject.get("description").getAsString());
report.setPlaceName(reportObject.get("place_name").getAsString());
report.setPlaceUuid(reportObject.get("place_uuid").getAsString());
Report report = getReport(element);
reportList.add(report);
}
@ -208,6 +219,18 @@ public class PlaceBottomSheetDialog extends BottomSheetDialogFragment {
});
}
private static @NonNull Report getReport(JsonElement element) {
JsonObject reportObject = element.getAsJsonObject();
Report report = new Report();
report.setUuid(reportObject.get("uuid").getAsString());
report.setReportRating(reportObject.get("rating").getAsInt());
report.setDescription(reportObject.get("description").getAsString());
report.setPlaceName(reportObject.get("place_name").getAsString());
report.setPlaceUuid(reportObject.get("place_uuid").getAsString());
return report;
}
private void updateReportsUI(List<Report> reports) {
if (reports != null && !reports.isEmpty()) {
adapter = new PlaceReportsAdapter(context, reports);
@ -277,7 +300,7 @@ public class PlaceBottomSheetDialog extends BottomSheetDialogFragment {
String token = "Bearer " + SharedPref.getAccessToken(context);
FavoriteService favoriteService = LocationApiClient.getInstance().getFavoriteService();
Call<JsonObject> call = favoriteService.restorePlaceToFavorites(token, userUuid, body);
Call<JsonObject> call = favoriteService.addPlaceToFavorites(token, userUuid, body);
call.enqueue(new Callback<JsonObject>() {
@Override
public void onResponse(Call<JsonObject> call, Response<JsonObject> response) {
@ -291,8 +314,8 @@ public class PlaceBottomSheetDialog extends BottomSheetDialogFragment {
if (response.errorBody() != null) {
String errorBody = response.errorBody().string();
// Try restoring if it's a duplicate (409 Conflict)
if (response.code() == 409 && errorBody.contains("ER_DUP_ENTRY")) {
// Try restoring if it's a duplicate (409 Conflict) or it isn't found (deleted)
if ((response.code() == 409 && errorBody.contains("ER_DUP_ENTRY"))|| response.code() == 404 ) {
restorePlaceToFavorites(userUuid, placeUuid);
return;
}

13
app/src/main/java/com/example/acloc/service/FavoriteService.java
View File

@ -7,6 +7,7 @@ import retrofit2.http.Body;
import retrofit2.http.DELETE;
import retrofit2.http.GET;
import retrofit2.http.Header;
import retrofit2.http.POST;
import retrofit2.http.PUT;
import retrofit2.http.Path;
@ -50,4 +51,16 @@ public interface FavoriteService {
@Path("user_uuid") String userUuid,
@Body JsonObject body
);
/**
* Adds a place to user's favorite places
* @param token Bearer token
* @param userUuid User UUID
* @param placeBody Data to modify (favorite)*/
@POST("users/{user_uuid}/places")
Call<JsonObject> addPlaceToFavorites(
@Header("Authorization") String token,
@Path("user_uuid") String userUuid,
@Body JsonObject placeBody
);
}