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

Insert and display report logo

This commit is contained in:
Pau 2025-05-23 00:21:13 +02:00
parent 7d940efb92
commit c22c091469
4 changed files with 112 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/example/acloc/activity/AddNewPlaceActivity.java
View File

@ -172,6 +172,7 @@ public class AddNewPlaceActivity extends AppCompatActivity implements View.OnCli
}
private void onClickIvPlacePhoto() {
btnSubmit.setClickable(false);
// Open the gallery to select an image
Intent intent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
intent.setType("image/*"); // Restrict to images only
@ -203,18 +204,25 @@ public class AddNewPlaceActivity extends AppCompatActivity implements View.OnCli
imageUrl = BASE_URL + "public/" + filename;
jsonString = "[\"" + imageUrl + "\"]";
Helper.makeSnackBar(rlAddPlace, "Image uploaded successfully");
Log.d(TAG, "JsonString: " + jsonString);
btnSubmit.setClickable(true);
} else {
Helper.makeSnackBar(rlAddPlace, "Upload failed");
btnSubmit.setClickable(true);
Log.d(TAG, "btnSubmit : TRUE");
}
} catch (JSONException e) {
Helper.makeSnackBar(rlAddPlace, "Response parsing error");
btnSubmit.setClickable(true);
Log.d(TAG, "btnSubmit : TRUE");
Log.e(TAG, "Failed to parse JSON", e);
}
}
@Override
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);
}
});

96
app/src/main/java/com/example/acloc/activity/AddReportActivity.java
View File

