Skip to content

Use column layout with consistent rounded cards #371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -7,15 +7,16 @@ import android.util.Log
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.ui.Alignment
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
Expand Down Expand Up @@ -384,7 +385,7 @@ fun ScannerDashboardScreen(
}
is HomeItem.Ad -> {
val config = chooseAdsConfigFor(item.slot, visibleCount, promotedApp != null)
AdBanner(adsConfig = config)
AdBanner(modifier = Modifier.fillMaxWidth(), adsConfig = config)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedCard
Expand All @@ -25,6 +24,8 @@ import androidx.constraintlayout.compose.ConstraintLayout
import com.d4rk.android.libs.apptoolkit.core.ui.components.buttons.TonalIconButtonWithText
import com.d4rk.android.libs.apptoolkit.core.ui.components.modifiers.bounceClick
import com.d4rk.android.libs.apptoolkit.core.utils.constants.ui.SizeConstants
import com.d4rk.cleaner.app.core.ui.theme.GroupedGridStyle
import androidx.compose.foundation.shape.RoundedCornerShape

@Composable
fun DashboardActionCard(
Expand All @@ -44,7 +45,7 @@ fun DashboardActionCard(
) {
OutlinedCard(
modifier = modifier.fillMaxWidth(),
shape = RoundedCornerShape(SizeConstants.ExtraLargeSize),
shape = GroupedGridStyle.cardShape,
) {
Column {
Column(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Recommend
import androidx.compose.material.icons.outlined.Shop
Expand All @@ -29,13 +28,14 @@ import com.d4rk.android.libs.apptoolkit.core.utils.constants.ui.SizeConstants
import com.d4rk.android.libs.apptoolkit.core.utils.helpers.IntentsHelper
import com.d4rk.cleaner.R
import com.d4rk.cleaner.app.clean.scanner.domain.data.model.ui.PromotedApp
import com.d4rk.cleaner.app.core.ui.theme.GroupedGridStyle

@Composable
fun PromotedAppCard(app: PromotedApp, modifier: Modifier = Modifier) {
val context = LocalContext.current
OutlinedCard(
modifier = modifier.fillMaxWidth(),
shape = RoundedCornerShape(SizeConstants.ExtraLargeSize)
shape = GroupedGridStyle.cardShape
) {
Column(
modifier = Modifier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.CleaningServices
import androidx.compose.material.icons.outlined.DiscFull
Expand Down Expand Up @@ -39,6 +38,7 @@ import com.d4rk.android.libs.apptoolkit.core.ui.components.spacers.SmallVertical
import com.d4rk.android.libs.apptoolkit.core.utils.constants.ui.SizeConstants
import com.d4rk.cleaner.R
import com.d4rk.cleaner.app.notifications.notifications.CleanerMessageProvider
import com.d4rk.cleaner.app.core.ui.theme.GroupedGridStyle

@Composable
fun QuickScanSummaryCard(
Expand Down Expand Up @@ -70,7 +70,7 @@ fun QuickScanSummaryCard(

OutlinedCard(
modifier = modifier.fillMaxWidth(),
shape = RoundedCornerShape(size = SizeConstants.ExtraLargeSize),
shape = GroupedGridStyle.cardShape,
) {
Row(
modifier = Modifier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import com.d4rk.android.libs.apptoolkit.core.ui.components.buttons.IconButton
import com.d4rk.android.libs.apptoolkit.core.ui.components.spacers.MediumVerticalSpacer
import com.d4rk.android.libs.apptoolkit.core.utils.constants.ui.SizeConstants
import com.d4rk.cleaner.R
import com.d4rk.cleaner.app.core.ui.theme.GroupedGridStyle

@Composable
fun WeeklyCleanStreakCard(
Expand All @@ -53,7 +54,7 @@ fun WeeklyCleanStreakCard(

OutlinedCard(
modifier = modifier.fillMaxWidth(),
shape = RoundedCornerShape(SizeConstants.ExtraLargeSize),
shape = GroupedGridStyle.cardShape,
) {
Column(
modifier = Modifier
Expand Down