Merge branch 'lineage-21.0' of https://github.com/LineageOS/android_packages_apps_Aperture into leaf-3.2
Change-Id: I6df88313ac932cf7df953bfb11f658e06f8c6691
diff --git a/app/Android.bp b/app/Android.bp
index 42c6c78..6e70a76 100644
--- a/app/Android.bp
+++ b/app/Android.bp
@@ -25,6 +25,8 @@
required: [
"ApertureFrameworksBaseOverlay",
"ApertureLensLauncher",
+ "initial-package-stopped-states-org.leafos.aperture",
+ "preinstalled-packages-org.leafos.aperture",
],
static_libs: [
@@ -47,6 +49,7 @@
"Aperture_androidx.media3_media3-exoplayer",
"Aperture_androidx.media3_media3-ui",
"Aperture_com.google.zxing_core",
+ "Aperture_io.github.zxing-cpp_android",
"Aperture_io.coil-kt_coil",
"Aperture_io.coil-kt_coil-video",
],
@@ -64,3 +67,19 @@
"org.leafos.aperture",
],
}
+
+prebuilt_etc {
+ name: "initial-package-stopped-states-org.leafos.aperture",
+ product_specific: true,
+ sub_dir: "sysconfig",
+ src: "initial-package-stopped-states-org.leafos.aperture.xml",
+ filename_from_src: true,
+}
+
+prebuilt_etc {
+ name: "preinstalled-packages-org.leafos.aperture",
+ product_specific: true,
+ sub_dir: "sysconfig",
+ src: "preinstalled-packages-org.leafos.aperture.xml",
+ filename_from_src: true,
+}
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 4654e64..de193e2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -72,7 +72,7 @@
dependencies {
// Align versions of all Kotlin components
- implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
+ implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.9.0"))
implementation("androidx.core:core-ktx:1.10.1")
implementation("androidx.activity:activity-ktx:1.7.2")
@@ -84,7 +84,7 @@
implementation("com.google.android.material:material:1.9.0")
// CameraX core library using the camera2 implementation
- val cameraxVersion = "1.4.0-beta01"
+ val cameraxVersion = "1.4.0-beta02"
// The following line is optional, as the core library is included indirectly by camera-camera2
implementation("androidx.camera:camera-core:${cameraxVersion}")
implementation("androidx.camera:camera-camera2:${cameraxVersion}")
@@ -95,7 +95,7 @@
// If you want to additionally use the CameraX View class
implementation("androidx.camera:camera-view:${cameraxVersion}")
// If you want to additionally use the CameraX Viewfinder class
- implementation("androidx.camera:camera-viewfinder:1.4.0-alpha06")
+ implementation("androidx.camera:camera-viewfinder:1.4.0-alpha07")
// If you want to additionally use the CameraX Extensions library
implementation("androidx.camera:camera-extensions:${cameraxVersion}")
@@ -107,7 +107,8 @@
implementation("androidx.media3:media3-ui:$media3Version")
// ZXing
- implementation("com.google.zxing:core:3.5.2")
+ implementation("com.google.zxing:core:3.5.3")
+ implementation("io.github.zxing-cpp:android:2.2.0")
// Coil
implementation("io.coil-kt:coil:2.4.0")
diff --git a/app/initial-package-stopped-states-org.leafos.aperture.xml b/app/initial-package-stopped-states-org.leafos.aperture.xml
new file mode 100644
index 0000000..314fca8
--- /dev/null
+++ b/app/initial-package-stopped-states-org.leafos.aperture.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ SPDX-FileCopyrightText: 2024 The LineageOS Project
+ SPDX-License-Identifier: Apache-2.0
+-->
+<config>
+ <initial-package-state package="org.leafos.aperture" stopped="false"/>
+</config>
diff --git a/app/libs/Android.bp b/app/libs/Android.bp
index 538b852..0cc102a 100644
--- a/app/libs/Android.bp
+++ b/app/libs/Android.bp
@@ -7,7 +7,7 @@
android_library_import {
name: "Aperture_androidx.camera_camera-camera2-nodeps",
- aars: ["androidx/camera/camera-camera2/1.4.0-beta01/camera-camera2-1.4.0-beta01.aar"],
+ aars: ["androidx/camera/camera-camera2/1.4.0-beta02/camera-camera2-1.4.0-beta02.aar"],
sdk_version: "34",
min_sdk_version: "14",
apex_available: [
@@ -32,7 +32,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- manifest: "androidx/camera/camera-camera2/1.4.0-beta01/AndroidManifest.xml",
+ manifest: "androidx/camera/camera-camera2/1.4.0-beta02/AndroidManifest.xml",
static_libs: [
"Aperture_androidx.camera_camera-camera2-nodeps",
"Aperture_androidx.camera_camera-core",
@@ -47,7 +47,7 @@
android_library_import {
name: "Aperture_androidx.camera_camera-core-nodeps",
- aars: ["androidx/camera/camera-core/1.4.0-beta01/camera-core-1.4.0-beta01.aar"],
+ aars: ["androidx/camera/camera-core/1.4.0-beta02/camera-core-1.4.0-beta02.aar"],
sdk_version: "34",
min_sdk_version: "14",
apex_available: [
@@ -79,7 +79,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- manifest: "androidx/camera/camera-core/1.4.0-beta01/AndroidManifest.xml",
+ manifest: "androidx/camera/camera-core/1.4.0-beta02/AndroidManifest.xml",
static_libs: [
"Aperture_androidx.camera_camera-core-nodeps",
"Aperture_androidx.lifecycle_lifecycle-common",
@@ -100,7 +100,7 @@
android_library_import {
name: "Aperture_androidx.camera_camera-extensions-nodeps",
- aars: ["androidx/camera/camera-extensions/1.4.0-beta01/camera-extensions-1.4.0-beta01.aar"],
+ aars: ["androidx/camera/camera-extensions/1.4.0-beta02/camera-extensions-1.4.0-beta02.aar"],
sdk_version: "34",
min_sdk_version: "14",
apex_available: [
@@ -124,7 +124,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- manifest: "androidx/camera/camera-extensions/1.4.0-beta01/AndroidManifest.xml",
+ manifest: "androidx/camera/camera-extensions/1.4.0-beta02/AndroidManifest.xml",
static_libs: [
"Aperture_androidx.camera_camera-extensions-nodeps",
"Aperture_androidx.camera_camera-core",
@@ -138,7 +138,7 @@
android_library_import {
name: "Aperture_androidx.camera_camera-lifecycle-nodeps",
- aars: ["androidx/camera/camera-lifecycle/1.4.0-beta01/camera-lifecycle-1.4.0-beta01.aar"],
+ aars: ["androidx/camera/camera-lifecycle/1.4.0-beta02/camera-lifecycle-1.4.0-beta02.aar"],
sdk_version: "34",
min_sdk_version: "14",
apex_available: [
@@ -165,7 +165,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- manifest: "androidx/camera/camera-lifecycle/1.4.0-beta01/AndroidManifest.xml",
+ manifest: "androidx/camera/camera-lifecycle/1.4.0-beta02/AndroidManifest.xml",
static_libs: [
"Aperture_androidx.camera_camera-lifecycle-nodeps",
"Aperture_androidx.camera_camera-core",
@@ -182,7 +182,7 @@
android_library_import {
name: "Aperture_androidx.camera_camera-video-nodeps",
- aars: ["androidx/camera/camera-video/1.4.0-beta01/camera-video-1.4.0-beta01.aar"],
+ aars: ["androidx/camera/camera-video/1.4.0-beta02/camera-video-1.4.0-beta02.aar"],
sdk_version: "34",
min_sdk_version: "14",
apex_available: [
@@ -206,7 +206,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- manifest: "androidx/camera/camera-video/1.4.0-beta01/AndroidManifest.xml",
+ manifest: "androidx/camera/camera-video/1.4.0-beta02/AndroidManifest.xml",
static_libs: [
"Aperture_androidx.camera_camera-video-nodeps",
"Aperture_androidx.camera_camera-core",
@@ -220,7 +220,7 @@
android_library_import {
name: "Aperture_androidx.camera_camera-view-nodeps",
- aars: ["androidx/camera/camera-view/1.4.0-beta01/camera-view-1.4.0-beta01.aar"],
+ aars: ["androidx/camera/camera-view/1.4.0-beta02/camera-view-1.4.0-beta02.aar"],
sdk_version: "34",
min_sdk_version: "14",
apex_available: [
@@ -250,7 +250,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- manifest: "androidx/camera/camera-view/1.4.0-beta01/AndroidManifest.xml",
+ manifest: "androidx/camera/camera-view/1.4.0-beta02/AndroidManifest.xml",
static_libs: [
"Aperture_androidx.camera_camera-view-nodeps",
"Aperture_androidx.camera_camera-core",
@@ -270,7 +270,7 @@
android_library_import {
name: "Aperture_androidx.camera_camera-viewfinder-nodeps",
- aars: ["androidx/camera/camera-viewfinder/1.4.0-alpha06/camera-viewfinder-1.4.0-alpha06.aar"],
+ aars: ["androidx/camera/camera-viewfinder/1.4.0-alpha07/camera-viewfinder-1.4.0-alpha07.aar"],
sdk_version: "34",
min_sdk_version: "14",
apex_available: [
@@ -301,7 +301,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- manifest: "androidx/camera/camera-viewfinder/1.4.0-alpha06/AndroidManifest.xml",
+ manifest: "androidx/camera/camera-viewfinder/1.4.0-alpha07/AndroidManifest.xml",
static_libs: [
"Aperture_androidx.camera_camera-viewfinder-nodeps",
"Aperture_androidx.camera_camera-viewfinder-core",
@@ -322,7 +322,7 @@
android_library_import {
name: "Aperture_androidx.camera_camera-viewfinder-core-nodeps",
- aars: ["androidx/camera/camera-viewfinder-core/1.4.0-alpha06/camera-viewfinder-core-1.4.0-alpha06.aar"],
+ aars: ["androidx/camera/camera-viewfinder-core/1.4.0-alpha07/camera-viewfinder-core-1.4.0-alpha07.aar"],
sdk_version: "34",
min_sdk_version: "14",
apex_available: [
@@ -352,7 +352,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- manifest: "androidx/camera/camera-viewfinder-core/1.4.0-alpha06/AndroidManifest.xml",
+ manifest: "androidx/camera/camera-viewfinder-core/1.4.0-alpha07/AndroidManifest.xml",
static_libs: [
"Aperture_androidx.camera_camera-viewfinder-core-nodeps",
"androidx.annotation_annotation",
@@ -740,7 +740,7 @@
java_import {
name: "Aperture_com.google.zxing_core-nodeps",
- jars: ["com/google/zxing/core/3.5.2/core-3.5.2.jar"],
+ jars: ["com/google/zxing/core/3.5.3/core-3.5.3.jar"],
sdk_version: "34",
min_sdk_version: "14",
apex_available: [
@@ -946,3 +946,36 @@
],
java_version: "1.7",
}
+
+android_library_import {
+ name: "Aperture_io.github.zxing-cpp_android-nodeps",
+ aars: ["io/github/zxing-cpp/android/2.2.0/android-2.2.0.aar"],
+ sdk_version: "34",
+ min_sdk_version: "14",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ static_libs: [
+ "Aperture_androidx.camera_camera-core",
+ "kotlin-stdlib-jdk8",
+ ],
+ extract_jni: true,
+}
+
+android_library {
+ name: "Aperture_io.github.zxing-cpp_android",
+ sdk_version: "34",
+ min_sdk_version: "14",
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
+ manifest: "io/github/zxing-cpp/android/2.2.0/AndroidManifest.xml",
+ static_libs: [
+ "Aperture_io.github.zxing-cpp_android-nodeps",
+ "Aperture_androidx.camera_camera-core",
+ "kotlin-stdlib-jdk8",
+ ],
+ java_version: "1.7",
+}
diff --git a/app/libs/androidx/camera/camera-camera2/1.4.0-beta01/camera-camera2-1.4.0-beta01.aar b/app/libs/androidx/camera/camera-camera2/1.4.0-beta01/camera-camera2-1.4.0-beta01.aar
deleted file mode 100644
index 152e65c..0000000
--- a/app/libs/androidx/camera/camera-camera2/1.4.0-beta01/camera-camera2-1.4.0-beta01.aar
+++ /dev/null
Binary files differ
diff --git a/app/libs/androidx/camera/camera-camera2/1.4.0-beta01/AndroidManifest.xml b/app/libs/androidx/camera/camera-camera2/1.4.0-beta02/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/camera/camera-camera2/1.4.0-beta01/AndroidManifest.xml
rename to app/libs/androidx/camera/camera-camera2/1.4.0-beta02/AndroidManifest.xml
diff --git a/app/libs/androidx/camera/camera-camera2/1.4.0-beta01/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-camera2/1.4.0-beta02/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/camera/camera-camera2/1.4.0-beta01/AndroidManifest.xml.license
rename to app/libs/androidx/camera/camera-camera2/1.4.0-beta02/AndroidManifest.xml.license
diff --git a/app/libs/androidx/camera/camera-camera2/1.4.0-beta02/camera-camera2-1.4.0-beta02.aar b/app/libs/androidx/camera/camera-camera2/1.4.0-beta02/camera-camera2-1.4.0-beta02.aar
new file mode 100644
index 0000000..794d0ca
--- /dev/null
+++ b/app/libs/androidx/camera/camera-camera2/1.4.0-beta02/camera-camera2-1.4.0-beta02.aar
Binary files differ
diff --git a/app/libs/androidx/camera/camera-camera2/1.4.0-beta01/camera-camera2-1.4.0-beta01.aar.license b/app/libs/androidx/camera/camera-camera2/1.4.0-beta02/camera-camera2-1.4.0-beta02.aar.license
similarity index 100%
rename from app/libs/androidx/camera/camera-camera2/1.4.0-beta01/camera-camera2-1.4.0-beta01.aar.license
rename to app/libs/androidx/camera/camera-camera2/1.4.0-beta02/camera-camera2-1.4.0-beta02.aar.license
diff --git a/app/libs/androidx/camera/camera-core/1.4.0-beta01/camera-core-1.4.0-beta01.aar b/app/libs/androidx/camera/camera-core/1.4.0-beta01/camera-core-1.4.0-beta01.aar
deleted file mode 100644
index 23afec3..0000000
--- a/app/libs/androidx/camera/camera-core/1.4.0-beta01/camera-core-1.4.0-beta01.aar
+++ /dev/null
Binary files differ
diff --git a/app/libs/androidx/camera/camera-core/1.4.0-beta01/AndroidManifest.xml b/app/libs/androidx/camera/camera-core/1.4.0-beta02/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/camera/camera-core/1.4.0-beta01/AndroidManifest.xml
rename to app/libs/androidx/camera/camera-core/1.4.0-beta02/AndroidManifest.xml
diff --git a/app/libs/androidx/camera/camera-core/1.4.0-beta01/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-core/1.4.0-beta02/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/camera/camera-core/1.4.0-beta01/AndroidManifest.xml.license
rename to app/libs/androidx/camera/camera-core/1.4.0-beta02/AndroidManifest.xml.license
diff --git a/app/libs/androidx/camera/camera-core/1.4.0-beta02/camera-core-1.4.0-beta02.aar b/app/libs/androidx/camera/camera-core/1.4.0-beta02/camera-core-1.4.0-beta02.aar
new file mode 100644
index 0000000..761119d
--- /dev/null
+++ b/app/libs/androidx/camera/camera-core/1.4.0-beta02/camera-core-1.4.0-beta02.aar
Binary files differ
diff --git a/app/libs/androidx/camera/camera-core/1.4.0-beta01/camera-core-1.4.0-beta01.aar.license b/app/libs/androidx/camera/camera-core/1.4.0-beta02/camera-core-1.4.0-beta02.aar.license
similarity index 100%
rename from app/libs/androidx/camera/camera-core/1.4.0-beta01/camera-core-1.4.0-beta01.aar.license
rename to app/libs/androidx/camera/camera-core/1.4.0-beta02/camera-core-1.4.0-beta02.aar.license
diff --git a/app/libs/androidx/camera/camera-extensions/1.4.0-beta01/camera-extensions-1.4.0-beta01.aar b/app/libs/androidx/camera/camera-extensions/1.4.0-beta01/camera-extensions-1.4.0-beta01.aar
deleted file mode 100644
index 3055756..0000000
--- a/app/libs/androidx/camera/camera-extensions/1.4.0-beta01/camera-extensions-1.4.0-beta01.aar
+++ /dev/null
Binary files differ
diff --git a/app/libs/androidx/camera/camera-extensions/1.4.0-beta01/AndroidManifest.xml b/app/libs/androidx/camera/camera-extensions/1.4.0-beta02/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/camera/camera-extensions/1.4.0-beta01/AndroidManifest.xml
rename to app/libs/androidx/camera/camera-extensions/1.4.0-beta02/AndroidManifest.xml
diff --git a/app/libs/androidx/camera/camera-extensions/1.4.0-beta01/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-extensions/1.4.0-beta02/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/camera/camera-extensions/1.4.0-beta01/AndroidManifest.xml.license
rename to app/libs/androidx/camera/camera-extensions/1.4.0-beta02/AndroidManifest.xml.license
diff --git a/app/libs/androidx/camera/camera-extensions/1.4.0-beta02/camera-extensions-1.4.0-beta02.aar b/app/libs/androidx/camera/camera-extensions/1.4.0-beta02/camera-extensions-1.4.0-beta02.aar
new file mode 100644
index 0000000..051ab2a
--- /dev/null
+++ b/app/libs/androidx/camera/camera-extensions/1.4.0-beta02/camera-extensions-1.4.0-beta02.aar
Binary files differ
diff --git a/app/libs/androidx/camera/camera-extensions/1.4.0-beta01/camera-extensions-1.4.0-beta01.aar.license b/app/libs/androidx/camera/camera-extensions/1.4.0-beta02/camera-extensions-1.4.0-beta02.aar.license
similarity index 100%
rename from app/libs/androidx/camera/camera-extensions/1.4.0-beta01/camera-extensions-1.4.0-beta01.aar.license
rename to app/libs/androidx/camera/camera-extensions/1.4.0-beta02/camera-extensions-1.4.0-beta02.aar.license
diff --git a/app/libs/androidx/camera/camera-lifecycle/1.4.0-beta01/camera-lifecycle-1.4.0-beta01.aar b/app/libs/androidx/camera/camera-lifecycle/1.4.0-beta01/camera-lifecycle-1.4.0-beta01.aar
deleted file mode 100644
index a6f20e6..0000000
--- a/app/libs/androidx/camera/camera-lifecycle/1.4.0-beta01/camera-lifecycle-1.4.0-beta01.aar
+++ /dev/null
Binary files differ
diff --git a/app/libs/androidx/camera/camera-lifecycle/1.4.0-beta01/AndroidManifest.xml b/app/libs/androidx/camera/camera-lifecycle/1.4.0-beta02/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/camera/camera-lifecycle/1.4.0-beta01/AndroidManifest.xml
rename to app/libs/androidx/camera/camera-lifecycle/1.4.0-beta02/AndroidManifest.xml
diff --git a/app/libs/androidx/camera/camera-lifecycle/1.4.0-beta01/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-lifecycle/1.4.0-beta02/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/camera/camera-lifecycle/1.4.0-beta01/AndroidManifest.xml.license
rename to app/libs/androidx/camera/camera-lifecycle/1.4.0-beta02/AndroidManifest.xml.license
diff --git a/app/libs/androidx/camera/camera-lifecycle/1.4.0-beta02/camera-lifecycle-1.4.0-beta02.aar b/app/libs/androidx/camera/camera-lifecycle/1.4.0-beta02/camera-lifecycle-1.4.0-beta02.aar
new file mode 100644
index 0000000..db4db53
--- /dev/null
+++ b/app/libs/androidx/camera/camera-lifecycle/1.4.0-beta02/camera-lifecycle-1.4.0-beta02.aar
Binary files differ
diff --git a/app/libs/androidx/camera/camera-lifecycle/1.4.0-beta01/camera-lifecycle-1.4.0-beta01.aar.license b/app/libs/androidx/camera/camera-lifecycle/1.4.0-beta02/camera-lifecycle-1.4.0-beta02.aar.license
similarity index 100%
rename from app/libs/androidx/camera/camera-lifecycle/1.4.0-beta01/camera-lifecycle-1.4.0-beta01.aar.license
rename to app/libs/androidx/camera/camera-lifecycle/1.4.0-beta02/camera-lifecycle-1.4.0-beta02.aar.license
diff --git a/app/libs/androidx/camera/camera-video/1.4.0-beta01/camera-video-1.4.0-beta01.aar b/app/libs/androidx/camera/camera-video/1.4.0-beta01/camera-video-1.4.0-beta01.aar
deleted file mode 100644
index 28dbbd5..0000000
--- a/app/libs/androidx/camera/camera-video/1.4.0-beta01/camera-video-1.4.0-beta01.aar
+++ /dev/null
Binary files differ
diff --git a/app/libs/androidx/camera/camera-video/1.4.0-beta01/AndroidManifest.xml b/app/libs/androidx/camera/camera-video/1.4.0-beta02/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/camera/camera-video/1.4.0-beta01/AndroidManifest.xml
rename to app/libs/androidx/camera/camera-video/1.4.0-beta02/AndroidManifest.xml
diff --git a/app/libs/androidx/camera/camera-video/1.4.0-beta01/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-video/1.4.0-beta02/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/camera/camera-video/1.4.0-beta01/AndroidManifest.xml.license
rename to app/libs/androidx/camera/camera-video/1.4.0-beta02/AndroidManifest.xml.license
diff --git a/app/libs/androidx/camera/camera-video/1.4.0-beta02/camera-video-1.4.0-beta02.aar b/app/libs/androidx/camera/camera-video/1.4.0-beta02/camera-video-1.4.0-beta02.aar
new file mode 100644
index 0000000..8830b60
--- /dev/null
+++ b/app/libs/androidx/camera/camera-video/1.4.0-beta02/camera-video-1.4.0-beta02.aar
Binary files differ
diff --git a/app/libs/androidx/camera/camera-video/1.4.0-beta01/camera-video-1.4.0-beta01.aar.license b/app/libs/androidx/camera/camera-video/1.4.0-beta02/camera-video-1.4.0-beta02.aar.license
similarity index 100%
rename from app/libs/androidx/camera/camera-video/1.4.0-beta01/camera-video-1.4.0-beta01.aar.license
rename to app/libs/androidx/camera/camera-video/1.4.0-beta02/camera-video-1.4.0-beta02.aar.license
diff --git a/app/libs/androidx/camera/camera-view/1.4.0-beta01/camera-view-1.4.0-beta01.aar b/app/libs/androidx/camera/camera-view/1.4.0-beta01/camera-view-1.4.0-beta01.aar
deleted file mode 100644
index 5e98d35..0000000
--- a/app/libs/androidx/camera/camera-view/1.4.0-beta01/camera-view-1.4.0-beta01.aar
+++ /dev/null
Binary files differ
diff --git a/app/libs/androidx/camera/camera-view/1.4.0-beta01/AndroidManifest.xml b/app/libs/androidx/camera/camera-view/1.4.0-beta02/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/camera/camera-view/1.4.0-beta01/AndroidManifest.xml
rename to app/libs/androidx/camera/camera-view/1.4.0-beta02/AndroidManifest.xml
diff --git a/app/libs/androidx/camera/camera-view/1.4.0-beta01/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-view/1.4.0-beta02/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/camera/camera-view/1.4.0-beta01/AndroidManifest.xml.license
rename to app/libs/androidx/camera/camera-view/1.4.0-beta02/AndroidManifest.xml.license
diff --git a/app/libs/androidx/camera/camera-view/1.4.0-beta02/camera-view-1.4.0-beta02.aar b/app/libs/androidx/camera/camera-view/1.4.0-beta02/camera-view-1.4.0-beta02.aar
new file mode 100644
index 0000000..069182e
--- /dev/null
+++ b/app/libs/androidx/camera/camera-view/1.4.0-beta02/camera-view-1.4.0-beta02.aar
Binary files differ
diff --git a/app/libs/androidx/camera/camera-view/1.4.0-beta01/camera-view-1.4.0-beta01.aar.license b/app/libs/androidx/camera/camera-view/1.4.0-beta02/camera-view-1.4.0-beta02.aar.license
similarity index 100%
rename from app/libs/androidx/camera/camera-view/1.4.0-beta01/camera-view-1.4.0-beta01.aar.license
rename to app/libs/androidx/camera/camera-view/1.4.0-beta02/camera-view-1.4.0-beta02.aar.license
diff --git a/app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha06/camera-viewfinder-core-1.4.0-alpha06.aar b/app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha06/camera-viewfinder-core-1.4.0-alpha06.aar
deleted file mode 100644
index 55fc402..0000000
--- a/app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha06/camera-viewfinder-core-1.4.0-alpha06.aar
+++ /dev/null
Binary files differ
diff --git a/app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha06/AndroidManifest.xml b/app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha07/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha06/AndroidManifest.xml
rename to app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha07/AndroidManifest.xml
diff --git a/app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha06/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha07/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha06/AndroidManifest.xml.license
rename to app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha07/AndroidManifest.xml.license
diff --git a/app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha07/camera-viewfinder-core-1.4.0-alpha07.aar b/app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha07/camera-viewfinder-core-1.4.0-alpha07.aar
new file mode 100644
index 0000000..ddcfed1
--- /dev/null
+++ b/app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha07/camera-viewfinder-core-1.4.0-alpha07.aar
Binary files differ
diff --git a/app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha06/camera-viewfinder-core-1.4.0-alpha06.aar.license b/app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha07/camera-viewfinder-core-1.4.0-alpha07.aar.license
similarity index 100%
rename from app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha06/camera-viewfinder-core-1.4.0-alpha06.aar.license
rename to app/libs/androidx/camera/camera-viewfinder-core/1.4.0-alpha07/camera-viewfinder-core-1.4.0-alpha07.aar.license
diff --git a/app/libs/androidx/camera/camera-viewfinder/1.4.0-alpha06/camera-viewfinder-1.4.0-alpha06.aar b/app/libs/androidx/camera/camera-viewfinder/1.4.0-alpha06/camera-viewfinder-1.4.0-alpha06.aar
deleted file mode 100644
index 3a8e283..0000000
--- a/app/libs/androidx/camera/camera-viewfinder/1.4.0-alpha06/camera-viewfinder-1.4.0-alpha06.aar
+++ /dev/null
Binary files differ
diff --git a/app/libs/androidx/camera/camera-viewfinder/1.4.0-alpha06/AndroidManifest.xml b/app/libs/androidx/camera/camera-viewfinder/1.4.0-alpha07/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/camera/camera-viewfinder/1.4.0-alpha06/AndroidManifest.xml
rename to app/libs/androidx/camera/camera-viewfinder/1.4.0-alpha07/AndroidManifest.xml
diff --git a/app/libs/androidx/camera/camera-viewfinder/1.4.0-alpha06/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-viewfinder/1.4.0-alpha07/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/camera/camera-viewfinder/1.4.0-alpha06/AndroidManifest.xml.license
rename to app/libs/androidx/camera/camera-viewfinder/1.4.0-alpha07/AndroidManifest.xml.license
diff --git a/app/libs/androidx/camera/camera-viewfinder/1.4.0-alpha07/camera-viewfinder-1.4.0-alpha07.aar b/app/libs/androidx/camera/camera-viewfinder/1.4.0-alpha07/camera-viewfinder-1.4.0-alpha07.aar
new file mode 100644
index 0000000..970ac41
--- /dev/null
+++ b/app/libs/androidx/camera/camera-viewfinder/1.4.0-alpha07/camera-viewfinder-1.4.0-alpha07.aar
Binary files differ
diff --git a/app/libs/androidx/camera/camera-viewfinder/1.4.0-alpha06/camera-viewfinder-1.4.0-alpha06.aar.license b/app/libs/androidx/camera/camera-viewfinder/1.4.0-alpha07/camera-viewfinder-1.4.0-alpha07.aar.license
similarity index 100%
rename from app/libs/androidx/camera/camera-viewfinder/1.4.0-alpha06/camera-viewfinder-1.4.0-alpha06.aar.license
rename to app/libs/androidx/camera/camera-viewfinder/1.4.0-alpha07/camera-viewfinder-1.4.0-alpha07.aar.license
diff --git a/app/libs/com/google/zxing/core/3.5.2/core-3.5.2.jar b/app/libs/com/google/zxing/core/3.5.2/core-3.5.2.jar
deleted file mode 100644
index 714bda4..0000000
--- a/app/libs/com/google/zxing/core/3.5.2/core-3.5.2.jar
+++ /dev/null
Binary files differ
diff --git a/app/libs/com/google/zxing/core/3.5.3/core-3.5.3.jar b/app/libs/com/google/zxing/core/3.5.3/core-3.5.3.jar
new file mode 100644
index 0000000..5730b51
--- /dev/null
+++ b/app/libs/com/google/zxing/core/3.5.3/core-3.5.3.jar
Binary files differ
diff --git a/app/libs/com/google/zxing/core/3.5.2/core-3.5.2.jar.license b/app/libs/com/google/zxing/core/3.5.3/core-3.5.3.jar.license
similarity index 100%
rename from app/libs/com/google/zxing/core/3.5.2/core-3.5.2.jar.license
rename to app/libs/com/google/zxing/core/3.5.3/core-3.5.3.jar.license
diff --git a/app/libs/io/github/zxing-cpp/android/2.2.0/AndroidManifest.xml b/app/libs/io/github/zxing-cpp/android/2.2.0/AndroidManifest.xml
new file mode 100644
index 0000000..8e40224
--- /dev/null
+++ b/app/libs/io/github/zxing-cpp/android/2.2.0/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="io.github.zxingcpp" >
+
+ <uses-sdk android:minSdkVersion="21" />
+
+</manifest>
\ No newline at end of file
diff --git a/app/libs/io/github/zxing-cpp/android/2.2.0/AndroidManifest.xml.license b/app/libs/io/github/zxing-cpp/android/2.2.0/AndroidManifest.xml.license
new file mode 100644
index 0000000..c0956dc
--- /dev/null
+++ b/app/libs/io/github/zxing-cpp/android/2.2.0/AndroidManifest.xml.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2024 zxing-cpp community
+
+SPDX-License-Identifier: Apache-2.0
diff --git a/app/libs/io/github/zxing-cpp/android/2.2.0/android-2.2.0.aar b/app/libs/io/github/zxing-cpp/android/2.2.0/android-2.2.0.aar
new file mode 100644
index 0000000..e19f6fb
--- /dev/null
+++ b/app/libs/io/github/zxing-cpp/android/2.2.0/android-2.2.0.aar
Binary files differ
diff --git a/app/libs/io/github/zxing-cpp/android/2.2.0/android-2.2.0.aar.license b/app/libs/io/github/zxing-cpp/android/2.2.0/android-2.2.0.aar.license
new file mode 100644
index 0000000..c0956dc
--- /dev/null
+++ b/app/libs/io/github/zxing-cpp/android/2.2.0/android-2.2.0.aar.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2024 zxing-cpp community
+
+SPDX-License-Identifier: Apache-2.0
diff --git a/app/preinstalled-packages-org.leafos.aperture.xml b/app/preinstalled-packages-org.leafos.aperture.xml
new file mode 100644
index 0000000..ad54896
--- /dev/null
+++ b/app/preinstalled-packages-org.leafos.aperture.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ SPDX-FileCopyrightText: 2024 The LineageOS Project
+ SPDX-License-Identifier: Apache-2.0
+-->
+<config>
+ <install-in-user-type package="org.leafos.aperture">
+ <install-in user-type="FULL" />
+ <install-in user-type="PROFILE" />
+ <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
+ </install-in-user-type>
+</config>
diff --git a/app/src/main/java/org/lineageos/aperture/ext/ImageProxy.kt b/app/src/main/java/org/lineageos/aperture/ext/ImageProxy.kt
deleted file mode 100644
index b484966..0000000
--- a/app/src/main/java/org/lineageos/aperture/ext/ImageProxy.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2022 The LineageOS Project
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.lineageos.aperture.ext
-
-import androidx.camera.core.ImageProxy
-import com.google.zxing.PlanarYUVLuminanceSource
-
-private fun rotateYUVLuminancePlane(data: ByteArray, width: Int, height: Int): ByteArray {
- val yuv = ByteArray(width * height)
- // Rotate the Y luma
- var i = 0
- for (x in 0 until width) {
- for (y in height - 1 downTo 0) {
- yuv[i] = data[y * width + x]
- i++
- }
- }
- return yuv
-}
-
-internal val ImageProxy.planarYUVLuminanceSource: PlanarYUVLuminanceSource
- get() {
- val plane = planes[0]
- val buffer = plane.buffer
- var bytes = ByteArray(buffer.remaining())
- buffer.get(bytes)
-
- var width = width
- var height = height
-
- if (imageInfo.rotationDegrees == 90 || imageInfo.rotationDegrees == 270) {
- bytes = rotateYUVLuminancePlane(bytes, width, height)
- width = height.also { height = width }
- }
-
- return PlanarYUVLuminanceSource(
- bytes, width, height, 0, 0, width, height, true
- )
- }
diff --git a/app/src/main/java/org/lineageos/aperture/qr/QrImageAnalyzer.kt b/app/src/main/java/org/lineageos/aperture/qr/QrImageAnalyzer.kt
index 354ca89..99ae658 100644
--- a/app/src/main/java/org/lineageos/aperture/qr/QrImageAnalyzer.kt
+++ b/app/src/main/java/org/lineageos/aperture/qr/QrImageAnalyzer.kt
@@ -1,5 +1,5 @@
/*
- * SPDX-FileCopyrightText: 2022-2023 The LineageOS Project
+ * SPDX-FileCopyrightText: 2022-2024 The LineageOS Project
* SPDX-License-Identifier: Apache-2.0
*/
@@ -28,10 +28,9 @@
import androidx.core.graphics.drawable.DrawableCompat
import com.google.android.material.bottomsheet.BottomSheetDialog
import com.google.android.material.button.MaterialButton
-import com.google.zxing.BinaryBitmap
-import com.google.zxing.MultiFormatReader
+import com.google.zxing.BarcodeFormat
import com.google.zxing.Result
-import com.google.zxing.common.HybridBinarizer
+import io.github.zxingcpp.BarcodeReader
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
@@ -78,7 +77,11 @@
}
// QR
- private val reader by lazy { MultiFormatReader() }
+ private val reader by lazy {
+ BarcodeReader().apply {
+ options.tryRotate = true
+ }
+ }
private val qrTextClassifier by lazy {
QrTextClassifier(activity, textClassificationManager.textClassifier)
@@ -86,23 +89,13 @@
override fun analyze(image: ImageProxy) {
image.use {
- val source = image.planarYUVLuminanceSource
-
- val result = runCatching {
- reader.decodeWithState(BinaryBitmap(HybridBinarizer(source)))
- }.getOrNull() ?: runCatching {
- reader.decodeWithState(BinaryBitmap(HybridBinarizer(source.invert())))
- }.getOrNull()
-
- result?.let {
+ reader.read(image).firstOrNull()?.let {
showQrDialog(it)
}
-
- reader.reset()
}
}
- private fun showQrDialog(result: Result) {
+ private fun showQrDialog(result: BarcodeReader.Result) {
scope.launch(Dispatchers.Main) {
if (bottomSheetDialog.isShowing) {
return@launch
@@ -113,7 +106,31 @@
// Classify message
val textClassification = withContext(Dispatchers.IO) {
- qrTextClassifier.classifyText(result)
+ qrTextClassifier.classifyText(
+ Result(
+ text, result.bytes, null, when (result.format) {
+ BarcodeReader.Format.NONE -> null
+ BarcodeReader.Format.AZTEC -> BarcodeFormat.AZTEC
+ BarcodeReader.Format.CODABAR -> BarcodeFormat.CODABAR
+ BarcodeReader.Format.CODE_39 -> BarcodeFormat.CODE_39
+ BarcodeReader.Format.CODE_93 -> BarcodeFormat.CODE_93
+ BarcodeReader.Format.CODE_128 -> BarcodeFormat.CODE_128
+ BarcodeReader.Format.DATA_BAR -> null
+ BarcodeReader.Format.DATA_BAR_EXPANDED -> null
+ BarcodeReader.Format.DATA_MATRIX -> BarcodeFormat.DATA_MATRIX
+ BarcodeReader.Format.EAN_8 -> BarcodeFormat.EAN_8
+ BarcodeReader.Format.EAN_13 -> BarcodeFormat.EAN_13
+ BarcodeReader.Format.ITF -> BarcodeFormat.ITF
+ BarcodeReader.Format.MAXICODE -> BarcodeFormat.MAXICODE
+ BarcodeReader.Format.PDF_417 -> BarcodeFormat.PDF_417
+ BarcodeReader.Format.QR_CODE -> BarcodeFormat.QR_CODE
+ BarcodeReader.Format.MICRO_QR_CODE -> BarcodeFormat.QR_CODE
+ BarcodeReader.Format.RMQR_CODE -> BarcodeFormat.QR_CODE
+ BarcodeReader.Format.UPC_A -> BarcodeFormat.UPC_A
+ BarcodeReader.Format.UPC_E -> BarcodeFormat.UPC_E
+ }
+ )
+ )
}
bottomSheetDialogData.text = textClassification.text
@@ -201,7 +218,7 @@
action = Intent.ACTION_SEND
type = ClipDescription.MIMETYPE_TEXT_PLAIN
putExtra(
- Intent.EXTRA_TEXT, result.text
+ Intent.EXTRA_TEXT, text
)
},
activity.getString(androidx.transition.R.string.abc_shareactionprovider_share_with)
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 178eb78..bae936a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -58,6 +58,8 @@
<string name="qr_tel_title">Telefonnummer anrufen</string>
<string name="qr_tel_content_description">Diese Telefonnummer anrufen</string>
<string name="qr_text">Text</string>
+ <string name="qr_upi_title">App zum Bezahlen auswählen</string>
+ <string name="qr_upi_content_description">UPI-Link mit der entsprechenden App öffnen, falls dies unterstützt wird</string>
<string name="qr_uri_title">URL öffnen</string>
<string name="qr_uri_content_description">Diese URL mit der entsprechenden App öffnen, wenn dies unterstützt wird</string>
<string name="qr_vin_title">VIN suchen</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 0e0d470..cdf42dc 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -58,6 +58,8 @@
<string name="qr_tel_title">Appeler le numéro de téléphone</string>
<string name="qr_tel_content_description">Appeler le numéro de téléphone</string>
<string name="qr_text">Texte</string>
+ <string name="qr_upi_title">Choisir une application pour payer</string>
+ <string name="qr_upi_content_description">Ouvrir ce lien UPI avec l\'application appropriée si pris en charge</string>
<string name="qr_uri_title">Ouvrir le lien</string>
<string name="qr_uri_content_description">Ouvrir ce lien avec l\'application appropriée si pris en charge</string>
<string name="qr_vin_title">Recherche VIN</string>
diff --git a/app/src/main/res/values-fur-rIT/strings.xml b/app/src/main/res/values-fur-rIT/strings.xml
index 3cc3217..ee29d64 100644
--- a/app/src/main/res/values-fur-rIT/strings.xml
+++ b/app/src/main/res/values-fur-rIT/strings.xml
@@ -58,6 +58,8 @@
<string name="qr_tel_title">Clame numar di telefon</string>
<string name="qr_tel_content_description">Clame il numar di telefon</string>
<string name="qr_text">Test</string>
+ <string name="qr_upi_title">Sielç la aplicazion par paiâ</string>
+ <string name="qr_upi_content_description">Vierç chest colegament UPI cu la aplicazion adate se supuartât</string>
<string name="qr_uri_title">Vierç URL</string>
<string name="qr_uri_content_description">Vierç chest URL cu la aplicazion adate se supuartât</string>
<string name="qr_vin_title">Cîr VIN</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 95af32e..73554df 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -24,22 +24,55 @@
<string name="qr_icon_description">Ikon</string>
<string name="qr_share_description">Bagikan</string>
<string name="qr_dpp_description">Konfigurasikan perangkat ini</string>
+ <string name="qr_geo_title">Buka lokasi ini</string>
<string name="qr_text">Teks</string>
<string name="qr_uri_title">Buka URL</string>
<string name="qr_wifi_title">Sambungkan ke jaringan Wi-Fi ini</string>
<string name="title_activity_settings">Pengaturan</string>
<string name="general_header">Umum</string>
<string name="video_header">Video</string>
+ <string name="advanced_header">Lanjutan</string>
<string name="bright_screen_title">Kecerahan layar</string>
<string name="bright_screen_summary" formatted="false">Kunci kecerahan ke 100%</string>
<string name="save_location_title">Lokasi penyimpanan data</string>
<string name="shutter_sound_title">Suara rana</string>
<string name="photo_capture_mode_maximize_quality">Maksimalkan kualitas</string>
<string name="photo_capture_mode_minimize_latency">Minimalkan latensi</string>
+ <string name="video_stabilization_title">Aktifkan stabilisasi video</string>
+ <string name="video_stabilization_summary">Ketika tersedia, aktifkan stabilisasi video untuk meminimalisir guncangan kamera saat perekaman</string>
+ <string name="processing_title">Memproses</string>
+ <string name="edge_mode_off">Nonaktif</string>
+ <string name="edge_mode_fast">Cepat</string>
+ <string name="edge_mode_high_quality">Kualitas tinggi</string>
+ <string name="noise_reduction_mode_off">Nonaktif</string>
+ <string name="noise_reduction_mode_fast">Cepat</string>
+ <string name="noise_reduction_mode_high_quality">Kualitas tinggi</string>
+ <string name="shading_mode_off">Nonaktif</string>
+ <string name="shading_mode_fast">Cepat</string>
+ <string name="shading_mode_high_quality">Kualitas tinggi</string>
+ <string name="color_correction_aberration_mode_off">Nonaktif</string>
+ <string name="color_correction_aberration_mode_fast">Cepat</string>
+ <string name="color_correction_aberration_mode_high_quality">Kualitas tinggi</string>
+ <string name="distortion_correction_mode_title">Koreksi distorsi</string>
+ <string name="distortion_correction_mode_off">Nonaktif</string>
+ <string name="distortion_correction_mode_fast">Cepat</string>
+ <string name="distortion_correction_mode_high_quality">Kualitas tinggi</string>
+ <string name="hot_pixel_mode_off">Nonaktif</string>
+ <string name="hot_pixel_mode_fast">Cepat</string>
+ <string name="hot_pixel_mode_high_quality">Kualitas tinggi</string>
<string name="shortcut_selfie">Ambil foto selfie</string>
<string name="shortcut_video">Ambil video</string>
<string name="shortcut_qr">Pindai barcode</string>
<string name="location_permission_dialog_title">Tambahkan lokasi foto dan video</string>
+ <string name="location_permission_dialog_description">Petakan kenangan Anda dengan menyertakan metadata lokasi pada setiap pengambilan.</string>
<string name="location_permission_dialog_later">Nanti</string>
<string name="location_permission_dialog_turn_on">Hidupkan</string>
+ <string name="gesture_action_zoom">Zoom</string>
+ <string name="gesture_action_volume">Volume</string>
+ <string name="gesture_action_nothing">Tidak ada</string>
+ <string name="camera_mode_photo">Foto</string>
+ <string name="camera_mode_video">Video</string>
+ <string name="camera_mode_qr">Pindai</string>
+ <string name="video_mirror_mode_off">Nonaktif</string>
+ <string name="video_mirror_mode_on">Aktif</string>
</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 7b97758..b05ca61 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -58,6 +58,8 @@
<string name="qr_tel_title">Chiama numero di telefono</string>
<string name="qr_tel_content_description">Chiama il numero di telefono</string>
<string name="qr_text">Testo</string>
+ <string name="qr_upi_title">Scegli l\'app con cui pagare</string>
+ <string name="qr_upi_content_description">Apri questo collegamento UPI con l\'app appropriata, se supportato</string>
<string name="qr_uri_title">Apri URL</string>
<string name="qr_uri_content_description">Apri questo URL con l\'app appropriata se supportato</string>
<string name="qr_vin_title">Ricerca VIN</string>
diff --git a/app/src/main/res/values-sc-rIT/strings.xml b/app/src/main/res/values-sc-rIT/strings.xml
index d051697..268dd8a 100644
--- a/app/src/main/res/values-sc-rIT/strings.xml
+++ b/app/src/main/res/values-sc-rIT/strings.xml
@@ -23,6 +23,8 @@
<string name="qr_sms_content_description">Imbia un\'SMS nou a is cuntatos ispetzificados</string>
<string name="qr_tel_title">Muti su nùmeru de telèfonu</string>
<string name="qr_tel_content_description">Muti su nùmeru de telèfonu</string>
+ <string name="qr_upi_title">Sèbera un\'aplicatzione pro is pagamentos</string>
+ <string name="qr_upi_content_description">Aberi custu ligòngiu UPI cun s\'aplicatzione adeguada si est cumpatìbile</string>
<string name="qr_uri_title">Aberi s\'URL</string>
<string name="qr_uri_content_description">Aberi custu URL cun s\'aplicatzione adeguada si est cumpatìbile</string>
<string name="qr_vin_title">Chirca su VIN</string>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 9053a5d..4b2474b 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -58,6 +58,8 @@
<string name="qr_tel_title">Telefononi numrin e telefonit</string>
<string name="qr_tel_content_description">Telefononi numrin e telefonit</string>
<string name="qr_text">Tekst</string>
+ <string name="qr_upi_title">Zgjidh aplikacionin për të paguar</string>
+ <string name="qr_upi_content_description">Hapni këtë lidhje UPI me aplikacionin e duhur nëse mbështetet</string>
<string name="qr_uri_title">Hap URL</string>
<string name="qr_uri_content_description">Hapeni këtë URL me aplikacionin e duhur nëse mbështetet</string>
<string name="qr_vin_title">Kërko VIN</string>
diff --git a/build.gradle.kts b/build.gradle.kts
index 6db3c5e..a8dad9d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,7 +7,7 @@
plugins {
id("com.android.application") version "8.4.0" apply false
id("com.android.library") version "8.4.0" apply false
- id("org.jetbrains.kotlin.android") version "1.7.10" apply false
+ id("org.jetbrains.kotlin.android") version "1.9.0" apply false
}
tasks.register<Delete>("clean").configure {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index de0c7c0..c332e17 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -13,7 +13,8 @@
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
- maven("https://raw.githubusercontent.com/lineage-next/camerax-aperture/bdc457ba0021c05507c4bec14806c120e132a37f/.m2")
+ maven("https://raw.githubusercontent.com/lineage-next/camerax-aperture/edfd86e9c8d6edfb6643fdea0e6af491a371dc5e/.m2")
+ maven("https://raw.githubusercontent.com/lineage-next/zxingcpp-aperture/7c0350df39a3e10a91d660e0e3b83af86e09f997/.m2")
google()
mavenCentral()
}