some organization

mlapaglia · Dec 14, 2023 · 368545e · 368545e
1 parent 81a84d2
commit 368545e
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 15 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -26,7 +26,7 @@
         android:theme="@style/Theme.AppCompat.Light"
         tools:targetApi="31">
         <activity
-            android:name=".BleScannerActivity"
+            android:name=".devicescanner.BleScannerActivity"
             android:exported="false" />
         <activity
             android:name=".MainActivity"
@@ -39,7 +39,7 @@
         </activity>
 
         <service
-            android:name=".MyCameraLinkService"
+            android:name=".cameralink.MyCameraLinkService"
             android:exported="false"
             android:foregroundServiceType="location|connectedDevice" />
     </application>

diff --git a/app/src/main/java/com.alphasync/MainActivity.kt b/app/src/main/java/com.alphasync/MainActivity.kt
@@ -18,6 +18,8 @@ import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
+import com.alphasync.cameralink.MyCameraLinkService
+import com.alphasync.devicescanner.BleScannerActivity
 
 class MainActivity : AppCompatActivity() {
     private val logTag: String = "MainActivity"

diff --git a/.../com.alphasync/ConnectionEventListener.kt → ...sync/bluetooth/ConnectionEventListener.kt b/.../com.alphasync/ConnectionEventListener.kt → ...sync/bluetooth/ConnectionEventListener.kt
@@ -1,4 +1,4 @@
-package com.alphasync
+package com.alphasync.bluetooth
 
 import android.bluetooth.BluetoothDevice
 import android.bluetooth.BluetoothGatt

diff --git a/...n/java/com.alphasync/ConnectionManager.kt → ....alphasync/bluetooth/ConnectionManager.kt b/...n/java/com.alphasync/ConnectionManager.kt → ....alphasync/bluetooth/ConnectionManager.kt
@@ -1,4 +1,4 @@
-package com.alphasync
+package com.alphasync.bluetooth
 
 import android.annotation.SuppressLint
 import android.bluetooth.BluetoothAdapter

diff --git a/...om.alphasync/MyCameraLinkEventListener.kt → ...c/cameralink/MyCameraLinkEventListener.kt b/...om.alphasync/MyCameraLinkEventListener.kt → ...c/cameralink/MyCameraLinkEventListener.kt
@@ -1,4 +1,4 @@
-package com.alphasync
+package com.alphasync.cameralink
 
 class MyCameraLinkEventListener {
     var onGpsSignalLost: (() -> Unit)? = null

diff --git a/...java/com.alphasync/MyCameraLinkService.kt → ...phasync/cameralink/MyCameraLinkService.kt b/...java/com.alphasync/MyCameraLinkService.kt → ...phasync/cameralink/MyCameraLinkService.kt
@@ -1,4 +1,4 @@
-package com.alphasync
+package com.alphasync.cameralink
 
 import android.annotation.SuppressLint
 import android.app.NotificationChannel
@@ -15,6 +15,10 @@ import android.widget.Toast
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.ServiceCompat
+import com.alphasync.bluetooth.ConnectionEventListener
+import com.alphasync.R
+import com.alphasync.sonycommand.SonyCommandGenerator
+import com.alphasync.bluetooth.ConnectionManager
 import java.util.Locale
 
 @SuppressLint("MissingPermission")

diff --git a/...ava/com.alphasync/BleDeviceListAdapter.kt → ...ync/devicescanner/BleDeviceListAdapter.kt b/...ava/com.alphasync/BleDeviceListAdapter.kt → ...ync/devicescanner/BleDeviceListAdapter.kt
@@ -1,4 +1,4 @@
-package com.alphasync
+package com.alphasync.devicescanner
 
 import android.annotation.SuppressLint
 import android.bluetooth.BluetoothDevice
@@ -8,6 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
+import com.alphasync.R
 
 class BleDeviceListAdapter(
     private val context: Context,

diff --git a/.../java/com.alphasync/BleScannerActivity.kt → ...async/devicescanner/BleScannerActivity.kt b/.../java/com.alphasync/BleScannerActivity.kt → ...async/devicescanner/BleScannerActivity.kt
@@ -1,4 +1,4 @@
-package com.alphasync
+package com.alphasync.devicescanner
 
 import android.annotation.SuppressLint
 import android.bluetooth.BluetoothAdapter
@@ -10,6 +10,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.alphasync.R
 
 
 @SuppressLint("MissingPermission")

diff --git a/...ava/com.alphasync/SonyCommandGenerator.kt → ...async/sonycommand/SonyCommandGenerator.kt b/...ava/com.alphasync/SonyCommandGenerator.kt → ...async/sonycommand/SonyCommandGenerator.kt
@@ -1,14 +1,11 @@
-package com.alphasync
+package com.alphasync.sonycommand
 
 import android.annotation.SuppressLint
-import android.bluetooth.BluetoothGattCharacteristic
 import android.content.Context
 import android.location.Location
 import android.os.HandlerThread
-import android.os.Looper
 import android.util.Log
-import android.widget.Toast
-import com.google.android.gms.location.CurrentLocationRequest
+import com.alphasync.cameralink.MyCameraLinkEventListener
 import com.google.android.gms.location.FusedLocationProviderClient
 import com.google.android.gms.location.Granularity
 import com.google.android.gms.location.LocationAvailability
@@ -17,7 +14,6 @@ import com.google.android.gms.location.LocationRequest
 import com.google.android.gms.location.LocationResult
 import com.google.android.gms.location.LocationServices
 import com.google.android.gms.location.Priority
-import com.google.android.gms.tasks.CancellationTokenSource
 import java.lang.Exception
 import java.lang.ref.WeakReference
 import java.nio.ByteBuffer

diff --git a/app/src/main/res/layout/activity_ble_scanner.xml b/app/src/main/res/layout/activity_ble_scanner.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".BleScannerActivity">
+    tools:context=".devicescanner.BleScannerActivity">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/bleDeviceRecyclerView"