Merge pull request #205 from timusus/emby-compose

add emby compose dialog

Author: timusus

android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/mediaprovider/MediaProviderSelectionScreen.kt

@@ -54,6 +54,7 @@ import com.simplecityapps.shuttle.model.MediaProviderType
 import com.simplecityapps.shuttle.ui.screens.onboarding.OnboardingChild
 import com.simplecityapps.shuttle.ui.screens.onboarding.OnboardingPage
 import com.simplecityapps.shuttle.ui.screens.onboarding.OnboardingParent
+import com.simplecityapps.shuttle.ui.screens.onboarding.mediaprovider.emby.EmbyConfigurationDialog
 import com.simplecityapps.shuttle.ui.screens.onboarding.mediaprovider.plex.PlexConfigurationDialog
 import com.simplecityapps.shuttle.ui.snapshot.Snapshot
 import com.simplecityapps.shuttle.ui.theme.AppTheme
@@ -94,7 +95,7 @@ class MediaProviderSelectionScreenFragment :
 @Composable
 private fun MediaProviderSelectionScreen(
     modifier: Modifier = Modifier,
-    viewModel: MediaProviderViewModel = hiltViewModel()
+    viewModel: MediaProviderSelectionViewModel = hiltViewModel()
 ) {
     val mediaProviders by viewModel.mediaProviders.collectAsStateWithLifecycle()
     val unAddedMediaProviders by viewModel.unAddedMediaProviders.collectAsStateWithLifecycle()
@@ -106,7 +107,7 @@ private fun MediaProviderSelectionScreen(
         when (configureMediaProvider!!) {
             MediaProviderType.Shuttle -> TODO()
             MediaProviderType.MediaStore -> TODO()
-            MediaProviderType.Emby -> TODO()
+            MediaProviderType.Emby -> EmbyConfigurationDialog(onDismissRequest = viewModel::onConsumeConfigureMediaProvider)
             MediaProviderType.Jellyfin -> TODO()
             MediaProviderType.Plex -> PlexConfigurationDialog(onDismissRequest = viewModel::onConsumeConfigureMediaProvider)
         }

…/mediaprovider/MediaProviderViewModel.kt …vider/MediaProviderSelectionViewModel.ktandroid/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/mediaprovider/MediaProviderViewModel.kt renamed to android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/mediaprovider/MediaProviderSelectionViewModel.kt android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/mediaprovider/MediaProviderViewModel.kt renamed to android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/mediaprovider/MediaProviderSelectionViewModel.kt

@@ -21,7 +21,7 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 
 @HiltViewModel
-class MediaProviderViewModel @Inject constructor(
+class MediaProviderSelectionViewModel @Inject constructor(
     playbackPreferenceManager: PlaybackPreferenceManager,
     private val mediaImporter: MediaImporter,
     private val plexMediaProvider: PlexMediaProvider,
@@ -87,11 +87,11 @@ class MediaProviderViewModel @Inject constructor(
 
     fun onConfigureProviderClick(provider: MediaProviderType) {
         _configureMediaProvider.update { provider }
-        _showProviderOverflowMenu.update { null }
     }
 
     fun onConsumeConfigureMediaProvider() {
         _configureMediaProvider.update { null }
+        _showProviderOverflowMenu.update { null }
     }
 
     private fun MediaProviderType.toMediaProvider(): MediaProvider = when (this) {

android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/onboarding/mediaprovider/emby/EmbyAuthenticationState.kt

@@ -0,0 +1,7 @@
+package com.simplecityapps.shuttle.ui.screens.onboarding.mediaprovider.emby
+
+sealed interface EmbyAuthenticationState {
+    data object Loading : EmbyAuthenticationState
+    data object Success : EmbyAuthenticationState
+    data class Error(val error: Throwable?) : EmbyAuthenticationState
+}