From b24211e43d0a332683ccd8ee9996cf1d31e51a49 Mon Sep 17 00:00:00 2001 From: poka Date: Sun, 21 Nov 2021 02:52:01 +0100 Subject: [PATCH] Text formatting --- lib/screens/history.dart | 45 +++++----- lib/screens/myWallets/unlocking_wallet.dart | 3 +- lib/screens/onBoarding/7.dart | 96 +++++++++++---------- 3 files changed, 77 insertions(+), 67 deletions(-) diff --git a/lib/screens/history.dart b/lib/screens/history.dart index 7701a56..da0dc4c 100644 --- a/lib/screens/history.dart +++ b/lib/screens/history.dart @@ -380,27 +380,30 @@ class HistoryScreen extends StatelessWidget with ChangeNotifier { ), ), Padding( - padding: const EdgeInsets.only(top: 15), - child: OutlinedButton( - style: OutlinedButton.styleFrom( - side: BorderSide(width: 2, color: orangeC)), - onPressed: () { - // if (_formKey.currentState.validate()) { - // _formKey.currentState.save(); - // } - // _historyProvider.pay(payAmount.text, payComment.text); - Navigator.push(context, - MaterialPageRoute(builder: (context) { - return UnlockingWallet( - wallet: defaultWallet, action: "pay"); - })); - }, - child: Padding( - padding: const EdgeInsets.all(12), - child: Text("PAYER", - style: TextStyle( - fontSize: 25, color: Colors.grey[850]))), - )) + padding: const EdgeInsets.only(top: 15), + child: OutlinedButton( + style: OutlinedButton.styleFrom( + side: BorderSide(width: 2, color: orangeC)), + onPressed: () { + // if (_formKey.currentState.validate()) { + // _formKey.currentState.save(); + // } + // _historyProvider.pay(payAmount.text, payComment.text); + Navigator.push(context, + MaterialPageRoute(builder: (context) { + return UnlockingWallet( + wallet: defaultWallet, action: "pay"); + })); + }, + child: Padding( + padding: const EdgeInsets.all(12), + child: Text( + "PAYER", + style: TextStyle(fontSize: 25, color: Colors.grey[850]), + ), + ), + ), + ) ], ), ), diff --git a/lib/screens/myWallets/unlocking_wallet.dart b/lib/screens/myWallets/unlocking_wallet.dart index 65c1b5f..0be8fa1 100644 --- a/lib/screens/myWallets/unlocking_wallet.dart +++ b/lib/screens/myWallets/unlocking_wallet.dart @@ -36,7 +36,6 @@ class UnlockingWallet extends StatelessWidget { Provider.of(context); int _pinLenght; - ChestData currentChest = chestBox.get(configBox.get('currentChest')); if (currentChest.isCesium) { @@ -53,7 +52,7 @@ class UnlockingWallet extends StatelessWidget { child: Column(children: [ Expanded( child: Column(children: [ - SizedBox(height: isTall ? 80 : 20), + SizedBox(height: isTall ? 100 : 20), Row(mainAxisAlignment: MainAxisAlignment.center, children: [ currentChest.imageFile == null ? Image.asset( diff --git a/lib/screens/onBoarding/7.dart b/lib/screens/onBoarding/7.dart index 756f046..5b31f9c 100644 --- a/lib/screens/onBoarding/7.dart +++ b/lib/screens/onBoarding/7.dart @@ -133,55 +133,63 @@ Widget sentanceArray(BuildContext context) { builder: (context, formatedArray) { // print(formatedArray.data); return Container( - padding: const EdgeInsets.symmetric(horizontal: 12), - child: Container( - decoration: BoxDecoration( - border: Border.all(color: Colors.black), - color: Colors.grey[300], - borderRadius: const BorderRadius.all( - Radius.circular(10), - )), - // color: Colors.grey[300], - padding: const EdgeInsets.all(20), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - mainAxisSize: MainAxisSize.max, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Row(children: [ - arrayCell(formatedArray.data[0]), - arrayCell(formatedArray.data[1]), - arrayCell(formatedArray.data[2]), - arrayCell(formatedArray.data[3]), - ]), - const SizedBox(height: 15), - Row(children: [ - arrayCell(formatedArray.data[4]), - arrayCell(formatedArray.data[5]), - arrayCell(formatedArray.data[6]), - arrayCell(formatedArray.data[7]), - ]), - const SizedBox(height: 15), - Row(children: [ - arrayCell(formatedArray.data[8]), - arrayCell(formatedArray.data[9]), - arrayCell(formatedArray.data[10]), - arrayCell(formatedArray.data[11]), - ]), - ]))); + padding: const EdgeInsets.symmetric(horizontal: 12), + child: Container( + decoration: BoxDecoration( + border: Border.all(color: Colors.black), + color: Colors.grey[300], + borderRadius: const BorderRadius.all( + Radius.circular(10), + )), + // color: Colors.grey[300], + padding: const EdgeInsets.all(20), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + mainAxisSize: MainAxisSize.max, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Row(children: [ + arrayCell(formatedArray.data[0]), + arrayCell(formatedArray.data[1]), + arrayCell(formatedArray.data[2]), + arrayCell(formatedArray.data[3]), + ]), + const SizedBox(height: 15), + Row(children: [ + arrayCell(formatedArray.data[4]), + arrayCell(formatedArray.data[5]), + arrayCell(formatedArray.data[6]), + arrayCell(formatedArray.data[7]), + ]), + const SizedBox(height: 15), + Row(children: [ + arrayCell(formatedArray.data[8]), + arrayCell(formatedArray.data[9]), + arrayCell(formatedArray.data[10]), + arrayCell(formatedArray.data[11]), + ]), + ]), + ), + ); }); } Widget arrayCell(dataWord) { return SizedBox( - width: 102, - child: Column(children: [ - Text(dataWord.split(':')[0], style: const TextStyle(fontSize: 14)), - const SizedBox(height: 2), - Text(dataWord.split(':')[1], - key: Key('word${dataWord.split(':')[0]}'), - style: const TextStyle(fontSize: 19, color: Colors.black)), - ])); + width: 102, + child: Column(children: [ + Text( + dataWord.split(':')[0], + style: const TextStyle(fontSize: 14), + ), + const SizedBox(height: 2), + Text( + dataWord.split(':')[1], + key: Key('word${dataWord.split(':')[0]}'), + style: const TextStyle(fontSize: 19, color: Colors.black), + ), + ]), + ); } // ignore: must_be_immutable