fix conflict merging

app/src/main/java/com/example/yourcashiertest/activities/ProductActivity.java

@@ -13,19 +13,13 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.database.Cursor;
+import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
 import android.provider.MediaStore;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.AutoCompleteTextView;
-import android.widget.ImageView;
-import android.widget.Spinner;
-import android.widget.Toast;
 
 import com.example.yourcashiertest.R;
 import com.example.yourcashiertest.databinding.ActivityProductBinding;
@@ -36,7 +30,6 @@ import com.example.yourcashiertest.viewmodels.ProductViewModel;
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.List;
 
 public class ProductActivity extends AppCompatActivity{
     private static final int PICK_IMAGE = 123;
@@ -63,7 +56,10 @@ public class ProductActivity extends AppCompatActivity{
 
         if (product != null){
             isUpdate = true;
+
+            viewModel.setPhoto(product.getPhoto());
             viewModel.setProduct(product);
+
             binding.btnSubmit.setText(R.string.btn_edit);
             binding.tvHeadProduct.setText("UPDATE PRODUCT");
         }else {
@@ -85,10 +81,10 @@ public class ProductActivity extends AppCompatActivity{
                 }
 
                 if (file != null){
-//                    fixProduct.setPhoto(file.getAbsolutePath());
-                    fixProduct.setPhoto(selectedImageUri.toString());
+                    fixProduct.setPhoto(file.getAbsolutePath());
                 }else {
                     fixProduct.setPhoto("");
+
                 }
 
                 fixProduct.setName(binding.etProduct.getText().toString());
@@ -167,9 +163,9 @@ public class ProductActivity extends AppCompatActivity{
     }
 
     private void openGallery(){
-        Intent gallery = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.INTERNAL_CONTENT_URI);
-
-        startActivityForResult(gallery, PICK_IMAGE);
+        Intent intent = new Intent(Intent.ACTION_PICK);
+        intent.setType("image/*");
+        startActivityForResult(intent, PICK_IMAGE);
     }
 
 
@@ -200,20 +196,32 @@ public class ProductActivity extends AppCompatActivity{
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-//        if (requestCode == PICK_IMAGE && resultCode == RESULT_OK) {
-//            imageUri = data.getData();
-//            String[] filePathColumn = { MediaStore.Images.Media.DATA };
-//            Cursor cursor = getContentResolver().query(imageUri,
-//                    filePathColumn, null, null, null);
-//            cursor.moveToFirst();
-//            cursor.close();
-        if (requestCode == REQUEST_IMAGE_CAPTURE) {
-            if(resultCode == RESULT_OK) {
-                selectedImageUri = data.getData();
+        Uri imageUri;
+
+        if (resultCode == RESULT_OK && requestCode == PICK_IMAGE){
+            //set image to image view
+            binding.ivProduct.setImageURI(data.getData());
+            imageUri = data.getData();
+            if (imageUri != null){
+                file = new File(getPath(imageUri));
+            } else {
+                file = file.getAbsoluteFile();
             }
         }
     }
 
+    public String getPath(Uri uri)
+    {
+        String[] projection = { MediaStore.Images.Media.DATA };
+        Cursor cursor = getContentResolver().query(uri, projection, null, null, null);
+        if (cursor == null) return null;
+        int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+        cursor.moveToFirst();
+        String s=cursor.getString(column_index);
+        cursor.close();
+        return s;
+    }
+
     @Override
     public boolean onSupportNavigateUp() {
         onBackPressed();