Skip to content
Merged
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
2 changes: 2 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ android {

dependencies {
implementation(project(":core:ui"))
implementation(project(":core:feature:feature-product"))
implementation(project(":core:feature:feature-cart"))
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.activity.compose)
implementation(platform(libs.androidx.compose.bom))
Expand Down
27 changes: 23 additions & 4 deletions app/src/main/java/com/sa/commercex/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@ import androidx.activity.enableEdgeToEdge
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.runtime.*
import androidx.compose.ui.Modifier
import com.sa.core.ui.preview.HomeScreenMockup
import com.sa.feature.cart.ui.CartScreenMockup
import com.sa.feature.product.ui.HomeScreenMockup
import com.sa.feature.product.ui.ProductDetailMockup
import com.sa.core.ui.theme.CommerceXTheme

/**
Expand All @@ -24,15 +27,31 @@ class MainActivity : ComponentActivity() {

setContent {
CommerceXTheme {
var showProductDetail by remember { mutableStateOf(false) }
var showCart by remember { mutableStateOf(false) }

Surface(
modifier = Modifier.fillMaxSize(),
color = MaterialTheme.colorScheme.background
) {
// Display Home Screen Mockup
HomeScreenMockup()
when {
showCart -> {
CartScreenMockup()
}
showProductDetail -> {
ProductDetailMockup(
onBackClick = { showProductDetail = false }
)
}
else -> {
HomeScreenMockup(
onProductClick = { showProductDetail = true },
onCartClick = { showCart = true }
)
}
}
}
}
}
}
}

56 changes: 56 additions & 0 deletions core/feature/feature-cart/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.compose)
}

android {
namespace = "com.sa.feature.cart"
compileSdk {
version = release(36)
}

defaultConfig {
minSdk = 28
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
release {
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
buildFeatures {
compose = true
}
}

dependencies {
implementation(project(":core:ui"))
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.lifecycle.runtime.ktx)
implementation(libs.androidx.activity.compose)
implementation(platform(libs.androidx.compose.bom))
implementation(libs.androidx.compose.ui)
implementation(libs.androidx.compose.ui.graphics)
implementation(libs.androidx.compose.ui.tooling.preview)
implementation(libs.androidx.compose.material3)
implementation(libs.androidx.compose.material.icons.extended)
implementation(libs.androidx.compose.animation.core)
implementation(libs.coil.compose)
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
androidTestImplementation(platform(libs.androidx.compose.bom))
androidTestImplementation(libs.androidx.compose.ui.test.junit4)
debugImplementation(libs.androidx.compose.ui.tooling)
debugImplementation(libs.androidx.compose.ui.test.manifest)
}

1 change: 1 addition & 0 deletions core/feature/feature-cart/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<manifest />
Original file line number Diff line number Diff line change
@@ -0,0 +1,218 @@
package com.sa.feature.cart.ui

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ShoppingCart
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.sa.core.ui.component.CartItemCard
import com.sa.core.ui.component.OrderSummary
import com.sa.core.ui.component.PrimaryButton
import com.sa.core.ui.component.SimpleTopAppBar
import com.sa.core.ui.theme.*

/**
* Cart Screen Mockup
*
* US-0.5: Screen Mockups - Shopping Cart
*/
@Preview(
name = "Cart Screen - Items",
showBackground = true,
widthDp = 448,
heightDp = 900
)
@Composable
fun CartScreenPreview() {
CommerceXTheme {
CartScreenMockup()
}
}

@Preview(
name = "Cart Screen - Empty",
showBackground = true,
widthDp = 448,
heightDp = 900
)
@Composable
fun CartScreenEmptyPreview() {
CommerceXTheme {
CartScreenEmptyMockup()
}
}

@Composable
fun CartScreenMockup(
onBackClick: () -> Unit = {}
) {
val cartItems = remember {
listOf(
CartMockItem("iPhone 9", 549.0, 1),
CartMockItem("MacBook Pro", 1749.0, 1),
CartMockItem("Brown Perfume", 40.0, 2)
)
}

Box(
modifier = Modifier
.fillMaxSize()
.background(BackgroundColor)
.windowInsetsPadding(WindowInsets.systemBars)
) {
Column(
modifier = Modifier
.fillMaxSize()
.verticalScroll(rememberScrollState())
.padding(horizontal = Spacing.lg)
.padding(bottom = 140.dp)
) {
SimpleTopAppBar(
title = "My Cart",
onBackClick = onBackClick,
actions = {
TextButton(onClick = { /* Clear all */ }) {
Text(
text = "Clear All",
color = SaleColor,
style = MaterialTheme.typography.labelLarge,
fontWeight = FontWeight.SemiBold
)
}
}
)

Spacer(modifier = Modifier.height(Spacing.lg))

Column(verticalArrangement = Arrangement.spacedBy(Spacing.md)) {
cartItems.forEach { item ->
CartItemCard(
imageUrl = "https://cdn.dummyjson.com/products/1/thumbnail.jpg",
title = item.title,
price = item.price,
quantity = item.quantity,
onQuantityChange = { /* Quantity change */ },
onDeleteClick = { /* Delete */ }
)
}
}
}

CartSummaryBar(
subtotal = cartItems.sumOf { it.price * it.quantity },
modifier = Modifier
.align(Alignment.BottomCenter)
.navigationBarsPadding()
)
}
}

@Composable
fun CartScreenEmptyMockup() {
Box(
modifier = Modifier
.fillMaxSize()
.background(BackgroundColor)
.windowInsetsPadding(WindowInsets.systemBars)
) {
Column(
modifier = Modifier
.fillMaxSize()
.padding(horizontal = Spacing.lg),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center
) {
Box(
modifier = Modifier
.size(120.dp)
.clip(CircleShape)
.background(SurfaceVariant),
contentAlignment = Alignment.Center
) {
Icon(
imageVector = Icons.Filled.ShoppingCart,
contentDescription = "Empty cart",
tint = TextSecondaryColor,
modifier = Modifier.size(48.dp)
)
}

Spacer(modifier = Modifier.height(Spacing.lg))

Text(
text = "Your cart is empty",
style = MaterialTheme.typography.titleLarge,
color = TextPrimaryColor,
fontWeight = FontWeight.Bold
)

Spacer(modifier = Modifier.height(Spacing.sm))

Text(
text = "Looks like you have not added anything yet.",
style = MaterialTheme.typography.bodyMedium,
color = TextSecondaryColor,
textAlign = TextAlign.Center
)

Spacer(modifier = Modifier.height(Spacing.lg))

PrimaryButton(
text = "Start Shopping",
onClick = { /* Navigate to home */ }
)
}
}
}

@Composable
private fun CartSummaryBar(
subtotal: Double,
modifier: Modifier = Modifier
) {
Surface(
modifier = modifier.fillMaxWidth(),
color = SurfaceColor,
tonalElevation = CommerceXElevation.level3,
shadowElevation = CommerceXElevation.level3
) {
Column(
modifier = Modifier
.fillMaxWidth()
.padding(Spacing.lg),
verticalArrangement = Arrangement.spacedBy(Spacing.md)
) {
OrderSummary(subtotal = subtotal)

PrimaryButton(
text = "Proceed to Checkout",
onClick = { /* Checkout action */ },
modifier = Modifier.fillMaxWidth()
)
}
}
}

private data class CartMockItem(
val title: String,
val price: Double,
val quantity: Int
)

56 changes: 56 additions & 0 deletions core/feature/feature-product/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.compose)
}

android {
namespace = "com.sa.feature.product"
compileSdk {
version = release(36)
}

defaultConfig {
minSdk = 28
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
release {
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
buildFeatures {
compose = true
}
}

dependencies {
implementation(project(":core:ui"))
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.lifecycle.runtime.ktx)
implementation(libs.androidx.activity.compose)
implementation(platform(libs.androidx.compose.bom))
implementation(libs.androidx.compose.ui)
implementation(libs.androidx.compose.ui.graphics)
implementation(libs.androidx.compose.ui.tooling.preview)
implementation(libs.androidx.compose.material3)
implementation(libs.androidx.compose.material.icons.extended)
implementation(libs.androidx.compose.animation.core)
implementation(libs.coil.compose)
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
androidTestImplementation(platform(libs.androidx.compose.bom))
androidTestImplementation(libs.androidx.compose.ui.test.junit4)
debugImplementation(libs.androidx.compose.ui.tooling)
debugImplementation(libs.androidx.compose.ui.test.manifest)
}

2 changes: 2 additions & 0 deletions core/feature/feature-product/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<manifest />

Loading