Update libuvc (2025) + enable Edge to Edge

libpretixui-android/build.gradle

@@ -51,9 +51,9 @@ dependencies {
     implementation 'com.neovisionaries:nv-i18n:1.27'
     implementation 'joda-time:joda-time:2.10.10'
     implementation 'com.github.ialokim:android-phone-field:0.2.3'
-    implementation 'androidx.core:core-ktx:1.10.0'
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation 'androidx.lifecycle:lifecycle-common:2.6.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'com.google.zxing:core:3.5.3'
@@ -63,7 +63,7 @@ dependencies {
     implementation "androidx.camera:camera-lifecycle:$camerax_version"
     implementation "androidx.camera:camera-view:$camerax_version"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'com.google.android.material:material:1.13.0'
     implementation 'com.github.pretix:json-logic-kotlin:1.0.0'
     implementation implementation(project(':android-libuvccamera',))
     implementation implementation(project(':android-libusbcameracommon',))

libpretixui-android/src/main/AndroidManifest.xml

@@ -7,8 +7,10 @@
     <application>
         <activity
             android:name=".scanning.ScanActivity"
-            android:theme="@style/Theme.MaterialComponents.Light.NoActionBar" />
-        <activity android:name=".PhotoCaptureActivity" />
+            android:theme="@style/Theme.Material3.Light.NoActionBar" />
+        <activity
+            android:name=".PhotoCaptureActivity"
+            android:theme="@style/Theme.Material3.Dark.NoActionBar" />
     </application>
 
 </manifest>

libpretixui-android/src/main/java/eu/pretix/libpretixui/android/PhotoCaptureActivity.kt

@@ -19,12 +19,16 @@ import android.view.Menu
 import android.view.Surface
 import android.view.View
 import android.widget.Toast
+import androidx.activity.enableEdgeToEdge
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.camera.core.*
 import androidx.camera.lifecycle.ProcessCameraProvider
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import com.serenegiant.usb.USBMonitor
 import com.serenegiant.usb.UVCCamera
 import eu.pretix.libpretixui.android.databinding.ActivityPhotoCaptureBinding
@@ -184,9 +188,27 @@ class PhotoCaptureActivity : CameraDialog.CameraDialogParent, AppCompatActivity(
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
         binding = ActivityPhotoCaptureBinding.inflate(layoutInflater)
         setContentView(binding.root)
+        setSupportActionBar(binding.topAppBar)
+
+        ViewCompat.setOnApplyWindowInsetsListener(
+            findViewById(R.id.content)
+        ) { v, windowInsets ->
+            val insets = windowInsets.getInsets(
+                WindowInsetsCompat.Type.systemBars()
+                        or WindowInsetsCompat.Type.displayCutout()
+            )
+            v.updatePadding(
+                left = insets.left,
+                right = insets.right,
+                top = 0, // handled by AppBar
+                bottom = insets.bottom
+            )
+            WindowInsetsCompat.CONSUMED
+        }
 
         outputDirectory = getOutputDirectory()
         prefs = getSharedPreferences("PhotoCaptureActivity", Context.MODE_PRIVATE)

libpretixui-android/src/main/res/layout/activity_photo_capture.xml

@@ -1,17 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data></data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:background="@android:color/black"
-    android:theme="@android:style/ThemeOverlay.Material.Dark"
-    tools:context=".PhotoCaptureActivity"
-    tools:targetApi="lollipop">
+    tools:context=".PhotoCaptureActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/topAppBar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@android:color/black"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <FrameLayout
             android:id="@+id/frameLayout"
@@ -102,4 +118,4 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>