added ledger as souec of funds for payouts
This commit is contained in:
@@ -1,21 +1,124 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
|
||||
import 'package:pshared/controllers/balance_mask/wallets.dart';
|
||||
import 'package:pshared/provider/ledger.dart';
|
||||
|
||||
class CarouselIndexController with ChangeNotifier {
|
||||
import 'package:pweb/pages/dashboard/buttons/balance/balance_item.dart';
|
||||
|
||||
class BalanceCarouselController with ChangeNotifier {
|
||||
WalletsController? _walletsController;
|
||||
List<BalanceItem> _items = const <BalanceItem>[BalanceItem.addAction()];
|
||||
int _index = 0;
|
||||
|
||||
List<BalanceItem> get items => _items;
|
||||
int get index => _index;
|
||||
|
||||
void setIndex(int value, int max) {
|
||||
final next = value.clamp(0, max > 0 ? max - 1 : 0);
|
||||
if (next == _index) return;
|
||||
void update({
|
||||
required WalletsController walletsController,
|
||||
required LedgerAccountsProvider ledgerProvider,
|
||||
}) {
|
||||
_walletsController = walletsController;
|
||||
|
||||
final nextItems = <BalanceItem>[
|
||||
...walletsController.wallets.map(BalanceItem.wallet),
|
||||
...ledgerProvider.accounts.map(BalanceItem.ledger),
|
||||
const BalanceItem.addAction(),
|
||||
];
|
||||
|
||||
final nextIndex = _resolveNextIndex(nextItems, walletsController);
|
||||
final hasItemsChanged = !_isSameItems(_items, nextItems);
|
||||
final hasIndexChanged = _index != nextIndex;
|
||||
|
||||
_items = nextItems;
|
||||
_index = nextIndex;
|
||||
|
||||
if (hasItemsChanged || hasIndexChanged) {
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
||||
void onPageChanged(int value) {
|
||||
final next = _clampIndex(value, _items.length);
|
||||
if (_index == next) {
|
||||
_syncSelectedWallet();
|
||||
return;
|
||||
}
|
||||
|
||||
_index = next;
|
||||
_syncSelectedWallet();
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void reset() {
|
||||
if (_index == 0) return;
|
||||
_index = 0;
|
||||
notifyListeners();
|
||||
void goBack() => onPageChanged(_index - 1);
|
||||
|
||||
void goForward() => onPageChanged(_index + 1);
|
||||
|
||||
int _resolveNextIndex(
|
||||
List<BalanceItem> nextItems,
|
||||
WalletsController walletsController,
|
||||
) {
|
||||
final currentWalletRef = _currentWalletRef(_items, _index);
|
||||
if (currentWalletRef != null) {
|
||||
final byCurrentWallet = _walletIndexByRef(nextItems, currentWalletRef);
|
||||
if (byCurrentWallet != null) return byCurrentWallet;
|
||||
|
||||
final selectedWalletRef = walletsController.selectedWalletRef;
|
||||
final bySelectedWallet = _walletIndexByRef(nextItems, selectedWalletRef);
|
||||
if (bySelectedWallet != null) return bySelectedWallet;
|
||||
}
|
||||
|
||||
return _clampIndex(_index, nextItems.length);
|
||||
}
|
||||
|
||||
String? _currentWalletRef(List<BalanceItem> items, int index) {
|
||||
if (items.isEmpty || index < 0 || index >= items.length) return null;
|
||||
final current = items[index];
|
||||
if (!current.isWallet) return null;
|
||||
return current.wallet?.id;
|
||||
}
|
||||
|
||||
int? _walletIndexByRef(List<BalanceItem> items, String? walletRef) {
|
||||
if (walletRef == null || walletRef.isEmpty) return null;
|
||||
final idx = items.indexWhere(
|
||||
(item) => item.isWallet && item.wallet?.id == walletRef,
|
||||
);
|
||||
if (idx < 0) return null;
|
||||
return idx;
|
||||
}
|
||||
|
||||
int _clampIndex(int value, int itemCount) {
|
||||
if (itemCount <= 0) return 0;
|
||||
return value.clamp(0, itemCount - 1);
|
||||
}
|
||||
|
||||
bool _isSameItems(List<BalanceItem> left, List<BalanceItem> right) {
|
||||
if (left.length != right.length) return false;
|
||||
|
||||
for (var i = 0; i < left.length; i++) {
|
||||
final a = left[i];
|
||||
final b = right[i];
|
||||
if (a.type != b.type) return false;
|
||||
if (_itemIdentity(a) != _itemIdentity(b)) return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
String _itemIdentity(BalanceItem item) => switch (item.type) {
|
||||
BalanceItemType.wallet => item.wallet?.id ?? '',
|
||||
BalanceItemType.ledger => item.account?.ledgerAccountRef ?? '',
|
||||
BalanceItemType.addAction => 'add',
|
||||
};
|
||||
|
||||
void _syncSelectedWallet() {
|
||||
final walletsController = _walletsController;
|
||||
if (walletsController == null || _items.isEmpty) return;
|
||||
|
||||
final current = _items[_index];
|
||||
if (!current.isWallet || current.wallet == null) return;
|
||||
|
||||
final wallet = current.wallet!;
|
||||
if (walletsController.selectedWallet?.id == wallet.id) return;
|
||||
walletsController.selectWallet(wallet);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
import 'package:pshared/controllers/balance_mask/wallets.dart';
|
||||
import 'package:pshared/provider/ledger.dart';
|
||||
|
||||
import 'package:pweb/pages/dashboard/buttons/balance/controller.dart';
|
||||
|
||||
class BalanceWidgetProviders extends StatelessWidget {
|
||||
final Widget child;
|
||||
|
||||
const BalanceWidgetProviders({super.key, required this.child});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return ChangeNotifierProxyProvider2<
|
||||
WalletsController,
|
||||
LedgerAccountsProvider,
|
||||
BalanceCarouselController
|
||||
>(
|
||||
create: (_) => BalanceCarouselController(),
|
||||
update: (_, walletsController, ledgerProvider, controller) => controller!
|
||||
..update(
|
||||
walletsController: walletsController,
|
||||
ledgerProvider: ledgerProvider,
|
||||
),
|
||||
child: child,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -8,11 +8,9 @@ import 'package:pshared/models/payment/wallet.dart';
|
||||
|
||||
import 'package:pweb/pages/dashboard/buttons/balance/carousel.dart';
|
||||
import 'package:pweb/pages/dashboard/buttons/balance/controller.dart';
|
||||
import 'package:pweb/pages/dashboard/buttons/balance/balance_item.dart';
|
||||
|
||||
import 'package:pweb/generated/i18n/app_localizations.dart';
|
||||
|
||||
|
||||
class BalanceWidget extends StatelessWidget {
|
||||
final ValueChanged<Wallet> onTopUp;
|
||||
final ValueChanged<Wallet> onWalletTap;
|
||||
@@ -27,12 +25,13 @@ class BalanceWidget extends StatelessWidget {
|
||||
Widget build(BuildContext context) {
|
||||
final walletsController = context.watch<WalletsController>();
|
||||
final ledgerProvider = context.watch<LedgerAccountsProvider>();
|
||||
final carousel = context.watch<CarouselIndexController>();
|
||||
final carousel = context.watch<BalanceCarouselController>();
|
||||
final loc = AppLocalizations.of(context)!;
|
||||
|
||||
final wallets = walletsController.wallets;
|
||||
final accounts = ledgerProvider.accounts;
|
||||
final isLoading = walletsController.isLoading &&
|
||||
final isLoading =
|
||||
walletsController.isLoading &&
|
||||
ledgerProvider.isLoading &&
|
||||
wallets.isEmpty &&
|
||||
accounts.isEmpty;
|
||||
@@ -41,40 +40,10 @@ class BalanceWidget extends StatelessWidget {
|
||||
return const Center(child: CircularProgressIndicator());
|
||||
}
|
||||
|
||||
final items = [
|
||||
...wallets.map(BalanceItem.wallet),
|
||||
...accounts.map(BalanceItem.ledger),
|
||||
const BalanceItem.addAction(),
|
||||
];
|
||||
|
||||
if (items.isEmpty) {
|
||||
return const SizedBox.shrink();
|
||||
}
|
||||
|
||||
// Ensure index is always valid when list changes
|
||||
carousel.setIndex(carousel.index, items.length);
|
||||
|
||||
final index = carousel.index;
|
||||
final current = items[index];
|
||||
|
||||
// Single source of truth: controller
|
||||
if (current.isWallet) {
|
||||
final wallet = current.wallet!;
|
||||
if (walletsController.selectedWallet?.id != wallet.id) {
|
||||
walletsController.selectWallet(wallet);
|
||||
}
|
||||
}
|
||||
|
||||
final carouselWidget = BalanceCarousel(
|
||||
items: items,
|
||||
currentIndex: index,
|
||||
onIndexChanged: (i) {
|
||||
carousel.setIndex(i, items.length);
|
||||
final next = items[carousel.index];
|
||||
if (next.isWallet) {
|
||||
walletsController.selectWallet(next.wallet!);
|
||||
}
|
||||
},
|
||||
items: carousel.items,
|
||||
currentIndex: carousel.index,
|
||||
onIndexChanged: carousel.onPageChanged,
|
||||
onTopUp: onTopUp,
|
||||
onWalletTap: onWalletTap,
|
||||
);
|
||||
Reference in New Issue
Block a user