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 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/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); 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; } 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 { diff --git a/lib/components/side_bar.dart b/lib/components/side_bar.dart index ebabbf9a6d..d58a9e9d05 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, @@ -283,9 +284,10 @@ class _AppSideBarState extends State { ArDriveAccordionItem( isExpanded: true, Text( - appLocalizationsOf(context).publicDrives, + appLocalizationsOf(context).publicDrives.toUpperCase(), style: typography.paragraphNormal( - fontWeight: ArFontWeight.bold, + fontWeight: ArFontWeight.semiBold, + color: colorTokens.textHigh, ), ), state.userDrives @@ -311,9 +313,10 @@ class _AppSideBarState extends State { ArDriveAccordionItem( isExpanded: true, Text( - appLocalizationsOf(context).privateDrives, + appLocalizationsOf(context).privateDrives.toUpperCase(), style: typography.paragraphNormal( - fontWeight: ArFontWeight.bold, + fontWeight: ArFontWeight.semiBold, + color: colorTokens.textHigh, ), ), state.userDrives @@ -334,9 +337,9 @@ class _AppSideBarState extends State { ArDriveAccordionItem( isExpanded: true, Text( - appLocalizationsOf(context).sharedDrives, + appLocalizationsOf(context).sharedDrives.toUpperCase(), 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( 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, 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'