From 41d811492c89847b2648d3544b49be8ba2c24129 Mon Sep 17 00:00:00 2001 From: Thiago Carvalho <32248947+thiagocarvalhodev@users.noreply.github.com> Date: Fri, 27 Sep 2024 15:14:07 -0300 Subject: [PATCH 1/2] feat(side bar) - update text styles - align items with - update scrollbar --- lib/components/side_bar.dart | 13 ++++++++----- .../ardrive_ui/lib/src/components/scroll_bar.dart | 2 ++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/components/side_bar.dart b/lib/components/side_bar.dart index ebabbf9a6d..252fa420c0 100644 --- a/lib/components/side_bar.dart +++ b/lib/components/side_bar.dart @@ -273,6 +273,7 @@ class _AppSideBarState extends State { Widget _buildAccordion(DrivesLoadSuccess state, bool isMobile) { final typography = ArDriveTypographyNew.of(context); + final colorTokens = ArDriveTheme.of(context).themeData.colorTokens; return ArDriveAccordion( contentPadding: isMobile ? const EdgeInsets.all(4) : null, @@ -285,7 +286,8 @@ class _AppSideBarState extends State { Text( appLocalizationsOf(context).publicDrives, style: typography.paragraphNormal( - fontWeight: ArFontWeight.bold, + fontWeight: ArFontWeight.semiBold, + color: colorTokens.textHigh, ), ), state.userDrives @@ -313,7 +315,8 @@ class _AppSideBarState extends State { Text( appLocalizationsOf(context).privateDrives, style: typography.paragraphNormal( - fontWeight: ArFontWeight.bold, + fontWeight: ArFontWeight.semiBold, + color: colorTokens.textHigh, ), ), state.userDrives @@ -336,7 +339,7 @@ class _AppSideBarState extends State { Text( appLocalizationsOf(context).sharedDrives, style: typography.paragraphNormal( - fontWeight: ArFontWeight.bold, + fontWeight: ArFontWeight.semiBold, ), ), state.sharedDrives @@ -538,7 +541,7 @@ class DriveListTile extends StatelessWidget { onTap: onTap, child: Padding( padding: const EdgeInsets.only( - left: 32.0, + left: 10.0, right: 8.0, ), child: Row( @@ -552,7 +555,7 @@ class DriveListTile extends StatelessWidget { drive.name, style: isSelected ? typography.paragraphNormal( - fontWeight: ArFontWeight.semiBold, + fontWeight: ArFontWeight.bold, ) : typography.paragraphNormal( fontWeight: ArFontWeight.semiBold, diff --git a/packages/ardrive_ui/lib/src/components/scroll_bar.dart b/packages/ardrive_ui/lib/src/components/scroll_bar.dart index 6edaa51870..3aa7571e81 100644 --- a/packages/ardrive_ui/lib/src/components/scroll_bar.dart +++ b/packages/ardrive_ui/lib/src/components/scroll_bar.dart @@ -27,6 +27,7 @@ class ArDriveScrollBar extends StatelessWidget { trackColor: MaterialStateProperty.all( isVisible ? grey.shade400 : Colors.transparent, ), // set the color of the track + thickness: MaterialStateProperty.all(2.0), ), ), child: isVisible @@ -34,6 +35,7 @@ class ArDriveScrollBar extends StatelessWidget { interactive: true, thumbVisibility: alwaysVisible, controller: controller, + thickness: 2.0, child: child, ) : child, From b1a16f6e32f7e4811cfdfeddd98c84b2f6d68623 Mon Sep 17 00:00:00 2001 From: Thiago Carvalho <32248947+thiagocarvalhodev@users.noreply.github.com> Date: Wed, 2 Oct 2024 11:51:11 -0300 Subject: [PATCH 2/2] Update side_bar.dart - set section title to uppercase and change weight --- lib/components/side_bar.dart | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/components/side_bar.dart b/lib/components/side_bar.dart index 252fa420c0..d58a9e9d05 100644 --- a/lib/components/side_bar.dart +++ b/lib/components/side_bar.dart @@ -284,7 +284,7 @@ class _AppSideBarState extends State { ArDriveAccordionItem( isExpanded: true, Text( - appLocalizationsOf(context).publicDrives, + appLocalizationsOf(context).publicDrives.toUpperCase(), style: typography.paragraphNormal( fontWeight: ArFontWeight.semiBold, color: colorTokens.textHigh, @@ -313,7 +313,7 @@ class _AppSideBarState extends State { ArDriveAccordionItem( isExpanded: true, Text( - appLocalizationsOf(context).privateDrives, + appLocalizationsOf(context).privateDrives.toUpperCase(), style: typography.paragraphNormal( fontWeight: ArFontWeight.semiBold, color: colorTokens.textHigh, @@ -337,7 +337,7 @@ class _AppSideBarState extends State { ArDriveAccordionItem( isExpanded: true, Text( - appLocalizationsOf(context).sharedDrives, + appLocalizationsOf(context).sharedDrives.toUpperCase(), style: typography.paragraphNormal( fontWeight: ArFontWeight.semiBold, ), @@ -555,7 +555,7 @@ class DriveListTile extends StatelessWidget { drive.name, style: isSelected ? typography.paragraphNormal( - fontWeight: ArFontWeight.bold, + fontWeight: ArFontWeight.semiBold, ) : typography.paragraphNormal( fontWeight: ArFontWeight.semiBold,