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/7] 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 6972716f69ecf24b86cbff1122f7dbbf8b319c4c Mon Sep 17 00:00:00 2001 From: Thiago Carvalho <32248947+thiagocarvalhodev@users.noreply.github.com> Date: Sun, 29 Sep 2024 18:19:48 -0300 Subject: [PATCH 2/7] Update profile_cubit.dart --- lib/blocs/profile/profile_cubit.dart | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lib/blocs/profile/profile_cubit.dart b/lib/blocs/profile/profile_cubit.dart index 6ebbf79e80..56536d7e60 100644 --- a/lib/blocs/profile/profile_cubit.dart +++ b/lib/blocs/profile/profile_cubit.dart @@ -36,13 +36,6 @@ class ProfileCubit extends Cubit { _arDriveAuth = arDriveAuth, super(ProfileCheckingAvailability()) { promptToAuthenticate(); - - _arDriveAuth.onAuthStateChanged().listen((user) { - if (user != null) { - emit(ProfileLoggedIn( - user: user, useTurbo: _turboUploadService.useTurboUpload)); - } - }); } Future isCurrentProfileArConnect() async { From 77e1fe0496372dd5d193d0b8ef1cd957175b2f79 Mon Sep 17 00:00:00 2001 From: Thiago Carvalho <32248947+thiagocarvalhodev@users.noreply.github.com> Date: Sun, 29 Sep 2024 19:04:30 -0300 Subject: [PATCH 3/7] bump version --- android/fastlane/metadata/android/en-US/changelogs/157.txt | 1 + pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 android/fastlane/metadata/android/en-US/changelogs/157.txt diff --git a/android/fastlane/metadata/android/en-US/changelogs/157.txt b/android/fastlane/metadata/android/en-US/changelogs/157.txt new file mode 100644 index 0000000000..b57892ee75 --- /dev/null +++ b/android/fastlane/metadata/android/en-US/changelogs/157.txt @@ -0,0 +1 @@ +- Fixes an issue that mistakenly redirects the user to the Drive Explorer instead of Tutorials Page when creating a wallet from ArDrive diff --git a/pubspec.yaml b/pubspec.yaml index bcb3fd057e..ea2db77505 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: Secure, permanent storage publish_to: 'none' -version: 2.55.0 +version: 2.55.1 environment: sdk: '>=3.2.0 <4.0.0' 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 4/7] 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, From da8ca629c66f9165873413d827a1c675cb2fe67e Mon Sep 17 00:00:00 2001 From: Thiago Carvalho <32248947+thiagocarvalhodev@users.noreply.github.com> Date: Thu, 3 Oct 2024 09:05:18 -0300 Subject: [PATCH 5/7] Update wallet_created_view.dart removes `ClipRect` that causes the entire container not to display --- lib/authentication/login/views/wallet_created_view.dart | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/authentication/login/views/wallet_created_view.dart b/lib/authentication/login/views/wallet_created_view.dart index d54c66ba66..5771740c77 100644 --- a/lib/authentication/login/views/wallet_created_view.dart +++ b/lib/authentication/login/views/wallet_created_view.dart @@ -385,11 +385,10 @@ class _WalletCreatedViewState extends State { color: colorTokens.textMid, fontWeight: ArFontWeight.book))); return isBlurred - ? ClipRect( - child: ImageFiltered( + ? ImageFiltered( imageFilter: ImageFilter.blur(sigmaX: 5, sigmaY: 5), child: text, - )) + ) : text; } From f488ba8615b70a75adbbdb34d8bcdb9901325ec7 Mon Sep 17 00:00:00 2001 From: Thiago Carvalho <32248947+thiagocarvalhodev@users.noreply.github.com> Date: Fri, 4 Oct 2024 10:23:38 -0300 Subject: [PATCH 6/7] Update enter_your_password_modal.dart --- .../login/views/modals/enter_your_password_modal.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/authentication/login/views/modals/enter_your_password_modal.dart b/lib/authentication/login/views/modals/enter_your_password_modal.dart index c9f2138da2..88f6ea7f51 100644 --- a/lib/authentication/login/views/modals/enter_your_password_modal.dart +++ b/lib/authentication/login/views/modals/enter_your_password_modal.dart @@ -236,7 +236,7 @@ class _EnterYourPasswordWidgetState extends State { child: ArDriveButtonNew( variant: ButtonVariant.outline, text: 'Advanced Settings', - maxHeight: 32, + maxHeight: 40, typography: typography, onPressed: () { showGatewaySwitcherModal(context); From 83033cbedee4ae4a0ff45d439c97010278b46d91 Mon Sep 17 00:00:00 2001 From: Thiago Carvalho <32248947+thiagocarvalhodev@users.noreply.github.com> Date: Tue, 15 Oct 2024 11:31:22 -0300 Subject: [PATCH 7/7] Update test.yml --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8a18bdc8bf..a2539e34b4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,7 +3,7 @@ on: jobs: test-and-lint: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: # Checkout - uses: actions/checkout@v3 @@ -34,4 +34,4 @@ jobs: run: flutter analyze - name: Test app - run: scr test \ No newline at end of file + run: scr test