From 1bbf6328040a30d53bfd73a41f5ed849ebf9736b Mon Sep 17 00:00:00 2001
From: Captain Arepa <captain_arepa@proton.me>
Date: Fri, 31 May 2024 14:20:03 -0400
Subject: [PATCH] Control commit

---
 .../segpass/camera/view/SegpassCameraLayout.java              | 4 ++--
 app/src/main/res/layout/activity_camera.xml                   | 2 +-
 app/src/main/res/layout/activity_camera_new.xml               | 2 +-
 .../{segpass_camera_view.xml => segpass_camera_layout.xml}    | 0
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename app/src/main/res/layout/{segpass_camera_view.xml => segpass_camera_layout.xml} (100%)

diff --git a/app/src/main/java/com/example/cameraxtestappjava/segpass/camera/view/SegpassCameraLayout.java b/app/src/main/java/com/example/cameraxtestappjava/segpass/camera/view/SegpassCameraLayout.java
index b2da3a3..1f836b9 100644
--- a/app/src/main/java/com/example/cameraxtestappjava/segpass/camera/view/SegpassCameraLayout.java
+++ b/app/src/main/java/com/example/cameraxtestappjava/segpass/camera/view/SegpassCameraLayout.java
@@ -44,12 +44,12 @@ public class SegpassCameraLayout extends FrameLayout {
 
     public SegpassCameraLayout(@NonNull Context context) {
         super(context);
-        rootView = inflate(context, R.layout.segpass_camera_view, this);
+        rootView = inflate(context, R.layout.segpass_camera_layout, this);
     }
 
     public SegpassCameraLayout(@NonNull Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
-        rootView = inflate(context, R.layout.segpass_camera_view, this);
+        rootView = inflate(context, R.layout.segpass_camera_layout, this);
     }
 
     /**
diff --git a/app/src/main/res/layout/activity_camera.xml b/app/src/main/res/layout/activity_camera.xml
index d85225c..4ca724a 100644
--- a/app/src/main/res/layout/activity_camera.xml
+++ b/app/src/main/res/layout/activity_camera.xml
@@ -9,7 +9,7 @@
 
     <include
         android:id="@+id/inCamera2"
-        layout="@layout/segpass_camera_view"
+        layout="@layout/segpass_camera_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
diff --git a/app/src/main/res/layout/activity_camera_new.xml b/app/src/main/res/layout/activity_camera_new.xml
index 050b3df..d383d8d 100644
--- a/app/src/main/res/layout/activity_camera_new.xml
+++ b/app/src/main/res/layout/activity_camera_new.xml
@@ -9,7 +9,7 @@
 
     <include
         android:id="@+id/inCamera2"
-        layout="@layout/segpass_camera_view"
+        layout="@layout/segpass_camera_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
diff --git a/app/src/main/res/layout/segpass_camera_view.xml b/app/src/main/res/layout/segpass_camera_layout.xml
similarity index 100%
rename from app/src/main/res/layout/segpass_camera_view.xml
rename to app/src/main/res/layout/segpass_camera_layout.xml