@@ -693,11 +693,12 @@ private fun StaleResultsWarningCard(
693693 colors = CardDefaults .cardColors(containerColor = MaterialTheme .colorScheme.tertiaryContainer)
694694 ) {
695695 Column {
696- Box (modifier = Modifier .fillMaxWidth()) {
696+ Row (
697+ modifier = Modifier .padding(start = 16 .dp, top = 8 .dp, end = 4 .dp),
698+ verticalAlignment = Alignment .Top
699+ ) {
697700 Row (
698- modifier = Modifier
699- .padding(start = 16 .dp, end = 16 .dp, top = 16 .dp, bottom = 8 .dp)
700- .fillMaxWidth(),
701+ modifier = Modifier .weight(1f ),
701702 verticalAlignment = Alignment .CenterVertically
702703 ) {
703704 Icon (
@@ -706,7 +707,7 @@ private fun StaleResultsWarningCard(
706707 tint = MaterialTheme .colorScheme.onTertiaryContainer
707708 )
708709 Spacer (Modifier .width(12 .dp))
709- Column (modifier = Modifier .weight( 1f )) {
710+ Column (modifier = Modifier .padding(top = 8 .dp )) {
710711 Text (
711712 text = " Showing results from $formattedDate " ,
712713 fontWeight = FontWeight .Bold ,
@@ -724,10 +725,7 @@ private fun StaleResultsWarningCard(
724725 tooltip = { PlainTooltip { Text (" Dismiss warning" ) } },
725726 state = rememberTooltipState()
726727 ) {
727- IconButton (
728- onClick = onDismiss,
729- modifier = Modifier .align(Alignment .TopEnd )
730- ) {
728+ IconButton (onClick = onDismiss) {
731729 Icon (
732730 imageVector = Icons .Default .Close ,
733731 contentDescription = " Dismiss warning" ,
@@ -763,11 +761,12 @@ private fun UnscannableFilesSummaryCard(
763761 .clickable(onClick = onClick),
764762 colors = CardDefaults .cardColors(containerColor = MaterialTheme .colorScheme.tertiaryContainer)
765763 ) {
766- Box (modifier = Modifier .fillMaxWidth()) {
764+ Row (
765+ modifier = Modifier .padding(start = 16 .dp, top = 16 .dp, bottom = 16 .dp, end = 4 .dp),
766+ verticalAlignment = Alignment .Top
767+ ) {
767768 Row (
768- modifier = Modifier
769- .padding(16 .dp)
770- .fillMaxWidth(),
769+ modifier = Modifier .weight(1f ),
771770 verticalAlignment = Alignment .CenterVertically
772771 ) {
773772 Icon (
@@ -776,7 +775,7 @@ private fun UnscannableFilesSummaryCard(
776775 tint = MaterialTheme .colorScheme.onTertiaryContainer
777776 )
778777 Spacer (Modifier .width(12 .dp))
779- Column (modifier = Modifier .weight( 1f )) {
778+ Column {
780779 Text (
781780 text = " $count files could not be read" ,
782781 fontWeight = FontWeight .Bold ,
@@ -794,10 +793,7 @@ private fun UnscannableFilesSummaryCard(
794793 tooltip = { PlainTooltip { Text (" Dismiss warning" ) } },
795794 state = rememberTooltipState()
796795 ) {
797- IconButton (
798- onClick = onDismiss,
799- modifier = Modifier .align(Alignment .TopEnd )
800- ) {
796+ IconButton (onClick = onDismiss) {
801797 Icon (
802798 imageVector = Icons .Default .Close ,
803799 contentDescription = " Dismiss warning" ,
@@ -1150,14 +1146,13 @@ private fun GridGroupCard(
11501146 modifier = Modifier .padding(horizontal = 6 .dp, vertical = 2 .dp)
11511147 )
11521148 }
1153-
1149+ val (overlayColor, icon) = when (selectionState) {
1150+ SelectionState .ALL -> MaterialTheme .colorScheme.primary.copy(alpha = 0.4f ) to Icons .Filled .CheckCircle
1151+ SelectionState .PARTIAL -> MaterialTheme .colorScheme.secondary.copy(alpha = 0.4f ) to null
1152+ SelectionState .NONE -> Color .Transparent to null
1153+ }
1154+
11541155 if (selectionState != SelectionState .NONE ) {
1155- val (overlayColor, icon) = when (selectionState) {
1156- SelectionState .ALL -> MaterialTheme .colorScheme.primary.copy(alpha = 0.4f ) to Icons .Filled .CheckCircle
1157- SelectionState .PARTIAL -> MaterialTheme .colorScheme.secondary.copy(alpha = 0.4f ) to null
1158- SelectionState .NONE -> Color .Transparent to null
1159- }
1160-
11611156 Box (
11621157 modifier = Modifier
11631158 .fillMaxSize()
0 commit comments