Text formatting
This commit is contained in:
parent
eceb2e3253
commit
b24211e43d
|
@ -380,27 +380,30 @@ class HistoryScreen extends StatelessWidget with ChangeNotifier {
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
Padding(
|
Padding(
|
||||||
padding: const EdgeInsets.only(top: 15),
|
padding: const EdgeInsets.only(top: 15),
|
||||||
child: OutlinedButton(
|
child: OutlinedButton(
|
||||||
style: OutlinedButton.styleFrom(
|
style: OutlinedButton.styleFrom(
|
||||||
side: BorderSide(width: 2, color: orangeC)),
|
side: BorderSide(width: 2, color: orangeC)),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
// if (_formKey.currentState.validate()) {
|
// if (_formKey.currentState.validate()) {
|
||||||
// _formKey.currentState.save();
|
// _formKey.currentState.save();
|
||||||
// }
|
// }
|
||||||
// _historyProvider.pay(payAmount.text, payComment.text);
|
// _historyProvider.pay(payAmount.text, payComment.text);
|
||||||
Navigator.push(context,
|
Navigator.push(context,
|
||||||
MaterialPageRoute(builder: (context) {
|
MaterialPageRoute(builder: (context) {
|
||||||
return UnlockingWallet(
|
return UnlockingWallet(
|
||||||
wallet: defaultWallet, action: "pay");
|
wallet: defaultWallet, action: "pay");
|
||||||
}));
|
}));
|
||||||
},
|
},
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: const EdgeInsets.all(12),
|
padding: const EdgeInsets.all(12),
|
||||||
child: Text("PAYER",
|
child: Text(
|
||||||
style: TextStyle(
|
"PAYER",
|
||||||
fontSize: 25, color: Colors.grey[850]))),
|
style: TextStyle(fontSize: 25, color: Colors.grey[850]),
|
||||||
))
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
)
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
|
@ -36,7 +36,6 @@ class UnlockingWallet extends StatelessWidget {
|
||||||
Provider.of<WalletOptionsProvider>(context);
|
Provider.of<WalletOptionsProvider>(context);
|
||||||
|
|
||||||
int _pinLenght;
|
int _pinLenght;
|
||||||
|
|
||||||
ChestData currentChest = chestBox.get(configBox.get('currentChest'));
|
ChestData currentChest = chestBox.get(configBox.get('currentChest'));
|
||||||
|
|
||||||
if (currentChest.isCesium) {
|
if (currentChest.isCesium) {
|
||||||
|
@ -53,7 +52,7 @@ class UnlockingWallet extends StatelessWidget {
|
||||||
child: Column(children: <Widget>[
|
child: Column(children: <Widget>[
|
||||||
Expanded(
|
Expanded(
|
||||||
child: Column(children: <Widget>[
|
child: Column(children: <Widget>[
|
||||||
SizedBox(height: isTall ? 80 : 20),
|
SizedBox(height: isTall ? 100 : 20),
|
||||||
Row(mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
|
Row(mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
|
||||||
currentChest.imageFile == null
|
currentChest.imageFile == null
|
||||||
? Image.asset(
|
? Image.asset(
|
||||||
|
|
|
@ -133,55 +133,63 @@ Widget sentanceArray(BuildContext context) {
|
||||||
builder: (context, formatedArray) {
|
builder: (context, formatedArray) {
|
||||||
// print(formatedArray.data);
|
// print(formatedArray.data);
|
||||||
return Container(
|
return Container(
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 12),
|
padding: const EdgeInsets.symmetric(horizontal: 12),
|
||||||
child: Container(
|
child: Container(
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
border: Border.all(color: Colors.black),
|
border: Border.all(color: Colors.black),
|
||||||
color: Colors.grey[300],
|
color: Colors.grey[300],
|
||||||
borderRadius: const BorderRadius.all(
|
borderRadius: const BorderRadius.all(
|
||||||
Radius.circular(10),
|
Radius.circular(10),
|
||||||
)),
|
)),
|
||||||
// color: Colors.grey[300],
|
// color: Colors.grey[300],
|
||||||
padding: const EdgeInsets.all(20),
|
padding: const EdgeInsets.all(20),
|
||||||
child: Column(
|
child: Column(
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
mainAxisSize: MainAxisSize.max,
|
mainAxisSize: MainAxisSize.max,
|
||||||
crossAxisAlignment: CrossAxisAlignment.center,
|
crossAxisAlignment: CrossAxisAlignment.center,
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
Row(children: <Widget>[
|
Row(children: <Widget>[
|
||||||
arrayCell(formatedArray.data[0]),
|
arrayCell(formatedArray.data[0]),
|
||||||
arrayCell(formatedArray.data[1]),
|
arrayCell(formatedArray.data[1]),
|
||||||
arrayCell(formatedArray.data[2]),
|
arrayCell(formatedArray.data[2]),
|
||||||
arrayCell(formatedArray.data[3]),
|
arrayCell(formatedArray.data[3]),
|
||||||
]),
|
]),
|
||||||
const SizedBox(height: 15),
|
const SizedBox(height: 15),
|
||||||
Row(children: <Widget>[
|
Row(children: <Widget>[
|
||||||
arrayCell(formatedArray.data[4]),
|
arrayCell(formatedArray.data[4]),
|
||||||
arrayCell(formatedArray.data[5]),
|
arrayCell(formatedArray.data[5]),
|
||||||
arrayCell(formatedArray.data[6]),
|
arrayCell(formatedArray.data[6]),
|
||||||
arrayCell(formatedArray.data[7]),
|
arrayCell(formatedArray.data[7]),
|
||||||
]),
|
]),
|
||||||
const SizedBox(height: 15),
|
const SizedBox(height: 15),
|
||||||
Row(children: <Widget>[
|
Row(children: <Widget>[
|
||||||
arrayCell(formatedArray.data[8]),
|
arrayCell(formatedArray.data[8]),
|
||||||
arrayCell(formatedArray.data[9]),
|
arrayCell(formatedArray.data[9]),
|
||||||
arrayCell(formatedArray.data[10]),
|
arrayCell(formatedArray.data[10]),
|
||||||
arrayCell(formatedArray.data[11]),
|
arrayCell(formatedArray.data[11]),
|
||||||
]),
|
]),
|
||||||
])));
|
]),
|
||||||
|
),
|
||||||
|
);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
Widget arrayCell(dataWord) {
|
Widget arrayCell(dataWord) {
|
||||||
return SizedBox(
|
return SizedBox(
|
||||||
width: 102,
|
width: 102,
|
||||||
child: Column(children: <Widget>[
|
child: Column(children: <Widget>[
|
||||||
Text(dataWord.split(':')[0], style: const TextStyle(fontSize: 14)),
|
Text(
|
||||||
const SizedBox(height: 2),
|
dataWord.split(':')[0],
|
||||||
Text(dataWord.split(':')[1],
|
style: const TextStyle(fontSize: 14),
|
||||||
key: Key('word${dataWord.split(':')[0]}'),
|
),
|
||||||
style: const TextStyle(fontSize: 19, color: Colors.black)),
|
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
|
// ignore: must_be_immutable
|
||||||
|
|
Loading…
Reference in New Issue