Currently selected wallet pointer UI (#1710)

* feat: Add UI signifying the currently selected wallet indicator * fix: Product Fix - Add more padding to child wallets list item tile in grouped wallets, fix sort by dragging for general single wallets, and also groups, add animation to trailing arrow icon when tile is expanded or not * Update wallet group image and change maxLines * fix: Make group tile expand if it has the currently selected wallet and fix issue with wallet group image --------- Co-authored-by: tuxpizza <[email protected]>
cake-tech · Sep 28, 2024 · fc5878d · fc5878d
1 parent a149c71
commit fc5878d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/lib/src/screens/new_wallet/wallet_group_description_page.dart b/lib/src/screens/new_wallet/wallet_group_description_page.dart
@@ -32,10 +32,10 @@ class WalletGroupDescriptionPage extends BasePage {
       padding: EdgeInsets.all(24),
       child: Column(
         children: [
-      Image.asset(
-        image,
-        height: 200
-      ),
+          Image.asset(
+            _getThemedWalletGroupImage(currentTheme.type),
+            height: 200,
+          ),
           SizedBox(height: 32),
           Expanded(
             child: Text.rich(
@@ -96,4 +96,19 @@ class WalletGroupDescriptionPage extends BasePage {
       ),
     );
   }
+
+  String _getThemedWalletGroupImage(ThemeType theme) {
+    final lightImage = 'assets/images/wallet_group_light.png';
+    final darkImage = 'assets/images/wallet_group_dark.png';
+    final brightImage = 'assets/images/wallet_group_bright.png';
+
+    switch (theme) {
+      case ThemeType.bright:
+        return brightImage;
+      case ThemeType.light:
+        return lightImage;
+      default:
+        return darkImage;
+    }
+  }
 }
diff --git a/lib/src/screens/new_wallet/widgets/grouped_wallet_expansion_tile.dart b/lib/src/screens/new_wallet/widgets/grouped_wallet_expansion_tile.dart
@@ -77,6 +77,9 @@ class GroupedWalletExpansionTile extends StatelessWidget {
         ),
         child: ExpansionTile(
           onExpansionChanged: onExpansionChanged,
+          initiallyExpanded: shouldShowCurrentWalletPointer
+              ? childWallets.any((element) => element.isCurrent)
+              : false,
           key: tileKey,
           tilePadding:
               EdgeInsets.symmetric(vertical: 1, horizontal: !isCurrentlySelectedWallet ? 16 : 0),

diff --git a/lib/src/screens/wallet_list/wallet_list_page.dart b/lib/src/screens/wallet_list/wallet_list_page.dart
@@ -259,7 +259,7 @@ class WalletListBodyState extends State<WalletListBody> {
                               tileKey: ValueKey('single_wallets_expansion_tile_widget_$index'),
                               isCurrentlySelectedWallet: wallet.isCurrent,
                               leadingWidget: SizedBox(
-                                width: 60,
+                                width: wallet.isCurrent ? 56 : 40,
                                 child: Row(
                                   children: [
                                     wallet.isCurrent