Merge "Fix hub empty state after hub layout changes" into main (dfd5dab1) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt

+80 −47

Original line number	Diff line number	Diff line
		@@ -1127,6 +1127,7 @@ private fun BoxScope.CommunalHubLazyGrid(
		@Composable
		private fun EmptyStateCta(contentPadding: PaddingValues, viewModel: BaseCommunalViewModel) {
		val colors = MaterialTheme.colorScheme
		Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
		Card(
		modifier = Modifier.height(hubDimensions.GridHeight).padding(contentPadding),
		colors =
		@@ -1137,12 +1138,23 @@ private fun EmptyStateCta(contentPadding: PaddingValues, viewModel: BaseCommunal
		shape = RoundedCornerShape(size = 80.adjustedDp),
		) {
		Column(
		modifier = Modifier.fillMaxSize().padding(horizontal = 110.adjustedDp),
		verticalArrangement =
		Arrangement.spacedBy(Dimensions.Spacing, Alignment.CenterVertically),
		modifier =
		Modifier.fillMaxSize().padding(horizontal = hubDimensions.emptyStatePadding),
		verticalArrangement = Arrangement.aligned(Alignment.CenterVertically),
		horizontalAlignment = Alignment.CenterHorizontally,
		) {
		val titleForEmptyStateCTA = stringResource(R.string.title_for_empty_state_cta)
		val windowSizeCategory = WindowSizeUtils.getWindowSizeCategory(LocalContext.current)
		// On larger screens, allow the text and button to cluster together near the center.
		// On smaller screens, push the button to the bottom of the card for a nicer
		// appearance.
		val modifier =
		if (windowSizeCategory == WindowSizeUtils.WindowSizeCategory.MOBILE_PORTRAIT) {
		Modifier.weight(1f).fillMaxSize()
		} else {
		Modifier
		}
		Box(modifier = modifier, contentAlignment = Alignment.Center) {
		BasicText(
		text = titleForEmptyStateCTA,
		style =
		@@ -1157,8 +1169,13 @@ private fun EmptyStateCta(contentPadding: PaddingValues, viewModel: BaseCommunal
		heading()
		},
		)
		}

		Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center) {
		Row(
		modifier =
		Modifier.fillMaxWidth().wrapContentHeight().padding(vertical = 24.dp),
		horizontalArrangement = Arrangement.Center,
		) {
		Button(
		modifier = Modifier.height(56.dp),
		colors =
		@@ -1166,7 +1183,9 @@ private fun EmptyStateCta(contentPadding: PaddingValues, viewModel: BaseCommunal
		containerColor = colors.primaryContainer,
		contentColor = colors.onPrimaryContainer,
		),
		onClick = { viewModel.onOpenWidgetEditor(shouldOpenWidgetPickerOnStart = true) },
		onClick = {
		viewModel.onOpenWidgetEditor(shouldOpenWidgetPickerOnStart = true)
		},
		) {
		Icon(
		imageVector = Icons.Default.Add,
		@@ -1183,6 +1202,7 @@ private fun EmptyStateCta(contentPadding: PaddingValues, viewModel: BaseCommunal
		}
		}
		}
		}

		/**
		* Toolbar that contains action buttons to
		@@ -2182,6 +2202,19 @@ class Dimensions(val context: Context, val config: Configuration) {
		}
		}

		val emptyStatePadding: Dp
		get() {
		return if (
		WindowSizeUtils.getWindowSizeCategory(context) == WindowSizeUtils.WindowSizeCategory.MOBILE_PORTRAIT
		) {
		24.adjustedDp
		} else {
		// Use more padding on large displays to cluster the text near the middle of the
		// screen for readability.
		110.adjustedDp
		}
		}

		companion object {
		val CardHeightFull
		get() = 530.adjustedDp