Skip to content

Commit 5480ddb

Browse files
committed
#489 move player to bottom in home screen, resize/style systray player
1 parent 6b2540f commit 5480ddb

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

hub/src/main/kotlin/uk/co/sentinelweb/cuer/hub/ui/home/HomeComposeables.kt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,17 @@ fun Home(coordinator: HomeUiCoordinator) {
101101
.background(Color.White)
102102
// .padding(bottom=if (state.value.showPlayer) 100.dp else 0.dp)
103103
) {
104+
Box(modifier = Modifier.weight(1f).fillMaxHeight()) {
105+
when (state.value.route) {
106+
Settings -> PreferencesUi(coordinator.preferencesUiCoordinator)
107+
is Folders -> coordinator.filesUiCoordinator.FileBrowserDesktopUi()
108+
ThemeTest -> SharedThemeView.View()
109+
LocalConfig -> LocalComposables.LocalDesktopUi(coordinator.localCoordinator)
110+
}
111+
}
104112
if (state.value.showPlayer) {
105113
coordinator.playerUiCoordinator?.PlayerDesktopUi()
106114
}
107-
when (state.value.route) {
108-
Settings -> PreferencesUi(coordinator.preferencesUiCoordinator)
109-
is Folders -> coordinator.filesUiCoordinator.FileBrowserDesktopUi()
110-
ThemeTest -> SharedThemeView.View()
111-
LocalConfig -> LocalComposables.LocalDesktopUi(coordinator.localCoordinator)
112-
}
113115
}
114116
}
115117
}

hub/src/main/kotlin/uk/co/sentinelweb/cuer/hub/util/system_tray/ComposePopup.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class ComposePopup : JFrame() {
1414
defaultCloseOperation = HIDE_ON_CLOSE
1515
isAlwaysOnTop = true
1616
setUndecorated(true)
17-
size = Dimension(400, 68)
17+
size = Dimension(580, 100)
1818
layout = BorderLayout()
1919

2020
// Create Compose Panel

hub/src/main/kotlin/uk/co/sentinelweb/cuer/hub/util/system_tray/CustomPopupContent.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package uk.co.sentinelweb.cuer.hub.util.system_tray
33
import androidx.compose.foundation.layout.Box
44
import androidx.compose.foundation.layout.Row
55
import androidx.compose.foundation.layout.padding
6-
import androidx.compose.material.Button
7-
import androidx.compose.material.Text
6+
import androidx.compose.material3.MaterialTheme
7+
import androidx.compose.material3.Text
88
import androidx.compose.runtime.Composable
99
import androidx.compose.runtime.collectAsState
1010
import androidx.compose.ui.Modifier
@@ -26,7 +26,7 @@ object SystemTrayPopup: KoinComponent {
2626
Box(modifier = Modifier.padding(8.dp, bottom=16.dp)) {
2727
homeUiCoordinator.playerUiCoordinator
2828
?.PlayerDesktopUi()
29-
?:Text("Not playing ...")
29+
?:Text("Not playing ...", color = MaterialTheme.colorScheme.onSurface)
3030
}
3131
}
3232
}

shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/player/PlayerComposeables.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,9 @@ object PlayerComposeables : KoinComponent {
9696
} else if (model.playState == BUFFERING) {
9797
CircularProgressIndicator(
9898
color = contentColor,
99+
strokeWidth = 2.dp,
99100
modifier = Modifier.size(buttonSize)
100-
.padding(buttonPadding)
101+
.padding(12.dp)
101102
)
102103
} else if (model.playState == PAUSED) {
103104
IconButton(onClick = {

0 commit comments

Comments
 (0)