diff --git a/CameraX-MLKit/app/build.gradle b/CameraX-MLKit/app/build.gradle index ff5a4f5c..7b939c1e 100644 --- a/CameraX-MLKit/app/build.gradle +++ b/CameraX-MLKit/app/build.gradle @@ -17,16 +17,17 @@ plugins { id 'com.android.application' id 'org.jetbrains.kotlin.android' + id 'org.jetbrains.kotlin.plugin.compose' } android { namespace 'com.example.camerax_mlkit' - compileSdk 33 + compileSdk 35 defaultConfig { applicationId "com.example.camerax_mlkit" minSdk 21 - targetSdk 33 + targetSdk 35 versionCode 1 versionName "1.0" @@ -40,33 +41,65 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_18 + targetCompatibility JavaVersion.VERSION_18 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '18' } buildFeatures { viewBinding true + compose true + + composeOptions { + kotlinCompilerExtensionVersion = "1.5.15" + } + + kotlinOptions { + jvmTarget = "18" + } } + + buildToolsVersion '35.0.0' } dependencies { + implementation "androidx.camera.viewfinder:viewfinder-view:1.5.0-beta01" + implementation "androidx.camera.viewfinder:viewfinder-compose:1.5.0-beta01" + implementation "androidx.camera.viewfinder:viewfinder-core:1.5.0-beta01" + + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.0' + implementation 'androidx.activity:activity-compose:1.10.1' + implementation platform('androidx.compose:compose-bom:2025.05.00') + implementation 'androidx.compose.ui:ui-graphics' + implementation 'androidx.camera.viewfinder:viewfinder-core:1.5.0-beta01' + androidTestImplementation platform('androidx.compose:compose-bom:2025.05.00') + androidTestImplementation 'androidx.compose.ui:ui-test-junit4' + def compose_version = "1.8.1" + implementation 'androidx.compose.material3:material3:1.3.2' + implementation "androidx.compose.ui:ui:$compose_version" + implementation "androidx.compose.material:material:$compose_version" + implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" + + implementation 'androidx.core:core-ktx:1.16.0' + implementation 'androidx.appcompat:appcompat:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.2.1' + implementation 'androidx.camera:camera-mlkit-vision:1.4.2' + + // Android Studio Preview support + implementation 'androidx.compose.ui:ui-tooling-preview' + debugImplementation 'androidx.compose.ui:ui-tooling' - implementation 'androidx.core:core-ktx:1.7.0' - implementation 'androidx.appcompat:appcompat:1.5.1' - implementation 'com.google.android.material:material:1.7.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.camera:camera-mlkit-vision:1.2.0-beta02' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + androidTestImplementation 'androidx.test.ext:junit:1.2.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' - def camerax_version = "1.2.0-rc01" + def camerax_version = "1.4.2" implementation "androidx.camera:camera-core:${camerax_version}" implementation "androidx.camera:camera-camera2:${camerax_version}" implementation "androidx.camera:camera-lifecycle:${camerax_version}" implementation "androidx.camera:camera-view:${camerax_version}" - implementation 'com.google.mlkit:barcode-scanning:17.0.2' + implementation 'com.google.mlkit:barcode-scanning:17.3.0' + debugImplementation 'androidx.compose.ui:ui-test-manifest' } \ No newline at end of file diff --git a/CameraX-MLKit/app/src/main/AndroidManifest.xml b/CameraX-MLKit/app/src/main/AndroidManifest.xml index 86f8fda8..03268725 100644 --- a/CameraX-MLKit/app/src/main/AndroidManifest.xml +++ b/CameraX-MLKit/app/src/main/AndroidManifest.xml @@ -29,7 +29,6 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.CameraxMLKit" tools:targetApi="31"> - val barcodeResults = result?.getValue(barcodeScanner) - if ((barcodeResults == null) || - (barcodeResults.size == 0) || - (barcodeResults.first() == null) + setContent { + CameraxMLKitTheme { + // A surface container using the 'background' color from the theme + Surface( + modifier = Modifier.fillMaxSize(), + color = MaterialTheme.colorScheme.background ) { - previewView.overlay.clear() - previewView.setOnTouchListener { _, _ -> false } //no-op - return@MlKitAnalyzer + MainScreen(barcodeScanner) } - - val qrCodeViewModel = QrCodeViewModel(barcodeResults[0]) - val qrCodeDrawable = QrCodeDrawable(qrCodeViewModel) - - previewView.setOnTouchListener(qrCodeViewModel.qrCodeTouchCallback) - previewView.overlay.clear() - previewView.overlay.add(qrCodeDrawable) } - ) - - cameraController.bindToLifecycle(this) - previewView.controller = cameraController - } - - private fun allPermissionsGranted() = REQUIRED_PERMISSIONS.all { - ContextCompat.checkSelfPermission( - baseContext, it) == PackageManager.PERMISSION_GRANTED + } } override fun onDestroy() { super.onDestroy() cameraExecutor.shutdown() - barcodeScanner.close() + if (this::barcodeScanner.isInitialized) { + barcodeScanner.close() + } } - companion object { - private const val TAG = "CameraX-MLKit" - private const val REQUEST_CODE_PERMISSIONS = 10 - private val REQUIRED_PERMISSIONS = - mutableListOf ( - Manifest.permission.CAMERA - ).toTypedArray() + private fun allPermissionsGranted() = REQUIRED_PERMISSIONS.all { + ContextCompat.checkSelfPermission(baseContext, it) == PackageManager.PERMISSION_GRANTED } override fun onRequestPermissionsResult( - requestCode: Int, permissions: Array, grantResults: - IntArray) { + requestCode: Int, permissions: Array, grantResults: IntArray + ) { super.onRequestPermissionsResult(requestCode, permissions, grantResults) if (requestCode == REQUEST_CODE_PERMISSIONS) { - if (allPermissionsGranted()) { - startCamera() - } else { - Toast.makeText(this, - "Permissions not granted by the user.", - Toast.LENGTH_SHORT).show() + if (!allPermissionsGranted()) { + Toast.makeText(this, "Permissions not granted by the user.", Toast.LENGTH_SHORT) + .show() finish() } } } + + companion object { + const val TAG = "CameraX-MLKit" + const val REQUEST_CODE_PERMISSIONS = 10 + val REQUIRED_PERMISSIONS = mutableListOf(Manifest.permission.CAMERA).toTypedArray() + val PADDING = 16.dp + } +} + +@Composable +fun MainScreen(barcodeScanner: BarcodeScanner) { + val context = LocalContext.current + var hasCameraPermission by remember { mutableStateOf(false) } + var qrCodeDetected by remember { mutableStateOf(false) } + var qrCodeContent by remember { mutableStateOf("") } + LaunchedEffect(key1 = Unit) { + if (ContextCompat.checkSelfPermission( + context, + Manifest.permission.CAMERA + ) == PackageManager.PERMISSION_GRANTED + ) { + hasCameraPermission = true + } else { + // Request permission - this is handled in the activity, not here + ActivityCompat.requestPermissions( + context as MainActivity, + MainActivity.REQUIRED_PERMISSIONS, + MainActivity.REQUEST_CODE_PERMISSIONS + ) + } + } + Box( + modifier = Modifier.fillMaxSize(), + contentAlignment = Alignment.Center + ) { + if (hasCameraPermission) { + CameraPreview( + barcodeScanner, + { detected -> qrCodeDetected = detected }, + { content -> qrCodeContent = content }) + } else { + //show a message that no camera is available + Text( + text = "No camera available", + modifier = Modifier + .padding(MainActivity.PADDING) + .align(Alignment.TopCenter) + ) + } + QrCodeText(qrCodeDetected, qrCodeContent) + } +} + +@Composable +fun QrCodeText(qrCodeDetected: Boolean, qrCodeContent: String) { + Box( + modifier = Modifier.fillMaxSize(), + contentAlignment = Alignment.BottomCenter + ) { + Text( + text = if (qrCodeDetected) "QR Code Detected: $qrCodeContent" else "No QR Code Detected", + modifier = Modifier.padding(MainActivity.PADDING) + ) + } +} + +@Composable +fun CameraPreview( + barcodeScanner: BarcodeScanner, + setQrCodeDetected: (Boolean) -> Unit, + setQrCodeContent: (String) -> Unit +) { + val lifecycleOwner = LocalLifecycleOwner.current + val context = LocalContext.current + var cameraError by remember { mutableStateOf(false) } + val cameraController = remember { LifecycleCameraController(context) } + val previewView = remember { PreviewView(context) } + cameraController.cameraSelector = CameraSelector.Builder().requireLensFacing(LENS_FACING_BACK).build() + + //Throttle the analysis to avoid constant checks. + val resolutionStrategy = ResolutionStrategy( + Size(500, 500), + ResolutionStrategy.FALLBACK_RULE_CLOSEST_HIGHER_THEN_LOWER + ) + val resolutionSelector = ResolutionSelector.Builder().setResolutionStrategy(resolutionStrategy).build() + cameraController.setImageAnalysisResolutionSelector(resolutionSelector) + + cameraController.setImageAnalysisAnalyzer( + ContextCompat.getMainExecutor(context), + MlKitAnalyzer( + listOf(barcodeScanner), + COORDINATE_SYSTEM_VIEW_REFERENCED, + ContextCompat.getMainExecutor(context) + ) { result: MlKitAnalyzer.Result? -> + val barcodeResults = result?.getValue(barcodeScanner) + if ((barcodeResults == null) || + (barcodeResults.size == 0) || + (barcodeResults.first() == null) + ) { + setQrCodeDetected(false) + setQrCodeContent("") // Clear the text. + previewView.overlay.clear() + previewView.setOnTouchListener { _, _ -> false } + return@MlKitAnalyzer + } + val qrCode = barcodeResults[0] + val qrCodeViewModel = QrCodeViewModel(qrCode) + val qrCodeDrawable = QrCodeDrawable(qrCodeViewModel) + setQrCodeContent(qrCode.rawValue ?: "") // Display the content. + setQrCodeDetected(true) + previewView.setOnTouchListener(qrCodeViewModel.qrCodeTouchCallback) + previewView.overlay.clear() + previewView.overlay.add(qrCodeDrawable) + + } + ) + + cameraController.bindToLifecycle(lifecycleOwner).also { + //Check if the camera was able to start or if there is a problem. + try { + cameraController.cameraInfo + } catch (e: Exception) { + Log.e(MainActivity.TAG, "Camera error: $e") + cameraError = true + } + } + + Box( + modifier = Modifier.fillMaxSize(), + contentAlignment = Alignment.Center + ) { + if (cameraError) { + Text( + text = "Error: could not initialize camera", + modifier = Modifier + .padding(MainActivity.PADDING) + ) + } else { + AndroidView( + factory = { + previewView.apply { + this.controller = cameraController + scaleType = PreviewView.ScaleType.FILL_CENTER + } + }, + modifier = Modifier.fillMaxSize() + ) + } + } } \ No newline at end of file diff --git a/CameraX-MLKit/app/src/main/java/com/example/camerax_mlkit/QrCodeDrawable.kt b/CameraX-MLKit/app/src/main/java/com/example/camerax_mlkit/QrCodeDrawable.kt index d2c5a4d6..02101225 100644 --- a/CameraX-MLKit/app/src/main/java/com/example/camerax_mlkit/QrCodeDrawable.kt +++ b/CameraX-MLKit/app/src/main/java/com/example/camerax_mlkit/QrCodeDrawable.kt @@ -27,7 +27,7 @@ import com.google.mlkit.vision.barcode.common.Barcode /** * A Drawable that handles displaying a QR Code's data and a bounding box around the QR code. */ -class QrCodeDrawable(qrCodeViewModel: QrCodeViewModel) : Drawable() { +class QrCodeDrawable(private val qrCodeViewModel: QrCodeViewModel) : Drawable() { private val boundingRectPaint = Paint().apply { style = Paint.Style.STROKE color = Color.YELLOW @@ -47,7 +47,6 @@ class QrCodeDrawable(qrCodeViewModel: QrCodeViewModel) : Drawable() { textSize = 36F } - private val qrCodeViewModel = qrCodeViewModel private val contentPadding = 25 private var textWidth = contentTextPaint.measureText(qrCodeViewModel.qrContent).toInt() diff --git a/CameraX-MLKit/app/src/main/java/com/example/camerax_mlkit/QrCodeViewModel.kt b/CameraX-MLKit/app/src/main/java/com/example/camerax_mlkit/QrCodeViewModel.kt index 8f4d0529..75190a85 100644 --- a/CameraX-MLKit/app/src/main/java/com/example/camerax_mlkit/QrCodeViewModel.kt +++ b/CameraX-MLKit/app/src/main/java/com/example/camerax_mlkit/QrCodeViewModel.kt @@ -22,6 +22,7 @@ import android.net.Uri import android.view.MotionEvent import android.view.View import com.google.mlkit.vision.barcode.common.Barcode +import androidx.core.net.toUri /** * A ViewModel for encapsulating the data for a QR Code, including the encoded data, the bounding @@ -42,7 +43,7 @@ class QrCodeViewModel(barcode: Barcode) { qrCodeTouchCallback = { v: View, e: MotionEvent -> if (e.action == MotionEvent.ACTION_DOWN && boundingRect.contains(e.getX().toInt(), e.getY().toInt())) { val openBrowserIntent = Intent(Intent.ACTION_VIEW) - openBrowserIntent.data = Uri.parse(qrContent) + openBrowserIntent.data = qrContent.toUri() v.context.startActivity(openBrowserIntent) } true // return true from the callback to signify the event was handled diff --git a/CameraX-MLKit/app/src/main/java/com/example/camerax_mlkit/ui/theme/Color.kt b/CameraX-MLKit/app/src/main/java/com/example/camerax_mlkit/ui/theme/Color.kt new file mode 100644 index 00000000..6dd30145 --- /dev/null +++ b/CameraX-MLKit/app/src/main/java/com/example/camerax_mlkit/ui/theme/Color.kt @@ -0,0 +1,11 @@ +package com.example.camerax_mlkit.ui.theme + +import androidx.compose.ui.graphics.Color + +val Purple80 = Color(0xFFD0BCFF) +val PurpleGrey80 = Color(0xFFCCC2DC) +val Pink80 = Color(0xFFEFB8C8) + +val Purple40 = Color(0xFF6650a4) +val PurpleGrey40 = Color(0xFF625b71) +val Pink40 = Color(0xFF7D5260) \ No newline at end of file diff --git a/CameraX-MLKit/app/src/main/java/com/example/camerax_mlkit/ui/theme/Theme.kt b/CameraX-MLKit/app/src/main/java/com/example/camerax_mlkit/ui/theme/Theme.kt new file mode 100644 index 00000000..63542287 --- /dev/null +++ b/CameraX-MLKit/app/src/main/java/com/example/camerax_mlkit/ui/theme/Theme.kt @@ -0,0 +1,58 @@ +package com.example.camerax_mlkit.ui.theme + +import android.app.Activity +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext + +private val DarkColorScheme = darkColorScheme( + primary = Purple80, + secondary = PurpleGrey80, + tertiary = Pink80 +) + +private val LightColorScheme = lightColorScheme( + primary = Purple40, + secondary = PurpleGrey40, + tertiary = Pink40 + + /* Other default colors to override + background = Color(0xFFFFFBFE), + surface = Color(0xFFFFFBFE), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color.White, + onBackground = Color(0xFF1C1B1F), + onSurface = Color(0xFF1C1B1F), + */ +) + +@Composable +fun CameraxMLKitTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + // Dynamic color is available on Android 12+ + dynamicColor: Boolean = true, + content: @Composable () -> Unit +) { + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/CameraX-MLKit/app/src/main/java/com/example/camerax_mlkit/ui/theme/Type.kt b/CameraX-MLKit/app/src/main/java/com/example/camerax_mlkit/ui/theme/Type.kt new file mode 100644 index 00000000..1dd02c30 --- /dev/null +++ b/CameraX-MLKit/app/src/main/java/com/example/camerax_mlkit/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package com.example.camerax_mlkit.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +val Typography = Typography( + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ +) \ No newline at end of file diff --git a/CameraX-MLKit/app/src/main/res/layout/activity_main.xml b/CameraX-MLKit/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index 90d64126..00000000 --- a/CameraX-MLKit/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/CameraX-MLKit/app/src/main/res/values-night/themes.xml b/CameraX-MLKit/app/src/main/res/values-night/themes.xml deleted file mode 100644 index 0469b37a..00000000 --- a/CameraX-MLKit/app/src/main/res/values-night/themes.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/CameraX-MLKit/app/src/main/res/values/themes.xml b/CameraX-MLKit/app/src/main/res/values/themes.xml index ad352288..1cb7597e 100644 --- a/CameraX-MLKit/app/src/main/res/values/themes.xml +++ b/CameraX-MLKit/app/src/main/res/values/themes.xml @@ -14,19 +14,8 @@ ~ limitations under the License. --> - - - - \ No newline at end of file + diff --git a/CameraX-MLKit/build.gradle b/CameraX-MLKit/build.gradle index 1b6e7f1f..dac4a031 100644 --- a/CameraX-MLKit/build.gradle +++ b/CameraX-MLKit/build.gradle @@ -16,7 +16,8 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.10.0' apply false + id 'com.android.library' version '8.10.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.20' apply false + id 'org.jetbrains.kotlin.plugin.compose' version '2.0.21' apply false } \ No newline at end of file diff --git a/CameraX-MLKit/gradle.properties b/CameraX-MLKit/gradle.properties index ae849f63..35ee0ff8 100644 --- a/CameraX-MLKit/gradle.properties +++ b/CameraX-MLKit/gradle.properties @@ -36,4 +36,6 @@ kotlin.code.style=official # Enables namespacing of each library's R class so that its R class includes only the # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true \ No newline at end of file +android.nonTransitiveRClass=true +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false \ No newline at end of file diff --git a/CameraX-MLKit/gradle/wrapper/gradle-wrapper.jar b/CameraX-MLKit/gradle/wrapper/gradle-wrapper.jar index e708b1c0..d64cd491 100644 Binary files a/CameraX-MLKit/gradle/wrapper/gradle-wrapper.jar and b/CameraX-MLKit/gradle/wrapper/gradle-wrapper.jar differ diff --git a/CameraX-MLKit/gradle/wrapper/gradle-wrapper.properties b/CameraX-MLKit/gradle/wrapper/gradle-wrapper.properties index 1da035b3..e2847c82 100644 --- a/CameraX-MLKit/gradle/wrapper/gradle-wrapper.properties +++ b/CameraX-MLKit/gradle/wrapper/gradle-wrapper.properties @@ -1,22 +1,7 @@ -# -# Copyright 2022 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -#Mon Nov 07 12:22:22 EST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/CameraX-MLKit/gradlew b/CameraX-MLKit/gradlew index 4f906e0c..1aa94a42 100755 --- a/CameraX-MLKit/gradlew +++ b/CameraX-MLKit/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,99 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/CameraX-MLKit/gradlew.bat b/CameraX-MLKit/gradlew.bat index ac1b06f9..6689b85b 100644 --- a/CameraX-MLKit/gradlew.bat +++ b/CameraX-MLKit/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal