app/build.gradle.kts

@@ -11,7 +11,6 @@ if (useKeystoreProperties) {
 plugins {
     id("com.android.application")
     kotlin("android")
-    kotlin("kapt")
 }
 
 java {
@@ -28,6 +27,7 @@ android {
                 storePassword = keystoreProperties["storePassword"] as String
                 keyAlias = keystoreProperties["keyAlias"] as String
                 keyPassword = keystoreProperties["keyPassword"] as String
+                enableV4Signing = true
             }
 
             create("play") {
@@ -39,17 +39,17 @@ android {
         }
     }
 
-    compileSdk = 34
+    compileSdk = 35
     buildToolsVersion = "35.0.0"
-    ndkVersion = "26.3.11579264"
+    ndkVersion = "27.2.12479018"
 
     namespace = "app.grapheneos.camera"
 
     defaultConfig {
         applicationId = "app.grapheneos.camera"
         minSdk = 29
-        targetSdk = 34
-        versionCode = 74
+        targetSdk = 35
+        versionCode = 75
         versionName = versionCode.toString()
         resourceConfigurations.add("en")
     }
@@ -93,10 +93,10 @@ android {
 dependencies {
     implementation("androidx.appcompat:appcompat:1.7.0")
     implementation("com.google.android.material:material:1.12.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("androidx.core:core:1.13.1")
+    implementation("androidx.constraintlayout:constraintlayout:2.2.0")
+    implementation("androidx.core:core:1.15.0")
 
-    val cameraVersion = "1.4.0-beta02"
+    val cameraVersion = "1.5.0-alpha04"
     implementation("androidx.camera:camera-core:$cameraVersion")
     implementation("androidx.camera:camera-camera2:$cameraVersion")
     implementation("androidx.camera:camera-lifecycle:$cameraVersion")

app/src/main/AndroidManifest.xml

@@ -29,6 +29,7 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/Theme.App"
+        android:enableOnBackInvokedCallback="true"
         tools:ignore="UnusedAttribute">
 
         <!-- The main activity of the app (supports all modes) -->
@@ -38,7 +39,8 @@
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:windowSoftInputMode="stateAlwaysHidden|adjustPan"
             android:screenOrientation="nosensor"
-            android:exported="true">
+            android:exported="true"
+            android:theme="@style/Theme.Camera">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -71,7 +73,8 @@
             android:screenOrientation="nosensor"
             android:showWhenLocked="true"
             android:excludeFromRecents="true"
-            android:exported="true">
+            android:exported="true"
+            android:theme="@style/Theme.Camera">
 
             <intent-filter>
                 <action android:name="android.media.action.STILL_IMAGE_CAMERA_SECURE"/>
@@ -159,28 +162,28 @@
 
         <activity
             android:name=".ui.activities.VideoPlayer"
-            android:theme="@style/OverlayActionBar"
+            android:theme="@style/Theme.Viewer"
             android:taskAffinity=".ui.activities.VideoPlayer"
             android:excludeFromRecents="true"
             android:exported="false"/>
 
         <activity
             android:name=".ui.activities.InAppGallery"
-            android:theme="@style/OverlayActionBar"
+            android:theme="@style/Theme.Viewer"
             android:taskAffinity=".ui.activities.InAppGallery"
             android:excludeFromRecents="true"
             android:exported="false"/>
 
         <activity
             android:name=".ui.activities.MoreSettings"
-            android:theme="@style/OverlayActionBar"
+            android:theme="@style/Theme.App"
             android:taskAffinity=".ui.activities.InAppGallery"
             android:excludeFromRecents="true"
             android:exported="false"/>
 
         <activity
             android:name=".ui.activities.MoreSettingsSecure"
-            android:theme="@style/OverlayActionBar"
+            android:theme="@style/Theme.App"
             android:taskAffinity=".ui.activities.InAppGallery"
             android:excludeFromRecents="true"
             android:showWhenLocked="true"

app/src/main/java/app/grapheneos/camera/App.kt

@@ -11,6 +11,7 @@ import android.view.WindowManager
 import androidx.annotation.RequiresPermission
 import androidx.appcompat.app.AppCompatActivity
 import app.grapheneos.camera.ui.activities.MainActivity
+import com.google.android.material.color.DynamicColors
 
 class App : Application() {
     private var activity: MainActivity? = null
@@ -91,6 +92,7 @@ class App : Application() {
     override fun onCreate() {
         super.onCreate()
         registerActivityLifecycleCallbacks(activityLifeCycleHelper)
+        DynamicColors.applyToActivitiesIfAvailable(this)
     }
 
     @RequiresPermission(allOf = [Manifest.permission.ACCESS_COARSE_LOCATION])

app/src/main/java/app/grapheneos/camera/BlurBitmap.kt

@@ -11,7 +11,7 @@ object BlurBitmap {
         val width = (sentBitmap.width * 0.1f).roundToInt()
         val height = (sentBitmap.height * 0.1f).roundToInt()
         sentBitmap = Bitmap.createScaledBitmap(sentBitmap, width, height, false)
-        val bitmap = sentBitmap.copy(sentBitmap.config, true)
+        val bitmap = sentBitmap.copy(sentBitmap.config!!, true)
         val w = bitmap.width
         val h = bitmap.height
         val pix = IntArray(w * h)

app/src/main/java/app/grapheneos/camera/CamConfig.kt

@@ -1,7 +1,6 @@
 package app.grapheneos.camera
 
 import android.annotation.SuppressLint
-import android.app.AlertDialog
 import android.content.Context
 import android.content.SharedPreferences
 import android.net.Uri
@@ -16,6 +15,7 @@ import android.view.animation.Animation
 import android.view.animation.LinearInterpolator
 import android.widget.Button
 import androidx.annotation.StringRes
+import androidx.appcompat.app.AlertDialog
 import androidx.camera.core.AspectRatio
 import androidx.camera.core.Camera
 import androidx.camera.core.CameraInfo
@@ -47,7 +47,9 @@ import app.grapheneos.camera.ui.activities.SecureActivity
 import app.grapheneos.camera.ui.activities.SecureMainActivity
 import app.grapheneos.camera.ui.activities.VideoCaptureActivity
 import app.grapheneos.camera.ui.activities.VideoOnlyActivity
+import app.grapheneos.camera.ui.showIgnoringShortEdgeMode
 import app.grapheneos.camera.util.edit
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.zxing.BarcodeFormat
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.Executors
@@ -951,7 +953,6 @@ class CamConfig(private val mActivity: MainActivity) {
         startCamera(true)
     }
 
-    @SuppressLint("RestrictedApi")
     private fun getCurrentCameraInfo() : CameraInfo {
         return cameraProvider!!.getCameraInfo(cameraSelector)
     }
@@ -1049,6 +1050,9 @@ class CamConfig(private val mActivity: MainActivity) {
     fun startCamera(forced: Boolean = false) {
         if ((!forced && camera != null) || cameraProvider == null) return
 
+        // Cancel any pending capture requests
+        mActivity.imageCapturer.cancelPendingCaptureRequest()
+
         mActivity.exposureBar.hidePanel()
         modePref = mActivity.getSharedPreferences(currentMode.name, Context.MODE_PRIVATE)
 
@@ -1450,7 +1454,7 @@ class CamConfig(private val mActivity: MainActivity) {
     }
 
     fun showMoreOptionsForQR() {
-        val builder = AlertDialog.Builder(mActivity)
+        val builder = MaterialAlertDialogBuilder(mActivity)
         builder.setTitle(mActivity.resources.getString(R.string.more_options))
 
         val optionNames = arrayListOf<String>()
@@ -1481,6 +1485,25 @@ class CamConfig(private val mActivity: MainActivity) {
         // Add OK and Cancel buttons
         builder.setPositiveButton(getString(R.string.ok)) { _, _ ->
 
+            val allCommonFormatsDisabled = commonFormats.none {
+                allowedFormats.contains(it)
+            }
+
+            // If all formats displayed outside the dialog are disabled (main QR scanner
+            // UI)
+            if (allCommonFormatsDisabled) {
+                val noOptionWasChecked = optionValues.none { it }
+
+                // If no option is selected within the check box too (implying no barcode format
+                // is selected at all) - don't make apply the selction made by the user
+                if (noOptionWasChecked) {
+                    mActivity.showMessage(
+                        getString(R.string.no_barcode_selected)
+                    )
+                    return@setPositiveButton
+                }
+            }
+
             commonPref.edit {
                 for (index in 0 until optionNames.size) {
 
@@ -1492,20 +1515,13 @@ class CamConfig(private val mActivity: MainActivity) {
                     val format = BarcodeFormat.valueOf(optionName)
 
                     if (optionValue) {
-                        allowedFormats.add(format)
-
-                        putBoolean(formatSRep, true)
-                    } else if (format in allowedFormats) {
-                        if (allowedFormats.size == 1) {
-                            mActivity.showMessage(
-                                getString(R.string.no_barcode_selected)
-                            )
-                        } else {
-                            allowedFormats.remove(format)
-
-                            putBoolean(formatSRep, false)
-                        }
+                        if (format !in allowedFormats)
+                            allowedFormats.add(format)
+                    } else {
+                        allowedFormats.remove(format)
                     }
+
+                    putBoolean(formatSRep, optionValue)
                 }
             }
 
@@ -1518,28 +1534,28 @@ class CamConfig(private val mActivity: MainActivity) {
         val dialog = builder.create()
 
         dialog.setOnShowListener {
-            val button: Button = (dialog as AlertDialog).getButton(AlertDialog.BUTTON_NEUTRAL)
+            val button: Button = dialog.getButton(AlertDialog.BUTTON_NEUTRAL)
             button.setOnClickListener {
 
             }
         }
 
-        dialog.show()
+        dialog.showIgnoringShortEdgeMode()
     }
 
     fun onStorageLocationNotFound() {
         // Reverting back to DEFAULT_MEDIA_STORE_CAPTURE_PATH
         storageLocation = SettingValues.Default.STORAGE_LOCATION
 
-        val builder = AlertDialog.Builder(mActivity)
-        builder.setTitle(R.string.folder_not_found)
-        builder.setMessage(R.string.reverting_to_default_folder)
-        builder.setPositiveButton(R.string.ok, null)
-        builder.setNeutralButton(R.string.more_settings) { _, _ ->
-            MoreSettings.start(mActivity)
-        }
-        val alertDialog: AlertDialog = builder.create()
+        val builder = MaterialAlertDialogBuilder(mActivity)
+            .setTitle(R.string.folder_not_found)
+            .setMessage(R.string.reverting_to_default_folder)
+            .setPositiveButton(R.string.ok, null)
+            .setNeutralButton(R.string.more_settings) { _, _ ->
+                MoreSettings.start(mActivity)
+            }
+        val alertDialog = builder.create()
         alertDialog.setCancelable(false)
-        alertDialog.show()
+        alertDialog.showIgnoringShortEdgeMode()
     }
 }

app/src/main/java/app/grapheneos/camera/CapturedItems.kt

@@ -212,7 +212,8 @@ object CapturedItems {
         list.add(0, treeUri)
 
         while (list.size > MAX_NUMBER_OF_TRACKED_PREVIOUS_SAF_TREES) {
-            list.removeLast()
+            // list.removeLast() requires API level 35 now due to Java adding it
+            list.removeAt(list.lastIndex)
         }
 
         prefs.edit {