Skip to content

Commit

Permalink
Feature/upgrade packages (#1947)
Browse files Browse the repository at this point in the history
* update

* versions update for android

* iOS to v 14

* iOS stuff (generated)

* back to key accounts

* add scaffold color for theme data

* add app state hidden

* update fields

* build number

* api fixes
  • Loading branch information
n13 authored Apr 30, 2024
1 parent 3ca7893 commit 765c314
Show file tree
Hide file tree
Showing 16 changed files with 105 additions and 96 deletions.
2 changes: 1 addition & 1 deletion analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ analyzer:
# Ignore analyzer hints for updating pubspecs when using Future or
# Stream and not importing dart:async
# Please see https://github.com/flutter/flutter/pull/24528 for details.
sdk_version_async_exported_from_core: ignore
# sdk_version_async_exported_from_core: ignore
exclude:
- flutter/** # Do not analyze the Flutter repository in the CI environment

Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ android {
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.joinseeds.seedswallet"
minSdkVersion 20
targetSdkVersion flutter.targetSdkVersion
minSdkVersion 21
targetSdkVersion 33 // flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
2 changes: 1 addition & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
platform :ios, '13.0'
platform :ios, '14.0'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
Expand Down
129 changes: 67 additions & 62 deletions ios/Runner.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1430"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion lib/components/account_action_row.dart
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class AccountActionRow extends StatelessWidget {
child: Text(
nickname.isNotEmpty ? nickname : account,
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.button,
style: Theme.of(context).textTheme.labelLarge,
),
),
const SizedBox(width: 10),
Expand Down
2 changes: 1 addition & 1 deletion lib/components/alert_input_value.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class AlertInputValue extends StatelessWidget {
Container(
padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4.0),
decoration: BoxDecoration(color: AppColors.darkGreen2, borderRadius: BorderRadius.circular(6)),
child: Text(text, style: Theme.of(context).textTheme.subtitle2),
child: Text(text, style: Theme.of(context).textTheme.titleSmall),
),
],
),
Expand Down
4 changes: 2 additions & 2 deletions lib/components/amount_entry/amount_entry_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class AmountEntryWidget extends StatelessWidget {
Expanded(
child: TextFormField(
textAlign: TextAlign.end,
style: Theme.of(context).textTheme.headline4,
style: Theme.of(context).textTheme.headlineMedium,
keyboardType: const TextInputType.numberWithOptions(decimal: true),
decoration: const InputDecoration(
hintText: "0.0",
Expand Down Expand Up @@ -82,7 +82,7 @@ class AmountEntryWidget extends StatelessWidget {
state.currentCurrencyInput == CurrencyInput.token
? state.tokenAmount.symbol
: state.fiatAmount?.symbol ?? "",
style: Theme.of(context).textTheme.subtitle2,
style: Theme.of(context).textTheme.titleSmall,
),
const SizedBox(height: 18)
],
Expand Down
3 changes: 2 additions & 1 deletion lib/components/balance_row.dart
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ class BalanceRow extends StatelessWidget {
Expanded(
child: Container(
alignment: Alignment.centerRight,
child: Text(tokenAmount?.asFormattedString() ?? "", style: Theme.of(context).textTheme.subtitle1)))
child:
Text(tokenAmount?.asFormattedString() ?? "", style: Theme.of(context).textTheme.titleMedium)))
],
),
Padding(
Expand Down
38 changes: 19 additions & 19 deletions lib/crypto/eosdart/src/client.dart
Original file line number Diff line number Diff line change
Expand Up @@ -222,27 +222,27 @@ class EOSClient {
}

/// Get Key Accounts
// Future<AccountNames> getKeyAccounts(String pubKey) async {
// return _post('/history/get_key_accounts', {'public_key': pubKey}).then((accountNames) {
// return AccountNames.fromJson(accountNames);
// });
// }
Future<AccountNames> getKeyAccounts(String pubKey) async {
return _post('/history/get_key_accounts', {'public_key': pubKey}).then((accountNames) {
return AccountNames.fromJson(accountNames);
});
}

// Get Key Accounts using new API: new get_accounts_by_authorizers API
Future<AccountNames> getAccountsByKey(String pubKey) async {
try {
return _post('/chain/get_accounts_by_authorizers', {
'accounts': [],
'keys': [pubKey]
}).then((response) {
final List<String> accountNames = List.from(response['accounts'].map((e) => e['account_name']));
return AccountNames()..accountNames = accountNames.toSet().toList();
});
} catch (e) {
print("getAccountsByKey error $e");
return AccountNames();
}
}
// Future<AccountNames> getAccountsByKey(String pubKey) async {
// try {
// return _post('/chain/get_accounts_by_authorizers', {
// 'accounts': [],
// 'keys': [pubKey]
// }).then((response) {
// final List<String> accountNames = List.from(response['accounts'].map((e) => e['account_name']));
// return AccountNames()..accountNames = accountNames.toSet().toList();
// });
// } catch (e) {
// print("getAccountsByKey error $e");
// return AccountNames();
// }
// }

/// Push transaction to EOS chain
Future<dynamic> pushTransaction(Transaction transaction,
Expand Down
1 change: 1 addition & 0 deletions lib/design/app_theme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ class SeedsAppTheme {
static ThemeData get darkTheme {
return ThemeData(
primaryColor: AppColors.primary,
scaffoldBackgroundColor: AppColorSchemes.darkColorScheme.background,
fontFamily: 'SFProDisplay',
textTheme: SeedsTextTheme.darkTheme,
brightness: Brightness.dark,
Expand Down
2 changes: 2 additions & 0 deletions lib/screens/app/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ class _AppState extends State<App> with WidgetsBindingObserver {
break;
case AppLifecycleState.detached:
break;
case AppLifecycleState.hidden:
break;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class VerificationScreen extends StatelessWidget {
case PageState.success:
return PasscodeScreen(
title: Text(state.passcodeTitle.localizedDescription(context),
style: Theme.of(context).textTheme.subtitle2),
style: Theme.of(context).textTheme.titleSmall),
onPasscodeCompleted: (passcode) {
if (state.isCreateMode && state.newPasscode == null) {
BlocProvider.of<VerificationBloc>(context).add(OnPasscodeCreated(passcode));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ class ClaimUnplantSeedsBalanceRow extends StatelessWidget {
onPressed: isClaimButtonEnable ? onTapClaim : null,
style: ElevatedButton.styleFrom(
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(6.0)),
primary: AppColors.green1),
backgroundColor: AppColors.green1),
child: const Text("Claim", style: TextStyle(fontSize: 10))),
),
const SizedBox(width: 10),
Container(
alignment: Alignment.centerRight,
child: Text(tokenAmount?.asFormattedString() ?? "", style: Theme.of(context).textTheme.subtitle1))
child: Text(tokenAmount?.asFormattedString() ?? "", style: Theme.of(context).textTheme.titleMedium))
],
),
Padding(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class UnplantSeedsAmountEntry extends StatelessWidget {
child: ElevatedButton(
style: ElevatedButton.styleFrom(
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16.0)),
primary: AppColors.green1,
backgroundColor: AppColors.green1,
),
onPressed: onTapMax,
child: const Text("MAX"),
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: seeds
description: SEEDS Wallet

version: 2.9.4+84
version: 2.9.4+87

environment:
sdk: '>=2.17.0 <3.0.0'
Expand Down

0 comments on commit 765c314

Please sign in to comment.