revert shit

app/src/main/java/com/example/cameraxtestappjava/MainActivity.java

@@ -2,24 +2,40 @@ package com.example.cameraxtestappjava;
 
 import android.content.ContentValues;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
+import android.provider.MediaStore;
 import android.util.Log;
 import android.widget.Toast;
 
 import androidx.activity.EdgeToEdge;
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.camera.core.CameraSelector;
+import androidx.camera.core.ImageCapture;
+import androidx.camera.core.ImageCaptureException;
+import androidx.camera.core.Preview;
+import androidx.camera.lifecycle.ProcessCameraProvider;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 
-import com.example.cameraxtestappjava.camera.CustomCamera;
-import com.example.cameraxtestappjava.camera.CustomCameraCallback;
 import com.example.cameraxtestappjava.databinding.ActivityMainBinding;
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.util.concurrent.ExecutionException;
 
 public class MainActivity extends AppCompatActivity {
 
-    CustomCamera customCamera;
+    ProcessCameraProvider cameraProvider;
+    ImageCapture imageCapture;
+    ImageCapture.OutputFileOptions outputFileOptions;
+    ListenableFuture<ProcessCameraProvider> cameraProviderFuture;
+    ContentValues contentValues;
+    String fileName;
+    Uri tempFileUri;
+
     ActivityMainBinding binding;
 
     @Override
@@ -30,12 +46,8 @@ public class MainActivity extends AppCompatActivity {
         binding = ActivityMainBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
-        customCamera = new CustomCamera(this);
+        setListeners();
-        customCamera.initCustomCamera(this, ContextCompat.getMainExecutor(this), this);
+        setUpCamera();
-
-        Log.d("TAGTAG", "UEEEPA");
-
-        //binding.scSegpassCameraView.takePictureBtn.setOnClickListener(v -> takePicture());
 
         ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
             Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
@@ -44,17 +56,77 @@ public class MainActivity extends AppCompatActivity {
         });
     }
 
-    private void takePicture() {
+    private void setListeners() {
-        customCamera.capturePhoto(new CustomCameraCallback() {
+        binding.btnTakePicture.setOnClickListener(v -> capturePhoto());
+    }
+
+    private void capturePhoto() {
+        if (imageCapture == null) return;
+
+        fileName = System.currentTimeMillis() + "";
+
+        outputFileOptions = getOutputFileOptions(fileName);
+
+        imageCapture.takePicture(outputFileOptions, ContextCompat.getMainExecutor(this), new ImageCapture.OnImageSavedCallback() {
             @Override
-            public void onPictureTakenSuccess(String message) {
+            public void onImageSaved(@NonNull ImageCapture.OutputFileResults outputFileResults) {
-                Toast.makeText(MainActivity.this, message, Toast.LENGTH_LONG).show();
+                tempFileUri = outputFileResults.getSavedUri();
+                Toast.makeText(MainActivity.this, "Image saved! " + tempFileUri, Toast.LENGTH_LONG).show();
             }
 
             @Override
-            public void onPictureTakenFailError(String error) {
+            public void onError(@NonNull ImageCaptureException exception) {
-                Toast.makeText(MainActivity.this, error, Toast.LENGTH_LONG).show();
+                Toast.makeText(MainActivity.this, "Image Not Saved " + exception.getMessage(), Toast.LENGTH_LONG).show();
             }
         });
+
+    }
+
+    @NonNull
+    private ImageCapture.OutputFileOptions getOutputFileOptions(String name) {
+        contentValues = new ContentValues();
+        contentValues.put(MediaStore.MediaColumns.DISPLAY_NAME, name);
+        contentValues.put(MediaStore.MediaColumns.MIME_TYPE, "image/jpeg");
+
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
+            contentValues.put(MediaStore.Images.Media.RELATIVE_PATH, "Pictures/CameraXTestApp");
+        }
+
+        return new ImageCapture.OutputFileOptions.Builder(
+                getContentResolver(), MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues
+        ).build();
+    }
+
+    private void setUpCamera() {
+        cameraProviderFuture = ProcessCameraProvider.getInstance(this);
+        cameraProviderFuture.addListener(() -> {
+            try {
+                cameraProvider = cameraProviderFuture.get();
+                startCustomCamera(cameraProvider);
+            } catch (ExecutionException | InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+
+        }, ContextCompat.getMainExecutor(this)); // por parametro
+    }
+
+    private void startCustomCamera(ProcessCameraProvider cameraProvider) {
+        Log.d("TAGTAG", "UEEEP");
+        CameraSelector cameraSelector = CameraSelector.DEFAULT_FRONT_CAMERA;
+
+        Preview preview = new Preview.Builder().build();
+        preview.setSurfaceProvider(binding.pvViewfinder.getSurfaceProvider());
+
+        imageCapture = new ImageCapture.Builder().build();
+
+        try {
+            cameraProvider.unbindAll();
+
+            cameraProvider.bindToLifecycle(this, cameraSelector, preview, imageCapture);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
     }
 }

app/src/main/res/layout/activity_main.xml

@@ -7,14 +7,33 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <com.example.cameraxtestappjava.camera.CustomCamera
+    <androidx.camera.view.PreviewView
-        android:id="@+id/ccCustomCamera"
+        android:id="@+id/pvViewfinder"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/llCameraButtons"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintTop_toTopOf="parent" />
 
+    <LinearLayout
+        android:id="@+id/llCameraButtons"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/pvViewfinder">
+
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btnTakePicture"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Take Picture" />
+
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>