triniwiz · triniwiz · Apr 22, 2024 · Apr 22, 2024 · Apr 22, 2024 · May 24, 2024
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion COMPILE_SDK_VERSION as int
+    compileSdk = COMPILE_SDK_VERSION as int
     buildToolsVersion BUILD_TOOLS_VERSION as String
     defaultConfig {
         applicationId "co.fitcom.videorecorder"
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion COMPILE_SDK_VERSION as int
         versionCode 1
         versionName "1.0"
@@ -20,9 +20,10 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
+    namespace 'io.github.triniwiz.videorecorder'
 }
 
 dependencies {
@@ -41,8 +42,7 @@ dependencies {
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     implementation "androidx.core:core-ktx:1.9.0"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "androidx.exifinterface:exifinterface:1.3.6"
+    implementation "androidx.exifinterface:exifinterface:1.3.7"
 }
 repositories {
     mavenCentral()

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.github.triniwiz.videorecorder"
     android:installLocation="auto"
     >
 
     <application
+        android:hardwareAccelerated="true"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"

diff --git a/app/src/main/java/io/github/triniwiz/videorecorder/MainActivity.kt b/app/src/main/java/io/github/triniwiz/videorecorder/MainActivity.kt
@@ -13,8 +13,8 @@ import android.widget.RelativeLayout
 import android.widget.TextView
 import android.widget.VideoView
 import io.github.triniwiz.fancycamera.*
-import org.json.JSONArray
-import org.json.JSONObject
+import io.github.triniwiz.fancycamera.barcodescanning.BarcodeScanner
+import io.github.triniwiz.fancycamera.textrecognition.TextRecognition
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
@@ -23,6 +23,8 @@ import java.util.*
 
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
+import kotlin.collections.ArrayList
+import kotlin.math.pow
 
 class MainActivity : AppCompatActivity() {
     internal lateinit var container: RelativeLayout
@@ -37,15 +39,18 @@ class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-       // FancyCamera.forceV1 = true
+//        FancyCamera.forceV1 = true
         setContentView(R.layout.activity_main)
         videoPlayer = findViewById(R.id.videoPlayer)
         durationView = findViewById(R.id.durationView)
         container = findViewById(R.id.container)
         cameraView = FancyCamera(this)
-       // cameraView.ratio = "16:9"
+//        cameraView.ratio = "16:9"
+//        cameraView.ratio = "16:9"
         cameraView.autoFocus = true
         cameraView.position = CameraPosition.BACK
+        cameraView.processEveryNthFrame = 9
+        cameraView.defaultLens = CameraLens.auto
         cameraView.setListener(object : CameraEventListenerUI() {
             override fun onReadyUI() {
             }
@@ -100,7 +105,14 @@ class MainActivity : AppCompatActivity() {
             }
 
         })
-        cameraView.detectorType = DetectorType.All // disable to use recorder
+
+//        cameraView.addImageProcessor(
+//            BarcodeScanner()
+//        )
+//        cameraView.addImageProcessor(
+//            TextRecognition()
+//        )
+
         cameraView.setOnBarcodeScanningListener(object : ImageAnalysisCallback {
             override fun onSuccess(result: Any) {
                 println("setOnBarcodeScanningListener: Success $result")
@@ -173,7 +185,7 @@ class MainActivity : AppCompatActivity() {
         })
         cameraView.saveToGallery = true
         container.addView(cameraView)
-      //  processBarcodeBitmap()
+        //  processBarcodeBitmap()
 
     }
 
@@ -197,16 +209,11 @@ class MainActivity : AppCompatActivity() {
                 }
 
                 val bm = BitmapFactory.decodeFile(barcodeFile.absolutePath)
-                val json = JSONObject()
-                json.put("detectorType", 0)
-                val barcode = JSONObject()
-                val formats = JSONArray()
-                formats.put(0)
-                barcode.put("barcodeFormat", formats)
-                json.put("barcodeScanning", barcode)
-                ML.processImage(bm, 0, json.toString(), object : ImageAnalysisCallback {
+                val processors = ArrayList<ImageProcessor<Any>>(1)
+                processors.add(BarcodeScanner() as ImageProcessor<Any>)
+                ML.processImage(bm, 0, processors, object : ImageAnalysisCallback {
                     override fun onSuccess(result: Any) {
-                        (result as? List<Array<Any>>)?.let { values ->
+                        (result as? List<Array<*>>)?.let { values ->
                             for (value in values) {
                                 val type = value[0]
                                 val data = value[1]
@@ -224,8 +231,10 @@ class MainActivity : AppCompatActivity() {
     }
 
     fun startRecording(view: View) {
-        cameraView.quality = Quality.HIGHEST
-        cameraView.startRecording()
+//        cameraView.quality = Quality.HIGHEST
+//        cameraView.startRecording()
+
+        cameraView.takePhoto()
 
     }
 
@@ -267,6 +276,7 @@ class MainActivity : AppCompatActivity() {
     override fun onPause() {
         cameraView.stopPreview()
         cameraView.stop()
+        cameraView.release()
         super.onPause()
         if (levelsTask != null) {
             levelsTask!!.cancel()
@@ -304,8 +314,7 @@ class MainActivity : AppCompatActivity() {
                 levelsTask!!.scheduleAtFixedRate(object : TimerTask() {
                     override fun run() {
                         runOnUiThread {
-                            level = Math.pow(10.0, 0.02 * cameraView.db)
-                            Log.d("co.test", "Audio Levels$level")
+                            level = 10.0.pow(0.02 * cameraView.db)
                         }
                     }
                 }, 0, 1000)

diff --git a/app/src/main/java/io/github/triniwiz/videorecorder/Photo.kt b/app/src/main/java/io/github/triniwiz/videorecorder/Photo.kt
@@ -22,11 +22,13 @@ class Photo : AppCompatActivity() {
         imageView = findViewById(R.id.imageView)
         cameraView = findViewById(R.id.PhotoView)
         //FancyCamera.forceV1 = true
+        // cameraView.defaultLens = CameraLens.telephoto
         cameraView.autoFocus = true
-      //  cameraView.quality = Quality.HIGHEST
+        cameraView.saveToGallery = true
+        cameraView.quality = Quality.HIGHEST
         cameraView.setListener(object : CameraEventListenerUI() {
             override fun onReadyUI() {
-                
+
             }
 
             override fun onCameraOpenUI() {
@@ -38,27 +40,23 @@ class Photo : AppCompatActivity() {
             }
 
             override fun onCameraPhotoUI(file: File?) {
-                imageView.setImageURI(Uri.fromFile(file))
+                file?.let { photo ->
+                    imageView.setImageURI(Uri.fromFile(photo))
+                }
             }
 
-            override fun onCameraVideoUI(file: File?) {
-                TODO("Not yet implemented")
-            }
+            override fun onCameraVideoUI(file: File?) {}
 
-            override fun onCameraVideoStartUI() {
-                TODO("Not yet implemented")
-            }
+            override fun onCameraVideoStartUI() {}
 
-            override fun onCameraAnalysisUI(analysis: ImageAnalysis) {
-                TODO("Not yet implemented")
-            }
+            override fun onCameraAnalysisUI(analysis: ImageAnalysis) {}
 
             override fun onCameraErrorUI(message: String, ex: Exception) {
                 println(message)
             }
 
         })
-        cameraView.detectorType = DetectorType.None
+
         cameraView.setOnFacesDetectedListener(object : ImageAnalysisCallback {
             override fun onSuccess(result: Any) {
                 println("setOnFacesDetectedListener: Success ${result}")
@@ -79,8 +77,9 @@ class Photo : AppCompatActivity() {
                 exception.printStackTrace()
             }
         })
-       // cameraView.saveToGallery = true
-        cameraView.autoSquareCrop = true
+        // cameraView.saveToGallery = true
+       cameraView.autoSquareCrop = true
+       // cameraView.defaultLens = CameraLens.auto
     }
 
     fun takePhoto(view: View) {
@@ -113,7 +112,11 @@ class Photo : AppCompatActivity() {
         super.onPause()
     }
 
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
+    override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<String>,
+        grantResults: IntArray
+    ) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         var count = 0
         for (grant in grantResults) {

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -119,17 +119,18 @@
 
     <RelativeLayout
         android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="150dp"
+        android:layout_width="384dp"
+        android:layout_height="226dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
         android:orientation="vertical"
+        app:layout_constraintBottom_toTopOf="@+id/durationView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <Button
         android:id="@+id/startPreview"

diff --git a/barcodeScanning/build.gradle b/barcodeScanning/build.gradle
@@ -4,13 +4,15 @@ plugins {
 }
 
 android {
-    compileSdkVersion COMPILE_SDK_VERSION as int
+    compileSdk = COMPILE_SDK_VERSION as int
     buildToolsVersion BUILD_TOOLS_VERSION as String
 
     defaultConfig {
         minSdkVersion 17
         targetSdkVersion 33
 
+        versionName = VERSION_NAME as String
+
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }
@@ -22,22 +24,23 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
+    namespace 'io.github.triniwiz.fancycamera.barcodescanning'
 }
 
 dependencies {
+    implementation project(':fancycamera')
     implementation "com.google.code.gson:gson:$gson_version"
-    implementation 'com.google.mlkit:barcode-scanning:17.0.3'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation 'com.google.mlkit:barcode-scanning:17.3.0'
     implementation "androidx.appcompat:appcompat:$app_compat_version"
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }
 
-apply from: 'publish.gradle'
+apply from: "${rootProject.projectDir}/scripts/upload.gradle"
diff --git a/barcodeScanning/gradle.properties b/barcodeScanning/gradle.properties
@@ -1,23 +1,8 @@
-GROUP=io.github.triniwiz.fancycamera
-
-POM_ARTIFACT_ID=barcodeScanning
-VERSION_NAME=1.0.2
-
-POM_NAME=barcodeScanning
+POM_ARTIFACT_ID=barcode-scanning
+POM_NAME=MLKit Barcode Scanning
 POM_PACKAGING=aar
-
 POM_DESCRIPTION=Fancy Android Camera BarcodeScanning
-POM_INCEPTION_YEAR=2019
-
-POM_URL=https://github.com/triniwiz/fancycamera
-POM_SCM_URL=https://github.com/triniwiz/fancycamera
-POM_SCM_CONNECTION=scm:git@github.com:triniwiz/fancycamera.git
-POM_SCM_DEV_CONNECTION=scm:git@github.com:triniwiz/fancycamera.git
-
-POM_LICENCE_NAME=The Apache Software License, Version 2.0
-POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
-POM_LICENCE_DIST=repo
 
-POM_DEVELOPER_ID=triniwiz
-POM_DEVELOPER_NAME=Osei Fortune
-POM_DEVELOPER_URL=https://github.com/triniwiz
+# Prefix and postfix for source and javadoc jars.
+JAR_PREFIX=fancycamera-
+JAR_POSTFIX=