feat: wallet membre can be drag and dropped
This commit is contained in:
parent
5dbec1ac53
commit
19fdf9715d
|
@ -15,7 +15,7 @@ import 'package:gecko/screens/myWallets/import_g1_v1.dart';
|
||||||
import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
|
import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
|
||||||
import 'package:gecko/widgets/bottom_app_bar.dart';
|
import 'package:gecko/widgets/bottom_app_bar.dart';
|
||||||
import 'package:gecko/widgets/commons/offline_info.dart';
|
import 'package:gecko/widgets/commons/offline_info.dart';
|
||||||
import 'package:gecko/widgets/payment_popup.dart';
|
import 'package:gecko/widgets/drag_tule_action.dart';
|
||||||
import 'package:gecko/widgets/wallet_tile.dart';
|
import 'package:gecko/widgets/wallet_tile.dart';
|
||||||
import 'package:gecko/widgets/wallet_tile_membre.dart';
|
import 'package:gecko/widgets/wallet_tile_membre.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
|
@ -77,11 +77,14 @@ class _WalletsHomeState extends State<WalletsHome> {
|
||||||
),
|
),
|
||||||
backgroundColor: const Color(0xffFFD58D),
|
backgroundColor: const Color(0xffFFD58D),
|
||||||
),
|
),
|
||||||
bottomNavigationBar: myWalletProvider.lastFlyBy == ''
|
bottomNavigationBar:
|
||||||
? const GeckoBottomAppBar(
|
Consumer<MyWalletsProvider>(builder: (context, _, __) {
|
||||||
actualRoute: 'safeHome',
|
return myWalletProvider.lastFlyBy == ''
|
||||||
)
|
? const GeckoBottomAppBar(
|
||||||
: dragInfo(context),
|
actualRoute: 'safeHome',
|
||||||
|
)
|
||||||
|
: dragInfo(context);
|
||||||
|
}),
|
||||||
body: FutureBuilder(
|
body: FutureBuilder(
|
||||||
future: myWalletProvider.readAllWallets(currentChestNumber),
|
future: myWalletProvider.readAllWallets(currentChestNumber),
|
||||||
builder: (context, snapshot) {
|
builder: (context, snapshot) {
|
||||||
|
@ -240,7 +243,6 @@ class _WalletsHomeState extends State<WalletsHome> {
|
||||||
Widget myWalletsTiles(BuildContext context, int currentChestNumber) {
|
Widget myWalletsTiles(BuildContext context, int currentChestNumber) {
|
||||||
final myWalletProvider = Provider.of<MyWalletsProvider>(context);
|
final myWalletProvider = Provider.of<MyWalletsProvider>(context);
|
||||||
final bool isWalletsExists = myWalletProvider.checkIfWalletExist();
|
final bool isWalletsExists = myWalletProvider.checkIfWalletExist();
|
||||||
final sub = Provider.of<SubstrateSdk>(context, listen: false);
|
|
||||||
|
|
||||||
if (!isWalletsExists) {
|
if (!isWalletsExists) {
|
||||||
return const Text('');
|
return const Text('');
|
||||||
|
@ -272,7 +274,6 @@ class _WalletsHomeState extends State<WalletsHome> {
|
||||||
List<WalletData> listWalletsWithoutIdty = listWallets.toList();
|
List<WalletData> listWalletsWithoutIdty = listWallets.toList();
|
||||||
listWalletsWithoutIdty.removeWhere((w) => w.address == idtyWallet.address);
|
listWalletsWithoutIdty.removeWhere((w) => w.address == idtyWallet.address);
|
||||||
|
|
||||||
WalletData? defaultWallet = myWalletProvider.getDefaultWallet();
|
|
||||||
final screenWidth = MediaQuery.of(context).size.width;
|
final screenWidth = MediaQuery.of(context).size.width;
|
||||||
int nTule;
|
int nTule;
|
||||||
|
|
||||||
|
@ -327,8 +328,11 @@ class _WalletsHomeState extends State<WalletsHome> {
|
||||||
const SliverToBoxAdapter(child: SizedBox(height: 20)),
|
const SliverToBoxAdapter(child: SizedBox(height: 20)),
|
||||||
if (idtyWallet.address != '')
|
if (idtyWallet.address != '')
|
||||||
SliverToBoxAdapter(
|
SliverToBoxAdapter(
|
||||||
child: WalletTileMembre(
|
child: DragTuleAction(
|
||||||
repository: idtyWallet, defaultWallet: defaultWallet)),
|
wallet: idtyWallet,
|
||||||
|
child: WalletTileMembre(repository: idtyWallet),
|
||||||
|
),
|
||||||
|
),
|
||||||
SliverGrid.count(
|
SliverGrid.count(
|
||||||
key: keyListWallets,
|
key: keyListWallets,
|
||||||
crossAxisCount: nTule,
|
crossAxisCount: nTule,
|
||||||
|
@ -337,63 +341,9 @@ class _WalletsHomeState extends State<WalletsHome> {
|
||||||
mainAxisSpacing: 0,
|
mainAxisSpacing: 0,
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
for (WalletData repository in listWalletsWithoutIdty)
|
for (WalletData repository in listWalletsWithoutIdty)
|
||||||
LongPressDraggable<String>(
|
DragTuleAction(
|
||||||
delay: const Duration(milliseconds: 200),
|
wallet: repository,
|
||||||
data: repository.address,
|
child: WalletTile(repository: repository),
|
||||||
dragAnchorStrategy:
|
|
||||||
(Draggable<Object> _, BuildContext __, Offset ___) =>
|
|
||||||
const Offset(0, 0),
|
|
||||||
// feedbackOffset: const Offset(-500, -500),
|
|
||||||
// dragAnchorStrategy: childDragAnchorStrategy,
|
|
||||||
onDragStarted: () =>
|
|
||||||
myWalletProvider.dragAddress = repository.address,
|
|
||||||
onDragEnd: (_) {
|
|
||||||
myWalletProvider.lastFlyBy = '';
|
|
||||||
myWalletProvider.dragAddress = '';
|
|
||||||
myWalletProvider.reload();
|
|
||||||
},
|
|
||||||
feedback: ElevatedButton(
|
|
||||||
onPressed: () {},
|
|
||||||
style: ElevatedButton.styleFrom(
|
|
||||||
backgroundColor: orangeC,
|
|
||||||
shape: const CircleBorder(),
|
|
||||||
padding: const EdgeInsets.all(15),
|
|
||||||
),
|
|
||||||
child: const SizedBox(
|
|
||||||
height: 35,
|
|
||||||
child: Image(image: AssetImage('assets/vector_white.png')),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
child: DragTarget<String>(
|
|
||||||
onAccept: (senderAddress) async {
|
|
||||||
log.d(
|
|
||||||
'INTERPAY: sender: $senderAddress --- receiver: ${repository.address}');
|
|
||||||
final walletData = myWalletProvider
|
|
||||||
.getWalletDataByAddress(senderAddress);
|
|
||||||
await sub.setCurrentWallet(walletData!);
|
|
||||||
sub.reload();
|
|
||||||
paymentPopup(
|
|
||||||
context,
|
|
||||||
repository.address,
|
|
||||||
g1WalletsBox.get(repository.address)!.username ??
|
|
||||||
repository.name!);
|
|
||||||
},
|
|
||||||
onMove: (details) {
|
|
||||||
if (repository.address != myWalletProvider.lastFlyBy) {
|
|
||||||
myWalletProvider.lastFlyBy = repository.address;
|
|
||||||
myWalletProvider.reload();
|
|
||||||
}
|
|
||||||
},
|
|
||||||
onWillAccept: (senderAddress) =>
|
|
||||||
senderAddress != repository.address,
|
|
||||||
builder: (
|
|
||||||
BuildContext context,
|
|
||||||
List<dynamic> accepted,
|
|
||||||
List<dynamic> rejected,
|
|
||||||
) {
|
|
||||||
return WalletTile(
|
|
||||||
repository: repository, defaultWallet: defaultWallet);
|
|
||||||
}),
|
|
||||||
),
|
),
|
||||||
Consumer<SubstrateSdk>(builder: (context, sub, _) {
|
Consumer<SubstrateSdk>(builder: (context, sub, _) {
|
||||||
return sub.nodeConnected &&
|
return sub.nodeConnected &&
|
||||||
|
@ -412,57 +362,59 @@ class _WalletsHomeState extends State<WalletsHome> {
|
||||||
String newDerivationName =
|
String newDerivationName =
|
||||||
'${'wallet'.tr()} ${myWalletProvider.listWallets.last.number! + 2}';
|
'${'wallet'.tr()} ${myWalletProvider.listWallets.last.number! + 2}';
|
||||||
return Padding(
|
return Padding(
|
||||||
padding: const EdgeInsets.all(16),
|
padding: const EdgeInsets.all(16),
|
||||||
child: ClipRRect(
|
child: ClipRRect(
|
||||||
borderRadius: const BorderRadius.all(Radius.circular(12)),
|
borderRadius: const BorderRadius.all(Radius.circular(12)),
|
||||||
child: Column(children: <Widget>[
|
child: Column(children: <Widget>[
|
||||||
Expanded(
|
Expanded(
|
||||||
child: InkWell(
|
child: InkWell(
|
||||||
key: keyAddDerivation,
|
key: keyAddDerivation,
|
||||||
onTap: () async {
|
onTap: () async {
|
||||||
if (!myWalletProvider.isNewDerivationLoading) {
|
if (!myWalletProvider.isNewDerivationLoading) {
|
||||||
WalletData? defaultWallet =
|
WalletData? defaultWallet =
|
||||||
myWalletProvider.getDefaultWallet();
|
myWalletProvider.getDefaultWallet();
|
||||||
String? pin;
|
String? pin;
|
||||||
if (myWalletProvider.pinCode == '') {
|
if (myWalletProvider.pinCode == '') {
|
||||||
pin = await Navigator.push(
|
pin = await Navigator.push(
|
||||||
context,
|
context,
|
||||||
MaterialPageRoute(
|
MaterialPageRoute(
|
||||||
builder: (homeContext) {
|
builder: (homeContext) {
|
||||||
return UnlockingWallet(wallet: defaultWallet);
|
return UnlockingWallet(wallet: defaultWallet);
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (pin != null || myWalletProvider.pinCode != '') {
|
if (pin != null || myWalletProvider.pinCode != '') {
|
||||||
await myWalletProvider.generateNewDerivation(
|
await myWalletProvider.generateNewDerivation(
|
||||||
context, newDerivationName);
|
context, newDerivationName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
child: Container(
|
child: Container(
|
||||||
width: double.infinity,
|
width: double.infinity,
|
||||||
height: double.infinity,
|
height: double.infinity,
|
||||||
decoration: const BoxDecoration(color: floattingYellow),
|
decoration: const BoxDecoration(color: floattingYellow),
|
||||||
child: Center(
|
child: Center(
|
||||||
child: myWalletProvider.isNewDerivationLoading
|
child: myWalletProvider.isNewDerivationLoading
|
||||||
? const SizedBox(
|
? const SizedBox(
|
||||||
height: 60,
|
height: 60,
|
||||||
width: 60,
|
width: 60,
|
||||||
child: CircularProgressIndicator(
|
child: CircularProgressIndicator(
|
||||||
color: orangeC,
|
color: orangeC,
|
||||||
strokeWidth: 7,
|
strokeWidth: 7,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
: const Text(
|
: const Text(
|
||||||
'+',
|
'+',
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontSize: 150,
|
fontSize: 150,
|
||||||
fontWeight: FontWeight.w700,
|
fontWeight: FontWeight.w700,
|
||||||
color: Color(0xFFFCB437)),
|
color: Color(0xFFFCB437)),
|
||||||
)),
|
)),
|
||||||
)),
|
)),
|
||||||
),
|
),
|
||||||
])));
|
]),
|
||||||
|
),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,7 +28,7 @@ class TransactionInProgress extends StatelessWidget {
|
||||||
final myWalletProvider =
|
final myWalletProvider =
|
||||||
Provider.of<MyWalletsProvider>(context, listen: false);
|
Provider.of<MyWalletsProvider>(context, listen: false);
|
||||||
bool isValid = false;
|
bool isValid = false;
|
||||||
bool isLoading = true;
|
bool isLoading = false;
|
||||||
final result = sub.transactionStatus;
|
final result = sub.transactionStatus;
|
||||||
|
|
||||||
final from = fromAddress ??
|
final from = fromAddress ??
|
||||||
|
@ -68,13 +68,11 @@ class TransactionInProgress extends StatelessWidget {
|
||||||
};
|
};
|
||||||
|
|
||||||
if (result.contains('blockHash: ')) {
|
if (result.contains('blockHash: ')) {
|
||||||
isLoading = false;
|
|
||||||
isValid = true;
|
isValid = true;
|
||||||
resultText = 'extrinsicValidated'
|
resultText = 'extrinsicValidated'
|
||||||
.tr(args: [actionMap[transType] ?? 'strangeTransaction'.tr()]);
|
.tr(args: [actionMap[transType] ?? 'strangeTransaction'.tr()]);
|
||||||
log.i('Bloc of last transaction: ${sub.blocNumber} --- $result');
|
log.i('Bloc of last transaction: ${sub.blocNumber} --- $result');
|
||||||
} else if (result.contains('Exception: ')) {
|
} else if (result.contains('Exception: ')) {
|
||||||
isLoading = false;
|
|
||||||
isValid = false;
|
isValid = false;
|
||||||
resultText = "${"anErrorOccurred".tr()}:\n";
|
resultText = "${"anErrorOccurred".tr()}:\n";
|
||||||
final List exceptionSplit = result.split('Exception: ');
|
final List exceptionSplit = result.split('Exception: ');
|
||||||
|
@ -87,6 +85,7 @@ class TransactionInProgress extends StatelessWidget {
|
||||||
resultText = resultMap[exception] ?? "$resultText\n$exception";
|
resultText = resultMap[exception] ?? "$resultText\n$exception";
|
||||||
log.d('expection: $exceptionSplit');
|
log.d('expection: $exceptionSplit');
|
||||||
} else {
|
} else {
|
||||||
|
isLoading = true;
|
||||||
resultText = resultMap[result] ?? 'unknown status...';
|
resultText = resultMap[result] ?? 'unknown status...';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,74 @@
|
||||||
|
// ignore_for_file: use_build_context_synchronously
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:gecko/globals.dart';
|
||||||
|
import 'package:gecko/models/wallet_data.dart';
|
||||||
|
import 'package:gecko/providers/my_wallets.dart';
|
||||||
|
import 'package:gecko/providers/substrate_sdk.dart';
|
||||||
|
import 'package:gecko/widgets/payment_popup.dart';
|
||||||
|
import 'package:provider/provider.dart';
|
||||||
|
|
||||||
|
class DragTuleAction extends StatelessWidget {
|
||||||
|
const DragTuleAction({Key? key, required this.wallet, required this.child})
|
||||||
|
: super(key: key);
|
||||||
|
|
||||||
|
final WalletData wallet;
|
||||||
|
final Widget child;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final myWalletProvider = Provider.of<MyWalletsProvider>(context);
|
||||||
|
final sub = Provider.of<SubstrateSdk>(context, listen: false);
|
||||||
|
return LongPressDraggable<String>(
|
||||||
|
delay: const Duration(milliseconds: 200),
|
||||||
|
data: wallet.address,
|
||||||
|
dragAnchorStrategy: (Draggable<Object> _, BuildContext __, Offset ___) =>
|
||||||
|
const Offset(0, 0),
|
||||||
|
// feedbackOffset: const Offset(-500, -500),
|
||||||
|
// dragAnchorStrategy: childDragAnchorStrategy,
|
||||||
|
onDragStarted: () => myWalletProvider.dragAddress = wallet.address,
|
||||||
|
onDragEnd: (_) {
|
||||||
|
myWalletProvider.lastFlyBy = '';
|
||||||
|
myWalletProvider.dragAddress = '';
|
||||||
|
myWalletProvider.reload();
|
||||||
|
},
|
||||||
|
feedback: ElevatedButton(
|
||||||
|
onPressed: () {},
|
||||||
|
style: ElevatedButton.styleFrom(
|
||||||
|
backgroundColor: orangeC,
|
||||||
|
shape: const CircleBorder(),
|
||||||
|
padding: const EdgeInsets.all(15),
|
||||||
|
),
|
||||||
|
child: const SizedBox(
|
||||||
|
height: 35,
|
||||||
|
child: Image(image: AssetImage('assets/vector_white.png')),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
child: DragTarget<String>(
|
||||||
|
onAccept: (senderAddress) async {
|
||||||
|
log.d(
|
||||||
|
'INTERPAY: sender: $senderAddress --- receiver: ${wallet.address}');
|
||||||
|
final walletData =
|
||||||
|
myWalletProvider.getWalletDataByAddress(senderAddress);
|
||||||
|
await sub.setCurrentWallet(walletData!);
|
||||||
|
sub.reload();
|
||||||
|
paymentPopup(context, wallet.address,
|
||||||
|
g1WalletsBox.get(wallet.address)!.username ?? wallet.name!);
|
||||||
|
},
|
||||||
|
onMove: (details) {
|
||||||
|
if (wallet.address != myWalletProvider.lastFlyBy) {
|
||||||
|
myWalletProvider.lastFlyBy = wallet.address;
|
||||||
|
myWalletProvider.reload();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
onWillAccept: (senderAddress) => senderAddress != wallet.address,
|
||||||
|
builder: (
|
||||||
|
BuildContext context,
|
||||||
|
List<dynamic> accepted,
|
||||||
|
List<dynamic> rejected,
|
||||||
|
) {
|
||||||
|
return child;
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
|
@ -3,23 +3,26 @@ import 'package:flutter/material.dart';
|
||||||
import 'package:gecko/globals.dart';
|
import 'package:gecko/globals.dart';
|
||||||
import 'package:gecko/models/wallet_data.dart';
|
import 'package:gecko/models/wallet_data.dart';
|
||||||
import 'package:gecko/models/widgets_keys.dart';
|
import 'package:gecko/models/widgets_keys.dart';
|
||||||
|
import 'package:gecko/providers/my_wallets.dart';
|
||||||
import 'package:gecko/screens/myWallets/wallet_options.dart';
|
import 'package:gecko/screens/myWallets/wallet_options.dart';
|
||||||
import 'package:gecko/widgets/balance.dart';
|
import 'package:gecko/widgets/balance.dart';
|
||||||
import 'package:gecko/widgets/commons/smooth_transition.dart';
|
import 'package:gecko/widgets/commons/smooth_transition.dart';
|
||||||
import 'package:gecko/widgets/name_by_address.dart';
|
import 'package:gecko/widgets/name_by_address.dart';
|
||||||
|
import 'package:provider/provider.dart';
|
||||||
|
|
||||||
class WalletTile extends StatelessWidget {
|
class WalletTile extends StatelessWidget {
|
||||||
const WalletTile({
|
const WalletTile({
|
||||||
Key? key,
|
Key? key,
|
||||||
required this.repository,
|
required this.repository,
|
||||||
required this.defaultWallet,
|
|
||||||
}) : super(key: key);
|
}) : super(key: key);
|
||||||
|
|
||||||
final WalletData repository;
|
final WalletData repository;
|
||||||
final WalletData defaultWallet;
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
|
final myWalletProvider = Provider.of<MyWalletsProvider>(context);
|
||||||
|
final defaultWallet = myWalletProvider.getDefaultWallet();
|
||||||
|
|
||||||
return Padding(
|
return Padding(
|
||||||
padding: const EdgeInsets.all(16),
|
padding: const EdgeInsets.all(16),
|
||||||
child: GestureDetector(
|
child: GestureDetector(
|
||||||
|
|
|
@ -3,23 +3,23 @@ import 'package:flutter/material.dart';
|
||||||
import 'package:gecko/globals.dart';
|
import 'package:gecko/globals.dart';
|
||||||
import 'package:gecko/models/wallet_data.dart';
|
import 'package:gecko/models/wallet_data.dart';
|
||||||
import 'package:gecko/models/widgets_keys.dart';
|
import 'package:gecko/models/widgets_keys.dart';
|
||||||
|
import 'package:gecko/providers/my_wallets.dart';
|
||||||
import 'package:gecko/screens/myWallets/wallet_options.dart';
|
import 'package:gecko/screens/myWallets/wallet_options.dart';
|
||||||
import 'package:gecko/widgets/balance.dart';
|
import 'package:gecko/widgets/balance.dart';
|
||||||
import 'package:gecko/widgets/commons/smooth_transition.dart';
|
import 'package:gecko/widgets/commons/smooth_transition.dart';
|
||||||
import 'package:gecko/widgets/name_by_address.dart';
|
import 'package:gecko/widgets/name_by_address.dart';
|
||||||
|
import 'package:provider/provider.dart';
|
||||||
|
|
||||||
class WalletTileMembre extends StatelessWidget {
|
class WalletTileMembre extends StatelessWidget {
|
||||||
const WalletTileMembre({
|
const WalletTileMembre({Key? key, required this.repository})
|
||||||
Key? key,
|
: super(key: key);
|
||||||
required this.repository,
|
|
||||||
required this.defaultWallet,
|
|
||||||
}) : super(key: key);
|
|
||||||
|
|
||||||
final WalletData repository;
|
final WalletData repository;
|
||||||
final WalletData defaultWallet;
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
|
final myWalletProvider = Provider.of<MyWalletsProvider>(context);
|
||||||
|
final defaultWallet = myWalletProvider.getDefaultWallet();
|
||||||
return Padding(
|
return Padding(
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 70, vertical: 20),
|
padding: const EdgeInsets.symmetric(horizontal: 70, vertical: 20),
|
||||||
child: GestureDetector(
|
child: GestureDetector(
|
||||||
|
|
Loading…
Reference in New Issue