Skip to content

Commit

Permalink
Fixed Userinfo page throwing exception and added monthly income changer
Browse files Browse the repository at this point in the history
  • Loading branch information
@xMadKing
xMadKing committed Dec 24, 2023
1 parent 95601e4 commit 4c8b42b
Show file tree
Hide file tree
Showing 2 changed files with 130 additions and 74 deletions.
165 changes: 105 additions & 60 deletions lib/pages/userinfopage.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,68 +38,93 @@ class _UserInfo extends State<UserInfo>{
if(_loading){
return const CircularProgressIndicator();
}
return(
Scaffold(
resizeToAvoidBottomInset: false,
body: Stack(
children: [
Container(
decoration: BoxDecoration(
color: Color(0xFF1E2038),
),
),
Positioned(
top: 40,
left: 20,
child: CustomizedBackButton()
),
Container(
child: Align(
alignment: Alignment(-0.9, -0.8),
child: Text(
"User\nInformation",
style: TextStyle(
fontFamily: 'Montserrat',
color: Colors.white,
fontSize: 50,
fontWeight: FontWeight.w800
return Scaffold(
body: SingleChildScrollView(
child: Container(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height,
decoration: BoxDecoration(
color: Color(0xFF1E2038),
),
child: Stack(
children: [
Column(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Container(
margin: EdgeInsets.only(top: 30, left: 20),
child: CustomizedBackButton()
),
SizedBox(height: 10,),
Container(
child: Align(
alignment: Alignment(-0.9, -0.8),
child: Text(
"User\nInformation",
style: TextStyle(
fontFamily: 'Montserrat',
color: Colors.white,
fontSize: 50,
fontWeight: FontWeight.w800
),
),
),
),
),
SizedBox(height: 70,),
Container(
child: CardWidget(
client: client,
),
),
],
),
Container(
child: CardWidget(
client: client,
Container(
alignment: Alignment(0,-0.23),
child: Profile(
name: client.name,
)
),
),

Align(child: Profile(
name: client.name,
)),
],
)
],
),
),
)
);
}

}
class CardWidget extends StatefulWidget {
final User client;


CardWidget({super.key, required this.client});

@override
State<StatefulWidget> createState() => _CardWidget();
}

class CardWidget extends StatelessWidget {
class _CardWidget extends State<CardWidget> {
Wyrm database = Wyrm();
final List<TextEditingController> controllers = [
TextEditingController(),
TextEditingController(),
TextEditingController()
];
final User client;
Wyrm database = Wyrm();
bool changedArgs = false;
bool _loading = true;

CardWidget({
super.key,
required this.client,
});
@override
void initState() {
setState(() {
_loading = false;
});
super.initState();
}

@override
Widget build(BuildContext context) {
if(_loading) {
return CircularProgressIndicator();
}
return Align(
alignment: Alignment.bottomCenter,
child: ClipRRect(
Expand All @@ -116,7 +141,7 @@ class CardWidget extends StatelessWidget {
),
),
width: MediaQuery.of(context).size.width * 0.9,
height: MediaQuery.of(context).size.height * 0.5,
height: MediaQuery.of(context).size.height * 0.6,
child: Column(
children: [
Container(
Expand All @@ -136,9 +161,10 @@ class CardWidget extends StatelessWidget {
height: 50,
width: MediaQuery.of(context).size.width * 0.75,
controller: controllers[0],
keyboardType: TextInputType.text,
function: (){},
icon: Icon(Icons.person),
inBoxText: client.name,
inBoxText: widget.client.name,
)
),
Container(
Expand All @@ -152,18 +178,35 @@ class CardWidget extends StatelessWidget {
controller: controllers[1],
function: (){},
icon: Icon(Icons.date_range),
inBoxText: client.birthDate,
inBoxText: widget.client.birthDate,
)
),
Container(
margin: EdgeInsets.only(top: 20),
child: Text(
"THIS ACTION WILL RESTART THE APPLICATION!",
style: TextStyle(
color: Colors.red,
fontWeight: FontWeight.bold,
fontSize: 12,
fontFamily: "Montserrat",
margin: EdgeInsets.only(top: 20),
width: MediaQuery.of(context).size.width * 0.75,
child: CustomTextField(
topText: "Monthly Income",
height: 50,
width: MediaQuery.of(context).size.width * 0.8,
controller: controllers[2],
keyboardType: TextInputType.number,
function: (){},
icon: Icon(Icons.monetization_on_outlined),
inBoxText: widget.client.monthlyIncome.toString(),
)
),
Visibility(
visible: changedArgs,
child: Container(
margin: EdgeInsets.only(top: 20),
child: Text(
"SUCESS!",
style: TextStyle(
color: Colors.green.shade600,
fontWeight: FontWeight.bold,
fontSize: 12,
fontFamily: "Montserrat",
),
),
),
),
Expand All @@ -177,14 +220,16 @@ class CardWidget extends StatelessWidget {
),
child: TextButton(
onPressed: () async {
client.name = controllers[0].text;
print(client.name);
database.updateEntryInTable(
widget.client.name = controllers[0].text;
widget.client.monthlyIncome = double.parse(controllers[2].text);
await database.updateEntryInTable(
'user',
'userID',
client.userID,
client);
Restart.restartApp();
widget.client.userID,
widget.client);
setState(() {
changedArgs = true;
});
},
child: const Text(
"Save",
Expand Down
39 changes: 25 additions & 14 deletions lib/widgets/backbutton.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,31 @@ class CustomizedBackButton extends StatelessWidget{

@override
Widget build(BuildContext context) {
return IconButton(
color: Colors.transparent,
icon: const Expanded(
child: Row(
children: [
Icon(Icons.arrow_back_ios_new, color: Color(0xffFFFFFF), size: 15),
SizedBox(width: 5),
Text('Back', style: TextStyle(fontFamily: 'Montserrat', fontSize: 15, color: Color(0xffFFFFFF)))
]
)
),
onPressed: () {
Navigator.of(context).pop();
},
//old implementation used expanded, expanded should not be used inside a stack.
return Row(
children: [
Container(
child: IconButton(
onPressed: () {
Navigator.pop(context);
},
icon: const Icon(
Icons.arrow_back_ios,
color: Colors.white,
size: 24,
),
),
),
Text(
"BACK",
style: TextStyle(
fontWeight: FontWeight.w500,
fontSize: 24,
fontFamily: 'Montserrat',
color: Colors.white
),
)
],
);
}
}

0 comments on commit 4c8b42b

Please sign in to comment.