Skip to content
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
110a55d
#484 move file browser from app to shred
Oct 26, 2024
470c9da
#484 load fileviewmodel in hub
Oct 26, 2024
b080af2
#487 filebrowser header and app / desktop views
Oct 27, 2024
6c60682
#487 move RemotesComposables to shared
Oct 28, 2024
803dd7f
#487 move LocalComposables to shared
Oct 28, 2024
0924ce4
#487 hub local composeables
Oct 28, 2024
90fb602
#487 style buttons, action bar,
Oct 28, 2024
aeefec9
#487 use folder list in hub
Oct 28, 2024
445c061
#487 folder app fixes
Oct 28, 2024
77611f6
#487 show remotes dialog
Oct 29, 2024
2940b12
#487 clean up headers
Oct 29, 2024
40c70eb
#487 remotes screen cleanup
Oct 29, 2024
6866586
#487 edit remote address
Oct 29, 2024
7ea38db
#487 launch local player from file browser - add local selection to r…
Oct 30, 2024
afaa8f3
#487 ui tweaks
Oct 30, 2024
4238d63
#487 create .cuer dir
Oct 30, 2024
6aff73b
#487 fix shownotification crash
siliconeagle Oct 30, 2024
eeb2b2f
#487 start exo
Oct 30, 2024
f81f979
#487 fix lin ip address parse
siliconeagle Oct 30, 2024
ce8fb90
#487 clean up titles
Oct 31, 2024
d10df50
#487 extract more title data and sort
Oct 31, 2024
6357272
#487 sorting
Nov 1, 2024
c7a03f2
#487 overflow menu
Nov 1, 2024
d656aaa
#487 show errors
Nov 2, 2024
4465214
#487 etyling snackbar desktop
Nov 2, 2024
76e8a0c
#487 chnage snackbar to material3 use scaffold
Nov 2, 2024
9faeba2
#487 tweak files row
Nov 2, 2024
2a3cfd4
#487 empty folder message, keep app file location on resume
Nov 2, 2024
84b62c8
#487 extract strings
Nov 2, 2024
e77b4eb
#487 settings navigation, overflow icon colors
Nov 2, 2024
df63016
#487 update setting after local config save and restart server - PROB…
Nov 2, 2024
930cf31
#487 fix compile error
Nov 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import androidx.fragment.app.FragmentActivity

class CastDialogLauncher(
private val activity: FragmentActivity
) : CastContract.CastDialogLauncher {
) : CastContract.DialogLauncher {

private var dialogFragment: DialogFragment? = null

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ fun CuerTheme(
) {
val context = LocalContext.current
val layoutDirection = LocalLayoutDirection.current
var (colors, type, shapes) = createMdcTheme(
val (colors, type, shapes) = createMdcTheme(
context = context,
layoutDirection = layoutDirection
)
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import androidx.fragment.app.DialogFragment
import androidx.fragment.app.Fragment
import org.koin.android.ext.android.inject
import org.koin.android.scope.AndroidScopeComponent
import org.koin.androidx.viewmodel.dsl.viewModel
import org.koin.core.qualifier.named
import org.koin.core.scope.Scope
import org.koin.dsl.module
Expand All @@ -22,7 +23,7 @@ import uk.co.sentinelweb.cuer.app.ui.common.navigation.NavigationModel.Target.NA
import uk.co.sentinelweb.cuer.app.ui.common.navigation.NavigationRouter
import uk.co.sentinelweb.cuer.app.ui.common.navigation.getString
import uk.co.sentinelweb.cuer.app.ui.common.navigation.navigationRouter
import uk.co.sentinelweb.cuer.app.ui.filebrowser.FileBrowserContract.Label
import uk.co.sentinelweb.cuer.app.ui.filebrowser.FilesContract.Label
import uk.co.sentinelweb.cuer.app.ui.play_control.CompactPlayerScroll
import uk.co.sentinelweb.cuer.app.util.extension.fragmentScopeWithSource
import uk.co.sentinelweb.cuer.app.util.extension.getFragmentActivity
Expand All @@ -37,7 +38,7 @@ import uk.co.sentinelweb.cuer.domain.toGUID
class FileBrowserFragment : Fragment(), AndroidScopeComponent {

override val scope: Scope by fragmentScopeWithSource<FileBrowserFragment>()
private val viewModel: FileBrowserViewModel by inject()
private val viewModel: FilesViewModel by inject()
private val log: LogWrapper by inject()
private val snackbarWrapper: SnackbarWrapper by inject()
private val edgeToEdgeWrapper: EdgeToEdgeWrapper by inject()
Expand All @@ -49,7 +50,7 @@ class FileBrowserFragment : Fragment(), AndroidScopeComponent {
private var _binding: FragmentComposeBinding? = null
private val binding get() = _binding ?: throw IllegalStateException("BrowseFragment view not bound")

private var dialogFragment: DialogFragment? = null
//private var dialogFragment: DialogFragment? = null

private val remoteIdArg: GUID? by lazy {
NavigationModel.Param.REMOTE_ID.getString(arguments)?.toGUID()
Expand Down Expand Up @@ -83,12 +84,12 @@ class FileBrowserFragment : Fragment(), AndroidScopeComponent {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
binding.composeView.setContent {
FileBrowserAppComposeables.FileBrowserAppWrapperUi(
appModelObservable = viewModel.appModelObservable,
FilesComposeables.FileBrowserAppUi(
modelObservable = viewModel.modelObservable,
viewModel = viewModel
)
}
statusBarColor.setStatusBarColorResource(R.color.primary_variant)
statusBarColor.setStatusBarColorResource(R.color.black)
bindFlow(viewModel.labels, ::observeLabels)
}

Expand Down Expand Up @@ -120,11 +121,6 @@ class FileBrowserFragment : Fragment(), AndroidScopeComponent {
// controller.onRefresh()
}

override fun onStop() {
super.onStop()
// playerView.showPlayer()
}

override fun onDestroyView() {
_binding = null
super.onDestroyView()
Expand All @@ -134,9 +130,9 @@ class FileBrowserFragment : Fragment(), AndroidScopeComponent {
@JvmStatic
val fragmentModule = module {
scope(named<FileBrowserFragment>()) {
scoped {
FileBrowserViewModel(
state = FileBrowserContract.State(),
viewModel{
FilesViewModel(
state = FilesContract.State(),
filesInteractor = get(),
remotesRepository = get(),
mapper = get(),
Expand All @@ -145,11 +141,11 @@ class FileBrowserFragment : Fragment(), AndroidScopeComponent {
castController = get(),
remoteDialogLauncher = get(),
cuerCastPlayerWatcher = get(),
appModelMapper = get()
getFolderListUseCase = get(),
localRepository = get(),
)
}
scoped { navigationRouter(true, this.getFragmentActivity()) }
scoped { FileBrowserAppModelMapper() }
}
}
}
Expand Down
Loading
Loading