Merge pull request #597 from namehillsoftware/bugfix/menu-clipping

[Bugfix] Menu Clipping

Author: davidvedvick

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/files/details/FileDetailsView.kt

@@ -58,6 +58,7 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalDensity
@@ -567,8 +568,9 @@ private fun FileDetailsSingleColumn(
 		min = LocalDensity.current.run { collapsedHeight.toPx() },
 		max = boxHeightPx
 	)
+	val maxMenuHeightPx = LocalDensity.current.remember { maxMenuHeight.toPx() }
 	val menuHeightScaler = rememberDeferredPreScrollConnectedScaler(
-		LocalDensity.current.remember { maxMenuHeight.toPx() },
+		maxMenuHeightPx,
 		0f
 	)
 	val compositeScrollConnection = remember(heightScaler, menuHeightScaler) {
@@ -753,7 +755,11 @@ private fun FileDetailsSingleColumn(
 					contentAlignment = Alignment.BottomStart
 				) {
 					ListMenuRow(
-						modifier = Modifier.requiredHeight(menuHeight)
+						modifier = Modifier
+							.graphicsLayer {
+								translationY = (menuHeightPx - maxMenuHeightPx) * 0.5f
+							}
+							.requiredHeight(menuHeight)
 					) {
 						menuIcons()
 					}

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/files/list/search/SearchFilesView.kt

@@ -48,6 +48,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.input.InputMode
 import androidx.compose.ui.input.nestedscroll.nestedScroll
@@ -209,8 +210,9 @@ private fun SearchFilesMenu(
 	searchFilesViewModel: SearchFilesViewModel,
 	applicationNavigation: NavigateApplication,
 	playbackServiceController: ControlPlaybackService,
+	modifier: Modifier = Modifier,
 ) {
-	ListMenuRow(modifier = Modifier.fillMaxWidth()) {
+	ListMenuRow(modifier = Modifier.fillMaxWidth().then(modifier)) {
 		val modifier = Modifier.requiredWidth(topMenuIconWidth)
 		val files by searchFilesViewModel.files.subscribeAsState()
 		val isFileControlsEnabled = files.any()
@@ -464,6 +466,9 @@ private fun SearchFilesList(
 						searchFilesViewModel,
 						applicationNavigation,
 						playbackServiceController,
+						modifier = Modifier.graphicsLayer {
+							translationY = (menuHeightValue - rowHeightPx) * 0.5f
+						}
 					)
 				}
 

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/browsing/items/list/ItemListView.kt

@@ -1,6 +1,5 @@
 package com.lasthopesoftware.bluewater.client.browsing.items.list
 
-import android.annotation.SuppressLint
 import android.util.Log
 import androidx.compose.foundation.background
 import androidx.compose.foundation.focusGroup
@@ -47,6 +46,7 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusProperties
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.input.InputMode
 import androidx.compose.ui.input.nestedscroll.nestedScroll
@@ -603,7 +603,6 @@ fun ItemListView(
 	}
 }
 
-@SuppressLint("UnusedBoxWithConstraintsScope")
 @OptIn(ExperimentalCoroutinesApi::class)
 @Composable
 fun ScreenDimensionsScope.ItemListView(
@@ -873,6 +872,9 @@ fun ScreenDimensionsScope.ItemListView(
 								applicationNavigation = applicationNavigation,
 								playbackServiceController = playbackServiceController,
 								modifier = Modifier
+									.graphicsLayer {
+										translationY = (menuHeightValue - topMenuHeightPx) * 0.5f
+									}
 									.focusProperties {
 										down = listFocus
 									}

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/settings/LibrarySettingsView.kt

@@ -38,6 +38,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.painterResource
@@ -1025,6 +1026,9 @@ fun ScreenDimensionsScope.LibrarySettingsView(
 					stringResources = stringResources,
 					onChangeServerTypeClick = { isSelectingServerType = true },
 					modifier = Modifier
+						.graphicsLayer {
+							translationY = (menuHeightPx - topMenuHeightPx) * 0.5f
+						}
 						.fillMaxWidth()
 						.height(menuHeightDp)
 						.clipToBounds()

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/client/stored/library/items/files/view/ActiveFileDownloadsView.kt

@@ -93,9 +93,10 @@ private val boxHeight = expandedTitleHeight + appBarHeight
 @Composable
 private fun SyncMenu(
 	activeFileDownloadsViewModel: ActiveFileDownloadsViewModel,
+	modifier: Modifier = Modifier,
 ) {
 	ListMenuRow(
-		modifier = Modifier.fillMaxWidth()
+		modifier = Modifier.fillMaxWidth().then(modifier)
 	) {
 		val isSyncing by activeFileDownloadsViewModel.isSyncing.subscribeAsState()
 		val label = stringResource(
@@ -351,7 +352,13 @@ fun ScreenDimensionsScope.ActiveFileDownloadsView(
 								.height(menuHeightValueDp)
 								.clipToBounds()
 						) {
-							SyncMenu(activeFileDownloadsViewModel)
+							SyncMenu(
+								activeFileDownloadsViewModel,
+								modifier = Modifier
+									.graphicsLayer {
+										translationY = (menuHeightValue - topMenuHeightPx) * 0.5f
+									}
+							)
 						}
 					}
 				}

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/settings/ApplicationSettingsView.kt

@@ -49,6 +49,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.layout.onPlaced
 import androidx.compose.ui.layout.positionInParent
@@ -176,7 +177,9 @@ fun ThemeSettingsSection(
 		modifier = Modifier.fillMaxWidth(),
 	) {
 		Row(
-			modifier = standardRowModifier.padding(horizontal = horizontalOptionsPadding).selectableGroup(),
+			modifier = standardRowModifier
+				.padding(horizontal = horizontalOptionsPadding)
+				.selectableGroup(),
 			horizontalArrangement = Arrangement.SpaceEvenly,
 		) {
 			val isLoading by applicationSettingsViewModel.isLoading.subscribeAsState()
@@ -482,12 +485,10 @@ private fun ApplicationSettingsViewVertical(
 			}
 		}
 
-		val menuHeightDp by LocalDensity.current.remember(menuScaler) { derivedStateOf { menuScaler.valueState.floatValue.toDp() } }
+		val menuHeightPx by LocalDensity.current.remember(menuScaler) { menuScaler.valueState }
+		val menuHeightDp by LocalDensity.current.remember { derivedStateOf { menuHeightPx.toDp() } }
 		val paddingDp by LocalDensity.current.remember(paddingScaler) { derivedStateOf { paddingScaler.valueState.value.toDp() } }
-		Column(
-			modifier = Modifier
-				.padding(top = paddingDp)
-		) {
+		Column(modifier = Modifier.padding(top = paddingDp)) {
 			Row(
 				modifier = Modifier
 					.fillMaxWidth()
@@ -499,19 +500,26 @@ private fun ApplicationSettingsViewVertical(
 				}
 			}
 
-			ApplicationSettingsMenu(
-				applicationSettingsViewModel,
-				applicationNavigation = applicationNavigation,
-				selectedLibraryId = selectedLibraryId,
+			Box(
 				modifier = Modifier
 					.fillMaxWidth()
 					.height(menuHeightDp)
 					.background(MaterialTheme.colors.surface)
-					.clipToBounds(),
-				onTabChange = {
-					scrollConnection.goToMax()
-				}
-			)
+					.clipToBounds()
+			) {
+				ApplicationSettingsMenu(
+					applicationSettingsViewModel,
+					applicationNavigation = applicationNavigation,
+					selectedLibraryId = selectedLibraryId,
+					modifier = Modifier
+						.graphicsLayer {
+							translationY = (menuHeightPx - expandedMenuHeightPx) * 0.5f
+						},
+					onTabChange = {
+						scrollConnection.goToMax()
+					}
+				)
+			}
 		}
 	}
 }