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
flutter.sdk=/Users/macbookpro/Developer/flutter
flutter.buildMode=debug
flutter.versionName=SS.16.WWW
flutter.versionCode=9
\ No newline at end of file
flutter.versionName=SS.17.WWW
flutter.versionCode=10
\ 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 {
vertical: 10, horizontal: 20),
child: Row(
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(
width: 400,
),
......@@ -1382,314 +1361,275 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
],
),
),
content: Container(
child: ListBody(
children: <Widget>[
Container(
margin: EdgeInsets.only(top: 0),
padding: EdgeInsets.symmetric(horizontal: 17),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'Masukkan nominal isi ulang disini',
style: blackTextStyle.copyWith(
fontSize: 20,
fontWeight: bold,
content: Column(
children: [
ListBody(
children: <Widget>[
Container(
margin: EdgeInsets.only(top: 0),
padding: EdgeInsets.symmetric(horizontal: 17),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'Masukkan nominal isi ulang disini',
style: blackTextStyle.copyWith(
fontSize: 20,
fontWeight: bold,
),
),
),
Text(
'enter topup amount here',
style: greyTextStyle.copyWith(
fontSize: 15,
fontStyle: FontStyle.italic,
fontWeight: light,
Text(
'enter topup amount here',
style: greyTextStyle.copyWith(
fontSize: 15,
fontStyle: FontStyle.italic,
fontWeight: light,
),
),
),
SizedBox(
height: 20,
),
Container(
height: 50,
padding:
EdgeInsets.symmetric(horizontal: 16),
decoration: BoxDecoration(
border:
Border.all(color: Colors.black12),
color: Colors.white,
borderRadius:
BorderRadius.circular(12)),
child: Center(
child: Row(
children: <Widget>[
Expanded(
child: TextFormField(
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(
SizedBox(
height: 20,
),
Container(
height: 50,
padding:
EdgeInsets.symmetric(horizontal: 16),
decoration: BoxDecoration(
border:
Border.all(color: Colors.black12),
color: Colors.white,
borderRadius:
BorderRadius.circular(12)),
child: Center(
child: Row(
children: <Widget>[
Expanded(
child: TextFormField(
style: blackTextStyle.copyWith(
fontSize: 20,
fontWeight: bold,
color: greyColor,
color: purpleColor,
),
),
onChanged: (value) {
if (timer != null)
timer?.cancel();
tapIdle();
},
onFieldSubmitted: (value) {
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:
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,
fontWeight: bold,
color: greyColor,
),
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(
",",
"")));
),
onChanged: (value) {
if (timer != null)
timer?.cancel();
tapIdle();
},
onFieldSubmitted: (value) {
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(
",",
"")));
}
});
},
),
),
),
],
],
),
),
),
),
],
],
),
),
),
Container(
padding: EdgeInsets.symmetric(horizontal: 17),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(
height: 15,
),
Text(
'Pilih nominal isi ulang',
style: blackTextStyle.copyWith(
fontSize: 20,
fontWeight: bold,
Container(
padding: EdgeInsets.symmetric(horizontal: 17),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(
height: 15,
),
),
Text(
'Choose topup amount',
style: greyTextStyle.copyWith(
fontSize: 15,
fontStyle: FontStyle.italic,
fontWeight: light,
Text(
'Pilih nominal isi ulang',
style: blackTextStyle.copyWith(
fontSize: 20,
fontWeight: bold,
),
),
),
SizedBox(
height: 20,
),
Row(
children: [
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,
Text(
'Choose topup amount',
style: greyTextStyle.copyWith(
fontSize: 15,
fontStyle: FontStyle.italic,
fontWeight: light,
),
Expanded(
child: GestureDetector(
onTap: () {
if (timer != null) timer?.cancel();
tapIdle();
),
SizedBox(
height: 20,
),
Row(
children: [
Expanded(
child: GestureDetector(
onTap: () {
if (timer != null) timer?.cancel();
tapIdle();
if (mounted) {
setState(() {
amountController!.text =
cTopUp2;
});
}
},
child: Container(
padding: EdgeInsets.symmetric(
vertical: 15),
decoration: BoxDecoration(
border: Border.all(
color:
(amountController!.text ==
cTopUp2)
? Color(0xff005DAC)
: Colors.black12),
borderRadius:
BorderRadius.circular(7),
),
child: Center(
child: Text("150,000",
style:
blackTextStyle.copyWith(
fontSize: 25,
fontWeight: bold,
)),
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,
),
))
],
),
SizedBox(
height: 10,
),
Row(
children: [
Expanded(
child: GestureDetector(
onTap: () {
if (timer != null) timer?.cancel();
tapIdle();
Expanded(
child: GestureDetector(
onTap: () {
if (timer != null) timer?.cancel();
tapIdle();
if (mounted) {
setState(() {
amountController!.text =
cTopUp3;
});
}
},
child: Container(
padding: EdgeInsets.symmetric(
vertical: 15),
decoration: BoxDecoration(
border: Border.all(
color:
(amountController!.text ==
cTopUp3)
? Color(0xff005DAC)
: Colors.black12),
borderRadius:
BorderRadius.circular(7),
),
child: Center(
child: Text("100,000",
style:
blackTextStyle.copyWith(
fontSize: 25,
fontWeight: bold,
)),
if (mounted) {
setState(() {
amountController!.text =
cTopUp2;
});
}
},
child: Container(
padding: EdgeInsets.symmetric(
vertical: 15),
decoration: BoxDecoration(
border: Border.all(
color:
(amountController!.text ==
cTopUp2)
? Color(0xff005DAC)
: Colors.black12),
borderRadius:
BorderRadius.circular(7),
),
child: Center(
child: Text("150,000",
style:
blackTextStyle.copyWith(
fontSize: 25,
fontWeight: bold,
)),
),
),
),
)),
SizedBox(
width: 10,
),
Expanded(
child: GestureDetector(
))
],
),
SizedBox(
height: 10,
),
Row(
children: [
Expanded(
child: GestureDetector(
onTap: () {
if (timer != null)
timer?.cancel();
if (timer != null) timer?.cancel();
tapIdle();
if (mounted) {
setState(() {
amountController!.text =
cTopUp4;
cTopUp3;
});
}
},
......@@ -1698,16 +1638,16 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
vertical: 15),
decoration: BoxDecoration(
border: Border.all(
color: (amountController!
.text ==
cTopUp4)
? Color(0xff005DAC)
: Colors.black12),
color:
(amountController!.text ==
cTopUp3)
? Color(0xff005DAC)
: Colors.black12),
borderRadius:
BorderRadius.circular(7),
),
child: Center(
child: Text("200,000",
child: Text("100,000",
style:
blackTextStyle.copyWith(
fontSize: 25,
......@@ -1715,144 +1655,190 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
)),
),
),
)),
SizedBox(
width: 10,
),
),
],
),
],
),
),
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(",", "")));
}
});
});
},
Expanded(
child: GestureDetector(
onTap: () {
if (timer != null)
timer?.cancel();
tapIdle();
if (mounted) {
setState(() {
amountController!.text =
cTopUp4;
});
}
},
child: Container(
padding: EdgeInsets.symmetric(
vertical: 15),
decoration: BoxDecoration(
border: Border.all(
color: (amountController!
.text ==
cTopUp4)
? Color(0xff005DAC)
: Colors.black12),
borderRadius:
BorderRadius.circular(7),
),
child: Center(
child: Text("200,000",
style:
blackTextStyle.copyWith(
fontSize: 25,
fontWeight: bold,
)),
),
),
),
),
],
),
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),
),
),
RotatedBox(
quarterTurns: 4,
child: ValueListenableBuilder(
valueListenable: idleDuration,
builder: (context, value, child) =>
Text(
value.toString(),
style: TextStyle(fontSize: 18),
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: 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 {
buildwalletCard(),
SizedBox(height: 20),
buildServices(context),
SizedBox(height: 20),
SizedBox(height: 10),
// 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