@ -1,5 +1,7 @@
package com.example.acloc.activity;
import static com.example.acloc.utility.Constants.BASE_URL;
import android.app.Dialog;
import android.content.Context;
import android.content.Intent;
@ -26,9 +28,15 @@ 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.example.acloc.utility.UploadManager;
import com.ieslamar.acloc.R;
import com.google.android.material.textfield.TextInputEditText;
import com.google.gson.JsonObject;
import com.squareup.picasso.Picasso;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import retrofit2.Call;
import retrofit2.Callback;
@ -43,7 +51,6 @@ public class AddReportActivity extends AppCompatActivity implements View.OnClick
private ImageView ivThumbsUp, ivThumbsAverage, ivThumbsDown;
private AppCompatButton btnSubmit;
private Context context;
private Dialog dialog;
private Place placeEntity;
private Report reportEntity;
private String report_type_uuid, place_uuid;
@ -52,6 +59,10 @@ public class AddReportActivity extends AppCompatActivity implements View.OnClick
private static final int PICK_IMAGE_REQUEST = 100;
private Uri selectedImageUri;
private String imageUrl;
private String jsonString;
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -127,6 +138,32 @@ public class AddReportActivity extends AppCompatActivity implements View.OnClick
ivThumbsAverage.setColorFilter(null);
reportRating = Constants.GOOD_RATING; //3
}
if (reportEntity.getImage() != null && !reportEntity.getImage().isEmpty()) {
String rawImg = reportEntity.getImage();
try {
JSONArray array = new JSONArray(rawImg);
String imageUrl = array.getString(0); // Get first element in the array
Picasso.get()
.load(imageUrl)
.into(ivReportPhoto, new com.squareup.picasso.Callback() {
@Override
public void onSuccess() {
Picasso.get().load(imageUrl).into(ivReportPhoto);
}
@Override
public void onError(Exception e) {
// Error loading image 404 -- load default
Picasso.get().load(R.drawable.logo_add_location).into(ivReportPhoto);
}
});
} catch (JSONException e) {
Log.e(TAG, "ERROR: " + e.toString());
Picasso.get().load(R.drawable.logo_add_location).into(ivReportPhoto);
}
} else { //if image is null
Picasso.get().load(R.drawable.logo_add_location).into(ivReportPhoto);
}
}
private void initListener() {
@ -169,14 +206,50 @@ public class AddReportActivity extends AppCompatActivity implements View.OnClick
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == PICK_IMAGE_REQUEST && resultCode == RESULT_OK && data != null && data.getData() != null) {
// Get the image URI
Uri selectedImageUri = data.getData();
selectedImageUri = data.getData();
// Upload the image
uploadImageToServer(selectedImageUri);
// Load image using Picasso
Picasso.get().load(selectedImageUri).into(ivReportPhoto);
// Set the image in the ImageView
ivReportPhoto.setImageURI(selectedImageUri);
}
}
private void uploadImageToServer(Uri imageUri) {
UploadManager.uploadImage(this, imageUri, new UploadManager.UploadCallback() {
@Override
public void onSuccess(String response) {
try {
JSONObject json = new JSONObject(response);
if (json.getBoolean("success")) {
String filename = json.getJSONObject("file").getString("filename");
imageUrl = BASE_URL + "public/" + filename;
jsonString = "[\"" + imageUrl + "\"]";
Helper.makeSnackBar(rlAddReport, "Image uploaded successfully");
btnSubmit.setClickable(true);
} else {
Helper.makeSnackBar(rlAddReport, "Upload failed");
btnSubmit.setClickable(true);
}
} catch (JSONException e) {
Helper.makeSnackBar(rlAddReport, "Response parsing error");
btnSubmit.setClickable(true);
Log.d(TAG, "btnSubmit : TRUE");
Log.e(TAG, "Failed to parse JSON", e);
}
}
@Override
public void onError(String message) {
Helper.makeSnackBar(rlAddReport, "Upload failed: " + message);
Log.e(TAG, "Upload error:" + message);
btnSubmit.setClickable(true);
}
});
}
private void onClickThumbsUp() {
ivThumbsUp.setColorFilter(ContextCompat.getColor(this, R.color.green), PorterDuff.Mode.SRC_IN);
ivThumbsDown.setColorFilter(null); // reset the other
@ -212,7 +285,8 @@ public class AddReportActivity extends AppCompatActivity implements View.OnClick
SharedPref.getUserUid(context),
String.valueOf(reportEntity.getReportRating()),
reportEntity.getDescription(),
reportEntity.getCreatedBy()
reportEntity.getCreatedBy(),
reportEntity.getImage()
);
} else {
insertReportRetrofit(
@ -220,7 +294,8 @@ public class AddReportActivity extends AppCompatActivity implements View.OnClick
SharedPref.getUserUid(context),
String.valueOf(reportEntity.getReportRating()),
reportEntity.getDescription(),
reportEntity.getCreatedBy()
reportEntity.getCreatedBy(),
reportEntity.getImage()
);
}
}
@ -230,6 +305,7 @@ public class AddReportActivity extends AppCompatActivity implements View.OnClick
reportEntity.setDescription(Helper.getStringFromInput(etDescription));
reportEntity.setReportRating(reportRating);
reportEntity.setCreatedBy(SharedPref.getUserUid(context));
reportEntity.setImage(jsonString);
}
private boolean isValidateRating() {
@ -242,7 +318,7 @@ public class AddReportActivity extends AppCompatActivity implements View.OnClick
}
private void insertReportRetrofit(String placeUuid, String userUuid, String rating,
String description, String createdBy) {
String description, String createdBy, String jsonString) {
DialogUtils.showLoadingDialog(context, getString(R.string.Please_wait));
@ -252,6 +328,7 @@ public class AddReportActivity extends AppCompatActivity implements View.OnClick
reportBody.addProperty("rating", rating);
reportBody.addProperty("description", description);
reportBody.addProperty("createdBy", createdBy);
reportBody.addProperty("images", jsonString);
String token = "Bearer " + SharedPref.getAccessToken(context);
@ -293,7 +370,7 @@ public class AddReportActivity extends AppCompatActivity implements View.OnClick
}
private void updateReportRetrofit(String uuid, String placeUuid, String userUuid, String rating,
String description, String createdBy) {
String description, String createdBy, String jsonString) {
DialogUtils.showLoadingDialog(context, getString(R.string.Updating_report));
@ -303,6 +380,7 @@ public class AddReportActivity extends AppCompatActivity implements View.OnClick
reportBody.addProperty("rating", rating);
reportBody.addProperty("description", description);
reportBody.addProperty("createdBy", createdBy);
reportBody.addProperty("images", jsonString);
String token = "Bearer " + SharedPref.getAccessToken(context);

4
app/src/main/java/com/example/acloc/fragments/MyReportsFragment.java
View File

@ -176,6 +176,10 @@ public class MyReportsFragment extends Fragment implements View.OnClickListener
report.setDescription(reportObject.get("description").getAsString());
report.setPlaceName(reportObject.get("place_name").getAsString());
report.setPlaceUuid(reportObject.get("place_uuid").getAsString());
JsonElement imagesElement = reportObject.get("images");
if (imagesElement != null && imagesElement.isJsonArray()) {
report.setImage(String.valueOf(imagesElement.getAsJsonArray()));
}
reportList.add(report);
}

20
app/src/main/java/com/example/acloc/model/Report.java
View File

@ -3,9 +3,10 @@ package com.example.acloc.model;
import java.io.Serializable;
public class Report implements Serializable {
private String uuid, fkUser, fkPlace, fkReportType, description, created, createdBy;
private String placeName, placeUuid;
private int reportRating;
String uuid, fkUser, fkPlace, fkReportType, description, createdBy;
String placeName, placeUuid;
int reportRating;
String image;
public String getUuid() {
return uuid;
@ -46,9 +47,7 @@ public class Report implements Serializable {
public void setDescription(String description) {
this.description = description;
}
public String getCreationDate(){
return created;
}
public String getCreatedBy() {
return createdBy;
}
@ -80,7 +79,12 @@ public class Report implements Serializable {
public void setPlaceUuid(String placeUuid) {
this.placeUuid = placeUuid;
}
public String getCreatedDate(){
return created;
public String getImage() {
return image;
}
public void setImage(String image) {
this.image = image;
}
}