Skip to content

#issue 25 Resolved Page breaking down at bottom #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

#issue 25 Resolved Page breaking down at bottom #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47b4621
Issue-23 & Issue-25 Resolved
pranjalagrawal2012 Mar 14, 2021
ddf1d60
Resolved the issue of UI screen Overflowing
pranjalagrawal2012 Mar 17, 2021
bd95196
Resolved the assigned issue (Removed the padding field whose value is…
pranjalagrawal2012 Mar 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ class _MyAppState extends State<MyApp> {
_lockButtonSubscription = HardwareButtons.lockButtonEvents.listen((event) {
setState(() {
// _latestHardwareButtonEvent = 'LOCK_BUTTON';
Navigator.push(context,
MaterialPageRoute(builder: (context) => PhotoCapture()));
Navigator.push(
context, MaterialPageRoute(builder: (context) => PhotoCapture()));
});
});
}
Expand Down
1,343 changes: 688 additions & 655 deletions lib/pages/emergency_dashboard.dart
View file
Open in desktop

Large diffs are not rendered by default.

207 changes: 106 additions & 101 deletions lib/pages/login_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,108 +78,110 @@ class _LoginPageState extends State<LoginPage>

@override
Widget build(BuildContext context) {
return new Scaffold(
key: _scaffoldKey,
body: NotificationListener<OverscrollIndicatorNotification>(
onNotification: (overscroll) {
overscroll.disallowGlow();
},
child: SingleChildScrollView(
child: Container(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height >= 775.0
? MediaQuery.of(context).size.height
: 775.0,
decoration: new BoxDecoration(color: bg
// begin: const FractionalOffset(0.0, 0.0),
// end: const FractionalOffset(1.0, 1.0),
// stops: [0.0, 1.0],
// tileMode: TileMode.clamp),
),
child: Column(
mainAxisSize: MainAxisSize.max,
children: <Widget>[
Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Padding(
padding: EdgeInsets.only(top: 75.0),
child: AvatarGlow(
endRadius: 100.0,
glowColor: HexColor("#ea6a88"),
child: Container(
height: 120,
width: 120,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(1000)),
child: new Image(
width: 250.0,
height: 191.0,
fit: BoxFit.fill,
image: new AssetImage('assets/SheHeroes.png')),
),
),
),
Container(
margin: EdgeInsets.fromLTRB(0, 0, 0, 0),
child: ScaleAnimatedTextKit(
onTap: () {
print("Tap Event");
},
text: [
"SheHeroes",
],
textStyle: TextStyle(
fontSize: 30.0,
fontFamily: "Canterbury",
color: HexColor("#ea6a88"),
fontWeight: FontWeight.bold),
textAlign: TextAlign.start,
alignment: AlignmentDirectional
.topStart // or Alignment.topLeft
return SafeArea(
child: new Scaffold(
key: _scaffoldKey,
body: NotificationListener<OverscrollIndicatorNotification>(
onNotification: (overscroll) {
overscroll.disallowGlow();
},
child: SingleChildScrollView(
child: Container(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height >= 775.0
? MediaQuery.of(context).size.height
: 775.0,
decoration: new BoxDecoration(color: bg
// begin: const FractionalOffset(0.0, 0.0),
// end: const FractionalOffset(1.0, 1.0),
// stops: [0.0, 1.0],
// tileMode: TileMode.clamp),
),
child: Column(
mainAxisSize: MainAxisSize.max,
children: <Widget>[
Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Padding(
padding: EdgeInsets.only(top: 75.0),
child: AvatarGlow(
endRadius: 100.0,
glowColor: HexColor("#ea6a88"),
child: Container(
height: 120,
width: 120,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(1000)),
child: new Image(
width: 250.0,
height: 191.0,
fit: BoxFit.fill,
image: new AssetImage('assets/SheHeroes.png')),
),
),
],
),
Padding(
padding: EdgeInsets.only(top: 20.0),
child: _buildMenuBar(context),
),
Expanded(
flex: 2,
child: PageView(
controller: _pageController,
onPageChanged: (i) {
if (i == 0) {
setState(() {
right = Colors.white;
left = Colors.black;
});
} else if (i == 1) {
setState(() {
right = Colors.black;
left = Colors.white;
});
}
},
children: <Widget>[
Center(
child: new ConstrainedBox(
constraints: const BoxConstraints.expand(),
child: _buildSignIn(context),
),
),
Center(
child: new ConstrainedBox(
constraints: const BoxConstraints.expand(),
child: _buildSignUp(context),
),
Container(
margin: EdgeInsets.fromLTRB(0, 0, 0, 0),
child: ScaleAnimatedTextKit(
onTap: () {
print("Tap Event");
},
text: [
"SheHeroes",
],
textStyle: TextStyle(
fontSize: 30.0,
fontFamily: "Canterbury",
color: HexColor("#ea6a88"),
fontWeight: FontWeight.bold),
textAlign: TextAlign.start,
alignment: AlignmentDirectional
.topStart // or Alignment.topLeft
),
),
],
),
),
],
Padding(
padding: EdgeInsets.only(top: 20.0),
child: _buildMenuBar(context),
),
Expanded(
flex: 2,
child: PageView(
controller: _pageController,
onPageChanged: (i) {
if (i == 0) {
setState(() {
right = Colors.white;
left = Colors.black;
});
} else if (i == 1) {
setState(() {
right = Colors.black;
left = Colors.white;
});
}
},
children: <Widget>[
Center(
child: new ConstrainedBox(
constraints: const BoxConstraints.expand(),
child: _buildSignIn(context),
),
),
Center(
child: new ConstrainedBox(
constraints: const BoxConstraints.expand(),
child: _buildSignUp(context),
),
),
],
),
),
],
),
),
),
),
Expand Down Expand Up @@ -445,7 +447,6 @@ class _LoginPageState extends State<LoginPage>

Widget _buildSignUp(BuildContext context) {
return Container(
padding: EdgeInsets.only(top: 23.0),
child: Column(
children: <Widget>[
Stack(
Expand Down Expand Up @@ -484,7 +485,8 @@ class _LoginPageState extends State<LoginPage>
),
hintText: "Username",
hintStyle: TextStyle(
fontFamily: "WorkSansSemiBold", fontSize: 16.0),
fontFamily: "WorkSansSemiBold",
fontSize: 16.0),
),
),
),
Expand Down Expand Up @@ -512,7 +514,8 @@ class _LoginPageState extends State<LoginPage>
),
hintText: "Email Address",
hintStyle: TextStyle(
fontFamily: "WorkSansSemiBold", fontSize: 16.0),
fontFamily: "WorkSansSemiBold",
fontSize: 16.0),
),
),
),
Expand Down Expand Up @@ -540,7 +543,8 @@ class _LoginPageState extends State<LoginPage>
),
hintText: "Password",
hintStyle: TextStyle(
fontFamily: "WorkSansSemiBold", fontSize: 16.0),
fontFamily: "WorkSansSemiBold",
fontSize: 16.0),
suffixIcon: GestureDetector(
onTap: _toggleSignup,
child: Icon(
Expand Down Expand Up @@ -577,7 +581,8 @@ class _LoginPageState extends State<LoginPage>
),
hintText: "Confirmation",
hintStyle: TextStyle(
fontFamily: "WorkSansSemiBold", fontSize: 16.0),
fontFamily: "WorkSansSemiBold",
fontSize: 16.0),
suffixIcon: GestureDetector(
onTap: _toggleSignupConfirm,
child: Icon(
Expand Down
Loading