Fixed compilation

This commit is contained in:
Stephan D
2026-01-22 14:15:14 +01:00
parent 8456263dd8
commit 32e8376700
41 changed files with 549 additions and 190 deletions

View File

@@ -1,4 +1,6 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pshared/utils/currency.dart';
@@ -23,11 +25,13 @@ class BalanceAmount extends StatelessWidget {
final textTheme = Theme.of(context).textTheme;
final colorScheme = Theme.of(context).colorScheme;
final currencyBalance = currencyCodeToSymbol(wallet.currency);
final wallets = context.read<WalletsController>();
return Row(
children: [
Text(
wallet.isHidden ? '•••• $currencyBalance' : '${amountToString(wallet.balance)} $currencyBalance',
wallets.isHidden(wallet.id) ? '•••• $currencyBalance' : '${amountToString(wallet.balance)} $currencyBalance',
style: textTheme.headlineSmall?.copyWith(
fontWeight: FontWeight.bold,
color: colorScheme.onSurface,
@@ -37,7 +41,7 @@ class BalanceAmount extends StatelessWidget {
GestureDetector(
onTap: onToggleVisibility,
child: Icon(
wallet.isHidden ? Icons.visibility_off : Icons.visibility,
wallets.isHidden(wallet.id) ? Icons.visibility_off : Icons.visibility,
size: _iconSize,
color: colorScheme.onSurface,
),

View File

@@ -2,9 +2,10 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pweb/pages/dashboard/buttons/balance/carousel.dart';
import 'package:pshared/provider/payment/wallets.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
@@ -16,24 +17,23 @@ class BalanceWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
final walletsProvider = context.watch<WalletsProvider>();
final walletsController = context.watch<WalletsController>();
final loc = AppLocalizations.of(context)!;
if (walletsProvider.isLoading) {
if (walletsController.isLoading) {
return const Center(child: CircularProgressIndicator());
}
final wallets = walletsProvider.wallets;
final wallets = walletsController.wallets;
if (wallets.isEmpty) {
return Center(child: Text(loc.noWalletsAvailable));
}
return
WalletCarousel(
wallets: wallets,
onWalletChanged: walletsProvider.selectWallet,
onTopUp: onTopUp,
);
return WalletCarousel(
wallets: wallets,
onWalletChanged: walletsController.selectWallet,
onTopUp: onTopUp,
);
}
}

View File

@@ -2,12 +2,13 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pweb/pages/dashboard/buttons/balance/add_funds.dart';
import 'package:pweb/pages/dashboard/buttons/balance/amount.dart';
import 'package:pweb/pages/dashboard/buttons/balance/config.dart';
import 'package:pweb/pages/dashboard/buttons/balance/header.dart';
import 'package:pshared/provider/payment/wallets.dart';
import 'package:pweb/widgets/wallet_balance_refresh_button.dart';
@@ -43,7 +44,7 @@ class WalletCard extends StatelessWidget {
BalanceAmount(
wallet: wallet,
onToggleVisibility: () {
context.read<WalletsProvider>().toggleVisibility(wallet.id);
context.read<WalletsController>().toggleVisibility(wallet.id);
},
),
WalletBalanceRefreshButton(

View File

@@ -2,13 +2,13 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pshared/utils/currency.dart';
import 'package:pweb/pages/dashboard/payouts/summary/fee.dart';
import 'package:pweb/pages/dashboard/payouts/summary/recipient_receives.dart';
import 'package:pweb/pages/dashboard/payouts/summary/sent_amount.dart';
import 'package:pweb/pages/dashboard/payouts/summary/total.dart';
import 'package:pshared/provider/payment/wallets.dart';
class PaymentSummary extends StatelessWidget {
@@ -22,7 +22,7 @@ class PaymentSummary extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
PaymentSentAmountRow(currency: currencyStringToCode(context.read<WalletsProvider>().selectedWallet?.tokenSymbol ?? 'USDT')),
PaymentSentAmountRow(currency: currencyStringToCode(context.read<WalletsController>().selectedWallet?.tokenSymbol ?? 'USDT')),
const PaymentFeeRow(),
const PaymentRecipientReceivesRow(),
SizedBox(height: spacing),

View File

@@ -2,13 +2,13 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pshared/models/payment/type.dart';
import 'package:pshared/models/recipient/recipient.dart';
import 'package:pshared/provider/payment/flow.dart';
import 'package:pshared/provider/payment/provider.dart';
import 'package:pshared/provider/recipient/pmethods.dart';
import 'package:pshared/provider/recipient/provider.dart';
import 'package:pshared/provider/payment/wallets.dart';
import 'package:pweb/pages/payment_methods/payment_page/body.dart';
import 'package:pweb/widgets/sidebar/destinations.dart';
@@ -108,7 +108,7 @@ class _PaymentPageState extends State<PaymentPage> {
recipient: recipient,
recipientProvider: recipientProvider,
methodsProvider: methodsProvider,
onWalletSelected: context.read<WalletsProvider>().selectWallet,
onWalletSelected: context.read<WalletsController>().selectWallet,
searchController: _searchController,
searchFocusNode: _searchFocusNode,
onSearchChanged: _handleSearchChanged,

View File

@@ -2,9 +2,9 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pshared/models/recipient/recipient.dart';
import 'package:pshared/provider/payment/wallets.dart';
import 'package:pshared/provider/recipient/provider.dart';
import 'package:pweb/pages/payment_methods/payment_page/back_button.dart';
@@ -81,7 +81,7 @@ class PaymentPageContent extends StatelessWidget {
Row(
children: [
Expanded(child: SectionTitle(loc.sourceOfFunds)),
Consumer<WalletsProvider>(
Consumer<WalletsController>(
builder: (context, provider, _) {
final selectedWalletId = provider.selectedWallet?.id;
if (selectedWalletId == null) {

View File

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pshared/provider/payment/wallets.dart';
import 'package:pweb/utils/payment/dropdown.dart';
@@ -17,7 +17,7 @@ class PaymentMethodSelector extends StatelessWidget {
});
@override
Widget build(BuildContext context) => Consumer<WalletsProvider>(
Widget build(BuildContext context) => Consumer<WalletsController>(
builder: (context, provider, _) => PaymentMethodDropdown(
methods: provider.wallets,
selectedMethod: provider.selectedWallet,

View File

@@ -2,11 +2,11 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pshared/utils/currency.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pshared/provider/payment/wallets.dart';
import 'package:pweb/models/visibility.dart';
import 'package:pweb/models/visibility.dart';
import 'package:pweb/pages/dashboard/buttons/balance/amount.dart';
import 'package:pweb/widgets/wallet_balance_refresh_button.dart';
@@ -51,7 +51,7 @@ class WalletCard extends StatelessWidget {
BalanceAmount(
wallet: wallet,
onToggleVisibility: () {
context.read<WalletsProvider>().toggleVisibility(wallet.id);
context.read<WalletsController>().toggleVisibility(wallet.id);
},
),
WalletBalanceRefreshButton(

View File

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pshared/models/payment/type.dart';
import 'package:pshared/provider/payment/wallets.dart';
import 'package:pweb/app/router/payout_routes.dart';
import 'package:pweb/widgets/sidebar/destinations.dart';
@@ -23,8 +23,8 @@ class SendPayoutButton extends StatelessWidget {
elevation: 0,
),
onPressed: () {
final walletsProvider = context.read<WalletsProvider>();
final wallet = walletsProvider.selectedWallet;
final wallets = context.read<WalletsController>();
final wallet = wallets.selectedWallet;
if (wallet != null) {
context.pushToPayment(

View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/provider/payment/wallets.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pweb/app/router/payout_routes.dart';
import 'package:pweb/widgets/sidebar/destinations.dart';
@@ -22,7 +22,7 @@ class TopUpButton extends StatelessWidget{
elevation: 0,
),
onPressed: () {
final wallet = context.read<WalletsProvider>().selectedWallet;
final wallet = context.read<WalletsController>().selectedWallet;
if (wallet == null) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text(loc.noWalletSelected)),

View File

@@ -3,7 +3,7 @@ import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import 'package:pshared/provider/payment/wallets.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pweb/pages/dashboard/buttons/balance/amount.dart';
import 'package:pweb/widgets/wallet_balance_refresh_button.dart';
@@ -14,9 +14,9 @@ class WalletEditFields extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Consumer<WalletsProvider>(
builder: (context, provider, child) {
final wallet = provider.selectedWallet;
return Consumer<WalletsController>(
builder: (context, controller, _) {
final wallet = controller.selectedWallet;
if (wallet == null) {
return SizedBox.shrink();
@@ -30,9 +30,7 @@ class WalletEditFields extends StatelessWidget {
Expanded(
child: BalanceAmount(
wallet: wallet,
onToggleVisibility: () {
context.read<WalletsProvider>().toggleVisibility(wallet.id);
},
onToggleVisibility: () => controller.toggleVisibility(wallet.id),
),
),
WalletBalanceRefreshButton(walletId: wallet.id),

View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/provider/payment/wallets.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
@@ -12,8 +12,8 @@ class WalletEditHeader extends StatelessWidget {
@override
Widget build(BuildContext context) {
final provider = context.watch<WalletsProvider>();
final wallet = provider.selectedWallet;
final controller = context.watch<WalletsController>();
final wallet = controller.selectedWallet;
final loc = AppLocalizations.of(context)!;
if (wallet == null) {

View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/provider/payment/wallets.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pweb/pages/payout_page/wallet/edit/buttons/buttons.dart';
import 'package:pweb/pages/payout_page/wallet/edit/fields.dart';
@@ -23,9 +23,9 @@ class WalletEditPage extends StatelessWidget {
final dimensions = AppDimensions();
final loc = AppLocalizations.of(context)!;
return Consumer<WalletsProvider>(
builder: (context, provider, child) {
final wallet = provider.selectedWallet;
return Consumer<WalletsController>(
builder: (context, controller, child) {
final wallet = controller.selectedWallet;
if (wallet == null) {
return Center(child: Text(loc.noWalletSelected));

View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/provider/payment/wallets.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pweb/pages/wallet_top_up/content.dart';
@@ -18,28 +18,26 @@ class WalletTopUpPage extends StatelessWidget {
Widget build(BuildContext context) {
final loc = AppLocalizations.of(context)!;
return Consumer<WalletsProvider>(
builder: (context, provider, child) {
if (provider.isLoading) {
return const Center(child: CircularProgressIndicator());
}
return Consumer<WalletsController>(builder: (context, provider, child) {
if (provider.isLoading) {
return const Center(child: CircularProgressIndicator());
}
if (provider.error != null) {
return Center(
child: Text(loc.notificationError(provider.error.toString())),
);
}
final wallet = provider.selectedWallet;
if (wallet == null) {
return Center(child: Text(loc.noWalletSelected));
}
return WalletTopUpContent(
wallet: wallet,
onBack: onBack,
if (provider.error != null) {
return Center(
child: Text(loc.notificationError(provider.error.toString())),
);
},
);
}
final wallet = provider.selectedWallet;
if (wallet == null) {
return Center(child: Text(loc.noWalletSelected));
}
return WalletTopUpContent(
wallet: wallet,
onBack: onBack,
);
});
}
}