Merge pull request #298 from Chooloo/dev

Fixed audio route changes isnt showing on call ui
Chooloo · Jan 1, 2022 · eb0f1a4 · eb0f1a4
2 parents 3b9a22a + 84ff344
commit eb0f1a4
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 33 deletions.
diff --git a/app/src/main/java/com/chooloo/www/koler/di/activitycomponent/ActivityComponent.kt b/app/src/main/java/com/chooloo/www/koler/di/activitycomponent/ActivityComponent.kt
@@ -3,7 +3,6 @@ package com.chooloo.www.koler.di.activitycomponent
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ViewModelStoreOwner
 import com.chooloo.www.koler.di.contextcomponent.ContextComponent
-import com.chooloo.www.koler.interactor.callaudio.CallAudioInteractorBound
 import com.chooloo.www.koler.interactor.dialog.DialogInteractor
 import com.chooloo.www.koler.interactor.navigation.NavigationInteractor
 import com.chooloo.www.koler.interactor.permission.PermissionsInteractor
@@ -24,5 +23,4 @@ interface ActivityComponent : ContextComponent {
     val proximities: ProximityInteractor
     val permissions: PermissionsInteractor
     val navigations: NavigationInteractor
-    override val callAudios: CallAudioInteractorBound
 }
diff --git a/app/src/main/java/com/chooloo/www/koler/di/activitycomponent/ActivityComponentImpl.kt b/app/src/main/java/com/chooloo/www/koler/di/activitycomponent/ActivityComponentImpl.kt
@@ -1,7 +1,6 @@
 package com.chooloo.www.koler.di.activitycomponent
 
 import com.chooloo.www.koler.KolerApp
-import com.chooloo.www.koler.interactor.callaudio.CallAudioInteractorBoundImpl
 import com.chooloo.www.koler.interactor.dialog.DialogInteractorImpl
 import com.chooloo.www.koler.interactor.navigation.NavigationInteractorImpl
 import com.chooloo.www.koler.interactor.permission.PermissionsInteractorImpl
@@ -75,10 +74,6 @@ class ActivityComponentImpl(
         )
     }
 
-    override val callAudios by lazy {
-        CallAudioInteractorBoundImpl(dialogs, strings)
-    }
-
 
     override val liveDataFactory get() = contextComponent.liveDataFactory
 
@@ -102,6 +97,7 @@ class ActivityComponentImpl(
     override val recents get() = contextComponent.recents
     override val drawables get() = contextComponent.drawables
     override val contacts get() = contextComponent.contacts
+    override val callAudios get() = contextComponent.callAudios
     override val animations get() = contextComponent.animations
     override val preferences get() = contextComponent.preferences
 }
diff --git a/app/src/main/java/com/chooloo/www/koler/interactor/callaudio/CallAudioInteractorBound.kt b/app/src/main/java/com/chooloo/www/koler/interactor/callaudio/CallAudioInteractorBound.kt
diff --git a/app/src/main/java/com/chooloo/www/koler/interactor/callaudio/CallAudioInteractorBoundImpl.kt b/app/src/main/java/com/chooloo/www/koler/interactor/callaudio/CallAudioInteractorBoundImpl.kt
diff --git a/app/src/main/java/com/chooloo/www/koler/interactor/dialog/DialogInteractor.kt b/app/src/main/java/com/chooloo/www/koler/interactor/dialog/DialogInteractor.kt
@@ -5,6 +5,7 @@ import androidx.annotation.ColorInt
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import com.chooloo.www.koler.interactor.base.BaseInteractor
+import com.chooloo.www.koler.interactor.callaudio.CallAudioInteractor
 import com.chooloo.www.koler.interactor.preferences.PreferencesInteractor.Companion.Page
 
 interface DialogInteractor : BaseInteractor<DialogInteractor.Listener> {
@@ -29,6 +30,8 @@ interface DialogInteractor : BaseInteractor<DialogInteractor.Listener> {
         @ColorInt selectedColor: Int? = null
     )
 
+    fun askForRoute(callback: (CallAudioInteractor.AudioRoute) -> Unit)
+
     fun askForDefaultPage(callback: (Page) -> Unit)
     fun askForCompact(callback: (isCompact: Boolean) -> Unit)
     fun askForAnimations(callback: (isAnimations: Boolean) -> Unit)

diff --git a/app/src/main/java/com/chooloo/www/koler/interactor/dialog/DialogInteractorImpl.kt b/app/src/main/java/com/chooloo/www/koler/interactor/dialog/DialogInteractorImpl.kt
@@ -3,6 +3,7 @@ package com.chooloo.www.koler.interactor.dialog
 import android.widget.ArrayAdapter
 import androidx.appcompat.app.AlertDialog
 import com.chooloo.www.koler.R
+import com.chooloo.www.koler.interactor.callaudio.CallAudioInteractor
 import com.chooloo.www.koler.interactor.preferences.PreferencesInteractor.Companion.Page
 import com.chooloo.www.koler.ui.base.BaseActivity
 import com.chooloo.www.koler.ui.base.BottomFragment
@@ -66,6 +67,16 @@ class DialogInteractorImpl(
         ).show(activity.supportFragmentManager)
     }
 
+    override fun askForRoute(callback: (CallAudioInteractor.AudioRoute) -> Unit) {
+        val audioRoutes = activity.component.callAudios.supportedAudioRoutes
+        askForChoice(
+            audioRoutes.map { activity.getString(it.stringRes) },
+            R.drawable.ic_volume_up_black_24dp,
+            R.string.action_choose_audio_route,
+            { _, index -> callback.invoke(audioRoutes[index]) }
+        )
+    }
+
     override fun askForDefaultPage(callback: (Page) -> Unit) {
         askForChoice(
             choices = Page.values().map { activity.getString(it.titleRes) },

diff --git a/app/src/main/java/com/chooloo/www/koler/ui/call/CallController.kt b/app/src/main/java/com/chooloo/www/koler/ui/call/CallController.kt
@@ -105,7 +105,7 @@ class CallController<V : CallContract.View>(view: V) :
     override fun onSpeakerClick() {
         component.callAudios.apply {
             if (supportedAudioRoutes.contains(AudioRoute.BLUETOOTH)) {
-                component.callAudios.askForRoute { audioRoute = it }
+                component.dialogs.askForRoute { audioRoute = it }
             } else {
                 isSpeakerOn = !view.isSpeakerActivated
             }