commit 576d02e420cfb2b27cb2028306fce62f625bddb1 Author: Danil Nikolaev Date: Tue Apr 2 21:28:50 2024 +0300 Initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..878c2cd --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +*.iml +.gradle +/local.properties +.idea +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..db0dee7 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,71 @@ +plugins { + alias(libs.plugins.androidApplication) + alias(libs.plugins.jetbrainsKotlinAndroid) +} + +android { + namespace = "com.meloda.app.mlkittestapp" + compileSdk = 34 + + defaultConfig { + applicationId = "com.meloda.app.mlkittestapp" + minSdk = 24 + targetSdk = 34 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary = true + } + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.1" + } + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } +} + +dependencies { + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.activity.compose) + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.ui) + implementation(libs.androidx.ui.graphics) + implementation(libs.androidx.ui.tooling.preview) + implementation(libs.androidx.material3) + debugImplementation(libs.androidx.ui.tooling) + debugImplementation(libs.androidx.ui.test.manifest) + implementation(libs.accompanist.permissions) + + implementation(libs.barcode.scanning) + + implementation(libs.androidx.camera.camera2) + implementation(libs.androidx.camera.lifecycle) + implementation(libs.androidx.camera.view) + implementation(libs.androidx.camera.mlkit.vision) +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..26eff31 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/kotlin/com/meloda/app/mlkittestapp/MainActivity.kt b/app/src/main/kotlin/com/meloda/app/mlkittestapp/MainActivity.kt new file mode 100644 index 0000000..951012d --- /dev/null +++ b/app/src/main/kotlin/com/meloda/app/mlkittestapp/MainActivity.kt @@ -0,0 +1,273 @@ +package com.meloda.app.mlkittestapp + +import android.Manifest +import android.os.Bundle +import android.util.Log +import android.widget.Toast +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.camera.core.CameraSelector +import androidx.camera.core.ImageAnalysis +import androidx.camera.lifecycle.ProcessCameraProvider +import androidx.camera.mlkit.vision.MlKitAnalyzer +import androidx.camera.view.CameraController +import androidx.camera.view.LifecycleCameraController +import androidx.camera.view.PreviewView +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.material3.Button +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalLifecycleOwner +import androidx.compose.ui.unit.dp +import androidx.compose.ui.viewinterop.AndroidView +import androidx.core.content.ContextCompat +import com.google.accompanist.permissions.ExperimentalPermissionsApi +import com.google.accompanist.permissions.isGranted +import com.google.accompanist.permissions.rememberPermissionState +import com.google.mlkit.vision.barcode.BarcodeScannerOptions +import com.google.mlkit.vision.barcode.BarcodeScanning +import com.google.mlkit.vision.barcode.common.Barcode +import com.meloda.app.mlkittestapp.ui.theme.MLKitTestAppTheme +import androidx.camera.core.Preview as CameraPreview + +class MainActivity : ComponentActivity() { + + private val cameraExecutor by lazy { + ContextCompat.getMainExecutor(this) + } + + private var previewView: PreviewView? = null + + private var cameraProvider: ProcessCameraProvider? = null + + @OptIn(ExperimentalPermissionsApi::class) + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + MLKitTestAppTheme { + val context = LocalContext.current + + val cameraPermission = + rememberPermissionState(permission = Manifest.permission.CAMERA) + + Surface( + modifier = Modifier.fillMaxSize(), + color = MaterialTheme.colorScheme.background + ) { + var cameraEnabled by remember { + mutableStateOf(false) + } + + var latestResult: String? by remember { + mutableStateOf(null) + } + + Column(modifier = Modifier.fillMaxSize()) { + Column(modifier = Modifier.fillMaxWidth()) { + Button( + onClick = { + when { + cameraPermission.status.isGranted -> { + Toast.makeText( + context, + "Permission already granted", + Toast.LENGTH_SHORT + ).show() + } + + else -> cameraPermission.launchPermissionRequest() + } + }, + modifier = Modifier.fillMaxWidth() + ) { + Text(text = "Request permission") + } + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(16.dp), + ) { + Button( + onClick = { + if (!cameraPermission.status.isGranted) { + Toast.makeText( + context, + "Camera permission is missing", + Toast.LENGTH_SHORT + ).show() + } else { + cameraEnabled = true + } + }, + modifier = Modifier.weight(1f) + ) { + Text(text = "Start camera") + } + + Button( + onClick = { + cameraEnabled = false + cameraProvider?.unbindAll() + cameraProvider = null + }, + modifier = Modifier.weight(1f) + ) { + Text(text = "Stop camera") + } + } + + if (latestResult != null) { + Text(text = "Result: $latestResult") + } + } + + if (cameraEnabled) { + CameraPreview( + onResult = { result -> + latestResult = result + cameraEnabled = false + + Log.d("StartCamera", "onCreate: latestResult: $latestResult") + } + ) + } + } + } + } + } + } + + + @Composable + fun CameraPreview( + onResult: (String) -> Unit + ) { + val lifecycleOwner = LocalLifecycleOwner.current + val context = LocalContext.current + + val cameraController = LifecycleCameraController(context) + cameraController.bindToLifecycle(lifecycleOwner) + + val options = BarcodeScannerOptions.Builder() + .setBarcodeFormats(Barcode.FORMAT_QR_CODE) + .build() + + val barcodeScanner = BarcodeScanning.getClient(options) + + var handlingResult = false + + val analyzer = MlKitAnalyzer( + listOf(barcodeScanner), + CameraController.COORDINATE_SYSTEM_VIEW_REFERENCED, + cameraExecutor + ) { result: MlKitAnalyzer.Result? -> + if (handlingResult) return@MlKitAnalyzer + handlingResult = true + + val barcodeResults = result?.getValue(barcodeScanner) + if ((barcodeResults == null) || + (barcodeResults.size == 0) || + (barcodeResults.first() == null) + ) { + handlingResult = false + return@MlKitAnalyzer + } + + val barcode = barcodeResults[0] + + when (val type = barcode.valueType) { + Barcode.TYPE_TEXT -> { + val resultText = barcode.displayValue ?: "null" + Log.d("StartCamera", "StartCamera: result: $resultText") + + cameraProvider?.unbindAll() + cameraProvider = null + + onResult(resultText) + } + + else -> { + Log.e( + "StartCamera", + "StartCamera: unsupported type: $type; result: ${barcode.rawValue}" + ) + } + } + + handlingResult = false + } + + val imageAnalyzer = ImageAnalysis.Builder() + .setBackpressureStrategy(ImageAnalysis.STRATEGY_BLOCK_PRODUCER) + .build() + .also { + it.setAnalyzer(cameraExecutor, analyzer) + } + + cameraController.setImageAnalysisAnalyzer( + cameraExecutor, + analyzer + ) + + val cameraProviderFuture = ProcessCameraProvider.getInstance(context) + val addCameraProviderListener: (PreviewView) -> Unit = { previewView -> + cameraProviderFuture.addListener( + { + cameraProvider = cameraProviderFuture.get() + + val preview = CameraPreview.Builder() + .build() + .also { + it.setSurfaceProvider(previewView.surfaceProvider) + } + + val cameraSelector = CameraSelector.DEFAULT_BACK_CAMERA + + try { + cameraProvider?.unbindAll() + + cameraProvider?.bindToLifecycle( + lifecycleOwner, + cameraSelector, + preview, imageAnalyzer + ) + } catch (e: Exception) { + Log.e("StartCamera", "StartCamera: error: $e") + } + }, + cameraExecutor + ) + } + + AndroidView( + modifier = Modifier.fillMaxSize(), + factory = { + PreviewView(it).also { preview -> + preview.controller = cameraController + addCameraProviderListener.invoke(preview) + + previewView = preview + } + } + ) + } + + + override fun onDestroy() { + super.onDestroy() + + previewView = null + } +} diff --git a/app/src/main/kotlin/com/meloda/app/mlkittestapp/ui/theme/Color.kt b/app/src/main/kotlin/com/meloda/app/mlkittestapp/ui/theme/Color.kt new file mode 100644 index 0000000..7dfcae5 --- /dev/null +++ b/app/src/main/kotlin/com/meloda/app/mlkittestapp/ui/theme/Color.kt @@ -0,0 +1,11 @@ +package com.meloda.app.mlkittestapp.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/app/src/main/kotlin/com/meloda/app/mlkittestapp/ui/theme/Theme.kt b/app/src/main/kotlin/com/meloda/app/mlkittestapp/ui/theme/Theme.kt new file mode 100644 index 0000000..83f185e --- /dev/null +++ b/app/src/main/kotlin/com/meloda/app/mlkittestapp/ui/theme/Theme.kt @@ -0,0 +1,70 @@ +package com.meloda.app.mlkittestapp.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.runtime.SideEffect +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalView +import androidx.core.view.WindowCompat + +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 MLKitTestAppTheme( + 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 + } + val view = LocalView.current + if (!view.isInEditMode) { + SideEffect { + val window = (view.context as Activity).window + window.statusBarColor = colorScheme.primary.toArgb() + WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme + } + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} diff --git a/app/src/main/kotlin/com/meloda/app/mlkittestapp/ui/theme/Type.kt b/app/src/main/kotlin/com/meloda/app/mlkittestapp/ui/theme/Type.kt new file mode 100644 index 0000000..acdbef5 --- /dev/null +++ b/app/src/main/kotlin/com/meloda/app/mlkittestapp/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package com.meloda.app.mlkittestapp.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/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..7706ab9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..b3e26b4 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..b3e26b4 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..ca1931b --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..4fd8d4d --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + MLKitTestApp + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..09d5210 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +