diff --git a/app/android/app/build_local b/app/android/app/build_local index 1ad129a2a..edbeaf71e 100644 --- a/app/android/app/build_local +++ b/app/android/app/build_local @@ -26,8 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - // compileSdkVersion flutter.compileSdkVersion - compileSdkVersion 34 + compileSdkVersion flutter.compileSdkVersion ndkVersion flutter.ndkVersion sourceSets { diff --git a/app/android/app/build_production b/app/android/app/build_production index d7f2d0322..d477a8716 100644 --- a/app/android/app/build_production +++ b/app/android/app/build_production @@ -26,8 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - // compileSdkVersion flutter.compileSdkVersion - compileSdkVersion 34 + compileSdkVersion flutter.compileSdkVersion ndkVersion flutter.ndkVersion sourceSets { diff --git a/app/android/app/build_staging b/app/android/app/build_staging index 1ad129a2a..edbeaf71e 100644 --- a/app/android/app/build_staging +++ b/app/android/app/build_staging @@ -26,8 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - // compileSdkVersion flutter.compileSdkVersion - compileSdkVersion 34 + compileSdkVersion flutter.compileSdkVersion ndkVersion flutter.ndkVersion sourceSets { diff --git a/app/android/app/build_testing b/app/android/app/build_testing index d7f2d0322..d477a8716 100644 --- a/app/android/app/build_testing +++ b/app/android/app/build_testing @@ -26,8 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - // compileSdkVersion flutter.compileSdkVersion - compileSdkVersion 34 + compileSdkVersion flutter.compileSdkVersion ndkVersion flutter.ndkVersion sourceSets { diff --git a/app/android/gradle.properties b/app/android/gradle.properties index 8eb01a2a4..770b25bfa 100644 --- a/app/android/gradle.properties +++ b/app/android/gradle.properties @@ -5,6 +5,7 @@ org.gradle.configureondemand=true android.useAndroidX=true android.jetifier.ignorelist=bcprov-jdk15on android.enableJetifier=true +android.enableR8.fullMode=false org.gradle.jvmargs=-Xmx1536M \ --add-exports=java.base/sun.nio.ch=ALL-UNNAMED \ --add-opens=java.base/java.lang=ALL-UNNAMED \ diff --git a/app/lib/main.dart b/app/lib/main.dart index 44a9e0b9c..1c2df74e8 100644 --- a/app/lib/main.dart +++ b/app/lib/main.dart @@ -43,15 +43,13 @@ Future main() async { ThemeMode initialThemeMode = ThemeMode.system; ThemeProvider themeProvider = ThemeProvider(initialThemeMode); - await themeProvider.loadTheme(); + await themeProvider.loadTheme(); runApp( MultiProvider( providers: [ - ChangeNotifierProvider( - create: (context) => themeProvider), - ChangeNotifierProvider( - create: (context) => TermsAgreement()), + ChangeNotifierProvider(create: (context) => themeProvider), + ChangeNotifierProvider(create: (context) => TermsAgreement()), ], child: MyApp(initDone: initDone, registered: registered), ), @@ -70,7 +68,7 @@ Future setGlobalValues() async { } class MyApp extends StatelessWidget { - const MyApp({ + const MyApp({ super.key, required this.initDone, this.doubleName, @@ -108,7 +106,7 @@ class MyApp extends StatelessWidget { foregroundColor: kColorScheme.onPrimary, ), cardTheme: const CardTheme().copyWith( - color: kColorScheme.secondaryContainer, + color: kColorScheme.surfaceContainer, margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 8)), elevatedButtonTheme: ElevatedButtonThemeData( style: ElevatedButton.styleFrom( @@ -118,7 +116,7 @@ class MyApp extends StatelessWidget { ), expansionTileTheme: const ExpansionTileThemeData().copyWith( backgroundColor: kColorScheme.backgroundDarker, - collapsedBackgroundColor: ThemeData().colorScheme.background), + collapsedBackgroundColor: ThemeData().colorScheme.surface), bottomNavigationBarTheme: const BottomNavigationBarThemeData().copyWith( selectedItemColor: kColorScheme.primary, unselectedItemColor: kColorScheme.secondary, @@ -134,7 +132,7 @@ class MyApp extends StatelessWidget { foregroundColor: kDarkColorScheme.onPrimaryContainer, ), cardTheme: const CardTheme().copyWith( - color: kDarkColorScheme.secondaryContainer, + color: kDarkColorScheme.surfaceContainer, margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 8)), elevatedButtonTheme: ElevatedButtonThemeData( style: ElevatedButton.styleFrom( @@ -144,15 +142,14 @@ class MyApp extends StatelessWidget { ), expansionTileTheme: const ExpansionTileThemeData().copyWith( backgroundColor: kDarkColorScheme.backgroundDarker, - collapsedBackgroundColor: kDarkColorScheme.background), + collapsedBackgroundColor: kDarkColorScheme.surface), bottomNavigationBarTheme: const BottomNavigationBarThemeData().copyWith( selectedItemColor: kDarkColorScheme.primary, unselectedItemColor: kDarkColorScheme.secondary, ), ), themeMode: themeProvider.themeMode, - home: SplashScreen( - initDone: initDone, registered: registered), + home: SplashScreen(initDone: initDone, registered: registered), ); } } diff --git a/app/lib/screens/dao_screen.dart b/app/lib/screens/dao_screen.dart index 31babc9ab..08bd8c9b3 100644 --- a/app/lib/screens/dao_screen.dart +++ b/app/lib/screens/dao_screen.dart @@ -66,7 +66,7 @@ class _DaoPageState extends State { Text( 'Loading Proposals...', style: Theme.of(context).textTheme.bodyLarge!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.bold), ), ], @@ -83,8 +83,7 @@ class _DaoPageState extends State { child: TabBar( labelColor: Theme.of(context).colorScheme.primary, indicatorColor: Theme.of(context).colorScheme.primary, - unselectedLabelColor: - Theme.of(context).colorScheme.onBackground, + unselectedLabelColor: Theme.of(context).colorScheme.onSurface, dividerColor: Theme.of(context).scaffoldBackgroundColor, labelStyle: Theme.of(context).textTheme.titleLarge, unselectedLabelStyle: Theme.of(context).textTheme.titleMedium, diff --git a/app/lib/screens/farm_screen.dart b/app/lib/screens/farm_screen.dart index 7354c4a18..b54de97f4 100644 --- a/app/lib/screens/farm_screen.dart +++ b/app/lib/screens/farm_screen.dart @@ -96,7 +96,7 @@ class _FarmScreenState extends State { Text( 'Loading Farms...', style: Theme.of(context).textTheme.bodyLarge!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.bold), ), ], @@ -108,7 +108,7 @@ class _FarmScreenState extends State { style: Theme.of(context) .textTheme .bodyLarge! - .copyWith(color: Theme.of(context).colorScheme.onBackground), + .copyWith(color: Theme.of(context).colorScheme.onSurface), ), ); } else { diff --git a/app/lib/screens/identity_verification_screen.dart b/app/lib/screens/identity_verification_screen.dart index ac04c996f..6da337f08 100644 --- a/app/lib/screens/identity_verification_screen.dart +++ b/app/lib/screens/identity_verification_screen.dart @@ -514,7 +514,7 @@ class _IdentityVerificationScreenState style: Theme.of(context) .textTheme .bodyMedium! - .copyWith(color: Theme.of(context).colorScheme.onBackground), + .copyWith(color: Theme.of(context).colorScheme.onSurface), ), const SizedBox( height: 10, @@ -546,8 +546,10 @@ class _IdentityVerificationScreenState ), Text( 'One moment please', - style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground), + style: Theme.of(context) + .textTheme + .bodyMedium! + .copyWith(color: Theme.of(context).colorScheme.onSurface), ), const SizedBox( height: 10, @@ -605,7 +607,7 @@ class _IdentityVerificationScreenState color: Theme.of(context).colorScheme.primary, width: 2), shape: BoxShape.circle, - color: Theme.of(context).colorScheme.background), + color: Theme.of(context).colorScheme.surface), child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ @@ -640,7 +642,7 @@ class _IdentityVerificationScreenState fontWeight: FontWeight.bold, color: Theme.of(context) .colorScheme - .onBackground), + .onSurface), ), ) ], @@ -729,7 +731,7 @@ class _IdentityVerificationScreenState border: Border.all( color: Theme.of(context).colorScheme.primary, width: 2), shape: BoxShape.circle, - color: Theme.of(context).colorScheme.background), + color: Theme.of(context).colorScheme.surface), child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ @@ -783,7 +785,7 @@ class _IdentityVerificationScreenState fontWeight: FontWeight.bold, color: Theme.of(context) .colorScheme - .onBackground), + .onSurface), ), ) ], @@ -935,7 +937,7 @@ class _IdentityVerificationScreenState fontWeight: FontWeight.bold, color: Theme.of(context) .colorScheme - .onBackground))) + .onSurface))) ], ), const SizedBox(height: 5), @@ -1354,16 +1356,14 @@ class _IdentityVerificationScreenState .textTheme .headlineMedium! .copyWith( - color: - Theme.of(context).colorScheme.onBackground), + color: Theme.of(context).colorScheme.onSurface), ) : Text('Change email', style: Theme.of(context) .textTheme .headlineMedium! .copyWith( - color: - Theme.of(context).colorScheme.onBackground)), + color: Theme.of(context).colorScheme.onSurface)), contentPadding: const EdgeInsets.all(24), content: Column( mainAxisSize: MainAxisSize.min, @@ -1374,18 +1374,16 @@ class _IdentityVerificationScreenState .textTheme .bodyLarge! .copyWith( - color: Theme.of(context) - .colorScheme - .onBackground)) + color: + Theme.of(context).colorScheme.onSurface)) : Text( 'Changing your email will require you to go through the email verification process again.', style: Theme.of(context) .textTheme .bodyLarge! .copyWith( - color: Theme.of(context) - .colorScheme - .onBackground)), + color: + Theme.of(context).colorScheme.onSurface)), TextField( controller: controller, decoration: InputDecoration( diff --git a/app/lib/screens/login_screen.dart b/app/lib/screens/login_screen.dart index e68ef1d77..b79970059 100644 --- a/app/lib/screens/login_screen.dart +++ b/app/lib/screens/login_screen.dart @@ -111,8 +111,10 @@ class _LoginScreenState extends State with BlockAndRunMixin { padding: const EdgeInsets.only(right: 24.0, left: 24.0), child: Text( isMobileCheck ? scopeTextMobile : scopeText, - style: Theme.of(context).textTheme.bodyLarge!.copyWith( - color: Theme.of(context).colorScheme.onBackground), + style: Theme.of(context) + .textTheme + .bodyLarge! + .copyWith(color: Theme.of(context).colorScheme.onSurface), textAlign: TextAlign.center, ), ), @@ -187,7 +189,8 @@ class _LoginScreenState extends State with BlockAndRunMixin { padding: const EdgeInsets.only(right: 24.0, left: 24.0), child: Text( 'Attempt expires in ${(timeLeft >= 0) ? timeLeft.toString() : '0'} second(s).', - style: Theme.of(context).textTheme.bodyMedium!.copyWith(color: Theme.of(context).colorScheme.onBackground), + style: Theme.of(context).textTheme.bodyMedium!.copyWith( + color: Theme.of(context).colorScheme.onSurface), textAlign: TextAlign.center, ), ), diff --git a/app/lib/screens/main_screen.dart b/app/lib/screens/main_screen.dart index fb09d846d..d4e839bf7 100644 --- a/app/lib/screens/main_screen.dart +++ b/app/lib/screens/main_screen.dart @@ -65,7 +65,9 @@ class _AppState extends State { children: [ const Hero( tag: 'logo', - child: HomeLogoWidget(animate: true,), + child: HomeLogoWidget( + animate: true, + ), ), const SizedBox(height: 50), Container( @@ -78,7 +80,7 @@ class _AppState extends State { fontWeight: FontWeight.bold, color: errorMessage != null ? Theme.of(context).colorScheme.error - : Theme.of(context).colorScheme.onBackground), + : Theme.of(context).colorScheme.onSurface), ), ), const SizedBox( diff --git a/app/lib/screens/mobile_registration_screen.dart b/app/lib/screens/mobile_registration_screen.dart index d1e076603..d3b508011 100644 --- a/app/lib/screens/mobile_registration_screen.dart +++ b/app/lib/screens/mobile_registration_screen.dart @@ -293,7 +293,7 @@ class _MobileRegistrationScreenState extends State { style: Theme.of(context) .textTheme .bodyMedium! - .copyWith(color: Theme.of(context).colorScheme.onBackground), + .copyWith(color: Theme.of(context).colorScheme.onSurface), ), const SizedBox( height: 10, @@ -351,13 +351,15 @@ class _MobileRegistrationScreenState extends State { style: Theme.of(context) .textTheme .titleMedium! - .copyWith(color: Theme.of(context).colorScheme.onBackground), + .copyWith(color: Theme.of(context).colorScheme.onSurface), ), subtitle: state.index > 0 ? Text( doubleNameController.text, - style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground), + style: Theme.of(context) + .textTheme + .bodyMedium! + .copyWith(color: Theme.of(context).colorScheme.onSurface), ) : null, content: Card( @@ -437,13 +439,15 @@ class _MobileRegistrationScreenState extends State { style: Theme.of(context) .textTheme .titleMedium! - .copyWith(color: Theme.of(context).colorScheme.onBackground), + .copyWith(color: Theme.of(context).colorScheme.onSurface), ), subtitle: state.index > _State.Email.index ? Text( emailController.text, - style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground), + style: Theme.of(context) + .textTheme + .bodyMedium! + .copyWith(color: Theme.of(context).colorScheme.onSurface), ) : null, content: Card( diff --git a/app/lib/screens/recover_screen.dart b/app/lib/screens/recover_screen.dart index e298fdd42..5f123f514 100644 --- a/app/lib/screens/recover_screen.dart +++ b/app/lib/screens/recover_screen.dart @@ -132,16 +132,15 @@ class _RecoverScreenState extends State { style: Theme.of(context) .textTheme .titleLarge! - .copyWith(color: Theme.of(context).colorScheme.onBackground), + .copyWith(color: Theme.of(context).colorScheme.onSurface), ), ), Padding( padding: const EdgeInsets.all(20), child: TextFormField( style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, - decorationColor: Theme.of(context).colorScheme.onBackground - ), + color: Theme.of(context).colorScheme.onSurface, + decorationColor: Theme.of(context).colorScheme.onSurface), keyboardType: TextInputType.text, decoration: const InputDecoration( labelText: 'Name', @@ -160,9 +159,8 @@ class _RecoverScreenState extends State { padding: const EdgeInsets.all(20), child: TextFormField( style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, - decorationColor: Theme.of(context).colorScheme.onBackground - ), + color: Theme.of(context).colorScheme.onSurface, + decorationColor: Theme.of(context).colorScheme.onSurface), keyboardType: TextInputType.multiline, maxLines: null, decoration: const InputDecoration( @@ -274,7 +272,7 @@ class _RecoverScreenState extends State { style: Theme.of(context) .textTheme .bodyMedium! - .copyWith(color: Theme.of(context).colorScheme.onBackground), + .copyWith(color: Theme.of(context).colorScheme.onSurface), ), const SizedBox( height: 10, diff --git a/app/lib/screens/registered_screen.dart b/app/lib/screens/registered_screen.dart index 245f76962..16d0a06da 100644 --- a/app/lib/screens/registered_screen.dart +++ b/app/lib/screens/registered_screen.dart @@ -43,7 +43,9 @@ class _RegisteredScreenState extends State ), const Hero( tag: 'logo', - child: HomeLogoWidget(animate: false,), + child: HomeLogoWidget( + animate: false, + ), ), ], ), @@ -64,7 +66,7 @@ class _RegisteredScreenState extends State .textTheme .titleMedium! .copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), children: const [ TextSpan( diff --git a/app/lib/screens/sign_screen.dart b/app/lib/screens/sign_screen.dart index c88898cda..87a05a0e5 100644 --- a/app/lib/screens/sign_screen.dart +++ b/app/lib/screens/sign_screen.dart @@ -285,8 +285,8 @@ class _SignScreenState extends State with BlockAndRunMixin { children: [ ElevatedButton( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all(Colors.white), - padding: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all(Colors.white), + padding: WidgetStateProperty.all( const EdgeInsets.all(12))), child: Row( mainAxisAlignment: MainAxisAlignment.center, diff --git a/app/lib/screens/successful_screen.dart b/app/lib/screens/successful_screen.dart index c4da2353f..d369fa8de 100644 --- a/app/lib/screens/successful_screen.dart +++ b/app/lib/screens/successful_screen.dart @@ -47,7 +47,7 @@ class _SuccessfulScreenState extends State { widget.text, style: Theme.of(context).textTheme.bodyLarge!.copyWith( fontWeight: FontWeight.bold, - color: Theme.of(context).colorScheme.onBackground), + color: Theme.of(context).colorScheme.onSurface), ), const SizedBox( height: 60.0, diff --git a/app/lib/screens/wallets/contacts.dart b/app/lib/screens/wallets/contacts.dart index 472282955..561c9ef98 100644 --- a/app/lib/screens/wallets/contacts.dart +++ b/app/lib/screens/wallets/contacts.dart @@ -126,7 +126,7 @@ class _ContractsScreenState extends State { labelColor: Theme.of(context).colorScheme.primary, indicatorColor: Theme.of(context).colorScheme.primary, unselectedLabelColor: - Theme.of(context).colorScheme.onBackground, + Theme.of(context).colorScheme.onSurface, dividerColor: Theme.of(context).scaffoldBackgroundColor, labelStyle: Theme.of(context).textTheme.titleLarge, unselectedLabelStyle: diff --git a/app/lib/screens/wallets/receive.dart b/app/lib/screens/wallets/receive.dart index c49cd063f..836dc70f5 100644 --- a/app/lib/screens/wallets/receive.dart +++ b/app/lib/screens/wallets/receive.dart @@ -96,7 +96,7 @@ class _WalletReceiveScreenState extends State { title: TextField( readOnly: true, style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), controller: toController, decoration: InputDecoration( @@ -107,7 +107,7 @@ class _WalletReceiveScreenState extends State { ListTile( title: TextField( style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), keyboardType: TextInputType.number, controller: amountController, @@ -122,7 +122,7 @@ class _WalletReceiveScreenState extends State { ListTile( title: TextField( style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), controller: memoController, decoration: const InputDecoration( diff --git a/app/lib/screens/wallets/send.dart b/app/lib/screens/wallets/send.dart index a7fb9c6a8..9bb78f61e 100644 --- a/app/lib/screens/wallets/send.dart +++ b/app/lib/screens/wallets/send.dart @@ -178,7 +178,7 @@ class _WalletSendScreenState extends State { title: TextField( readOnly: true, style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), controller: fromController, decoration: InputDecoration( @@ -189,7 +189,7 @@ class _WalletSendScreenState extends State { ListTile( title: TextField( style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), controller: toController, decoration: InputDecoration( @@ -211,7 +211,7 @@ class _WalletSendScreenState extends State { ListTile( title: TextField( style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), keyboardType: TextInputType.number, controller: amountController, @@ -228,7 +228,7 @@ class _WalletSendScreenState extends State { ListTile( title: TextField( style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), controller: memoController, decoration: const InputDecoration( diff --git a/app/lib/screens/wallets/transactions.dart b/app/lib/screens/wallets/transactions.dart index df3c297fd..f361924c0 100644 --- a/app/lib/screens/wallets/transactions.dart +++ b/app/lib/screens/wallets/transactions.dart @@ -94,7 +94,7 @@ class _WalletTransactionsWidgetState extends State { Text( 'Loading Transactions...', style: Theme.of(context).textTheme.bodyLarge!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.bold), ), ], @@ -106,7 +106,7 @@ class _WalletTransactionsWidgetState extends State { style: Theme.of(context) .textTheme .bodyLarge! - .copyWith(color: Theme.of(context).colorScheme.onBackground), + .copyWith(color: Theme.of(context).colorScheme.onSurface), ), ); } else { diff --git a/app/lib/screens/wallets/wallet_info.dart b/app/lib/screens/wallets/wallet_info.dart index be3f89c51..3ab8a5955 100644 --- a/app/lib/screens/wallets/wallet_info.dart +++ b/app/lib/screens/wallets/wallet_info.dart @@ -119,14 +119,14 @@ class _WalletDetailsWidgetState extends State { Text( 'Addresses', style: Theme.of(context).textTheme.titleLarge!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), ), ListTile( title: TextField( readOnly: true, style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), controller: stellarAddressController, decoration: const InputDecoration( @@ -146,7 +146,7 @@ class _WalletDetailsWidgetState extends State { title: TextField( readOnly: true, style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), controller: tfchainAddressController, decoration: const InputDecoration( @@ -166,7 +166,7 @@ class _WalletDetailsWidgetState extends State { Text( 'Secrets', style: Theme.of(context).textTheme.titleLarge!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), ), ListTile( @@ -174,7 +174,7 @@ class _WalletDetailsWidgetState extends State { readOnly: true, obscureText: !showStellarSecret, style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), controller: stellarSecretController, decoration: InputDecoration( @@ -204,7 +204,7 @@ class _WalletDetailsWidgetState extends State { readOnly: true, obscureText: !showTfchainSecret, style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), controller: tfchainSecretController, decoration: InputDecoration( @@ -236,7 +236,7 @@ class _WalletDetailsWidgetState extends State { autofocus: edit, readOnly: !edit, style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), controller: walletNameController, decoration: const InputDecoration( diff --git a/app/lib/screens/wallets/wallet_screen.dart b/app/lib/screens/wallets/wallet_screen.dart index 97cc3dfbb..6bee58f53 100644 --- a/app/lib/screens/wallets/wallet_screen.dart +++ b/app/lib/screens/wallets/wallet_screen.dart @@ -57,7 +57,7 @@ class _WalletScreenState extends State { Text( 'Loading Wallets...', style: Theme.of(context).textTheme.bodyLarge!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.bold), ), ], @@ -69,7 +69,7 @@ class _WalletScreenState extends State { style: Theme.of(context) .textTheme .bodyLarge! - .copyWith(color: Theme.of(context).colorScheme.onBackground), + .copyWith(color: Theme.of(context).colorScheme.onSurface), ), ); } else { diff --git a/app/lib/screens/warning_screen.dart b/app/lib/screens/warning_screen.dart index 82537dd65..4dfddd3a6 100644 --- a/app/lib/screens/warning_screen.dart +++ b/app/lib/screens/warning_screen.dart @@ -51,8 +51,10 @@ class _WarningScreenState extends State { children: [ Text( 'Please check the URL bar in your browser and make sure it matches one of the images below.', - style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground), + style: Theme.of(context) + .textTheme + .bodyMedium! + .copyWith(color: Theme.of(context).colorScheme.onSurface), ), ], ), @@ -81,8 +83,10 @@ class _WarningScreenState extends State { children: [ Text( 'Does the URL bar match?', - style: Theme.of(context).textTheme.titleMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground), + style: Theme.of(context) + .textTheme + .titleMedium! + .copyWith(color: Theme.of(context).colorScheme.onSurface), ), ], ), @@ -93,7 +97,7 @@ class _WarningScreenState extends State { children: [ ElevatedButton( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).colorScheme.errorContainer), ), onPressed: () { @@ -102,12 +106,13 @@ class _WarningScreenState extends State { child: Text( "No, it doesn't", style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onErrorContainer), + color: + Theme.of(context).colorScheme.onErrorContainer), ), ), ElevatedButton( style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( Theme.of(context).colorScheme.primaryContainer), ), onPressed: () { @@ -116,7 +121,8 @@ class _WarningScreenState extends State { child: Text( 'Yes, it does', style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onPrimaryContainer), + color: + Theme.of(context).colorScheme.onPrimaryContainer), ), ), ], diff --git a/app/lib/screens/wizard/page5.dart b/app/lib/screens/wizard/page5.dart index 21122a10a..ef19f2856 100644 --- a/app/lib/screens/wizard/page5.dart +++ b/app/lib/screens/wizard/page5.dart @@ -1,6 +1,5 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_svg/svg.dart'; import 'package:provider/provider.dart'; import 'package:threebotlogin/screens/wizard/web_view.dart'; import 'package:threebotlogin/services/shared_preference_service.dart'; @@ -33,7 +32,7 @@ class _Page5State extends State { Text( 'STARTYOUR', style: Theme.of(context).textTheme.displayMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.bold, ), ), @@ -47,7 +46,7 @@ class _Page5State extends State { Text( 'JOURNEY', style: Theme.of(context).textTheme.displayMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.bold, ), ), @@ -100,9 +99,7 @@ class _Page5State extends State { .attemptedWithoutAccepting && !termsAgreement.isChecked ? Theme.of(context).colorScheme.error - : Theme.of(context) - .colorScheme - .onBackground, + : Theme.of(context).colorScheme.onSurface, ), ), TextSpan( diff --git a/app/lib/screens/wizard/swipe_page.dart b/app/lib/screens/wizard/swipe_page.dart index 38b6560dc..f3e4dbb80 100644 --- a/app/lib/screens/wizard/swipe_page.dart +++ b/app/lib/screens/wizard/swipe_page.dart @@ -48,7 +48,7 @@ class _SwipePagesState extends State { child: Text( 'SKIP', style: Theme.of(context).textTheme.bodyLarge!.copyWith( - color: Theme.of(context).colorScheme.onBackground), + color: Theme.of(context).colorScheme.onSurface), )) ], ), diff --git a/app/lib/widgets/add_farm.dart b/app/lib/widgets/add_farm.dart index 4ae590e0e..8d74914d0 100644 --- a/app/lib/widgets/add_farm.dart +++ b/app/lib/widgets/add_farm.dart @@ -117,7 +117,7 @@ class _NewFarmState extends State { label: wallet.name, labelWidget: Text(wallet.name, style: Theme.of(context).textTheme.bodyLarge!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, )), ); }).toList(); @@ -142,14 +142,13 @@ class _NewFarmState extends State { Text( 'Create Farm', style: Theme.of(context).textTheme.headlineSmall!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), ), TextField( style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, - decorationColor: - Theme.of(context).colorScheme.onBackground), + color: Theme.of(context).colorScheme.onSurface, + decorationColor: Theme.of(context).colorScheme.onSurface), maxLength: 40, decoration: InputDecoration( label: const Text('Name'), errorText: nameError), @@ -165,7 +164,7 @@ class _NewFarmState extends State { errorText: walletError, width: MediaQuery.sizeOf(context).width * 0.92, textStyle: Theme.of(context).textTheme.bodyLarge!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), trailingIcon: const Icon( CupertinoIcons.chevron_down, @@ -190,7 +189,7 @@ class _NewFarmState extends State { ), ), menuStyle: MenuStyle( - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( const RoundedRectangleBorder( borderRadius: BorderRadius.all(Radius.circular(4)), ), diff --git a/app/lib/widgets/custom_dialog.dart b/app/lib/widgets/custom_dialog.dart index 550e3c72e..fa1b772be 100644 --- a/app/lib/widgets/custom_dialog.dart +++ b/app/lib/widgets/custom_dialog.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:threebotlogin/main.dart'; -enum DialogType {Info, Warning, Error} +enum DialogType { Info, Warning, Error } class CustomDialog extends StatefulWidget { final String? description; @@ -10,7 +10,7 @@ class CustomDialog extends StatefulWidget { final String title; final IconData image; final dynamic hiddenAction; - final DialogType type; + final DialogType type; const CustomDialog({ super.key, @@ -97,10 +97,10 @@ class _CustomDialogState extends State { const int timesPressedToReveal = 5; Color backgroundColor; Color color; - if (widget.type == DialogType.Error){ + if (widget.type == DialogType.Error) { backgroundColor = Theme.of(context).colorScheme.error; color = Theme.of(context).colorScheme.onError; - } else if (widget.type == DialogType.Warning){ + } else if (widget.type == DialogType.Warning) { backgroundColor = Theme.of(context).colorScheme.warning; color = Theme.of(context).colorScheme.onWarning; } else { @@ -112,7 +112,7 @@ class _CustomDialogState extends State { right: 20.0, child: TextButton( style: ButtonStyle( - overlayColor: MaterialStateProperty.all(Colors.transparent), + overlayColor: WidgetStateProperty.all(Colors.transparent), ), onPressed: () { if (widget.hiddenAction != null) { @@ -146,7 +146,7 @@ class _CustomDialogState extends State { padding: const EdgeInsets.only(top: 30.0 + 20.0), margin: const EdgeInsets.only(top: 30.0), decoration: BoxDecoration( - color: Theme.of(context).colorScheme.background, + color: Theme.of(context).colorScheme.surface, shape: BoxShape.rectangle, borderRadius: BorderRadius.circular(20.0), boxShadow: const [ @@ -166,7 +166,7 @@ class _CustomDialogState extends State { widget.title, style: Theme.of(context).textTheme.titleLarge!.copyWith( fontWeight: FontWeight.bold, - color: Theme.of(context).colorScheme.onBackground), + color: Theme.of(context).colorScheme.onSurface), textAlign: TextAlign.center, ), ), @@ -181,7 +181,7 @@ class _CustomDialogState extends State { textAlign: TextAlign.center, style: Theme.of(context).textTheme.bodyMedium!.copyWith( fontWeight: FontWeight.bold, - color: Theme.of(context).colorScheme.onBackground), + color: Theme.of(context).colorScheme.onSurface), ) : widget.widgetDescription, ), diff --git a/app/lib/widgets/dao/dao_card.dart b/app/lib/widgets/dao/dao_card.dart index 4aeb66656..94a3d5f6e 100644 --- a/app/lib/widgets/dao/dao_card.dart +++ b/app/lib/widgets/dao/dao_card.dart @@ -34,7 +34,6 @@ class _DaoCardState extends State { @override Widget build(BuildContext context) { return Card( - color: Theme.of(context).cardColor, child: Padding( padding: const EdgeInsets.all(16), child: Column( diff --git a/app/lib/widgets/dao/proposals.dart b/app/lib/widgets/dao/proposals.dart index e90c0cc23..838d0a03b 100644 --- a/app/lib/widgets/dao/proposals.dart +++ b/app/lib/widgets/dao/proposals.dart @@ -61,30 +61,30 @@ class _ProposalsWidgetState extends State { child: SizedBox( height: 40, child: SearchBar( - backgroundColor: MaterialStateProperty.all( - Theme.of(context).colorScheme.background), + backgroundColor: WidgetStateProperty.all( + Theme.of(context).colorScheme.surfaceContainer), onChanged: search, trailing: [ Icon( Icons.search, - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ) ], hintText: 'Search by proposal description', - hintStyle: MaterialStateProperty.all( + hintStyle: WidgetStateProperty.all( Theme.of(context).textTheme.bodyLarge!.copyWith( color: Theme.of(context).colorScheme.onSecondaryContainer, ), ), - textStyle: MaterialStateProperty.all( + textStyle: WidgetStateProperty.all( Theme.of(context).textTheme.bodyLarge!.copyWith( color: Theme.of(context).colorScheme.onSecondaryContainer, decorationThickness: 0, ), ), - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(15), ), @@ -103,8 +103,10 @@ class _ProposalsWidgetState extends State { widget.proposals.isEmpty ? 'No active proposal at the moment' : 'No result was found', - style: Theme.of(context).textTheme.bodyLarge!.copyWith( - color: Theme.of(context).colorScheme.onBackground), + style: Theme.of(context) + .textTheme + .bodyLarge! + .copyWith(color: Theme.of(context).colorScheme.onSurface), ), )); } diff --git a/app/lib/widgets/dao/show_result_dialog.dart b/app/lib/widgets/dao/show_result_dialog.dart index 7fef98ce8..ca325b1d7 100644 --- a/app/lib/widgets/dao/show_result_dialog.dart +++ b/app/lib/widgets/dao/show_result_dialog.dart @@ -87,7 +87,7 @@ class _ShowResultDialogState extends State Text( 'Loading Votes...', style: Theme.of(context).textTheme.bodyLarge!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.bold), ), ], @@ -112,10 +112,12 @@ class _ShowResultDialogState extends State }, ), Center( - child: Text('Threshold ${totalVotes} / ${threshold}', - style: Theme.of(context).textTheme.titleMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, - )), + child: Text( + 'Threshold $totalVotes / $threshold', + style: Theme.of(context).textTheme.titleMedium!.copyWith( + color: Theme.of(context).colorScheme.onSurface, + ), + ), ), ], ), @@ -125,14 +127,14 @@ class _ShowResultDialogState extends State children: [ Text('Yes', style: Theme.of(context).textTheme.bodyLarge!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, )), Text( totalVotes == 0 ? '0%' : '${((yesVotes / totalVotes) * 100).toStringAsFixed(0)}%', style: Theme.of(context).textTheme.bodyLarge!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, )), ], ), @@ -152,14 +154,14 @@ class _ShowResultDialogState extends State children: [ Text('No', style: Theme.of(context).textTheme.bodyLarge!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, )), Text( totalVotes == 0 ? '0%' : '${(noVotes / totalVotes * 100).toStringAsFixed(0)}%', style: Theme.of(context).textTheme.bodyLarge!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, )), ], ), @@ -181,7 +183,7 @@ class _ShowResultDialogState extends State shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(10), ), - backgroundColor: Theme.of(context).colorScheme.background, + backgroundColor: Theme.of(context).colorScheme.surface, child: content); } } diff --git a/app/lib/widgets/dao/vote_dialog.dart b/app/lib/widgets/dao/vote_dialog.dart index 571e95475..7c33ce34a 100644 --- a/app/lib/widgets/dao/vote_dialog.dart +++ b/app/lib/widgets/dao/vote_dialog.dart @@ -51,7 +51,7 @@ class _VoteDialogState extends State { label: farm.name, labelWidget: Text(farm.name, style: Theme.of(context).textTheme.bodyLarge!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, )), ); }).toList(); @@ -73,7 +73,7 @@ class _VoteDialogState extends State { Text( 'Loading Farms...', style: Theme.of(context).textTheme.bodyLarge!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.bold), ), ], @@ -91,7 +91,7 @@ class _VoteDialogState extends State { enableFilter: true, width: MediaQuery.sizeOf(context).width * 0.55, textStyle: Theme.of(context).textTheme.bodyLarge!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), trailingIcon: const Icon( CupertinoIcons.chevron_down, @@ -113,7 +113,7 @@ class _VoteDialogState extends State { ), ), menuStyle: MenuStyle( - shape: MaterialStateProperty.all( + shape: WidgetStateProperty.all( const RoundedRectangleBorder( borderRadius: BorderRadius.all(Radius.circular(4)), ), @@ -202,7 +202,8 @@ class _VoteDialogState extends State { try { await vote(approve, widget.proposalHash, farmId!, seed!); - _showDialog('Voted!', 'You have voted successfully.', Icons.check, DialogType.Info); + _showDialog('Voted!', 'You have voted successfully.', Icons.check, + DialogType.Info); } catch (e) { _showDialog('Error', 'Failed to Vote.', Icons.error, DialogType.Error); } finally { @@ -213,7 +214,8 @@ class _VoteDialogState extends State { } } - _showDialog(String title, String description, IconData icon, DialogType type) async { + _showDialog( + String title, String description, IconData icon, DialogType type) async { if (context.mounted) { showDialog( barrierDismissible: false, diff --git a/app/lib/widgets/farm_item.dart b/app/lib/widgets/farm_item.dart index 382504163..de3c9cabf 100644 --- a/app/lib/widgets/farm_item.dart +++ b/app/lib/widgets/farm_item.dart @@ -41,7 +41,7 @@ class _FarmItemWidgetState extends State { title: Text( widget.farm.name, style: Theme.of(context).textTheme.titleMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), ), childrenPadding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10), @@ -50,7 +50,7 @@ class _FarmItemWidgetState extends State { title: TextField( readOnly: true, style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), controller: walletAddressController, decoration: const InputDecoration( @@ -72,7 +72,7 @@ class _FarmItemWidgetState extends State { readOnly: true, obscureText: !showTfchainSecret, style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), controller: tfchainWalletSecretController, decoration: InputDecoration( @@ -103,7 +103,7 @@ class _FarmItemWidgetState extends State { title: TextField( readOnly: true, style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), controller: walletNameController, decoration: const InputDecoration( @@ -114,7 +114,7 @@ class _FarmItemWidgetState extends State { title: TextField( readOnly: true, style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), controller: twinIdController, decoration: const InputDecoration( @@ -125,7 +125,7 @@ class _FarmItemWidgetState extends State { title: TextField( readOnly: true, style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), controller: farmIdController, decoration: const InputDecoration( diff --git a/app/lib/widgets/farm_node_item.dart b/app/lib/widgets/farm_node_item.dart index e3f03a23a..553ff321b 100644 --- a/app/lib/widgets/farm_node_item.dart +++ b/app/lib/widgets/farm_node_item.dart @@ -46,7 +46,7 @@ class _FarmNodeItemWidgetState extends State { style: Theme.of(context) .textTheme .bodyMedium! - .copyWith(color: Theme.of(context).colorScheme.onBackground), + .copyWith(color: Theme.of(context).colorScheme.onSurface), controller: nodeIdController, decoration: const InputDecoration( labelText: 'Node ID', diff --git a/app/lib/widgets/home_card.dart b/app/lib/widgets/home_card.dart index b4f693612..8c922d202 100644 --- a/app/lib/widgets/home_card.dart +++ b/app/lib/widgets/home_card.dart @@ -21,6 +21,7 @@ class HomeCardWidget extends StatelessWidget { final size = MediaQuery.of(context).size.width; const double margin = 3; return Card( + color: Theme.of(context).colorScheme.secondaryContainer, margin: const EdgeInsets.all(margin), shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(5)), clipBehavior: Clip.hardEdge, diff --git a/app/lib/widgets/home_logo.dart b/app/lib/widgets/home_logo.dart index 435f328b7..74d41cfd1 100644 --- a/app/lib/widgets/home_logo.dart +++ b/app/lib/widgets/home_logo.dart @@ -32,7 +32,7 @@ class HomeLogoWidget extends StatelessWidget { .textTheme .headlineSmall! .copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.bold), ), ], @@ -41,7 +41,7 @@ class HomeLogoWidget extends StatelessWidget { 'assets/TF_logo.svg', alignment: Alignment.center, colorFilter: ColorFilter.mode( - Theme.of(context).colorScheme.onBackground, + Theme.of(context).colorScheme.onSurface, BlendMode.srcIn, ), ), diff --git a/app/lib/widgets/layout_drawer.dart b/app/lib/widgets/layout_drawer.dart index 701a75826..5d40ce1f3 100644 --- a/app/lib/widgets/layout_drawer.dart +++ b/app/lib/widgets/layout_drawer.dart @@ -90,7 +90,7 @@ class _LayoutDrawerState extends State { child: SvgPicture.asset( 'assets/TF_log_horizontal.svg', colorFilter: ColorFilter.mode( - Theme.of(context).colorScheme.onBackground, + Theme.of(context).colorScheme.onSurface, BlendMode.srcIn), ), ), @@ -202,7 +202,8 @@ class _LayoutDrawerState extends State { BottomNavigationBarItem(icon: Icon(Icons.home), label: 'Home'), BottomNavigationBarItem( icon: Icon(Icons.account_balance_wallet), label: 'Wallet'), - BottomNavigationBarItem(icon: Icon(Icons.storage), label: 'Farming'), + BottomNavigationBarItem( + icon: Icon(Icons.storage), label: 'Farming'), BottomNavigationBarItem( icon: Icon(Icons.settings), label: 'Settings'), ], diff --git a/app/lib/widgets/phone_widget.dart b/app/lib/widgets/phone_widget.dart index 750671990..c592bc95f 100644 --- a/app/lib/widgets/phone_widget.dart +++ b/app/lib/widgets/phone_widget.dart @@ -93,12 +93,12 @@ class PhoneAlertDialogState extends State { ), ), style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground), + color: Theme.of(context).colorScheme.onSurface), dropdownTextStyle: Theme.of(context) .textTheme .bodyMedium! .copyWith( - color: Theme.of(context).colorScheme.onBackground), + color: Theme.of(context).colorScheme.onSurface), onChanged: (phone) { PhoneNumber p = phone; setState(() { diff --git a/app/lib/widgets/pin_code.dart b/app/lib/widgets/pin_code.dart index 81df0db48..f9afd8245 100644 --- a/app/lib/widgets/pin_code.dart +++ b/app/lib/widgets/pin_code.dart @@ -64,8 +64,10 @@ class _PincodeWidgetState extends State { children: [ Text( widget.userMessage, - style: Theme.of(context).textTheme.bodyLarge!.copyWith( - color: Theme.of(context).colorScheme.onBackground), + style: Theme.of(context) + .textTheme + .bodyLarge! + .copyWith(color: Theme.of(context).colorScheme.onSurface), ), const SizedBox(height: 150), Pinput( diff --git a/app/lib/widgets/preference_dialog.dart b/app/lib/widgets/preference_dialog.dart index 263962adf..0988649d4 100644 --- a/app/lib/widgets/preference_dialog.dart +++ b/app/lib/widgets/preference_dialog.dart @@ -162,10 +162,11 @@ class _PreferenceDialogState extends State { (BuildContext context, AsyncSnapshot snapshot) { if (snapshot.hasData) { return Container( - decoration: BoxDecoration( + decoration: BoxDecoration( border: Border( bottom: BorderSide( - color:Theme.of(context).colorScheme.onBackground, + color: + Theme.of(context).colorScheme.onSurface, width: 0.5, )), ), @@ -188,7 +189,7 @@ class _PreferenceDialogState extends State { .copyWith( color: Theme.of(context) .colorScheme - .onBackground, + .onSurface, fontWeight: FontWeight.bold, ), ), @@ -207,10 +208,11 @@ class _PreferenceDialogState extends State { (BuildContext context, AsyncSnapshot snapshot) { if (snapshot.hasData) { return Container( - decoration: BoxDecoration( + decoration: BoxDecoration( border: Border( bottom: BorderSide( - color: Theme.of(context).colorScheme.onBackground, + color: + Theme.of(context).colorScheme.onSurface, width: 0.5, )), ), @@ -233,7 +235,7 @@ class _PreferenceDialogState extends State { .copyWith( color: Theme.of(context) .colorScheme - .onBackground, + .onSurface, fontWeight: FontWeight.bold, ), ), @@ -247,10 +249,10 @@ class _PreferenceDialogState extends State { case 'digitalTwin': return Container( - decoration: BoxDecoration( + decoration: BoxDecoration( border: Border( bottom: BorderSide( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, width: 0.5, )), ), @@ -269,9 +271,8 @@ class _PreferenceDialogState extends State { .textTheme .bodyLarge! .copyWith( - color: Theme.of(context) - .colorScheme - .onBackground, + color: + Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.bold, ), ), @@ -285,10 +286,11 @@ class _PreferenceDialogState extends State { (BuildContext context, AsyncSnapshot snapshot) { if (snapshot.hasData) { return Container( - decoration: BoxDecoration( + decoration: BoxDecoration( border: Border( bottom: BorderSide( - color: Theme.of(context).colorScheme.onBackground, + color: + Theme.of(context).colorScheme.onSurface, width: 0.5, )), ), @@ -310,7 +312,7 @@ class _PreferenceDialogState extends State { .copyWith( color: Theme.of(context) .colorScheme - .onBackground, + .onSurface, fontWeight: FontWeight.bold, ), ), @@ -329,10 +331,11 @@ class _PreferenceDialogState extends State { (BuildContext context, AsyncSnapshot snapshot) { if (snapshot.hasData) { return Container( - decoration: BoxDecoration( + decoration: BoxDecoration( border: Border( bottom: BorderSide( - color: Theme.of(context).colorScheme.onBackground, + color: + Theme.of(context).colorScheme.onSurface, width: 0.5, )), ), @@ -355,7 +358,7 @@ class _PreferenceDialogState extends State { .copyWith( color: Theme.of(context) .colorScheme - .onBackground, + .onSurface, fontWeight: FontWeight.bold, ), ), @@ -374,10 +377,11 @@ class _PreferenceDialogState extends State { (BuildContext context, AsyncSnapshot snapshot) { if (snapshot.hasData) { return Container( - decoration: BoxDecoration( + decoration: BoxDecoration( border: Border( bottom: BorderSide( - color: Theme.of(context).colorScheme.onBackground, + color: + Theme.of(context).colorScheme.onSurface, width: 0.5, )), ), @@ -399,7 +403,7 @@ class _PreferenceDialogState extends State { .copyWith( color: Theme.of(context) .colorScheme - .onBackground, + .onSurface, fontWeight: FontWeight.bold, ), ), @@ -418,10 +422,11 @@ class _PreferenceDialogState extends State { (BuildContext context, AsyncSnapshot snapshot) { if (snapshot.hasData) { return Container( - decoration: BoxDecoration( + decoration: BoxDecoration( border: Border( bottom: BorderSide( - color: Theme.of(context).colorScheme.onBackground, + color: + Theme.of(context).colorScheme.onSurface, width: 0.5, )), ), @@ -443,7 +448,7 @@ class _PreferenceDialogState extends State { .copyWith( color: Theme.of(context) .colorScheme - .onBackground, + .onSurface, fontWeight: FontWeight.bold, ), ), @@ -462,10 +467,11 @@ class _PreferenceDialogState extends State { (BuildContext context, AsyncSnapshot snapshot) { if (snapshot.hasData) { return Container( - decoration: BoxDecoration( + decoration: BoxDecoration( border: Border( bottom: BorderSide( - color: Theme.of(context).colorScheme.onBackground, + color: + Theme.of(context).colorScheme.onSurface, width: 0.5, )), ), @@ -487,7 +493,7 @@ class _PreferenceDialogState extends State { .copyWith( color: Theme.of(context) .colorScheme - .onBackground, + .onSurface, fontWeight: FontWeight.bold, ), ), @@ -506,10 +512,11 @@ class _PreferenceDialogState extends State { (BuildContext context, AsyncSnapshot snapshot) { if (snapshot.hasData) { return Container( - decoration: BoxDecoration( + decoration: BoxDecoration( border: Border( bottom: BorderSide( - color: Theme.of(context).colorScheme.onBackground, + color: + Theme.of(context).colorScheme.onSurface, width: 0.5, )), ), @@ -531,7 +538,7 @@ class _PreferenceDialogState extends State { .copyWith( color: Theme.of(context) .colorScheme - .onBackground, + .onSurface, fontWeight: FontWeight.bold, ), ), @@ -550,10 +557,11 @@ class _PreferenceDialogState extends State { (BuildContext context, AsyncSnapshot snapshot) { if (snapshot.hasData) { return Container( - decoration: BoxDecoration( + decoration: BoxDecoration( border: Border( bottom: BorderSide( - color: Theme.of(context).colorScheme.onBackground, + color: + Theme.of(context).colorScheme.onSurface, width: 0.5, )), ), @@ -575,7 +583,7 @@ class _PreferenceDialogState extends State { .copyWith( color: Theme.of(context) .colorScheme - .onBackground, + .onSurface, fontWeight: FontWeight.bold, ), ), @@ -595,10 +603,12 @@ class _PreferenceDialogState extends State { if (!snapshot.hasData || snapshot.data.length == 0) { return Container( - decoration: BoxDecoration( + decoration: BoxDecoration( border: Border( bottom: BorderSide( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context) + .colorScheme + .onSurface, width: 0.5, )), ), @@ -619,7 +629,7 @@ class _PreferenceDialogState extends State { .copyWith( color: Theme.of(context) .colorScheme - .onBackground, + .onSurface, fontWeight: FontWeight.bold, ), ), @@ -646,10 +656,11 @@ class _PreferenceDialogState extends State { } return Container( - decoration: BoxDecoration( + decoration: BoxDecoration( border: Border( bottom: BorderSide( - color: Theme.of(context).colorScheme.onBackground, + color: + Theme.of(context).colorScheme.onSurface, width: 0.5, )), ), @@ -685,7 +696,7 @@ class _PreferenceDialogState extends State { .copyWith( color: Theme.of(context) .colorScheme - .onBackground, + .onSurface, fontWeight: FontWeight.bold, ), ), @@ -744,7 +755,7 @@ class _PreferenceDialogState extends State { '${widget.appId} would like to access', style: Theme.of(context).textTheme.bodyLarge!.copyWith( fontWeight: FontWeight.bold, - color: Theme.of(context).colorScheme.onBackground), + color: Theme.of(context).colorScheme.onSurface), textAlign: TextAlign.center, ), ), diff --git a/app/lib/widgets/wallets/add_edit_contact.dart b/app/lib/widgets/wallets/add_edit_contact.dart index 71c8f245b..81842927c 100644 --- a/app/lib/widgets/wallets/add_edit_contact.dart +++ b/app/lib/widgets/wallets/add_edit_contact.dart @@ -207,14 +207,13 @@ class _AddEditContactState extends State { ? 'Add Contact' : 'Edit Contact', style: Theme.of(context).textTheme.headlineSmall!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), ), TextField( style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, - decorationColor: - Theme.of(context).colorScheme.onBackground), + color: Theme.of(context).colorScheme.onSurface, + decorationColor: Theme.of(context).colorScheme.onSurface), maxLength: 50, decoration: InputDecoration( label: const Text('Name'), errorText: nameError), @@ -222,9 +221,8 @@ class _AddEditContactState extends State { ), TextField( style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, - decorationColor: - Theme.of(context).colorScheme.onBackground), + color: Theme.of(context).colorScheme.onSurface, + decorationColor: Theme.of(context).colorScheme.onSurface), keyboardType: TextInputType.multiline, maxLines: null, decoration: InputDecoration( diff --git a/app/lib/widgets/wallets/add_wallet.dart b/app/lib/widgets/wallets/add_wallet.dart index 5754dafd5..c54294463 100644 --- a/app/lib/widgets/wallets/add_wallet.dart +++ b/app/lib/widgets/wallets/add_wallet.dart @@ -172,14 +172,13 @@ class _NewWalletState extends State { Text( 'Import Wallet', style: Theme.of(context).textTheme.headlineSmall!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), ), TextField( style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, - decorationColor: - Theme.of(context).colorScheme.onBackground), + color: Theme.of(context).colorScheme.onSurface, + decorationColor: Theme.of(context).colorScheme.onSurface), maxLength: 50, decoration: InputDecoration( label: const Text('Name'), errorText: nameError), @@ -187,9 +186,8 @@ class _NewWalletState extends State { ), TextField( style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, - decorationColor: - Theme.of(context).colorScheme.onBackground), + color: Theme.of(context).colorScheme.onSurface, + decorationColor: Theme.of(context).colorScheme.onSurface), keyboardType: TextInputType.multiline, maxLines: null, decoration: InputDecoration( diff --git a/app/lib/widgets/wallets/balance_tile.dart b/app/lib/widgets/wallets/balance_tile.dart index e057cd8d6..70c53b13d 100644 --- a/app/lib/widgets/wallets/balance_tile.dart +++ b/app/lib/widgets/wallets/balance_tile.dart @@ -25,7 +25,7 @@ class WalletBalanceTileWidget extends StatelessWidget { child: Image.asset( 'assets/tft_icon.png', fit: BoxFit.cover, - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, height: 50, ), ), diff --git a/app/lib/widgets/wallets/contact_card.dart b/app/lib/widgets/wallets/contact_card.dart index 24626d398..e8a153373 100644 --- a/app/lib/widgets/wallets/contact_card.dart +++ b/app/lib/widgets/wallets/contact_card.dart @@ -62,7 +62,6 @@ class _ContactCardWidgetState extends State { @override Widget build(BuildContext context) { return Card( - color: Theme.of(context).colorScheme.background, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(5), side: BorderSide(color: Theme.of(context).colorScheme.primary)), diff --git a/app/lib/widgets/wallets/contacts_widget.dart b/app/lib/widgets/wallets/contacts_widget.dart index e944ed01e..7c462290e 100644 --- a/app/lib/widgets/wallets/contacts_widget.dart +++ b/app/lib/widgets/wallets/contacts_widget.dart @@ -28,7 +28,7 @@ class ContactsWidget extends StatelessWidget { style: Theme.of(context) .textTheme .bodyLarge! - .copyWith(color: Theme.of(context).colorScheme.onBackground), + .copyWith(color: Theme.of(context).colorScheme.onSurface), ), ); } else { diff --git a/app/lib/widgets/wallets/select_chain_widget.dart b/app/lib/widgets/wallets/select_chain_widget.dart index 514448e3b..3a8c153a9 100644 --- a/app/lib/widgets/wallets/select_chain_widget.dart +++ b/app/lib/widgets/wallets/select_chain_widget.dart @@ -20,7 +20,7 @@ class SelectChainWidget extends StatelessWidget { style: ElevatedButton.styleFrom( fixedSize: Size.fromWidth(width), backgroundColor: - active ? colorScheme.primaryContainer : colorScheme.background, + active ? colorScheme.primaryContainer : colorScheme.surface, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(5), side: BorderSide( @@ -32,7 +32,7 @@ class SelectChainWidget extends StatelessWidget { style: Theme.of(context).textTheme.titleLarge!.copyWith( color: active ? colorScheme.onPrimaryContainer - : colorScheme.onBackground), + : colorScheme.onSurface), ), ); } diff --git a/app/lib/widgets/wallets/send_confirmation.dart b/app/lib/widgets/wallets/send_confirmation.dart index 5b940c970..e20cc6945 100644 --- a/app/lib/widgets/wallets/send_confirmation.dart +++ b/app/lib/widgets/wallets/send_confirmation.dart @@ -60,14 +60,14 @@ class _SendConfirmationWidgetState extends State { Text( 'Send Confirmation', style: Theme.of(context).textTheme.headlineSmall!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), ), ListTile( title: TextField( readOnly: true, style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), controller: fromController, decoration: const InputDecoration( @@ -79,7 +79,7 @@ class _SendConfirmationWidgetState extends State { title: TextField( readOnly: true, style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), controller: toController, decoration: const InputDecoration( @@ -91,7 +91,7 @@ class _SendConfirmationWidgetState extends State { title: TextField( readOnly: true, style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), keyboardType: TextInputType.number, controller: amountController, @@ -106,7 +106,7 @@ class _SendConfirmationWidgetState extends State { title: TextField( readOnly: true, style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, ), controller: memoController, decoration: const InputDecoration( @@ -153,13 +153,13 @@ class _SendConfirmationWidgetState extends State { } else { await TFChain.transfer(widget.secret, widget.to, widget.amount); } - await _showDialog( - 'Success!', 'Tokens have been transferred successfully', Icons.check, DialogType.Info); + await _showDialog('Success!', 'Tokens have been transferred successfully', + Icons.check, DialogType.Info); } catch (e) { - _showDialog( - 'Error', 'Failed to transfer. Please try again.', Icons.error, DialogType.Error); + _showDialog('Error', 'Failed to transfer. Please try again.', Icons.error, + DialogType.Error); setState(() { - loading = false; + loading = false; }); return; } @@ -171,7 +171,8 @@ class _SendConfirmationWidgetState extends State { Navigator.pop(context); } - Future _showDialog(String title, String message, IconData icon, DialogType type) async { + Future _showDialog( + String title, String message, IconData icon, DialogType type) async { showDialog( barrierDismissible: false, context: context, diff --git a/app/lib/widgets/wallets/transaction.dart b/app/lib/widgets/wallets/transaction.dart index a2799ddb0..e671311dd 100644 --- a/app/lib/widgets/wallets/transaction.dart +++ b/app/lib/widgets/wallets/transaction.dart @@ -49,7 +49,7 @@ class TransactionWidget extends StatelessWidget { Text(transaction.hash, overflow: TextOverflow.ellipsis, style: Theme.of(context).textTheme.bodyLarge!.copyWith( - color: Theme.of(context).colorScheme.onBackground)), + color: Theme.of(context).colorScheme.onSurface)), Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ @@ -73,9 +73,8 @@ class TransactionWidget extends StatelessWidget { .textTheme .bodyMedium! .copyWith( - color: Theme.of(context) - .colorScheme - .onBackground)), + color: + Theme.of(context).colorScheme.onSurface)), ], ), ], diff --git a/app/lib/widgets/wallets/transaction_details.dart b/app/lib/widgets/wallets/transaction_details.dart index 529e22392..a242cbaba 100644 --- a/app/lib/widgets/wallets/transaction_details.dart +++ b/app/lib/widgets/wallets/transaction_details.dart @@ -23,7 +23,7 @@ class TransactionDetails extends StatelessWidget { children: [ Text(label, style: Theme.of(context).textTheme.titleLarge!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.bold)), const SizedBox(height: 10), label == 'Type' @@ -53,9 +53,8 @@ class TransactionDetails extends StatelessWidget { .textTheme .bodyLarge! .copyWith( - color: Theme.of(context) - .colorScheme - .onBackground)), + color: + Theme.of(context).colorScheme.onSurface)), ], ), ), diff --git a/app/lib/widgets/wallets/wallet_card.dart b/app/lib/widgets/wallets/wallet_card.dart index 55ab1d423..b8cc90644 100644 --- a/app/lib/widgets/wallets/wallet_card.dart +++ b/app/lib/widgets/wallets/wallet_card.dart @@ -87,7 +87,7 @@ class _WalletCardWidgetState extends State { width: 35, child: Image.asset( 'assets/tft_icon.png', - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, )), Text( 'Stellar', @@ -112,7 +112,7 @@ class _WalletCardWidgetState extends State { child: Image.asset( 'assets/tft_icon.png', fit: BoxFit.contain, - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, )), Text( 'TFChain', @@ -132,7 +132,6 @@ class _WalletCardWidgetState extends State { ]; } return Card( - color: Theme.of(context).colorScheme.background, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(5), side: BorderSide(color: Theme.of(context).colorScheme.primary)), diff --git a/app/lib/widgets/wizard/common_page.dart b/app/lib/widgets/wizard/common_page.dart index 34a02f06f..62aa5307b 100644 --- a/app/lib/widgets/wizard/common_page.dart +++ b/app/lib/widgets/wizard/common_page.dart @@ -38,7 +38,7 @@ class _CommonPageState extends State { style: Theme.of(context).textTheme.displayMedium!.copyWith( color: widget.title == 'Welcome to' ? Theme.of(context).colorScheme.primary - : Theme.of(context).colorScheme.onBackground, + : Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.bold, ), ), @@ -52,15 +52,15 @@ class _CommonPageState extends State { ), SizedBox( height: widget.subtitle.isEmpty - ? MediaQuery.of(context).size.height * 0.15 - : MediaQuery.of(context).size.height * 0.04, + ? MediaQuery.of(context).size.height * 0.15 + : MediaQuery.of(context).size.height * 0.04, ), widget.imagePath.endsWith('.svg') ? SvgPicture.asset( widget.imagePath, alignment: Alignment.center, colorFilter: ColorFilter.mode( - Theme.of(context).colorScheme.onBackground, + Theme.of(context).colorScheme.onSurface, BlendMode.srcIn, ), width: widget.widthPercentage != null @@ -92,7 +92,7 @@ class _CommonPageState extends State { child: Text( widget.description, style: Theme.of(context).textTheme.bodyLarge!.copyWith( - color: Theme.of(context).colorScheme.onBackground, + color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.bold, ), textAlign: TextAlign.center, diff --git a/app/lib/widgets/wizard/terms_and_conditions.dart b/app/lib/widgets/wizard/terms_and_conditions.dart index ccfe2df73..ff4a207c0 100644 --- a/app/lib/widgets/wizard/terms_and_conditions.dart +++ b/app/lib/widgets/wizard/terms_and_conditions.dart @@ -25,8 +25,10 @@ class _TermsAndConditionsState extends State { children: [ Text( 'Before you can start using the app, you must accept the Terms and Conditions.', - style: Theme.of(context).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onBackground)), + style: Theme.of(context) + .textTheme + .bodyMedium! + .copyWith(color: Theme.of(context).colorScheme.onSurface)), GestureDetector( onTap: () { Navigator.push( @@ -56,7 +58,7 @@ class _TermsAndConditionsState extends State { color: termsAgreement.attemptedWithoutAccepting && !termsAgreement.isChecked ? Theme.of(context).colorScheme.error - : Theme.of(context).colorScheme.onBackground)), + : Theme.of(context).colorScheme.onSurface)), ), ], ); diff --git a/app/pubspec.lock b/app/pubspec.lock index 18ea86fb8..ebf2c5788 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -5,10 +5,15 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" + sha256: "5aaf60d96c4cd00fe7f21594b5ad6a1b699c80a27420f8a837f4d68473ef09e3" url: "https://pub.dev" source: hosted - version: "67.0.0" + version: "68.0.0" + _macros: + dependency: transitive + description: dart + source: sdk + version: "0.1.0" adaptive_number: dependency: transitive description: @@ -21,10 +26,10 @@ packages: dependency: transitive description: name: analyzer - sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" + sha256: "21f1d3720fd1c70316399d5e2bccaebb415c434592d778cce8acb967b8578808" url: "https://pub.dev" source: hosted - version: "6.4.1" + version: "6.5.0" archive: dependency: transitive description: @@ -109,10 +114,10 @@ packages: dependency: transitive description: name: build_daemon - sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1" + sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9" url: "https://pub.dev" source: hosted - version: "4.0.1" + version: "4.0.2" build_resolvers: dependency: transitive description: @@ -125,18 +130,18 @@ packages: dependency: "direct main" description: name: build_runner - sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22" + sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7" url: "https://pub.dev" source: hosted - version: "2.4.9" + version: "2.4.11" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799" + sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe url: "https://pub.dev" source: hosted - version: "7.3.0" + version: "7.3.1" built_collection: dependency: transitive description: @@ -213,10 +218,10 @@ packages: dependency: transitive description: name: crypto - sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27 url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.5" cryptography: dependency: transitive description: @@ -245,10 +250,10 @@ packages: dependency: transitive description: name: dart_style - sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9" + sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab" url: "https://pub.dev" source: hosted - version: "2.3.6" + version: "2.3.7" decimal: dependency: transitive description: @@ -333,18 +338,18 @@ packages: dependency: transitive description: name: ffi - sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.3" file: dependency: transitive description: name: file - sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 url: "https://pub.dev" source: hosted - version: "7.0.0" + version: "7.0.1" fixnum: dependency: transitive description: @@ -419,10 +424,10 @@ packages: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: "8cf40eebf5dec866a6d1956ad7b4f7016e6c0cc69847ab946833b7d43743809f" + sha256: "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda" url: "https://pub.dev" source: hosted - version: "2.0.19" + version: "2.0.22" flutter_svg: dependency: "direct main" description: @@ -477,18 +482,16 @@ packages: dependency: transitive description: name: graphs - sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 + sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.2" gridproxy_client: dependency: "direct main" description: - path: "packages/gridproxy_client" - ref: tfchain_graphql - resolved-ref: "34c29c3d39530dae2843fbe3ad47307db6d28a23" - url: "https://github.com/codescalers/tfgrid-sdk-dart" - source: git + path: "../../../codescalers/tfgrid-sdk-dart/packages/gridproxy_client" + relative: true + source: path version: "1.0.0" hashlib: dependency: transitive @@ -594,6 +597,30 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.4+9" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + url: "https://pub.dev" + source: hosted + version: "10.0.4" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + url: "https://pub.dev" + source: hosted + version: "3.0.3" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" lints: dependency: transitive description: @@ -626,22 +653,30 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.2" + macros: + dependency: transitive + description: + name: macros + sha256: "12e8a9842b5a7390de7a781ec63d793527582398d16ea26c60fed58833c9ae79" + url: "https://pub.dev" + source: hosted + version: "0.1.0-main.0" matcher: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" merlin: dependency: transitive description: @@ -718,10 +753,10 @@ packages: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" path_parsing: dependency: transitive description: @@ -742,18 +777,18 @@ packages: dependency: transitive description: name: path_provider_android - sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d + sha256: "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7" url: "https://pub.dev" source: hosted - version: "2.2.4" + version: "2.2.10" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f" + sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16 url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.0" path_provider_linux: dependency: transitive description: @@ -878,34 +913,34 @@ packages: dependency: transitive description: name: polkadart - sha256: "91ff0cefa9a6a94a55bc241b40f2bde69ad11a3de2b26912941367127c933afe" + sha256: "55b40e205ea4227c97fdfc8dce1783d862ddcce0b097bae6327e3835017ce9bd" url: "https://pub.dev" source: hosted - version: "0.4.6" + version: "0.4.7" polkadart_cli: dependency: transitive description: name: polkadart_cli - sha256: a0c82811e7ed935208afc7a8e0ef04446574d53f0a1855694ec5ad0792decef1 + sha256: a332ccdda670e634e266d4e38b4aba7c52cbc37a32ed037af40b37b3e6dd3c8d url: "https://pub.dev" source: hosted - version: "0.4.2" + version: "0.4.3" polkadart_keyring: dependency: transitive description: name: polkadart_keyring - sha256: "10cdd75e3319169ca7a4bb49745d85fab3f56bba2eafda35655c4f278a4c5e07" + sha256: "482260a119110ef21f8d66e69ae8c2716afab974247391535d1b02dee613f9e9" url: "https://pub.dev" source: hosted - version: "0.4.3" + version: "0.4.4" polkadart_scale_codec: dependency: transitive description: name: polkadart_scale_codec - sha256: fab60c739f6ebcc812796e56378656dca57179cec46e92c23614db6fd9ed0f86 + sha256: "0bc6700e93af2dd054db413837433b8383aae095348282d7837583da3e621978" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" pool: dependency: transitive description: @@ -942,10 +977,10 @@ packages: dependency: transitive description: name: qr - sha256: "64957a3930367bf97cc211a5af99551d630f2f4625e38af10edd6b19131b64b3" + sha256: "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" qr_code_scanner: dependency: "direct main" description: @@ -990,10 +1025,10 @@ packages: dependency: transitive description: name: reflectable - sha256: cdc1a278a2e9769abafaf9ba54ce1fd3432b2a38360e14b87ea6344f715340de + sha256: "9fa1bb5b533e404c93345c8c2beced73882c0ea45af1d980f5550546727db683" url: "https://pub.dev" source: hosted - version: "4.0.6" + version: "4.0.8" rest_client: dependency: transitive description: @@ -1070,10 +1105,10 @@ packages: dependency: transitive description: name: secp256k1_ecdsa - sha256: "87008b4fd164d861b94b0edf2e01ffadd6f06769e1f0382e19bb091daecc0576" + sha256: "7e731f4039f44d8e416a193db449f80c67a69ab6933a4970eb6ac7a91e1ca7b2" url: "https://pub.dev" source: hosted - version: "0.4.0" + version: "0.4.1" shared_preferences: dependency: "direct main" description: @@ -1086,26 +1121,26 @@ packages: dependency: transitive description: name: shared_preferences_android - sha256: "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2" + sha256: "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e" url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.3.2" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c" + sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d" url: "https://pub.dev" source: hosted - version: "2.3.5" + version: "2.5.3" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - sha256: "2ba0510d3017f91655b7543e9ee46d48619de2a2af38e5c790423f7007c7ccc1" + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.1" shared_preferences_platform_interface: dependency: transitive description: @@ -1126,10 +1161,10 @@ packages: dependency: transitive description: name: shared_preferences_windows - sha256: "398084b47b7f92110683cac45c6dc4aae853db47e470e5ddcd52cab7f7196ab2" + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.1" shelf: dependency: transitive description: @@ -1142,24 +1177,24 @@ packages: dependency: transitive description: name: shelf_web_socket - sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" + sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611" url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "2.0.0" shuftipro_onsite_sdk: dependency: "direct main" description: name: shuftipro_onsite_sdk - sha256: d1329e5fe5a15cbbe5d2e75af9ab0eab1dd00a41a017eaf74225cb37d39f9e52 + sha256: "3de6bf3c1c6a6a88356adcc15232e7ea3deda694090df64ae2e8295a100f6f37" url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.0.3" signer: dependency: transitive description: path: "packages/signer" ref: main - resolved-ref: fb8afb190f8c4fcad43692f37ea0d72cc57bcefc + resolved-ref: "249ef275b6b9e27e58a4969ec25c138f8e3e922a" url: "https://github.com/codescalers/tfgrid-sdk-dart.git" source: git version: "0.1.0" @@ -1204,18 +1239,18 @@ packages: dependency: transitive description: name: sodium - sha256: ad436bdd889ec5b0a86e1a0b49a1c714b94c87c08c759defab10717239f39879 + sha256: d9830a388e37c82891888e64cfd4c6764fa3ac716bed80ac6eab89ee42c3cd76 url: "https://pub.dev" source: hosted - version: "2.3.0+2" + version: "2.3.1+1" sodium_libs: dependency: "direct main" description: name: sodium_libs - sha256: a3399776deac73767bff9dd3da041b9553dce2da432912a6134b8441995df285 + sha256: aa764acd6ccc6113e119c2d99471aeeb4637a9a501639549b297d3a143ff49b3 url: "https://pub.dev" source: hosted - version: "2.2.0+11" + version: "2.2.1+6" source_span: dependency: transitive description: @@ -1236,18 +1271,18 @@ packages: dependency: transitive description: name: sr25519 - sha256: "266f7b2a4dd2d6a41a49924d41e80665f3b8340c157deff172f2b0cf64657a27" + sha256: "351a42deaf7656690fb3e09568701a13c1813229cee15a21a5ca1b322246c24d" url: "https://pub.dev" source: hosted - version: "0.4.0" + version: "0.4.1" ss58: dependency: transitive description: name: ss58 - sha256: b24d2713597b83708ef30daea5a565dba8bc9129031b30c025069e168301ae5e + sha256: "5c2f4be38fb657a4e1aa03a712871c3a8aeea734ebdd77f6a67e4a39cf36647a" url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.3" stack_trace: dependency: transitive description: @@ -1259,11 +1294,9 @@ packages: stellar_client: dependency: "direct main" description: - path: "packages/stellar_client" - ref: tfchain_graphql - resolved-ref: "34c29c3d39530dae2843fbe3ad47307db6d28a23" - url: "https://github.com/codescalers/tfgrid-sdk-dart" - source: git + path: "../../../codescalers/tfgrid-sdk-dart/packages/stellar_client" + relative: true + source: path version: "0.1.0" stellar_flutter_sdk: dependency: transitive @@ -1309,18 +1342,18 @@ packages: dependency: transitive description: name: substrate_bip39 - sha256: "29548105e939d1fb213aba96686eb5c5aae472249fa12b8dda58b252d23f492c" + sha256: fa950b80b92b7fc96f13683033fe974cdfd3ee0d30d989f6b8f3fcbfe6021ac2 url: "https://pub.dev" source: hosted - version: "0.4.0" + version: "0.4.1" substrate_metadata: dependency: transitive description: name: substrate_metadata - sha256: "4557950c7dcea17cdf7e1224ac7822ab38dd9658f000be6d58b4a41b0a8126d4" + sha256: ed6511dcca9dae3b10d525a6b8c1688e4eda0ab27bed0bbdfc31bc31bf34b441 url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.2" synchronized: dependency: transitive description: @@ -1341,18 +1374,16 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.0" tfchain_client: dependency: "direct main" description: - path: "packages/tfchain_client" - ref: tfchain_graphql - resolved-ref: "34c29c3d39530dae2843fbe3ad47307db6d28a23" - url: "https://github.com/codescalers/tfgrid-sdk-dart" - source: git + path: "../../../codescalers/tfgrid-sdk-dart/packages/tfchain_client" + relative: true + source: path version: "0.1.0" timing: dependency: transitive @@ -1438,42 +1469,42 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3" + sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603" url: "https://pub.dev" source: hosted - version: "6.3.0" + version: "6.3.1" url_launcher_android: dependency: transitive description: name: url_launcher_android - sha256: "17cd5e205ea615e2c6ea7a77323a11712dffa0720a8a90540db57a01347f9ad9" + sha256: f0c73347dfcfa5b3db8bc06e1502668265d39c08f310c29bff4e28eea9699f79 url: "https://pub.dev" source: hosted - version: "6.3.2" + version: "6.3.9" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03" + sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e url: "https://pub.dev" source: hosted - version: "6.2.4" + version: "6.3.1" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811 + sha256: e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.0" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de" + sha256: "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672" url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.2.1" url_launcher_platform_interface: dependency: transitive description: @@ -1510,10 +1541,10 @@ packages: dependency: transitive description: name: uuid - sha256: f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77 + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff url: "https://pub.dev" source: hosted - version: "4.5.0" + version: "4.5.1" validators: dependency: "direct main" description: @@ -1554,6 +1585,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + url: "https://pub.dev" + source: hosted + version: "14.2.1" watcher: dependency: transitive description: @@ -1566,18 +1605,18 @@ packages: dependency: transitive description: name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05" url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.4.2" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b + sha256: "939ab60734a4f8fa95feacb55804fa278de28bdeef38e616dc08e44a84adea23" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.3" webview_flutter: dependency: "direct main" description: @@ -1590,10 +1629,10 @@ packages: dependency: transitive description: name: webview_flutter_android - sha256: "0d21cfc3bfdd2e30ab2ebeced66512b91134b39e72e97b43db2d47dda1c4e53a" + sha256: ed021f27ae621bc97a6019fb601ab16331a3db4bf8afa305e9f6689bdb3edced url: "https://pub.dev" source: hosted - version: "3.16.3" + version: "3.16.8" webview_flutter_platform_interface: dependency: transitive description: @@ -1614,26 +1653,26 @@ packages: dependency: transitive description: name: win32 - sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8" + sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a" url: "https://pub.dev" source: hosted - version: "5.2.0" + version: "5.5.4" win32_registry: dependency: transitive description: name: win32_registry - sha256: "41fd8a189940d8696b1b810efb9abcf60827b6cbfab90b0c43e8439e3a39d85a" + sha256: "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852" url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.5" xdg_directories: dependency: transitive description: name: xdg_directories - sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.1.0" xml: dependency: transitive description: @@ -1659,5 +1698,5 @@ packages: source: hosted version: "1.1.4+10" sdks: - dart: ">=3.2.3 <4.0.0" - flutter: ">=3.16.6" + dart: ">=3.4.0 <4.0.0" + flutter: ">=3.22.0" diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 8ca35dbbd..a732ea43b 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -31,7 +31,7 @@ dependencies: url: https://github.com/codescalers/tfgrid-sdk-dart ref: tfchain_graphql path: packages/gridproxy_client - shuftipro_onsite_sdk: ^1.0.5 + shuftipro_onsite_sdk: 1.0.3 flutter_svg: ^2.0.6 bip39: ^1.0.6 socket_io_client: ^1.0.2