feat: homepage theme (#1452)

espresso-cash · May 30, 2024 · 1fcba88 · 1fcba88
1 parent b920d79
commit 1fcba88
Show file tree

Hide file tree

Showing 20 changed files with 195 additions and 131 deletions.
diff --git a/packages/espressocash_app/lib/features/activities/widgets/activity_tile.dart b/packages/espressocash_app/lib/features/activities/widgets/activity_tile.dart
@@ -15,6 +15,7 @@ class CpActivityTile extends StatelessWidget {
     this.incomingAmount,
     this.outgoingAmount,
     this.onTap,
+    this.showIcon = true,
   });
 
   final String title;
@@ -24,6 +25,7 @@ class CpActivityTile extends StatelessWidget {
   final String? incomingAmount;
   final String? outgoingAmount;
   final VoidCallback? onTap;
+  final bool showIcon;
 
   @override
   Widget build(BuildContext context) {
@@ -33,7 +35,12 @@ class CpActivityTile extends StatelessWidget {
     return ListTile(
       onTap: onTap,
       contentPadding: const EdgeInsets.symmetric(vertical: 4, horizontal: 16),
-      leading: SizedBox.square(dimension: 42, child: icon),
+      leading: showIcon
+          ? SizedBox.square(
+              dimension: 42,
+              child: icon,
+            )
+          : null,
       title: Row(
         children: [
           Expanded(
@@ -69,7 +76,6 @@ class CpActivityTile extends StatelessWidget {
 const _titleStyle = TextStyle(
   fontSize: 16,
   letterSpacing: .23,
-  color: CpColors.menuPrimaryTextColor,
   fontWeight: FontWeight.w600,
 );
 
@@ -82,7 +88,6 @@ const _inAmountStyle = TextStyle(
 
 const _subtitleStyle = TextStyle(
   fontSize: 14,
-  color: CpColors.menuPrimaryTextColor,
   letterSpacing: .19,
 );
 

diff --git a/packages/espressocash_app/lib/features/activities/widgets/common_tile.dart b/packages/espressocash_app/lib/features/activities/widgets/common_tile.dart
@@ -14,9 +14,11 @@ class CommonTile extends StatelessWidget {
   const CommonTile({
     super.key,
     required this.txCommon,
+    required this.showIcon,
   });
 
   final TxCommon txCommon;
+  final bool showIcon;
 
   @override
   Widget build(BuildContext context) {
@@ -43,6 +45,7 @@ class CommonTile extends StatelessWidget {
         final link = Uri.parse(createTransactionLink(signature));
         context.openLink(link.toString());
       },
+      showIcon: showIcon,
     );
   }
 }
diff --git a/packages/espressocash_app/lib/features/activities/widgets/odp_tile.dart b/packages/espressocash_app/lib/features/activities/widgets/odp_tile.dart
@@ -11,9 +11,14 @@ import '../models/activity.dart';
 import 'activity_tile.dart';
 
 class ODPTile extends StatelessWidget {
-  const ODPTile({super.key, required this.activity});
+  const ODPTile({
+    super.key,
+    required this.activity,
+    this.showIcon = true,
+  });
 
   final ODPActivity activity;
+  final bool showIcon;
 
   @override
   Widget build(BuildContext context) => CpActivityTile(
@@ -29,5 +34,6 @@ class ODPTile extends StatelessWidget {
           txFailure: always(CpActivityTileStatus.failure),
         ),
         onTap: () => ODPDetailsScreen.push(context, id: activity.id),
+        showIcon: showIcon,
       );
 }
diff --git a/packages/espressocash_app/lib/features/activities/widgets/off_ramp_tile.dart b/packages/espressocash_app/lib/features/activities/widgets/off_ramp_tile.dart
@@ -12,9 +12,14 @@ import '../models/activity.dart';
 import 'activity_tile.dart';
 
 class OffRampTile extends StatelessWidget {
-  const OffRampTile({super.key, required this.activity});
+  const OffRampTile({
+    super.key,
+    required this.activity,
+    this.showIcon = true,
+  });
 
   final OffRampActivity activity;
+  final bool showIcon;
 
   @override
   Widget build(BuildContext context) => OffRampOrderDetails(
@@ -33,6 +38,7 @@ class OffRampTile extends StatelessWidget {
                   : CpActivityTileStatus.inProgress,
           timestamp: context.formatDate(activity.created),
           onTap: () => OffRampOrderScreen.push(context, id: activity.id),
+          showIcon: showIcon,
         ),
       );
 }
diff --git a/packages/espressocash_app/lib/features/activities/widgets/olp_tile.dart b/packages/espressocash_app/lib/features/activities/widgets/olp_tile.dart
@@ -11,9 +11,14 @@ import '../models/activity.dart';
 import 'activity_tile.dart';
 
 class OLPTile extends StatelessWidget {
-  const OLPTile({super.key, required this.activity});
+  const OLPTile({
+    super.key,
+    required this.activity,
+    this.showIcon = true,
+  });
 
   final OLPActivity activity;
+  final bool showIcon;
 
   @override
   Widget build(BuildContext context) => CpActivityTile(
@@ -29,5 +34,6 @@ class OLPTile extends StatelessWidget {
           orElse: always(CpActivityTileStatus.inProgress),
         ),
         onTap: () => OLPScreen.push(context, id: activity.id),
+        showIcon: showIcon,
       );
 }
diff --git a/packages/espressocash_app/lib/features/activities/widgets/on_ramp_tile.dart b/packages/espressocash_app/lib/features/activities/widgets/on_ramp_tile.dart
@@ -12,9 +12,14 @@ import '../models/activity.dart';
 import 'activity_tile.dart';
 
 class OnRampTile extends StatelessWidget {
-  const OnRampTile({super.key, required this.activity});
+  const OnRampTile({
+    super.key,
+    required this.activity,
+    this.showIcon = true,
+  });
 
   final OnRampActivity activity;
+  final bool showIcon;
 
   @override
   Widget build(BuildContext context) => OnRampOrderDetails(
@@ -38,6 +43,7 @@ class OnRampTile extends StatelessWidget {
             maxDecimals: 2,
           ),
           onTap: () => OnRampOrderScreen.push(context, id: order?.id ?? ''),
+          showIcon: showIcon,
         ),
       );
 }
diff --git a/packages/espressocash_app/lib/features/activities/widgets/outgoing_dln_tile.dart b/packages/espressocash_app/lib/features/activities/widgets/outgoing_dln_tile.dart
@@ -11,9 +11,14 @@ import '../models/activity.dart';
 import 'activity_tile.dart';
 
 class OutgoingDlnTile extends StatelessWidget {
-  const OutgoingDlnTile({super.key, required this.activity});
+  const OutgoingDlnTile({
+    super.key,
+    required this.activity,
+    this.showIcon = true,
+  });
 
   final OutgoingDlnPaymentActivity activity;
+  final bool showIcon;
 
   @override
   Widget build(BuildContext context) => CpActivityTile(
@@ -32,5 +37,6 @@ class OutgoingDlnTile extends StatelessWidget {
         ),
         onTap: () =>
             OutgoingDlnPaymentDetailsScreen.push(context, id: activity.id),
+        showIcon: showIcon,
       );
 }
diff --git a/packages/espressocash_app/lib/features/activities/widgets/payment_request_tile.dart b/packages/espressocash_app/lib/features/activities/widgets/payment_request_tile.dart
@@ -14,9 +14,11 @@ class PaymentRequestTile extends StatefulWidget {
   const PaymentRequestTile({
     super.key,
     required this.id,
+    this.showIcon = true,
   });
 
   final String id;
+  final bool showIcon;
 
   @override
   State<PaymentRequestTile> createState() => _PaymentRequestTileState();
@@ -54,6 +56,7 @@ class _PaymentRequestTileState extends State<PaymentRequestTile> {
                     PaymentRequestState.error => CpActivityTileStatus.failure,
                   },
                   onTap: () => PaymentRequestScreen.push(context, id: data.id),
+                  showIcon: widget.showIcon,
                 );
         },
       );

diff --git a/packages/espressocash_app/lib/features/activities/widgets/recent_activity.dart b/packages/espressocash_app/lib/features/activities/widgets/recent_activity.dart
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart' hide Notification;
 import '../../../di.dart';
 import '../../../l10n/l10n.dart';
 import '../../../ui/button.dart';
+import '../../../ui/colors.dart';
 import '../../../ui/home_tile.dart';
 import '../../../ui/theme.dart';
 import '../data/transaction_repository.dart';
@@ -45,7 +46,7 @@ class _RecentActivityWidgetState extends State<RecentActivityWidget> {
           if (data == null) return const SizedBox.shrink();
 
           return HomeTile(
-            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 32),
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               mainAxisSize: MainAxisSize.min,
@@ -71,7 +72,9 @@ class _RecentActivityWidgetState extends State<RecentActivityWidget> {
                           .map(
                             (e) => _KeepAlive(
                               key: ValueKey(e),
-                              child: TransactionItem(tx: e),
+                              child: CpTheme.black(
+                                child: TransactionItem(tx: e, showIcon: false),
+                              ),
                             ),
                           )
                           .toList(),
@@ -86,7 +89,7 @@ class _RecentActivityWidgetState extends State<RecentActivityWidget> {
                       CpButton(
                         text: context.l10n.recentActivitySeeAll,
                         size: CpButtonSize.micro,
-                        variant: CpButtonVariant.black,
+                        variant: CpButtonVariant.dark,
                         onPressed: widget.onTransactionsPressed,
                       ),
                     ],
@@ -113,7 +116,7 @@ class _NoActivity extends StatelessWidget {
               Text(
                 context.l10n.recentActivityEmpty,
                 style: const TextStyle(
-                  color: Color(0xFF2D2B2C),
+                  color: Colors.white,
                   fontSize: 15,
                   fontWeight: FontWeight.w400,
                 ),
@@ -137,9 +140,9 @@ class _Card extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) => Container(
-        padding: const EdgeInsets.all(4),
+        padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 12),
         decoration: const ShapeDecoration(
-          color: Colors.white,
+          color: CpColors.darkBackgroundColor,
           shape: RoundedRectangleBorder(
             borderRadius: BorderRadius.all(
               Radius.circular(28),

diff --git a/packages/espressocash_app/lib/features/activities/widgets/tr_tile.dart b/packages/espressocash_app/lib/features/activities/widgets/tr_tile.dart
@@ -10,9 +10,14 @@ import '../models/activity.dart';
 import 'activity_tile.dart';
 
 class TrTile extends StatelessWidget {
-  const TrTile({super.key, required this.activity});
+  const TrTile({
+    super.key,
+    required this.activity,
+    this.showIcon = true,
+  });
 
   final TransactionRequestActivity activity;
+  final bool showIcon;
 
   @override
   Widget build(BuildContext context) => CpActivityTile(
@@ -29,5 +34,6 @@ class TrTile extends StatelessWidget {
           maxDecimals: 2,
         ),
         onTap: () => TRDetailsScreen.push(context, id: activity.id),
+        showIcon: showIcon,
       );
 }
diff --git a/packages/espressocash_app/lib/features/activities/widgets/transaction_item.dart b/packages/espressocash_app/lib/features/activities/widgets/transaction_item.dart
@@ -16,9 +16,11 @@ class TransactionItem extends StatefulWidget {
   const TransactionItem({
     super.key,
     required this.tx,
+    this.showIcon = true,
   });
 
   final String tx;
+  final bool showIcon;
 
   @override
   State<TransactionItem> createState() => _TransactionItemState();
@@ -44,35 +46,43 @@ class _TransactionItemState extends State<TransactionItem> {
             common: (t) => CommonTile(
               key: ValueKey(t.tx.id),
               txCommon: t,
+              showIcon: widget.showIcon,
             ),
             activity: (txActivity) => txActivity.activity.map(
               outgoingPaymentRequest: (p) => PaymentRequestTile(
                 key: ValueKey(p.id),
                 id: p.id,
+                showIcon: widget.showIcon,
               ),
               outgoingDirectPayment: (p) => ODPTile(
                 key: ValueKey(p.id),
                 activity: p,
+                showIcon: widget.showIcon,
               ),
               outgoingLinkPayment: (p) => OLPTile(
                 key: ValueKey(p.id),
                 activity: p,
+                showIcon: widget.showIcon,
               ),
               onRamp: (it) => OnRampTile(
                 key: ValueKey(it.id),
                 activity: it,
+                showIcon: widget.showIcon,
               ),
               offRamp: (it) => OffRampTile(
                 key: ValueKey(it.id),
                 activity: it,
+                showIcon: widget.showIcon,
               ),
               outgoingDlnPayment: (it) => OutgoingDlnTile(
                 key: ValueKey(it.id),
                 activity: it,
+                showIcon: widget.showIcon,
               ),
               transactionRequest: (it) => TrTile(
                 key: ValueKey(it.id),
                 activity: it,
+                showIcon: widget.showIcon,
               ),
             ),
           );