Skip to content

Commit 5e0d8bf

Browse files
committed
Bug fixes
1 parent fcde217 commit 5e0d8bf

File tree

7 files changed

+34
-18
lines changed

7 files changed

+34
-18
lines changed

lib/myapp.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class MyApp extends StatelessWidget {
1818
primarySwatch: Colors.yellow),
1919
debugShowCheckedModeBanner: false,
2020
showPerformanceOverlay: false,
21-
home: ShoppingDetails(),
21+
home: HomePage(),
2222
// initialRoute: UIData.notFoundRoute,
2323

2424
//routes

lib/ui/page/login/login_card.dart

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class _LoginCardState extends State<LoginCard>
3939
style: new TextStyle(fontSize: 15.0, color: Colors.black),
4040
decoration: new InputDecoration(
4141
hintText: UIData.enter_code_hint,
42-
labelText: UIData.enter_code_hint),
42+
labelText: UIData.enter_code_label),
4343
),
4444
new SizedBox(
4545
height: 10.0,
@@ -53,7 +53,7 @@ class _LoginCardState extends State<LoginCard>
5353
fontSize: 15.0, color: Colors.black),
5454
decoration: new InputDecoration(
5555
hintText: UIData.enter_otp_hint,
56-
labelText: UIData.enter_otp_hint),
56+
labelText: UIData.enter_otp_label),
5757
obscureText: true,
5858
),
5959
new SizedBox(
@@ -96,9 +96,7 @@ class _LoginCardState extends State<LoginCard>
9696
height: deviceSize.height / 2 - 20,
9797
width: deviceSize.width * 0.85,
9898
child: new Card(
99-
color: Colors.white,
100-
elevation: 2.0,
101-
child: loginBuilder()),
99+
color: Colors.white, elevation: 2.0, child: loginBuilder()),
102100
),
103101
);
104102
}

lib/ui/page/profile/profile_one_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ class ProfileOnePage extends StatelessWidget {
9090
style: TextStyle(fontWeight: FontWeight.w700),
9191
textAlign: TextAlign.center,
9292
maxLines: 3,
93-
9493
softWrap: true,
9594
),
9695
),
@@ -161,6 +160,7 @@ class ProfileOnePage extends StatelessWidget {
161160
bodyData: bodyData(),
162161
showFAB: true,
163162
showDrawer: false,
163+
floatingIcon: Icons.person_add,
164164
);
165165

166166
@override

lib/ui/page/shopping/shopping_widget.dart

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,31 @@ class ShoppingWidgets extends StatelessWidget {
8181
),
8282
);
8383

84-
Widget descCard() => Padding(
84+
Widget descCard() => Container(
85+
width: double.infinity,
8586
padding: const EdgeInsets.symmetric(horizontal: 18.0),
8687
child: Card(
8788
child: Padding(
8889
padding: const EdgeInsets.all(8.0),
89-
child: ProfileTile(
90-
title: "Description",
91-
subtitle: product.description,
90+
child: Column(
91+
crossAxisAlignment: CrossAxisAlignment.start,
92+
children: <Widget>[
93+
Text(
94+
"Description",
95+
style: TextStyle(
96+
fontSize: 20.0,
97+
fontWeight: FontWeight.w700,
98+
),
99+
),
100+
SizedBox(
101+
height: 5.0,
102+
),
103+
Text(
104+
product.description,
105+
style:
106+
TextStyle(fontSize: 15.0, fontWeight: FontWeight.normal),
107+
),
108+
],
92109
),
93110
),
94111
),

lib/ui/widgets/common_scaffold.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,14 @@ class CommonScaffold extends StatelessWidget {
109109
"5",
110110
style: TextStyle(color: Colors.white, fontSize: 10.0),
111111
)
112-
: Null,
112+
: null,
113113
icon: floatingIcon,
114114
qrCallback: () {},
115115
)
116116
: null,
117-
floatingActionButtonLocation:
118-
centerDocked ? FloatingActionButtonLocation.centerDocked : null,
117+
floatingActionButtonLocation: centerDocked
118+
? FloatingActionButtonLocation.centerDocked
119+
: FloatingActionButtonLocation.endFloat,
119120
bottomNavigationBar: showBottomNav ? myBottomBar() : null,
120121
);
121122
}

lib/ui/widgets/profile_tile.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'package:flutter/material.dart';
2-
import 'package:flutter_uikit/utils/uidata.dart';
32

43
class ProfileTile extends StatelessWidget {
54
final title;
@@ -9,7 +8,6 @@ class ProfileTile extends StatelessWidget {
98
Widget build(BuildContext context) {
109
return Column(
1110
mainAxisAlignment: MainAxisAlignment.center,
12-
crossAxisAlignment: CrossAxisAlignment.stretch,
1311
children: <Widget>[
1412
Text(
1513
title,

lib/utils/uidata.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ class UIData {
3636
static const String verifyImage = "$imageDir/verification.jpg";
3737

3838
//login
39-
static const String enter_code_hint = "Phone Number";
40-
static const String enter_otp_hint = "OTP";
39+
static const String enter_code_label = "Phone Number";
40+
static const String enter_code_hint = "10 Digit Phone Number";
41+
static const String enter_otp_label = "OTP";
42+
static const String enter_otp_hint = "4 Digit OTP";
4143
static const String get_otp = "Get OTP";
4244
static const String resend_otp = "Resend OTP";
4345
static const String login = "Login";

0 commit comments

Comments
 (0)