admin.suherdy/odoo_loyalty_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: update UI components to use theme-based tertiary color scheme for consistent branding

Browse Source
This commit is contained in:
Suherdy Yacob 2026-06-15 19:01:25 +07:00
parent f1a08d6396
commit c680dd1c31
3 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/screens/branches_screen.dart
View File

@ -332,14 +332,14 @@ class _BranchesScreenState extends State<BranchesScreen> {
Icon( Icon(
Icons.near_me_rounded, Icons.near_me_rounded,
size: 14, size: 14,
color: colorScheme.primary, color: colorScheme.tertiary,
), ),
const SizedBox(width: 4), const SizedBox(width: 4),
Text( Text(
'$distanceLabel away', '$distanceLabel away',
style: theme.textTheme.bodyMedium style: theme.textTheme.bodyMedium
?.copyWith( ?.copyWith(
color: colorScheme.primary, color: colorScheme.tertiary,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),

28
lib/screens/orders_screen.dart
View File

@ -159,15 +159,17 @@ class _OrdersScreenState extends State<OrdersScreen> {
leading: Container( leading: Container(
padding: const EdgeInsets.all(10), padding: const EdgeInsets.all(10),
decoration: BoxDecoration( decoration: BoxDecoration(
color: (isEarn color: (isEarn
? const Color(0xFF2E7D32) ? theme.colorScheme.tertiary
: const Color(0xFFC62828)) : theme.colorScheme.error)
.withValues(alpha: 0.1), .withValues(alpha: 0.1),
shape: BoxShape.circle, shape: BoxShape.circle,
), ),
child: Icon( child: Icon(
isEarn ? Icons.add_card_rounded : Icons.payment_rounded, isEarn ? Icons.add_card_rounded : Icons.payment_rounded,
color: isEarn ? const Color(0xFF2E7D32) : const Color(0xFFC62828), color: isEarn
? theme.colorScheme.tertiary
: theme.colorScheme.error,
size: 24, size: 24,
), ),
), ),
@ -189,14 +191,14 @@ class _OrdersScreenState extends State<OrdersScreen> {
Icon( Icon(
Icons.storefront_rounded, Icons.storefront_rounded,
size: 14, size: 14,
color: theme.colorScheme.primary, color: theme.colorScheme.tertiary,
), ),
const SizedBox(width: 4), const SizedBox(width: 4),
Text( Text(
posName, posName,
style: theme.textTheme.bodySmall?.copyWith( style: theme.textTheme.bodySmall?.copyWith(
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: theme.colorScheme.primary, color: theme.colorScheme.tertiary,
), ),
), ),
], ],
@ -214,12 +216,12 @@ class _OrdersScreenState extends State<OrdersScreen> {
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3), padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
decoration: BoxDecoration( decoration: BoxDecoration(
color: isSubscription color: isSubscription
? const Color(0xFF1B5E20).withValues(alpha: 0.08) ? theme.colorScheme.tertiary.withValues(alpha: 0.08)
: theme.colorScheme.primary.withValues(alpha: 0.08), : theme.colorScheme.primary.withValues(alpha: 0.08),
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
border: Border.all( border: Border.all(
color: isSubscription color: isSubscription
? const Color(0xFF1B5E20).withValues(alpha: 0.2) ? theme.colorScheme.tertiary.withValues(alpha: 0.2)
: theme.colorScheme.primary.withValues(alpha: 0.2), : theme.colorScheme.primary.withValues(alpha: 0.2),
width: 0.5, width: 0.5,
), ),
@ -233,7 +235,7 @@ class _OrdersScreenState extends State<OrdersScreen> {
: Icons.card_membership_rounded, : Icons.card_membership_rounded,
size: 10, size: 10,
color: isSubscription color: isSubscription
? const Color(0xFF2E7D32) ? theme.colorScheme.tertiary
: theme.colorScheme.primary, : theme.colorScheme.primary,
), ),
const SizedBox(width: 4), const SizedBox(width: 4),
@ -248,7 +250,7 @@ class _OrdersScreenState extends State<OrdersScreen> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
letterSpacing: 0.5, letterSpacing: 0.5,
color: isSubscription color: isSubscription
? const Color(0xFF2E7D32) ? theme.colorScheme.tertiary
: theme.colorScheme.primary, : theme.colorScheme.primary,
), ),
), ),
@ -262,7 +264,9 @@ class _OrdersScreenState extends State<OrdersScreen> {
'${isEarn ? '+' : ''}${item['points']} pts', '${isEarn ? '+' : ''}${item['points']} pts',
style: theme.textTheme.titleMedium?.copyWith( style: theme.textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: isEarn ? const Color(0xFF2E7D32) : const Color(0xFFC62828), color: isEarn
? theme.colorScheme.tertiary
: theme.colorScheme.error,
fontSize: 16, fontSize: 16,
), ),
), ),

13
lib/widgets/subscription_list_widget.dart
View File

@ -122,19 +122,18 @@ class _SubscriptionCard extends StatelessWidget {
Row( Row(
children: [ children: [
Icon( Icon(
Icons Icons.local_activity_rounded,
.local_activity_rounded, // Distinct ticket pass icon
size: 18, size: 18,
color: active color: active
? colorScheme.primary ? colorScheme.tertiary
: colorScheme.outline, : colorScheme.outline,
), ),
const SizedBox(width: 8), const SizedBox(width: 8),
Text( Text(
'SUBSCRIPTION PASS', // Distinct title 'SUBSCRIPTION PASS',
style: theme.textTheme.labelLarge?.copyWith( style: theme.textTheme.labelLarge?.copyWith(
color: active color: active
? colorScheme.primary ? colorScheme.tertiary
: colorScheme.outline, : colorScheme.outline,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 10, fontSize: 10,
@ -150,7 +149,7 @@ class _SubscriptionCard extends StatelessWidget {
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: active color: active
? const Color(0xFF1B5E20).withValues(alpha: 0.10) ? colorScheme.tertiary.withValues(alpha: 0.10)
: const Color(0xFFB02500).withValues(alpha: 0.08), : const Color(0xFFB02500).withValues(alpha: 0.08),
borderRadius: BorderRadius.circular(20), borderRadius: BorderRadius.circular(20),
), ),
@ -161,7 +160,7 @@ class _SubscriptionCard extends StatelessWidget {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
letterSpacing: 0.8, letterSpacing: 0.8,
color: active color: active
? const Color(0xFF2E7D32) ? colorScheme.tertiary
: const Color(0xFFB02500), : const Color(0xFFB02500),
), ),
), ),