Skip to content

D
Dolan SelfService Topup
Commit b7193e9b authored by Izol's avatar Izol
Browse files
Options

Update version SS.17.WWW

parent c57ec7b8
Hide whitespace changes
Inline Side-by-side
Showing with 427 additions and 441 deletions
android/local.properties
View file @ b7193e9b
sdk.dir=/Users/macbookpro/Library/Android/sdk sdk.dir=/Users/macbookpro/Library/Android/sdk
flutter.sdk=/Users/macbookpro/Developer/flutter flutter.sdk=/Users/macbookpro/Developer/flutter
flutter.buildMode=debug flutter.buildMode=debug
flutter.versionName=SS.16.WWW flutter.versionName=SS.17.WWW
flutter.versionCode=9 flutter.versionCode=10
\ No newline at end of file \ No newline at end of file
lib/ui/pages/home_page.dart
View file @ b7193e9b
...@@ -1345,27 +1345,6 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback { ...@@ -1345,27 +1345,6 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
vertical: 10, horizontal: 20), vertical: 10, horizontal: 20),
child: Row( child: Row(
children: [ children: [
// Align(
// alignment: Alignment.topLeft,
// child: GestureDetector(
// onTap: () {
// setState(() {
// checkCountZero = false;
// Navigator.pop(context);
// timer?.cancel();
// dataQris = null;
// isShowingDialog = true;
// _showTap();
// tapDial();
// });
// },
// child: Icon(
// Icons.arrow_back,
// size: 32,
// color: lightBackgroundColor,
// ),
// ),
// ),
SizedBox( SizedBox(
width: 400, width: 400,
), ),
...@@ -1382,314 +1361,275 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback { ...@@ -1382,314 +1361,275 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
], ],
), ),
), ),
content: Container( content: Column(
child: ListBody( children: [
children: <Widget>[ ListBody(
Container( children: <Widget>[
margin: EdgeInsets.only(top: 0), Container(
padding: EdgeInsets.symmetric(horizontal: 17), margin: EdgeInsets.only(top: 0),
child: Column( padding: EdgeInsets.symmetric(horizontal: 17),
crossAxisAlignment: CrossAxisAlignment.start, child: Column(
children: [ crossAxisAlignment: CrossAxisAlignment.start,
Text( children: [
'Masukkan nominal isi ulang disini', Text(
style: blackTextStyle.copyWith( 'Masukkan nominal isi ulang disini',
fontSize: 20, style: blackTextStyle.copyWith(
fontWeight: bold, fontSize: 20,
fontWeight: bold,
),
), ),
), Text(
Text( 'enter topup amount here',
'enter topup amount here', style: greyTextStyle.copyWith(
style: greyTextStyle.copyWith( fontSize: 15,
fontSize: 15, fontStyle: FontStyle.italic,
fontStyle: FontStyle.italic, fontWeight: light,
fontWeight: light, ),
), ),
), SizedBox(
SizedBox( height: 20,
height: 20, ),
), Container(
Container( height: 50,
height: 50, padding:
padding: EdgeInsets.symmetric(horizontal: 16),
EdgeInsets.symmetric(horizontal: 16), decoration: BoxDecoration(
decoration: BoxDecoration( border:
border: Border.all(color: Colors.black12),
Border.all(color: Colors.black12), color: Colors.white,
color: Colors.white, borderRadius:
borderRadius: BorderRadius.circular(12)),
BorderRadius.circular(12)), child: Center(
child: Center( child: Row(
child: Row( children: <Widget>[
children: <Widget>[ Expanded(
Expanded( child: TextFormField(
child: TextFormField( style: blackTextStyle.copyWith(
style: blackTextStyle.copyWith(
fontSize: 20,
fontWeight: bold,
color: purpleColor,
),
keyboardType: TextInputType
.numberWithOptions(
signed: true,
decimal: true),
controller: amountController,
inputFormatters: [
FilteringTextInputFormatter
.digitsOnly,
CurrencyInputFormatter()
],
textInputAction:
TextInputAction.done,
decoration:
InputDecoration.collapsed(
hintText: '50,000',
hintStyle:
blackTextStyle.copyWith(
fontSize: 20, fontSize: 20,
fontWeight: bold, fontWeight: bold,
color: greyColor, color: purpleColor,
), ),
), keyboardType: TextInputType
onChanged: (value) { .numberWithOptions(
if (timer != null) signed: true,
timer?.cancel(); decimal: true),
tapIdle(); controller: amountController,
}, inputFormatters: [
onFieldSubmitted: (value) { FilteringTextInputFormatter
if (timer != null) { .digitsOnly,
timer!.cancel(); CurrencyInputFormatter()
} ],
AwesomeDialog( textInputAction:
context: context, TextInputAction.done,
dialogType: DialogType.info, decoration:
animType: InputDecoration.collapsed(
AnimType.rightSlide, hintText: '50,000',
dismissOnTouchOutside: hintStyle:
false,
autoHide:
Duration(seconds: 2),
headerAnimationLoop: true,
title:
'Mohon Tunggu Sebentar ...',
titleTextStyle:
blackTextStyle.copyWith( blackTextStyle.copyWith(
fontSize: 20, fontSize: 20,
fontWeight: bold, fontWeight: bold,
color: greyColor,
), ),
desc: ),
"Please wait a moment ...", onChanged: (value) {
descTextStyle: if (timer != null)
greyTextStyle.copyWith( timer?.cancel();
fontSize: 18, tapIdle();
fontWeight: light, },
), onFieldSubmitted: (value) {
).show().then((value) { if (timer != null) {
if (amountController! timer!.cancel();
.text.isEmpty) {
AwesomeDialog(
context: context,
dialogType:
DialogType.error,
animType:
AnimType.rightSlide,
headerAnimationLoop:
true,
title:
'Terjadi Kesalahan',
desc:
"Anda belum mengisi saldo",
btnOkOnPress: () {
if (timer != null)
timer?.cancel();
tapIdle();
},
btnOkIcon: Icons.cancel,
btnOkColor: Colors.red,
).show();
}
if (mounted) {
denomLimits(
outletName,
info,
int.parse(
amountController!
.text
.replaceAll(
",",
"")));
} }
}); AwesomeDialog(
}, context: context,
dialogType: DialogType.info,
animType:
AnimType.rightSlide,
dismissOnTouchOutside:
false,
autoHide:
Duration(seconds: 2),
headerAnimationLoop: true,
title:
'Mohon Tunggu Sebentar ...',
titleTextStyle:
blackTextStyle.copyWith(
fontSize: 20,
fontWeight: bold,
),
desc:
"Please wait a moment ...",
descTextStyle:
greyTextStyle.copyWith(
fontSize: 18,
fontWeight: light,
),
).show().then((value) {
if (amountController!
.text.isEmpty) {
AwesomeDialog(
context: context,
dialogType:
DialogType.error,
animType:
AnimType.rightSlide,
headerAnimationLoop:
true,
title:
'Terjadi Kesalahan',
desc:
"Anda belum mengisi saldo",
btnOkOnPress: () {
if (timer != null)
timer?.cancel();
tapIdle();
},
btnOkIcon: Icons.cancel,
btnOkColor: Colors.red,
).show();
}
if (mounted) {
denomLimits(
outletName,
info,
int.parse(
amountController!
.text
.replaceAll(
",",
"")));
}
});
},
),
), ),
), ],
], ),
), ),
), ),
), ],
], ),
), ),
), Container(
Container( padding: EdgeInsets.symmetric(horizontal: 17),
padding: EdgeInsets.symmetric(horizontal: 17), child: Column(
child: Column( crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: [
children: [ SizedBox(
SizedBox( height: 15,
height: 15,
),
Text(
'Pilih nominal isi ulang',
style: blackTextStyle.copyWith(
fontSize: 20,
fontWeight: bold,
), ),
), Text(
Text( 'Pilih nominal isi ulang',
'Choose topup amount', style: blackTextStyle.copyWith(
style: greyTextStyle.copyWith( fontSize: 20,
fontSize: 15, fontWeight: bold,
fontStyle: FontStyle.italic, ),
fontWeight: light,
), ),
), Text(
SizedBox( 'Choose topup amount',
height: 20, style: greyTextStyle.copyWith(
), fontSize: 15,
Row( fontStyle: FontStyle.italic,
children: [ fontWeight: light,
Expanded(
child: GestureDetector(
onTap: () {
if (timer != null) timer?.cancel();
tapIdle();
if (mounted) {
setState(() {
amountController!.text =
cTopUp1;
});
}
},
child: Container(
padding: EdgeInsets.symmetric(
vertical: 15),
decoration: BoxDecoration(
border: Border.all(
color:
amountController!.text ==
cTopUp1
? purpleColor
: Colors.black12),
borderRadius:
BorderRadius.circular(7),
),
child: Center(
child: Text("50,000",
style:
blackTextStyle.copyWith(
fontSize: 25,
fontWeight: bold,
)),
),
),
)),
SizedBox(
width: 10,
), ),
Expanded( ),
child: GestureDetector( SizedBox(
onTap: () { height: 20,
if (timer != null) timer?.cancel(); ),
tapIdle(); Row(
children: [
Expanded(
child: GestureDetector(
onTap: () {
if (timer != null) timer?.cancel();
tapIdle();
if (mounted) { if (mounted) {
setState(() { setState(() {
amountController!.text = amountController!.text =
cTopUp2; cTopUp1;
}); });
} }
}, },
child: Container( child: Container(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
vertical: 15), vertical: 15),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
color: color:
(amountController!.text == amountController!.text ==
cTopUp2) cTopUp1
? Color(0xff005DAC) ? purpleColor
: Colors.black12), : Colors.black12),
borderRadius: borderRadius:
BorderRadius.circular(7), BorderRadius.circular(7),
), ),
child: Center( child: Center(
child: Text("150,000", child: Text("50,000",
style: style:
blackTextStyle.copyWith( blackTextStyle.copyWith(
fontSize: 25, fontSize: 25,
fontWeight: bold, fontWeight: bold,
)), )),
),
), ),
)),
SizedBox(
width: 10,
), ),
)) Expanded(
], child: GestureDetector(
), onTap: () {
SizedBox( if (timer != null) timer?.cancel();
height: 10, tapIdle();
),
Row(
children: [
Expanded(
child: GestureDetector(
onTap: () {
if (timer != null) timer?.cancel();
tapIdle();
if (mounted) { if (mounted) {
setState(() { setState(() {
amountController!.text = amountController!.text =
cTopUp3; cTopUp2;
}); });
} }
}, },
child: Container( child: Container(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
vertical: 15), vertical: 15),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
color: color:
(amountController!.text == (amountController!.text ==
cTopUp3) cTopUp2)
? Color(0xff005DAC) ? Color(0xff005DAC)
: Colors.black12), : Colors.black12),
borderRadius: borderRadius:
BorderRadius.circular(7), BorderRadius.circular(7),
), ),
child: Center( child: Center(
child: Text("100,000", child: Text("150,000",
style: style:
blackTextStyle.copyWith( blackTextStyle.copyWith(
fontSize: 25, fontSize: 25,
fontWeight: bold, fontWeight: bold,
)), )),
),
), ),
), ))
)), ],
SizedBox( ),
width: 10, SizedBox(
), height: 10,
Expanded( ),
child: GestureDetector( Row(
children: [
Expanded(
child: GestureDetector(
onTap: () { onTap: () {
if (timer != null) if (timer != null) timer?.cancel();
timer?.cancel();
tapIdle(); tapIdle();
if (mounted) { if (mounted) {
setState(() { setState(() {
amountController!.text = amountController!.text =
cTopUp4; cTopUp3;
}); });
} }
}, },
...@@ -1698,16 +1638,16 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback { ...@@ -1698,16 +1638,16 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
vertical: 15), vertical: 15),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
color: (amountController! color:
.text == (amountController!.text ==
cTopUp4) cTopUp3)
? Color(0xff005DAC) ? Color(0xff005DAC)
: Colors.black12), : Colors.black12),
borderRadius: borderRadius:
BorderRadius.circular(7), BorderRadius.circular(7),
), ),
child: Center( child: Center(
child: Text("200,000", child: Text("100,000",
style: style:
blackTextStyle.copyWith( blackTextStyle.copyWith(
fontSize: 25, fontSize: 25,
...@@ -1715,144 +1655,190 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback { ...@@ -1715,144 +1655,190 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
)), )),
), ),
), ),
)),
SizedBox(
width: 10,
), ),
), Expanded(
], child: GestureDetector(
), onTap: () {
], if (timer != null)
), timer?.cancel();
), tapIdle();
SizedBox(height: 10),
Container( if (mounted) {
margin: const EdgeInsets.only( setState(() {
right: 300, left: 300), amountController!.text =
child: Column( cTopUp4;
children: [ });
Row( }
children: [ },
Expanded( child: Container(
child: CustomFilledButton( padding: EdgeInsets.symmetric(
title: 'lanjut', vertical: 15),
subtitle: ' / proceed', decoration: BoxDecoration(
onPressed: () { border: Border.all(
setState(() { color: (amountController!
if (timer != null) timer?.cancel(); .text ==
AwesomeDialog( cTopUp4)
context: context, ? Color(0xff005DAC)
dialogType: DialogType.info, : Colors.black12),
animType: AnimType.rightSlide, borderRadius:
dismissOnTouchOutside: false, BorderRadius.circular(7),
autoHide: Duration(seconds: 2), ),
headerAnimationLoop: true, child: Center(
title: child: Text("200,000",
'Mohon Tunggu Sebentar ...', style:
titleTextStyle: blackTextStyle.copyWith(
blackTextStyle.copyWith( fontSize: 25,
fontSize: 20, fontWeight: bold,
fontWeight: bold, )),
), ),
desc: "Please wait a moment ...", ),
descTextStyle: ),
greyTextStyle.copyWith(
fontSize: 18,
fontWeight: light,
),
).show().then((value) {
if (amountController!
.text.isEmpty) {
AwesomeDialog(
context: context,
dialogType: DialogType.error,
animType: AnimType.rightSlide,
headerAnimationLoop: true,
title: 'Terjadi Kesalahan',
desc:
"Anda belum mengisi saldo",
btnOkOnPress: () {
if (timer != null)
timer?.cancel();
tapIdle();
},
btnOkIcon: Icons.cancel,
btnOkColor: Colors.red,
).show();
}
if (mounted) {
denomLimits(
outletName,
info,
int.parse(amountController!
.text
.replaceAll(",", "")));
}
});
});
},
), ),
],
),
SizedBox(height: 10),
Container(
margin: const EdgeInsets.only(
right: 300, left: 300),
child: Column(
children: [
Row(
children: [
Expanded(
child: CustomFilledButton(
title: 'lanjut',
subtitle: ' / proceed',
onPressed: () {
setState(() {
if (timer != null) timer?.cancel();
AwesomeDialog(
context: context,
dialogType: DialogType.info,
animType: AnimType.rightSlide,
dismissOnTouchOutside: false,
autoHide: Duration(seconds: 2),
headerAnimationLoop: true,
title:
'Mohon Tunggu Sebentar ...',
titleTextStyle:
blackTextStyle.copyWith(
fontSize: 20,
fontWeight: bold,
),
desc: "Please wait a moment ...",
descTextStyle:
greyTextStyle.copyWith(
fontSize: 18,
fontWeight: light,
),
).show().then((value) {
if (amountController!
.text.isEmpty) {
AwesomeDialog(
context: context,
dialogType: DialogType.error,
animType: AnimType.rightSlide,
headerAnimationLoop: true,
title: 'Terjadi Kesalahan',
desc:
"Anda belum mengisi saldo",
btnOkOnPress: () {
if (timer != null)
timer?.cancel();
tapIdle();
},
btnOkIcon: Icons.cancel,
btnOkColor: Colors.red,
).show();
}
if (mounted) {
denomLimits(
outletName,
info,
int.parse(amountController!
.text
.replaceAll(",", "")));
}
});
});
},
),
),
],
),
],
), ),
],
),
],
),
),
SizedBox(height: 10),
Container(
margin: const EdgeInsets.only(
right: 350, left: 350),
child: Row(
children: [
Expanded(
child: CustomFillButton(
title: 'Batal',
subtitle:' / cancel',
onPressed: (){
Navigator.of(context).pop(); timer?.cancel();
checkCountZero = false;
isShowingDialog = true;
_showTap();
tapDial();
},
)
)
]
),
),
SizedBox(height: 10),
Positioned(
bottom: 20,
right: 0,
child: Stack(
alignment: Alignment.center,
children: [
ValueListenableBuilder(
valueListenable: idleDuration,
builder: (context, value, child) =>
CircularProgressIndicator(
strokeWidth: 5,
value: (idleDuration.value.toDouble()) /
_maxDuration,
valueColor:
AlwaysStoppedAnimation<Color>(
Colors.blue),
), ),
), SizedBox(height: 10),
RotatedBox( Container(
quarterTurns: 4, margin: const EdgeInsets.only(
child: ValueListenableBuilder( right: 350, left: 350),
valueListenable: idleDuration, child: Row(
builder: (context, value, child) => children: [
Text( Expanded(
value.toString(), child: CustomFillButton(
style: TextStyle(fontSize: 18), title: 'Batal',
subtitle:' / cancel',
onPressed: (){
Navigator.of(context).pop(); timer?.cancel();
checkCountZero = false;
isShowingDialog = true;
_showTap();
tapDial();
},
)
)
]
), ),
), ),
), SizedBox(height: 15),
], Align(
alignment: Alignment.center,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children:[
Stack(
alignment: Alignment.center,
children: [
ValueListenableBuilder(
valueListenable: idleDuration,
builder: (context, value, child) =>
CircularProgressIndicator(
strokeWidth: 5,
value: (idleDuration.value.toDouble()) /
_maxDuration,
valueColor:
AlwaysStoppedAnimation<Color>(
Colors.blue),
),
),
RotatedBox(
quarterTurns: 4,
child: ValueListenableBuilder(
valueListenable: idleDuration,
builder: (context, value, child) =>
Text(
value.toString(),
style: TextStyle(fontSize: 18),
),
),
),
]
),
],
),
),
],
),
), ),
), ],
], ),
), ],
), ),
), ),
), ),
...@@ -2334,7 +2320,7 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback { ...@@ -2334,7 +2320,7 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
buildwalletCard(), buildwalletCard(),
SizedBox(height: 20), SizedBox(height: 20),
buildServices(context), buildServices(context),
SizedBox(height: 20), SizedBox(height: 10),
// buildFloat(), // buildFloat(),
], ],
), ),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment