From 9aece34311708e16db09a7ff32b31929ca759a5f Mon Sep 17 00:00:00 2001 From: Matthew Homan <48568237+matthewhoman@users.noreply.github.com> Date: Wed, 8 May 2024 08:16:16 -0400 Subject: [PATCH] Update Calculator Screens (#55) --- lib/app/widgets/currency_dropdown.dart | 22 +-- lib/app/widgets/overlay/mobile_overlay.dart | 2 +- lib/calculator/view/calculator_screen.dart | 160 +++++++++--------- lib/widgets/components/coin_stats_card.g.dart | 135 +++++++-------- .../components/conversion_result.g.dart | 40 ++--- .../currency_selector/mode_from.g.dart | 24 +-- .../currency_selector/mode_to.g.dart | 27 +-- lib/widgets/components/enter_amount.g.dart | 38 ++--- .../components/enter_amount_widget.g.dart | 36 ++-- lib/widgets/components/genius_appbar.g.dart | 24 +-- lib/widgets/components/header.g.dart | 12 +- 11 files changed, 232 insertions(+), 288 deletions(-) diff --git a/lib/app/widgets/currency_dropdown.dart b/lib/app/widgets/currency_dropdown.dart index e2d819a2..e0479e71 100644 --- a/lib/app/widgets/currency_dropdown.dart +++ b/lib/app/widgets/currency_dropdown.dart @@ -1,5 +1,7 @@ import 'package:flutter/material.dart'; import 'package:genius_api/genius_api.dart'; +import 'package:genius_wallet/theme/genius_wallet_colors.g.dart'; +import 'package:genius_wallet/theme/genius_wallet_consts.dart'; class CurrencyDropdown extends StatelessWidget { final List currencies; @@ -17,28 +19,28 @@ class CurrencyDropdown extends StatelessWidget { final items = currencies.map((currency) { return DropdownMenuItem( value: currency, - child: Text( - currency.name, - style: const TextStyle( - fontSize: 30, - ), + child: Container( + padding: const EdgeInsets.all(5), + child: Text(currency.name, + style: const TextStyle( + fontSize: 24, + )), ), ); }).toList(); return DropdownButton( + dropdownColor: GeniusWalletColors.containerGray, + borderRadius: BorderRadius.circular(GeniusWalletConsts.borderRadiusCard), underline: const SizedBox(), - icon: Image.asset( - 'assets/images/maskcurrencyselector.png', - package: 'genius_wallet', - ), + icon: const Icon(Icons.arrow_drop_down), items: items, onChanged: (currency) => onChanged(currency!), value: value, hint: const Text( 'Select a Currency', style: TextStyle( - fontSize: 30, + fontSize: 24, ), ), ); diff --git a/lib/app/widgets/overlay/mobile_overlay.dart b/lib/app/widgets/overlay/mobile_overlay.dart index fe3687f4..4bdb8997 100644 --- a/lib/app/widgets/overlay/mobile_overlay.dart +++ b/lib/app/widgets/overlay/mobile_overlay.dart @@ -23,7 +23,7 @@ class MobileOverlay extends StatelessWidget { Container( padding: const EdgeInsets.symmetric( horizontal: GeniusWalletConsts.horizontalPadding), - height: 40, + height: 55, child: LayoutBuilder( builder: (BuildContext context, BoxConstraints constraints) { return GeniusAppbar(constraints); diff --git a/lib/calculator/view/calculator_screen.dart b/lib/calculator/view/calculator_screen.dart index fbc6e135..f60c0ef4 100644 --- a/lib/calculator/view/calculator_screen.dart +++ b/lib/calculator/view/calculator_screen.dart @@ -7,6 +7,7 @@ import 'package:genius_wallet/calculator/bloc/calculator_bloc.dart'; import 'package:genius_wallet/calculator/bloc/calculator_event.dart'; import 'package:genius_wallet/calculator/bloc/calculator_state.dart'; import 'package:genius_wallet/calculator/widgets/desktop_calculator.dart'; +import 'package:genius_wallet/theme/genius_wallet_colors.g.dart'; import 'package:genius_wallet/widgets/components/back_button_header.g.dart'; import 'package:genius_wallet/widgets/components/coin_stats_card.g.dart'; import 'package:genius_wallet/widgets/components/conversion_result.g.dart'; @@ -21,6 +22,7 @@ class CalculatorScreen extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( + backgroundColor: GeniusWalletColors.deepBlueTertiary, body: BlocProvider( create: (context) => CalculatorBloc( geniusApi: context.read(), @@ -84,86 +86,82 @@ class _CalculatorView extends StatelessWidget { @override Widget build(BuildContext context) { return AppScreenView( - body: Padding( - padding: const EdgeInsets.symmetric(horizontal: 30), - child: Column( - children: [ - SizedBox( - height: 50, - child: LayoutBuilder( - builder: (context, constraints) { - return BackButtonHeader( - constraints, - ovrTitle: '', - ); - }, - ), - ), - SizedBox( - height: 30, - child: LayoutBuilder( - builder: (BuildContext context, BoxConstraints constraints) { - return Header( - constraints, - ovrHeaderName: 'Calculator', - ); - }, - ), - ), - const SizedBox(height: 20), - SizedBox( - height: 120, - child: LayoutBuilder( - builder: (BuildContext context, BoxConstraints constraints) { - return ModeFrom(constraints); - }, - ), - ), - SizedBox( - height: 120, - child: LayoutBuilder( - builder: (BuildContext context, BoxConstraints constraints) { - return ModeTo(constraints); - }, - ), - ), - const SizedBox(height: 20), - SizedBox( - height: 120, - child: LayoutBuilder( - builder: (BuildContext context, BoxConstraints constraints) { - return EnterAmount(constraints); - }, - ), - ), - const SizedBox(height: 20), - SizedBox( - height: 115, - child: LayoutBuilder( - builder: (BuildContext context, BoxConstraints constraints) { - return BlocBuilder( - builder: (context, state) { - if (state.getResultStatus == CalculatorStatus.loading) { - return const Center(child: CircularProgressIndicator()); - } - if (state.conversionResult.isNotEmpty) { - return ConversionResult( - constraints, - ovrAmountentered: state.amountToConvert, - ovrResult: - '${state.currencyFrom!.symbol} = ${state.conversionResult} ${state.currencyTo!.symbol}', - ); - } - return const SizedBox(); + body: Column( + children: [ + Padding( + padding: const EdgeInsets.only(left: 20, right: 20), + child: Column(children: [ + SizedBox( + height: 30, + child: LayoutBuilder( + builder: + (BuildContext context, BoxConstraints constraints) { + return Header( + constraints, + ovrHeaderName: 'Calculator', + ); }, - ); - }, - ), - ), - const SizedBox(height: 20), - const CoinsOverview(), - ], - ), + ), + ), + const SizedBox(height: 30), + SizedBox( + height: 120, + child: LayoutBuilder( + builder: + (BuildContext context, BoxConstraints constraints) { + return ModeFrom(constraints); + }, + ), + ), + SizedBox( + height: 120, + child: LayoutBuilder( + builder: + (BuildContext context, BoxConstraints constraints) { + return ModeTo(constraints); + }, + ), + ), + SizedBox( + height: 120, + child: LayoutBuilder( + builder: + (BuildContext context, BoxConstraints constraints) { + return EnterAmount(constraints); + }, + ), + ), + const SizedBox(height: 20), + SizedBox( + height: 115, + child: LayoutBuilder( + builder: + (BuildContext context, BoxConstraints constraints) { + return BlocBuilder( + builder: (context, state) { + if (state.getResultStatus == + CalculatorStatus.loading) { + return const Center( + child: CircularProgressIndicator()); + } + if (state.conversionResult.isNotEmpty) { + return ConversionResult( + constraints, + ovrAmountentered: state.amountToConvert, + ovrResult: + '${state.currencyFrom!.symbol} = ${state.conversionResult} ${state.currencyTo!.symbol}', + ); + } + return const SizedBox(); + }, + ); + }, + ), + ), + const SizedBox(height: 20), + const CoinsOverview(), + ])) + ], ), ); } @@ -180,7 +178,7 @@ class CoinsOverview extends StatelessWidget { return Column( children: [ SizedBox( - height: 200, + height: 225, child: LayoutBuilder( builder: (BuildContext context, BoxConstraints constraints) { return CoinStatsCard( @@ -198,7 +196,7 @@ class CoinsOverview extends StatelessWidget { ), const SizedBox(height: 20), SizedBox( - height: 200, + height: 225, child: LayoutBuilder( builder: (BuildContext context, BoxConstraints constraints) { return CoinStatsCard( diff --git a/lib/widgets/components/coin_stats_card.g.dart b/lib/widgets/components/coin_stats_card.g.dart index 3ed68034..8f5486df 100644 --- a/lib/widgets/components/coin_stats_card.g.dart +++ b/lib/widgets/components/coin_stats_card.g.dart @@ -1,11 +1,7 @@ -// ********************************************************************************* -// PARABEAC-GENERATED CODE. DO NOT MODIFY. -// -// FOR MORE INFORMATION ON HOW TO USE PARABEAC, PLEASE VISIT docs.parabeac.com -// ********************************************************************************* - import 'package:flutter/material.dart'; import 'package:auto_size_text/auto_size_text.dart'; +import 'package:genius_wallet/theme/genius_wallet_colors.g.dart'; +import 'package:genius_wallet/theme/genius_wallet_consts.dart'; import 'package:genius_wallet/widgets/components/custom/trend_line_custom.dart'; import 'package:flutter_svg/flutter_svg.dart'; @@ -39,9 +35,9 @@ class _CoinStatsCard extends State { child: Stack(children: [ Positioned( left: 0, - width: widget.constraints.maxWidth * 1.0, + width: widget.constraints.maxWidth, top: 0, - height: widget.constraints.maxHeight * 1.0, + height: widget.constraints.maxHeight, child: Stack(children: [ Positioned( left: 0, @@ -49,11 +45,12 @@ class _CoinStatsCard extends State { top: 0, bottom: 0, child: Container( - height: widget.constraints.maxHeight * 1.0, - width: widget.constraints.maxWidth * 1.0, + height: widget.constraints.maxHeight, + width: widget.constraints.maxWidth, decoration: BoxDecoration( - color: Color(0xff2a2b31), - borderRadius: BorderRadius.all(Radius.circular(2.0)), + color: GeniusWalletColors.deepBlueCardColor, + borderRadius: BorderRadius.all( + Radius.circular(GeniusWalletConsts.borderRadiusCard)), ), ), ), @@ -78,21 +75,15 @@ class _CoinStatsCard extends State { )), ), Positioned( - right: 20.359, - width: 35.0, - top: 15.672, - height: 35.0, + left: 20, + width: 24, + top: 20, + height: 24, child: Container( decoration: BoxDecoration(), child: Stack(children: [ Positioned( - left: 0, - width: 35.0, - top: 0, - height: 35.0, child: Container( - height: 35.0, - width: 35.0, decoration: BoxDecoration( color: Color(0xff3a3c43), borderRadius: @@ -125,64 +116,49 @@ class _CoinStatsCard extends State { ])), ), Positioned( - left: 21.0, - width: 62.0, + left: 60, top: 22.0, - height: 23.0, - child: Container( - height: 23.0, - width: 62.0, - child: AutoSizeText( - widget.ovrCoinName ?? 'Bitcoin', - style: TextStyle( - fontFamily: 'Roboto', - fontSize: 20.0, - fontWeight: FontWeight.w300, - letterSpacing: 0.25, - color: Colors.white, - ), - textAlign: TextAlign.left, - )), - ), - Positioned( - right: 20.0, - width: 136.0, - bottom: 12.0, - height: 41.0, child: Container( - height: 41.0, - width: 136.0, child: AutoSizeText( - widget.ovrPrice ?? '11 329.2', - style: TextStyle( - fontFamily: 'Roboto', - fontSize: 35.0, - fontWeight: FontWeight.w300, - letterSpacing: 0.3500000238418579, - color: Colors.white, - ), - textAlign: TextAlign.right, - )), + widget.ovrCoinName ?? 'Bitcoin', + style: TextStyle( + fontFamily: 'Roboto', + fontSize: 16, + fontWeight: FontWeight.w400, + letterSpacing: 0.33, + color: Colors.white, + ), + textAlign: TextAlign.left, + )), ), Positioned( - right: 20.0, - width: 66.0, - bottom: 51.0, - height: 14.0, - child: Container( - height: 14.0, - width: 66.0, - child: AutoSizeText( - widget.ovrCurrencySymbol ?? 'USD', - style: TextStyle( - fontFamily: 'Roboto', - fontSize: 12.0, - fontWeight: FontWeight.w700, - letterSpacing: 0.2571428716182709, - color: Color(0xff3a3c43), - ), - textAlign: TextAlign.right, - )), + top: 20, + right: 30, + child: + Row(crossAxisAlignment: CrossAxisAlignment.end, children: [ + Container( + padding: const EdgeInsets.only(right: 5), + child: AutoSizeText( + widget.ovrPrice ?? '11 329.2', + style: const TextStyle( + fontFamily: 'Roboto', + fontSize: 24, + fontWeight: FontWeight.w700, + letterSpacing: 1, + color: Colors.white, + ), + )), + AutoSizeText( + widget.ovrCurrencySymbol ?? 'USD', + style: const TextStyle( + fontFamily: 'Roboto', + fontSize: 14.0, + fontWeight: FontWeight.w700, + letterSpacing: 0.26, + color: GeniusWalletColors.gray500, + ), + ) + ]), ), Positioned( left: widget.constraints.maxWidth * 0.084, @@ -191,6 +167,15 @@ class _CoinStatsCard extends State { height: widget.constraints.maxHeight * 0.354, child: Center( child: Container( + decoration: + BoxDecoration(shape: BoxShape.circle, boxShadow: [ + BoxShadow( + color: GeniusWalletColors.lightGreenPrimary + .withOpacity(.8), + spreadRadius: 2, + blurRadius: 90, + ) + ]), height: 68.0, width: 259.0, child: TrendLineCustom( diff --git a/lib/widgets/components/conversion_result.g.dart b/lib/widgets/components/conversion_result.g.dart index 17ae23ca..033764f2 100644 --- a/lib/widgets/components/conversion_result.g.dart +++ b/lib/widgets/components/conversion_result.g.dart @@ -1,11 +1,7 @@ -// ********************************************************************************* -// PARABEAC-GENERATED CODE. DO NOT MODIFY. -// -// FOR MORE INFORMATION ON HOW TO USE PARABEAC, PLEASE VISIT docs.parabeac.com -// ********************************************************************************* - import 'package:flutter/material.dart'; import 'package:auto_size_text/auto_size_text.dart'; +import 'package:genius_wallet/theme/genius_wallet_colors.g.dart'; +import 'package:genius_wallet/theme/genius_wallet_consts.dart'; class ConversionResult extends StatefulWidget { final BoxConstraints constraints; @@ -31,41 +27,40 @@ class _ConversionResult extends State { child: Stack(children: [ Positioned( left: 0, - width: widget.constraints.maxWidth * 1.0, + width: widget.constraints.maxWidth, top: 0, - height: widget.constraints.maxHeight * 1.0, + height: widget.constraints.maxHeight, child: Stack(children: [ Positioned( left: 0, - right: 4.0, top: 0, bottom: 0, child: Container( - height: widget.constraints.maxHeight * 1.0, - width: widget.constraints.maxWidth * 0.9869281045751634, + height: widget.constraints.maxHeight, + width: widget.constraints.maxWidth, decoration: BoxDecoration( - color: Color(0xff2a2b31), - borderRadius: BorderRadius.all(Radius.circular(2.0)), + color: GeniusWalletColors.containerGray, + borderRadius: BorderRadius.all( + Radius.circular(GeniusWalletConsts.borderRadiusCard)), ), ), ), Positioned( left: widget.constraints.maxWidth * 0.075, width: widget.constraints.maxWidth * 0.846, - top: widget.constraints.maxHeight * 0.568, + top: widget.constraints.maxHeight * 0.6, height: widget.constraints.maxHeight * 0.341, child: Center( child: Container( height: 45.0, - width: 259.0, child: AutoSizeText( widget.ovrResult ?? 'BTC = 3748.76 USD', style: TextStyle( fontFamily: 'Roboto', - fontSize: 18.0, - fontWeight: FontWeight.w300, - letterSpacing: 0.26999998092651367, - color: Color(0xff6b6b71), + fontSize: 16, + fontWeight: FontWeight.w500, + letterSpacing: 0.3, + color: Colors.white, ), textAlign: TextAlign.center, ))), @@ -78,14 +73,13 @@ class _ConversionResult extends State { child: Center( child: Container( height: 40.0, - width: 259.0, child: AutoSizeText( widget.ovrAmountentered ?? '0.3333333333', style: TextStyle( fontFamily: 'Roboto', - fontSize: 34.0, - fontWeight: FontWeight.w300, - letterSpacing: 0.5100001096725464, + fontSize: 36.0, + fontWeight: FontWeight.w400, + letterSpacing: 0.3, color: Colors.white, ), textAlign: TextAlign.center, diff --git a/lib/widgets/components/currency_selector/mode_from.g.dart b/lib/widgets/components/currency_selector/mode_from.g.dart index d2fccd5e..12e7fe68 100644 --- a/lib/widgets/components/currency_selector/mode_from.g.dart +++ b/lib/widgets/components/currency_selector/mode_from.g.dart @@ -1,9 +1,3 @@ -// ********************************************************************************* -// PARABEAC-GENERATED CODE. DO NOT MODIFY. -// -// FOR MORE INFORMATION ON HOW TO USE PARABEAC, PLEASE VISIT docs.parabeac.com -// ********************************************************************************* - import 'package:flutter/material.dart'; import 'package:auto_size_text/auto_size_text.dart'; import 'package:genius_wallet/widgets/components/custom/currency_dropdown_from_custom.dart'; @@ -42,17 +36,15 @@ class _ModeFrom extends State { left: 0, width: 68.0, top: 0, - height: 14.0, child: Container( - height: 14.0, width: 68.0, child: AutoSizeText( - widget.ovrTitle ?? 'FROM', + widget.ovrTitle ?? 'From', style: TextStyle( fontFamily: 'Roboto', - fontSize: 12.0, - fontWeight: FontWeight.w700, - letterSpacing: 0.25714290142059326, + fontSize: 16.0, + fontWeight: FontWeight.w500, + letterSpacing: 0.3, color: Color(0xff3a3c43), ), textAlign: TextAlign.left, @@ -61,7 +53,7 @@ class _ModeFrom extends State { Positioned( left: 0, width: 311.0, - top: 43.0, + top: 30, height: 35.0, child: CurrencyDropdownFromCustom( child: Container( @@ -101,9 +93,9 @@ class _ModeFrom extends State { widget.ovrcurrency ?? 'Bitcoin (BTC)', style: TextStyle( fontFamily: 'Roboto', - fontSize: 30.0, - fontWeight: FontWeight.w300, - letterSpacing: 0.45000001788139343, + fontSize: 24, + fontWeight: FontWeight.w500, + letterSpacing: 0.3, color: Colors.white, ), textAlign: TextAlign.left, diff --git a/lib/widgets/components/currency_selector/mode_to.g.dart b/lib/widgets/components/currency_selector/mode_to.g.dart index 15853d23..8d450d39 100644 --- a/lib/widgets/components/currency_selector/mode_to.g.dart +++ b/lib/widgets/components/currency_selector/mode_to.g.dart @@ -1,9 +1,3 @@ -// ********************************************************************************* -// PARABEAC-GENERATED CODE. DO NOT MODIFY. -// -// FOR MORE INFORMATION ON HOW TO USE PARABEAC, PLEASE VISIT docs.parabeac.com -// ********************************************************************************* - import 'package:flutter/material.dart'; import 'package:auto_size_text/auto_size_text.dart'; import 'package:genius_wallet/widgets/components/custom/currency_dropdown_to_custom.dart'; @@ -34,7 +28,7 @@ class _ModeTo extends State { child: Stack(children: [ Positioned( left: 0, - width: widget.constraints.maxWidth * 1.047, + width: widget.constraints.maxWidth, top: 0, height: widget.constraints.maxHeight * 1.0, child: Stack(children: [ @@ -42,17 +36,15 @@ class _ModeTo extends State { left: 0, width: 68.0, top: 0, - height: 14.0, child: Container( - height: 14.0, width: 68.0, child: AutoSizeText( - widget.ovrTitle ?? 'TO', + widget.ovrTitle ?? 'To', style: TextStyle( fontFamily: 'Roboto', - fontSize: 12.0, - fontWeight: FontWeight.w700, - letterSpacing: 0.25714290142059326, + fontSize: 16.0, + fontWeight: FontWeight.w500, + letterSpacing: 0.3, color: Color(0xff3a3c43), ), textAlign: TextAlign.left, @@ -60,8 +52,7 @@ class _ModeTo extends State { ), Positioned( left: 0, - width: 311.0, - top: 43.0, + top: 30, height: 35.0, child: CurrencyDropdownToCustom( child: Container( @@ -101,9 +92,9 @@ class _ModeTo extends State { widget.ovrcurrency ?? 'Bitcoin (BTC)', style: TextStyle( fontFamily: 'Roboto', - fontSize: 30.0, - fontWeight: FontWeight.w300, - letterSpacing: 0.45000001788139343, + fontSize: 24, + fontWeight: FontWeight.w500, + letterSpacing: 0.3, color: Colors.white, ), textAlign: TextAlign.left, diff --git a/lib/widgets/components/enter_amount.g.dart b/lib/widgets/components/enter_amount.g.dart index ec528800..3fd5b0f4 100644 --- a/lib/widgets/components/enter_amount.g.dart +++ b/lib/widgets/components/enter_amount.g.dart @@ -1,9 +1,3 @@ -// ********************************************************************************* -// PARABEAC-GENERATED CODE. DO NOT MODIFY. -// -// FOR MORE INFORMATION ON HOW TO USE PARABEAC, PLEASE VISIT docs.parabeac.com -// ********************************************************************************* - import 'package:flutter/material.dart'; import 'package:auto_size_text/auto_size_text.dart'; import 'package:genius_wallet/widgets/components/custom/enter_amount_logic.dart'; @@ -35,34 +29,30 @@ class _EnterAmount extends State { child: Stack(children: [ Positioned( left: 0, - width: widget.constraints.maxWidth * 1.0, + width: widget.constraints.maxWidth, top: 0, - height: widget.constraints.maxHeight * 1.0, + height: widget.constraints.maxHeight, child: Stack(children: [ Positioned( left: 0, - width: 126.0, top: 0, - height: 14.0, child: Container( - height: 14.0, - width: 126.0, child: AutoSizeText( - widget.ovrENTERAMOUNT ?? 'ENTER AMOUNT', - style: TextStyle( - fontFamily: 'Roboto', - fontSize: 12.0, - fontWeight: FontWeight.w700, - letterSpacing: 0.25714290142059326, - color: Color(0xff3a3c43), - ), - textAlign: TextAlign.left, - )), + widget.ovrENTERAMOUNT ?? 'Enter Amount', + style: TextStyle( + fontFamily: 'Roboto', + fontSize: 16.0, + fontWeight: FontWeight.w500, + letterSpacing: 0.3, + color: Color(0xff3a3c43), + ), + textAlign: TextAlign.left, + )), ), Positioned( left: 0, - width: 357.0, - top: 43.0, + width: widget.constraints.maxWidth, + top: 30.0, height: 61.0, child: EnterAmountWidget( logic: EnterAmountLogic(context), diff --git a/lib/widgets/components/enter_amount_widget.g.dart b/lib/widgets/components/enter_amount_widget.g.dart index 8f4250a0..f25f6e55 100644 --- a/lib/widgets/components/enter_amount_widget.g.dart +++ b/lib/widgets/components/enter_amount_widget.g.dart @@ -1,10 +1,6 @@ -// ********************************************************************************* -// PARABEAC-GENERATED CODE. DO NOT MODIFY. -// -// FOR MORE INFORMATION ON HOW TO USE PARABEAC, PLEASE VISIT docs.parabeac.com -// ********************************************************************************* - import 'package:flutter/material.dart'; +import 'package:genius_wallet/theme/genius_wallet_colors.g.dart'; +import 'package:genius_wallet/theme/genius_wallet_consts.dart'; import 'package:genius_wallet/widgets/components/custom/enter_amount_logic.dart'; import 'package:genius_wallet/widgets/text_form_field_logic.g.dart'; @@ -21,41 +17,39 @@ class EnterAmountWidget extends StatelessWidget { return TextFormField( style: TextStyle( fontFamily: 'Roboto', - fontSize: 30.0, - fontWeight: FontWeight.w300, - letterSpacing: 0.45000001788139343, + fontSize: 20.0, + fontWeight: FontWeight.w500, + letterSpacing: 0.3, color: Colors.white, ), decoration: InputDecoration( hintText: logic.hintText, hintStyle: TextStyle( fontFamily: 'Roboto', - fontSize: 30.0, - fontWeight: FontWeight.w300, - letterSpacing: 0.45000001788139343, + fontSize: 20, + fontWeight: FontWeight.w500, + letterSpacing: 0.3, color: Colors.white, ), prefixIcon: null, focusedBorder: OutlineInputBorder( borderSide: BorderSide( - color: Color( - 0x00ffffff, - ), + color: GeniusWalletColors.containerGray, width: 1.0, ), - borderRadius: BorderRadius.circular(1), + borderRadius: + BorderRadius.circular(GeniusWalletConsts.borderRadiusCard), ), enabledBorder: OutlineInputBorder( borderSide: BorderSide( - color: Color( - 0x00ffffff, - ), + color: GeniusWalletColors.containerGray, width: 1.0, ), - borderRadius: BorderRadius.circular(1), + borderRadius: + BorderRadius.circular(GeniusWalletConsts.borderRadiusCard), ), filled: true, - fillColor: Color(0xff2a2b31), + fillColor: GeniusWalletColors.containerGray, suffixIcon: null, ), controller: logic.controller, diff --git a/lib/widgets/components/genius_appbar.g.dart b/lib/widgets/components/genius_appbar.g.dart index 0724adf7..5b09bdf5 100644 --- a/lib/widgets/components/genius_appbar.g.dart +++ b/lib/widgets/components/genius_appbar.g.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:genius_wallet/widgets/components/custom/alerts_custom.dart'; import 'package:genius_wallet/widgets/components/custom/hamburger_menu_icon_custom.dart'; +import 'package:go_router/go_router.dart'; class GeniusAppbar extends StatefulWidget { final BoxConstraints constraints; @@ -74,17 +75,20 @@ class _GeniusAppbar extends State { ), Positioned( left: 2, - width: 38.0, - top: 5.0, - height: 38.0, + top: 0, child: widget.ovrGeniusAppbarLogo ?? - Image.asset( - 'assets/images/geniusappbarlogo.png', - package: 'genius_wallet', - height: 38.0, - width: 38.0, - fit: BoxFit.none, - ), + IconButton( + onPressed: () { + null; + // TODO: fix this routing.. not working - context.go("/dashboard"); + }, + iconSize: 30, + icon: Image.asset( + 'assets/images/geniusappbarlogo.png', + package: 'genius_wallet', + height: 30, + width: 30, + )), ), ])), ])); diff --git a/lib/widgets/components/header.g.dart b/lib/widgets/components/header.g.dart index 03ddc6ce..4e84f3c0 100644 --- a/lib/widgets/components/header.g.dart +++ b/lib/widgets/components/header.g.dart @@ -1,9 +1,3 @@ -// ********************************************************************************* -// PARABEAC-GENERATED CODE. DO NOT MODIFY. -// -// FOR MORE INFORMATION ON HOW TO USE PARABEAC, PLEASE VISIT docs.parabeac.com -// ********************************************************************************* - import 'package:flutter/material.dart'; import 'package:auto_size_text/auto_size_text.dart'; @@ -37,11 +31,11 @@ class _Header extends State
{ width: 213.0, child: AutoSizeText( widget.ovrHeaderName ?? 'Header Name', - style: TextStyle( + style: const TextStyle( fontFamily: 'Roboto', fontSize: 24.0, - fontWeight: FontWeight.w300, - letterSpacing: 0.30000001192092896, + fontWeight: FontWeight.w500, + letterSpacing: 0.3, color: Colors.white, ), textAlign: TextAlign.left,