Merge pull request #1748 from ardriveapp/dev

PE-6146: Release ArDrive v2.45.0
ardriveapp · May 15, 2024 · 758bfe0 · 758bfe0
2 parents 7269cad + 0a0ecc3
commit 758bfe0
Show file tree

Hide file tree

Showing 25 changed files with 1,801 additions and 867 deletions.
diff --git a/android/fastlane/metadata/android/en-US/changelogs/128.txt b/android/fastlane/metadata/android/en-US/changelogs/128.txt
@@ -0,0 +1 @@
+- Adds option to choose payment method for manifest uploads, including Turbo Credits
diff --git a/lib/app_shell.dart b/lib/app_shell.dart
@@ -93,6 +93,8 @@ class AppShellState extends State<AppShell> {
                             ),
                             BlocBuilder<ProfileCubit, ProfileState>(
                               builder: (context, state) {
+                                final typography =
+                                    ArDriveTypographyNew.of(context);
                                 return FutureBuilder(
                                   future: context
                                       .read<ProfileCubit>()
@@ -106,22 +108,29 @@ class AppShellState extends State<AppShell> {
                                       child: Material(
                                         borderRadius: BorderRadius.circular(8),
                                         child: ProgressDialog(
+                                            useNewArDriveUI: true,
                                             progressBar: ProgressBar(
                                               percentage: context
                                                   .read<SyncCubit>()
                                                   .syncProgressController
                                                   .stream,
                                             ),
-                                            percentageDetails: _syncStreamBuilder(
-                                                builderWithData: (syncProgress) =>
-                                                    Text(appLocalizationsOf(
-                                                            context)
-                                                        .syncProgressPercentage(
-                                                            (syncProgress
-                                                                        .progress *
-                                                                    100)
-                                                                .roundToDouble()
-                                                                .toString()))),
+                                            percentageDetails:
+                                                _syncStreamBuilder(
+                                              builderWithData: (syncProgress) =>
+                                                  Text(
+                                                appLocalizationsOf(context)
+                                                    .syncProgressPercentage(
+                                                  (syncProgress.progress * 100)
+                                                      .roundToDouble()
+                                                      .toString(),
+                                                ),
+                                                style:
+                                                    typography.paragraphNormal(
+                                                  fontWeight: ArFontWeight.bold,
+                                                ),
+                                              ),
+                                            ),
                                             progressDescription:
                                                 _syncStreamBuilder(
                                               builderWithData: (syncProgress) =>
@@ -140,8 +149,10 @@ class AppShellState extends State<AppShell> {
                                                         : appLocalizationsOf(
                                                                 context)
                                                             .syncingOnlyOneDrive,
-                                                style: ArDriveTypography.body
-                                                    .buttonNormalBold(),
+                                                style:
+                                                    typography.paragraphNormal(
+                                                  fontWeight: ArFontWeight.bold,
+                                                ),
                                               ),
                                             ),
                                             title: isCurrentProfileArConnect
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Adds option to choose payment method for manifest uploads, including Turbo Credits