chore: get started fixes (#148)

[Notion task](https://www.notion.so/leftclick/Fix-get-started-e324d9a0be544b2ea35e8634820d0fdc) This PR uses our [custom version](fujidaiti/smooth_sheets#222) of smooth_sheets lib. So that we could control the `minFlingVelocityToDismiss` and `minDragDistanceToDismiss` dismiss params. Also this PR sets all font letter spacing to `0` (to make fonts look exactly like in figma) - keep that in mind because that might change the markdown in some places.
ice-blockchain · Aug 20, 2024 · 99e6a67 · 99e6a67
1 parent 53b88ce
commit 99e6a67
Show file tree

Hide file tree

Showing 33 changed files with 134 additions and 112 deletions.
diff --git a/.github/workflows/CICD.yaml b/.github/workflows/CICD.yaml
@@ -70,6 +70,11 @@ jobs:
           channel: "stable"
           cache: true
       - run: flutter --version
+      - name: Bootstrap
+        id: bootstrap
+        run: |
+          cd main-repo
+          ./scripts/bootstrap.sh
       - name: Install dependencies
         id: install-dependencies
         run: |
@@ -145,11 +150,6 @@ jobs:
           channel: "stable"
           cache: true
       - run: flutter --version
-      - name: Install dependencies
-        id: install-dependencies
-        run: |
-          cd main-repo
-          flutter pub get
       - name: Detect context and set APP environment variables
         id: setup-env
         env:
@@ -236,16 +236,6 @@ jobs:
           channel: "stable"
           cache: true
       - run: flutter --version
-      - name: Bootstrap
-        id: bootstrap
-        run: |
-          cd main-repo
-          ./scripts/bootstrap.sh
-      - name: Install dependencies
-        id: install-dependencies
-        run: |
-          cd main-repo
-          melos run pub_get
       - name: Detect context and set APP environment variables
         id: setup-env
         env:

diff --git a/assets/images/icons/1.5x/icon_block_information.png b/assets/images/icons/1.5x/icon_block_information.png
diff --git a/assets/images/icons/2.0x/icon_block_information.png b/assets/images/icons/2.0x/icon_block_information.png
diff --git a/assets/images/icons/3.0x/icon_block_information.png b/assets/images/icons/3.0x/icon_block_information.png
diff --git a/assets/images/icons/4.0x/icon_block_information.png b/assets/images/icons/4.0x/icon_block_information.png
diff --git a/assets/images/icons/icon_block_information copy.png b/assets/images/icons/icon_block_information copy.png
diff --git a/lib/app/constants/links.dart b/lib/app/constants/links.dart
@@ -0,0 +1,9 @@
+class Links {
+  Links._();
+
+  static String terms = 'https://identity.io/terms';
+
+  static String privacy = 'https://identity.io/privacy';
+
+  static String identity = 'https://identity.io';
+}
diff --git a/lib/app/features/auth/data/models/auth_state.dart b/lib/app/features/auth/data/models/auth_state.dart
@@ -16,8 +16,8 @@ class AuthenticationLoading extends AuthState with _$AuthenticationLoading {
 }
 
 @freezed
-class UnAuthenticated extends AuthState with _$UnAuthenticated {
-  const factory UnAuthenticated() = _UnAuthenticated;
+class Unauthenticated extends AuthState with _$Unauthenticated {
+  const factory Unauthenticated() = _Unauthenticated;
 }
 
 @freezed

diff --git a/lib/app/features/auth/providers/auth_provider.dart b/lib/app/features/auth/providers/auth_provider.dart
@@ -13,9 +13,7 @@ class Auth extends _$Auth {
   }
 
   Future<void> rehydrate() async {
-    state = const Authenticated(
-      authToken: AuthToken(access: 'access', refresh: 'refresh'),
-    );
+    state = const Unauthenticated();
   }
 
   Future<void> signUp({required String keyName}) async {
@@ -61,7 +59,7 @@ class Auth extends _$Auth {
     try {
       state = const AuthenticationLoading();
       await Future<void>.delayed(const Duration(seconds: 2));
-      state = const UnAuthenticated();
+      state = const Unauthenticated();
     } catch (error) {
       state = AuthenticationFailure(message: error.toString());
       rethrow;

diff --git a/lib/app/features/auth/views/components/auth_footer/auth_footer.dart b/lib/app/features/auth/views/components/auth_footer/auth_footer.dart
@@ -1,11 +1,12 @@
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:ice/app/extensions/asset_gen_image.dart';
+import 'package:ice/app/constants/links.dart';
 import 'package:ice/app/extensions/build_context.dart';
 import 'package:ice/app/extensions/num.dart';
 import 'package:ice/app/extensions/theme_data.dart';
-import 'package:ice/generated/assets.gen.dart';
+import 'package:ice/app/features/auth/views/components/identity_link/identity_link.dart';
+import 'package:ice/app/services/browser/browser.dart';
 import 'package:ice/l10n/i10n.dart';
 
 enum FooterLink {
@@ -23,8 +24,8 @@ enum FooterLink {
 
   VoidCallback get onPressed {
     return switch (this) {
-      FooterLink.terms => () {},
-      FooterLink.privacy => () {},
+      FooterLink.terms => () => openUrlInAppBrowser(Links.terms),
+      FooterLink.privacy => () => openUrlInAppBrowser(Links.privacy),
       _ => () {},
     };
   }
@@ -65,26 +66,20 @@ class AuthFooter extends HookWidget {
         Text.rich(
           TextSpan(
             children: [
-              TextSpan(text: context.i18n.auth_secured_by),
-              const TextSpan(text: ' '),
-              WidgetSpan(
-                alignment: PlaceholderAlignment.middle,
-                child: Assets.images.icons.iconLoginIdentity.icon(size: 20.0.s),
-              ),
-              const TextSpan(text: ' '),
               TextSpan(
-                text: context.i18n.auth_identity_io,
-                style: TextStyle(
-                  color: context.theme.appColors.primaryAccent,
+                text: context.i18n.auth_secured_by,
+                style: context.theme.appTextThemes.caption.copyWith(
+                  color: context.theme.appColors.secondaryText,
                 ),
-                recognizer: TapGestureRecognizer()..onTap = () {},
+              ),
+              WidgetSpan(child: SizedBox(width: 6.0.s)),
+              WidgetSpan(
+                alignment: PlaceholderAlignment.middle,
+                child: IdentityLink(),
               ),
             ],
           ),
           textAlign: TextAlign.center,
-          style: context.theme.appTextThemes.caption.copyWith(
-            color: context.theme.appColors.secondaryText,
-          ),
         ),
         SizedBox(height: 20.0.s),
         ConstrainedBox(

diff --git a/lib/app/features/auth/views/components/identity_key_name_input/identity_info.dart b/lib/app/features/auth/views/components/identity_key_name_input/identity_info.dart
@@ -1,11 +1,11 @@
-import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:ice/app/components/card/info_card.dart';
 import 'package:ice/app/components/screen_offset/screen_bottom_offset.dart';
-import 'package:ice/app/extensions/asset_gen_image.dart';
 import 'package:ice/app/extensions/build_context.dart';
 import 'package:ice/app/extensions/num.dart';
 import 'package:ice/app/extensions/theme_data.dart';
+import 'package:ice/app/features/auth/views/components/identity_link/identity_link.dart';
 import 'package:ice/app/router/components/navigation_app_bar/navigation_app_bar.dart';
 import 'package:ice/app/router/components/navigation_app_bar/navigation_close_button.dart';
 import 'package:ice/generated/assets.gen.dart';
@@ -21,7 +21,7 @@ class IdentityInfo extends StatelessWidget {
         NavigationAppBar.modal(
           showBackButton: false,
           title: Text(context.i18n.identity_key_name_title),
-          actions: [NavigationCloseButton()],
+          actions: [NavigationCloseButton(onPressed: () => context.pop())],
         ),
         Padding(
           padding: EdgeInsets.symmetric(horizontal: 24.0.s),
@@ -37,18 +37,10 @@ class IdentityInfo extends StatelessWidget {
                 TextSpan(
                   children: [
                     TextSpan(text: context.i18n.identity_key_name_usage),
-                    const TextSpan(text: ' '),
+                    WidgetSpan(child: SizedBox(width: 6.0.s)),
                     WidgetSpan(
                       alignment: PlaceholderAlignment.middle,
-                      child: Assets.images.icons.iconLoginIdentity.icon(size: 20.0.s),
-                    ),
-                    const TextSpan(text: ' '),
-                    TextSpan(
-                      text: context.i18n.auth_identity_io,
-                      style: context.theme.appTextThemes.caption.copyWith(
-                        color: context.theme.appColors.primaryAccent,
-                      ),
-                      recognizer: TapGestureRecognizer()..onTap = () {},
+                      child: IdentityLink(),
                     ),
                   ],
                 ),

diff --git a/lib/app/features/auth/views/components/identity_key_name_input/identity_key_name_input.dart b/lib/app/features/auth/views/components/identity_key_name_input/identity_key_name_input.dart
@@ -36,12 +36,11 @@ class IdentityKeyNameInput extends HookWidget {
       ),
       suffixIcon: notShowInfoIcon
           ? null
-          : TextInputIcons(
-              icons: [
-                IconButton(
-                  icon: Assets.images.icons.iconBlockInformation.icon(
-                    size: 20.0.s,
-                  ),
+          : TextInputIcons(icons: [
+              SizedBox.square(
+                dimension: 40.0.s,
+                child: IconButton(
+                  icon: Assets.images.icons.iconBlockInformation.icon(),
                   onPressed: () {
                     hideKeyboardAndCallOnce(callback: () {
                       showSimpleBottomSheet<void>(
@@ -52,8 +51,8 @@ class IdentityKeyNameInput extends HookWidget {
                     });
                   },
                 ),
-              ],
-            ),
+              ),
+            ]),
       labelText: context.i18n.common_identity_key_name,
       controller: controller,
       validator: (String? value) {

diff --git a/lib/app/features/auth/views/components/identity_link/identity_link.dart b/lib/app/features/auth/views/components/identity_link/identity_link.dart
@@ -0,0 +1,33 @@
+import 'package:flutter/material.dart';
+import 'package:ice/app/constants/links.dart';
+import 'package:ice/app/extensions/extensions.dart';
+import 'package:ice/app/services/browser/browser.dart';
+import 'package:ice/generated/assets.gen.dart';
+
+class IdentityLink extends StatelessWidget {
+  const IdentityLink({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: () => openUrlInAppBrowser(Links.identity),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Assets.images.icons.iconLoginIdentity.icon(size: 20.0.s),
+          SizedBox(width: 4.0.s),
+          Text(
+            context.i18n.auth_identity_io,
+            style: context.theme.appTextThemes.caption.copyWith(
+              color: context.theme.appColors.primaryAccent,
+            ),
+            // Disabling text scaling to prevent multiple scaling
+            //    when using this widget as a child of a WidgetSpan
+            // https://github.com/flutter/flutter/issues/126962
+            textScaler: TextScaler.linear(1),
+          )
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart b/lib/app/features/auth/views/pages/fill_profile/fill_profile.dart
@@ -45,7 +45,7 @@ class FillProfile extends HookWidget {
                     title: context.i18n.fill_profile_title,
                     description: context.i18n.fill_profile_description,
                     icon: AuthHeaderIcon(
-                      icon: Assets.images.icons.iconLoginIcelogo.icon(size: 36.0.s),
+                      icon: Assets.images.icons.iconLoginIcelogo.icon(size: 44.0.s),
                     ),
                   ),
                   ScreenSideOffset.large(

diff --git a/lib/app/features/auth/views/pages/get_started/get_started.dart b/lib/app/features/auth/views/pages/get_started/get_started.dart
@@ -28,7 +28,7 @@ class GetStartedPage extends HookWidget {
           showBackButton: false,
           title: context.i18n.get_started_title,
           description: context.i18n.get_started_description,
-          icon: Assets.images.icons.iconLoginIcelogo.icon(size: 36.0.s),
+          icon: Assets.images.icons.iconLoginIcelogo.icon(size: 44.0.s),
           children: [
             ScreenSideOffset.large(
               child: Column(

diff --git a/lib/app/features/auth/views/pages/intro_page/intro_page.dart b/lib/app/features/auth/views/pages/intro_page/intro_page.dart
@@ -38,7 +38,7 @@ class IntroPage extends HookWidget {
                 ScaleEffect(
                   duration: 500.ms,
                   curve: Curves.easeOutBack,
-                  delay: 10.seconds,
+                  delay: 4.5.seconds,
                 ),
               ],
               child: Button(

diff --git a/lib/app/features/core/providers/init_provider.dart b/lib/app/features/core/providers/init_provider.dart
@@ -13,7 +13,7 @@ part 'init_provider.g.dart';
 Future<void> initApp(InitAppRef ref) async {
   Nostr.initialize();
   await ref.read(envProvider.future);
-  await Future.wait(<Future<void>>[
+  await Future.wait([
     ref.read(appTemplateProvider.future),
     ref.read(authProvider.notifier).rehydrate(),
   ]);

diff --git a/lib/app/features/nostr/providers/relays_provider.dart b/lib/app/features/nostr/providers/relays_provider.dart
@@ -13,7 +13,7 @@ class Relays extends _$Relays {
   @override
   Map<String, NostrRelay> build() {
     ref.listen(authProvider, (AuthState? previous, AuthState next) {
-      if (next is UnAuthenticated) {
+      if (next is Unauthenticated) {
         _closeAll();
       }
     });

diff --git a/lib/app/features/wallet/views/pages/coins_flow/coin_details/components/balance/balance.dart b/lib/app/features/wallet/views/pages/coins_flow/coin_details/components/balance/balance.dart
@@ -8,7 +8,6 @@ import 'package:ice/app/extensions/theme_data.dart';
 import 'package:ice/app/features/wallet/model/coin_data.dart';
 import 'package:ice/app/features/wallet/model/network_type.dart';
 import 'package:ice/app/features/wallet/views/pages/coins_flow/coin_receive_modal/model/coin_receive_modal_data.dart';
-import 'package:ice/app/features/wallet/views/pages/coins_flow/network_list/network_list_view.dart';
 import 'package:ice/app/features/wallet/views/pages/coins_flow/providers/send_asset_form_provider.dart';
 import 'package:ice/app/features/wallet/views/pages/wallet_page/components/balance/balance_actions.dart';
 import 'package:ice/app/router/app_routes.dart';
@@ -74,7 +73,7 @@ class Balance extends ConsumerWidget {
               },
               onSend: () {
                 ref.read(sendAssetFormControllerProvider().notifier).setCoin(coinData);
-                NetworkSelectSendRoute(viewType: NetworkListViewType.send).push<void>(context);
+                NetworkSelectSendRoute().push<void>(context);
               },
             ),
           ),

diff --git a/...s/pages/coins_flow/coin_receive_modal/components/coin_address_tile/coin_address_tile.dart b/...s/pages/coins_flow/coin_receive_modal/components/coin_address_tile/coin_address_tile.dart
@@ -60,7 +60,7 @@ class CoinAddressTile extends HookConsumerWidget {
                   SizedBox(
                     width: 6.0.s,
                   ),
-                  Assets.images.icons.iconBlockInformation.icon(size: 14.0.s),
+                  Assets.images.icons.iconBlockInformation.icon(size: 20.0.s),
                 ],
               ),
               SizedBox(

diff --git a/lib/app/features/wallet/views/pages/coins_flow/receive_coins/receive_coin_modal_page.dart b/lib/app/features/wallet/views/pages/coins_flow/receive_coins/receive_coin_modal_page.dart
@@ -4,7 +4,6 @@ import 'package:ice/app/extensions/build_context.dart';
 import 'package:ice/app/extensions/theme_data.dart';
 import 'package:ice/app/features/wallet/model/coin_data.dart';
 import 'package:ice/app/features/wallet/views/pages/coins_flow/coin_receive_modal/components/coins_list_view.dart';
-import 'package:ice/app/features/wallet/views/pages/coins_flow/network_list/network_list_view.dart';
 import 'package:ice/app/features/wallet/views/pages/coins_flow/receive_coins/providers/receive_coins_form_provider.dart';
 import 'package:ice/app/router/app_routes.dart';
 import 'package:ice/app/router/components/sheet_content/sheet_content.dart';
@@ -19,7 +18,7 @@ class ReceiveCoinModalPage extends ConsumerWidget {
       body: CoinsListView(
         onCoinItemTap: (CoinData coin) {
           ref.read(receiveCoinsFormControllerProvider.notifier).setCoin(coin);
-          NetworkSelectReceiveRoute(viewType: NetworkListViewType.receive).push<void>(context);
+          NetworkSelectReceiveRoute().push<void>(context);
         },
         type: CoinsListViewType.receive,
       ),

diff --git a/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/send_coins_form.dart b/lib/app/features/wallet/views/pages/coins_flow/send_coins/components/send_coins_form.dart
@@ -11,7 +11,6 @@ import 'package:ice/app/extensions/extensions.dart';
 import 'package:ice/app/features/wallet/components/arrival_time/arrival_time.dart';
 import 'package:ice/app/features/wallet/components/network_fee/network_fee.dart';
 import 'package:ice/app/features/wallet/model/network_type.dart';
-import 'package:ice/app/features/wallet/views/pages/coins_flow/network_list/network_list_view.dart';
 import 'package:ice/app/features/wallet/views/pages/coins_flow/providers/send_asset_form_provider.dart';
 import 'package:ice/app/features/wallet/views/pages/coins_flow/send_coins/components/buttons/coin_button.dart';
 import 'package:ice/app/features/wallet/views/pages/coins_flow/send_coins/components/buttons/network_button.dart';
@@ -73,8 +72,7 @@ class SendCoinsForm extends HookConsumerWidget {
                     NetworkButton(
                       networkType: formController.selectedNetwork,
                       onTap: () {
-                        NetworkSelectSendRoute(viewType: NetworkListViewType.send)
-                            .push<void>(context);
+                        NetworkSelectSendRoute().push<void>(context);
                       },
                     ),
                     SizedBox(height: 12.0.s),

diff --git a/lib/app/features/wallet/views/pages/coins_flow/send_coins/send_coin_modal_page.dart b/lib/app/features/wallet/views/pages/coins_flow/send_coins/send_coin_modal_page.dart
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:ice/app/features/wallet/model/coin_data.dart';
 import 'package:ice/app/features/wallet/views/pages/coins_flow/coin_receive_modal/components/coins_list_view.dart';
-import 'package:ice/app/features/wallet/views/pages/coins_flow/network_list/network_list_view.dart';
 import 'package:ice/app/features/wallet/views/pages/coins_flow/providers/send_asset_form_provider.dart';
 import 'package:ice/app/router/app_routes.dart';
 import 'package:ice/app/router/components/sheet_content/sheet_content.dart';
@@ -17,7 +16,7 @@ class SendCoinModalPage extends ConsumerWidget {
       body: CoinsListView(
         onCoinItemTap: (CoinData coin) {
           ref.read(sendAssetFormControllerProvider().notifier).setCoin(coin);
-          NetworkSelectSendRoute(viewType: NetworkListViewType.send).push<void>(context);
+          NetworkSelectSendRoute().push<void>(context);
         },
       ),
     );