Merge pull request #122 from wiiznokes/settings-tiles2

refractor some stuff

Author: teamclouday

Android/app/src/main/AndroidManifest.xml

@@ -44,6 +44,7 @@
                 android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"
                 android:resource="@xml/accessory_filter" />
         </activity>
+
         <service
             android:name="io.github.teamclouday.AndroidMic.domain.service.ForegroundService"
             android:foregroundServiceType="microphone" />

Android/app/src/main/java/io/github/teamclouday/AndroidMic/AndroidMicApp.kt

@@ -20,8 +20,8 @@ class AndroidMicApp : Application() {
 
     companion object {
         lateinit var appModule: AppModule
-        var mService: Messenger? = null
-        var mBound = false
+        var service: Messenger? = null
+        var isBound = false
     }
 
     private val scope = MainScope()
@@ -38,8 +38,8 @@ class AndroidMicApp : Application() {
     private val mConnection = object : ServiceConnection {
         override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
             Log.d(TAG, "onServiceConnected")
-            mService = Messenger(service)
-            mBound = true
+            Companion.service = Messenger(service)
+            isBound = true
             // notify current running activity that service is connected
             val notifyIntent = Intent(applicationContext, MainActivity::class.java).apply {
                 action = Intent.ACTION_VIEW
@@ -51,8 +51,8 @@ class AndroidMicApp : Application() {
 
         override fun onServiceDisconnected(name: ComponentName?) {
             Log.d(TAG, "onServiceDisconnected")
-            mService = null
-            mBound = false
+            service = null
+            isBound = false
         }
     }
 
@@ -67,7 +67,7 @@ class AndroidMicApp : Application() {
 
     fun unBindService() {
         unbindService(mConnection)
-        mService = null
-        mBound = false
+        service = null
+        isBound = false
     }
 }

Android/app/src/main/java/io/github/teamclouday/AndroidMic/domain/service/Command.kt

@@ -2,10 +2,15 @@ package io.github.teamclouday.AndroidMic.domain.service
 
 import android.os.Bundle
 import android.os.Message
+import io.github.teamclouday.AndroidMic.AppPreferences
 import io.github.teamclouday.AndroidMic.AudioFormat
 import io.github.teamclouday.AndroidMic.ChannelCount
+import io.github.teamclouday.AndroidMic.Dialogs
 import io.github.teamclouday.AndroidMic.Mode
 import io.github.teamclouday.AndroidMic.SampleRates
+import io.github.teamclouday.AndroidMic.utils.Either
+import io.github.teamclouday.AndroidMic.utils.checkIp
+import io.github.teamclouday.AndroidMic.utils.checkPort
 
 
 private const val ID_MSG: String = "ID_MSG"
@@ -66,26 +71,62 @@ data class CommandData(
                 audioFormat = msg.data.getOrdinal(ID_AUDIO_FORMAT)?.let { AudioFormat.entries[it] },
             )
         }
+
+        suspend fun fromPref(
+            prefs: AppPreferences,
+            command: Command
+        ): Either<CommandData, Dialogs> {
+            val ip = prefs.ip.get()
+            val port = prefs.port.get()
+            val mode = prefs.mode.get()
+
+            val data = CommandData(
+                command = command,
+                sampleRate = prefs.sampleRate.get(),
+                channelCount = prefs.channelCount.get(),
+                audioFormat = prefs.audioFormat.get(),
+                mode = mode
+            )
+
+            when (mode) {
+                Mode.WIFI, Mode.UDP -> {
+                    if (!checkIp(ip) || !checkPort(port, true)) {
+
+                        return Either.Right(Dialogs.IpPort)
+                    }
+                    data.ip = ip
+                    data.port = try {
+                        port.toInt()
+                    } catch (_: Exception) {
+                        null
+                    }
+                }
+
+                else -> {}
+            }
+
+            return Either.Left(data)
+        }
     }
 
     fun toCommandMsg(): Message {
 
-        val r = Bundle()
+        val data = Bundle()
 
-        this.mode?.let { r.putInt(ID_MODE, it.ordinal) }
+        this.mode?.let { data.putInt(ID_MODE, it.ordinal) }
 
-        this.ip?.let { r.putString(ID_IP, it) }
-        r.putInt(ID_PORT, this.port ?: -1)
+        this.ip?.let { data.putString(ID_IP, it) }
+        data.putInt(ID_PORT, this.port ?: -1)
 
-        this.sampleRate?.let { r.putInt(ID_SAMPLE_RATE, it.ordinal) }
-        this.channelCount?.let { r.putInt(ID_CHANNEL_COUNT, it.ordinal) }
-        this.audioFormat?.let { r.putInt(ID_AUDIO_FORMAT, it.ordinal) }
+        this.sampleRate?.let { data.putInt(ID_SAMPLE_RATE, it.ordinal) }
+        this.channelCount?.let { data.putInt(ID_CHANNEL_COUNT, it.ordinal) }
+        this.audioFormat?.let { data.putInt(ID_AUDIO_FORMAT, it.ordinal) }
 
-        val reply = Message.obtain()
-        reply.data = r
-        reply.what = this.command.ordinal
+        val message = Message.obtain()
+        message.data = data
+        message.what = this.command.ordinal
 
-        return reply
+        return message
     }
 
 

Android/app/src/main/java/io/github/teamclouday/AndroidMic/domain/service/ForegroundService.kt

@@ -31,7 +31,7 @@ data class ServiceStates(
 )
 
 private const val TAG = "ForegroundService"
-private const val WAIT_PERIOD = 500L
+const val WAIT_PERIOD = 500L
 
 
 const val BIND_SERVICE_ACTION = "BIND_SERVICE_ACTION"

Android/app/src/main/java/io/github/teamclouday/AndroidMic/ui/MainActivity.kt

@@ -7,6 +7,7 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
 import io.github.teamclouday.AndroidMic.AndroidMicApp
+import io.github.teamclouday.AndroidMic.domain.service.WAIT_PERIOD
 import io.github.teamclouday.AndroidMic.ui.home.HomeScreen
 import io.github.teamclouday.AndroidMic.ui.home.openAppSettings
 import io.github.teamclouday.AndroidMic.ui.theme.AndroidMicTheme
@@ -17,8 +18,6 @@ import io.github.teamclouday.AndroidMic.utils.ignore
 class MainActivity : ComponentActivity() {
     private val TAG = "MainActivity"
 
-    private val WAIT_PERIOD = 500L
-
     val vm: MainViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -66,7 +65,7 @@ class MainActivity : ComponentActivity() {
     override fun onStop() {
         super.onStop()
         Log.d(TAG, "onStop")
-        vm.mMessengerLooper.quitSafely()
+        vm.messengerLooper.quitSafely()
         ignore { vm.handlerThread.join(WAIT_PERIOD) }
 
         (application as AndroidMicApp).unBindService()

Android/app/src/main/java/io/github/teamclouday/AndroidMic/ui/MainViewModel.kt

@@ -25,9 +25,9 @@ import io.github.teamclouday.AndroidMic.domain.service.Response
 import io.github.teamclouday.AndroidMic.domain.service.ResponseData
 import io.github.teamclouday.AndroidMic.domain.service.ServiceState
 import io.github.teamclouday.AndroidMic.ui.utils.UiHelper
-import io.github.teamclouday.AndroidMic.utils.checkIp
-import io.github.teamclouday.AndroidMic.utils.checkPort
+import io.github.teamclouday.AndroidMic.utils.Either
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 
 
 class MainViewModel : ViewModel() {
@@ -38,13 +38,12 @@ class MainViewModel : ViewModel() {
     val prefs: AppPreferences = AndroidMicApp.appModule.appPreferences
     val uiHelper: UiHelper = AndroidMicApp.appModule.uiHelper
 
-    private var mService: Messenger? = null
-    private var mBound = false
+    private var service: Messenger? = null
+    private var isBound = false
 
     lateinit var handlerThread: HandlerThread
-    private lateinit var mMessenger: Messenger
-    lateinit var mMessengerLooper: Looper
-    private lateinit var mMessengerHandler: ReplyHandler
+    private lateinit var messenger: Messenger
+    lateinit var messengerLooper: Looper
 
 
     val textLog = mutableStateOf("")
@@ -61,7 +60,7 @@ class MainViewModel : ViewModel() {
 
             val data = ResponseData.fromMessage(msg);
 
-            when (Response.entries[msg.what]) {
+            when (data.kind) {
                 Response.Standard -> {
                     data.state?.let {
                         isButtonConnectClickable.value = true
@@ -77,71 +76,57 @@ class MainViewModel : ViewModel() {
     }
 
     fun handlerServiceResponse() {
-        handlerThread = HandlerThread("activity", Process.THREAD_PRIORITY_BACKGROUND)
+        handlerThread =
+            HandlerThread("MainViewModelResponseHandler", Process.THREAD_PRIORITY_BACKGROUND)
         handlerThread.start()
-        mMessengerLooper = handlerThread.looper
-        mMessengerHandler = ReplyHandler(mMessengerLooper)
-        mMessenger = Messenger(mMessengerHandler)
+        messengerLooper = handlerThread.looper
+        messenger = Messenger(ReplyHandler(messengerLooper))
     }
 
     fun refreshAppVariables() {
-        mBound = AndroidMicApp.mBound
-        mService = AndroidMicApp.mService
+        isBound = AndroidMicApp.isBound
+        service = AndroidMicApp.service
 
         isStreamStarted.value = false
         isButtonConnectClickable.value = false
 
         val msg = CommandData(Command.BindCheck).toCommandMsg()
-        msg.replyTo = mMessenger
-        mService?.send(msg)
+        msg.replyTo = messenger
+        service?.send(msg)
     }
 
     fun onConnectButton(): Dialogs? {
-        if (!mBound) return null
-        val reply = if (isStreamStarted.value) {
+        if (!isBound) return null
+        val message = if (isStreamStarted.value) {
             Log.d(TAG, "onConnectButton: stop stream")
-            CommandData(Command.StopStream).toCommandMsg()
+            CommandData(Command.StopStream)
         } else {
-            val ip = prefs.ip.getBlocking()
-            val port = prefs.port.getBlocking()
-            val mode = prefs.mode.getBlocking()
-
-            val data = CommandData(
-                command = Command.StartStream,
-                sampleRate = prefs.sampleRate.getBlocking(),
-                channelCount = prefs.channelCount.getBlocking(),
-                audioFormat = prefs.audioFormat.getBlocking(),
-                mode = mode
-            )
-
-            when (mode) {
-                Mode.WIFI, Mode.UDP -> {
-                    if (!checkIp(ip) || !checkPort(port, true)) {
-                        uiHelper.makeToast(
-                            uiHelper.getString(R.string.invalid_ip_port)
-                        )
-                        return Dialogs.IpPort
-                    }
-                    data.ip = ip
-                    data.port = try {
-                        port.toInt()
-                    } catch (_: Exception) {
-                        null
-                    }
+            val res = runBlocking {
+                CommandData.fromPref(prefs, Command.StartStream)
+            }
+            val data = when (res) {
+                is Either.Left<CommandData> -> {
+                    res.value
                 }
 
-                else -> {}
+                is Either.Right<Dialogs> -> {
+                    uiHelper.makeToast(
+                        uiHelper.getString(R.string.invalid_ip_port)
+                    )
+                    return res.value
+                }
             }
 
             Log.d(TAG, "onConnectButton: start stream")
-            // lock button to avoid duplicate events
-            isButtonConnectClickable.value = false
 
-            data.toCommandMsg()
-        }
+            data
+        }.toCommandMsg()
+
+        // lock button to avoid duplicate events
+        isButtonConnectClickable.value = false
 
-        reply.replyTo = mMessenger
-        mService?.send(reply)
+        message.replyTo = messenger
+        service?.send(message)
 
         return null
     }
@@ -197,11 +182,11 @@ class MainViewModel : ViewModel() {
 
     // ask foreground service for current status
     fun askForStatus() {
-        if (!mBound) return
-        val reply = Message.obtain()
-        reply.what = Command.GetStatus.ordinal
-        reply.replyTo = mMessenger
-        mService?.send(reply)
+        if (!isBound) return
+        val message = Message.obtain()
+        message.what = Command.GetStatus.ordinal
+        message.replyTo = messenger
+        service?.send(message)
     }
 
 

Android/app/src/main/java/io/github/teamclouday/AndroidMic/utils/Utils.kt

@@ -60,4 +60,9 @@ fun ByteArray.chunked(size: Int): List<ByteArray> {
             )
         )
     }
+}
+
+sealed class Either<out A, out B> {
+    class Left<A>(val value: A) : Either<A, Nothing>()
+    class Right<B>(val value: B) : Either<Nothing, B>()
 }