Grouped similar classes by packages.

maulikhirani · Feb 7, 2021 · 43c45ff · 43c45ff
1 parent 00ee8bf
commit 43c45ff
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 14 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -12,10 +12,10 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".BarcodeScanningActivity"
+        <activity android:name=".ui.BarcodeScanningActivity"
             android:screenOrientation="sensorPortrait"
             android:theme="@style/FullScreenTheme"/>
-        <activity android:name=".MainActivity"
+        <activity android:name=".ui.MainActivity"
             android:screenOrientation="sensorPortrait"
             android:theme="@style/NoActionBarTheme">
             <intent-filter>

diff --git a/...ik/barcodescanner/MLKitBarcodeAnalyzer.kt → ...escanner/analyzer/MLKitBarcodeAnalyzer.kt b/...ik/barcodescanner/MLKitBarcodeAnalyzer.kt → ...escanner/analyzer/MLKitBarcodeAnalyzer.kt
@@ -1,4 +1,4 @@
-package maulik.barcodescanner
+package maulik.barcodescanner.analyzer
 
 import android.util.Log
 import androidx.camera.core.ExperimentalGetImage

diff --git a/.../barcodescanner/ScanningResultListener.kt → ...canner/analyzer/ScanningResultListener.kt b/.../barcodescanner/ScanningResultListener.kt → ...canner/analyzer/ScanningResultListener.kt
@@ -1,4 +1,4 @@
-package maulik.barcodescanner
+package maulik.barcodescanner.analyzer
 
 interface ScanningResultListener {
     fun onScanned(result: String)

diff --git a/...ik/barcodescanner/ZXingBarcodeAnalyzer.kt → ...escanner/analyzer/ZXingBarcodeAnalyzer.kt b/...ik/barcodescanner/ZXingBarcodeAnalyzer.kt → ...escanner/analyzer/ZXingBarcodeAnalyzer.kt
@@ -1,4 +1,4 @@
-package maulik.barcodescanner
+package maulik.barcodescanner.analyzer
 
 import android.graphics.ImageFormat
 import android.util.Log

diff --git a/...barcodescanner/BarcodeScanningActivity.kt → ...codescanner/ui/BarcodeScanningActivity.kt b/...barcodescanner/BarcodeScanningActivity.kt → ...codescanner/ui/BarcodeScanningActivity.kt
@@ -1,4 +1,4 @@
-package maulik.barcodescanner
+package maulik.barcodescanner.ui
 
 import android.content.Context
 import android.content.Intent
@@ -15,6 +15,10 @@ import androidx.camera.core.TorchState
 import androidx.camera.lifecycle.ProcessCameraProvider
 import androidx.core.content.ContextCompat
 import com.google.common.util.concurrent.ListenableFuture
+import maulik.barcodescanner.R
+import maulik.barcodescanner.analyzer.MLKitBarcodeAnalyzer
+import maulik.barcodescanner.analyzer.ScanningResultListener
+import maulik.barcodescanner.analyzer.ZXingBarcodeAnalyzer
 import maulik.barcodescanner.databinding.ActivityBarcodeScanningBinding
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
@@ -109,8 +113,9 @@ class BarcodeScanningActivity : AppCompatActivity() {
                 runOnUiThread {
                     imageAnalysis.clearAnalyzer()
                     cameraProvider?.unbindAll()
-                    ScannerResultDialog
-                        .newInstance(result, object : ScannerResultDialog.DialogDismissListener {
+                    ScannerResultDialog.newInstance(
+                        result,
+                        object : ScannerResultDialog.DialogDismissListener {
                             override fun onDismiss() {
                                 bindPreview(cameraProvider)
                             }

diff --git a/...ava/maulik/barcodescanner/MainActivity.kt → .../maulik/barcodescanner/ui/MainActivity.kt b/...ava/maulik/barcodescanner/MainActivity.kt → .../maulik/barcodescanner/ui/MainActivity.kt
@@ -1,4 +1,4 @@
-package maulik.barcodescanner
+package maulik.barcodescanner.ui
 
 import android.Manifest
 import android.content.Intent

diff --git a/...lik/barcodescanner/ScannerResultDialog.kt → .../barcodescanner/ui/ScannerResultDialog.kt b/...lik/barcodescanner/ScannerResultDialog.kt → .../barcodescanner/ui/ScannerResultDialog.kt
@@ -1,4 +1,4 @@
-package maulik.barcodescanner
+package maulik.barcodescanner.ui
 
 import android.content.ClipData
 import android.content.ClipboardManager

diff --git a/...aulik/barcodescanner/ViewFinderOverlay.kt → ...odescanner/ui/custom/ViewFinderOverlay.kt b/...aulik/barcodescanner/ViewFinderOverlay.kt → ...odescanner/ui/custom/ViewFinderOverlay.kt
@@ -1,10 +1,11 @@
-package maulik.barcodescanner
+package maulik.barcodescanner.ui.custom
 
 import android.content.Context
 import android.graphics.*
 import android.util.AttributeSet
 import android.view.View
 import androidx.core.content.ContextCompat
+import maulik.barcodescanner.R
 
 class ViewFinderOverlay(context: Context, attrs: AttributeSet) : View(context, attrs) {
 

diff --git a/app/src/main/res/layout/activity_barcode_scanning.xml b/app/src/main/res/layout/activity_barcode_scanning.xml
@@ -5,14 +5,14 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="false"
     tools:background="@android:color/white"
-    tools:context=".BarcodeScanningActivity">
+    tools:context=".ui.BarcodeScanningActivity">
 
     <androidx.camera.view.PreviewView
         android:id="@+id/cameraPreview"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <maulik.barcodescanner.ViewFinderOverlay
+    <maulik.barcodescanner.ui.custom.ViewFinderOverlay
         android:id="@+id/overlay"
         android:layerType="software"
         android:layout_width="match_parent"

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity"
+    tools:context=".ui.MainActivity"
     app:layoutDescription="@xml/activity_main_scene">
 
     <TextView