Skip to content

Commit 9ca253f

Browse files
CoderMikeHeCoderMikeHe
committed
ADD：登录模块屏幕适配
1 parent d55f406 commit 9ca253f

File tree

9 files changed

+268
-131
lines changed

9 files changed

+268
-131
lines changed

‎lib/views/login/login_page.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import 'package:flutter_wechat/constant/style.dart';
1313
import 'package:flutter_wechat/routers/fluro_navigator.dart';
1414
import 'login_router.dart';
1515

16+
// 适配完毕
1617
class LoginPage extends StatefulWidget {
1718
LoginPage({Key key}) : super(key: key);
1819

@@ -144,7 +145,7 @@ class _LoginPageState extends State<LoginPage> {
144145
),
145146
),
146147
),
147-
top: FlutterScreenUtil.ScreenUtil().setHeight(30.0) +
148+
top: FlutterScreenUtil.ScreenUtil().setHeight(15.0) +
148149
FlutterScreenUtil.ScreenUtil.statusBarHeight,
149150
right: FlutterScreenUtil.ScreenUtil().setWidth(60.0),
150151
),

‎lib/views/login/register/register_page.dart

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
import 'package:flutter/material.dart';
22

3+
import 'package:flutter_screenutil/flutter_screenutil.dart'
4+
as FlutterScreenUtil;
5+
36
import 'package:flutter_wechat/constant/style.dart';
47

58
import 'package:flutter_wechat/widgets/bar_button/bar_button.dart';
69
import 'package:flutter_wechat/widgets/login/register_widget.dart';
710

11+
// 适配完毕
812
class RegisterPage extends StatelessWidget {
913
const RegisterPage({Key key}) : super(key: key);
1014

@@ -41,7 +45,11 @@ class RegisterPage extends StatelessWidget {
4145
Widget _buildHeaderWidget(BuildContext context) {
4246
return Container(
4347
color: Colors.white38,
44-
padding: EdgeInsets.fromLTRB(16.0, 0, 16.0, 12.0),
48+
padding: EdgeInsets.fromLTRB(
49+
FlutterScreenUtil.ScreenUtil().setWidth(16.0 * 3),
50+
0,
51+
FlutterScreenUtil.ScreenUtil().setWidth(16.0 * 3),
52+
FlutterScreenUtil.ScreenUtil().setHeight(12.0 * 3)),
4553
alignment: Alignment.bottomLeft,
4654
height: kToolbarHeight + MediaQuery.of(context).padding.top,
4755
width: double.maxFinite,

‎lib/views/login/zone_code_picker/zone_code_picker_page.dart

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import 'package:flutter/material.dart';
22
import 'package:azlistview/azlistview.dart';
3+
import 'package:flutter_screenutil/flutter_screenutil.dart'
4+
as FlutterScreenUtil;
35

46
import 'package:flutter_wechat/constant/constant.dart';
57
import 'package:flutter_wechat/constant/style.dart';
@@ -10,6 +12,7 @@ import 'package:flutter_wechat/utils/service/zone_code_service.dart';
1012
import 'package:flutter_wechat/components/list_tile/mh_list_tile.dart';
1113
import 'package:flutter_wechat/components/search_bar/search_bar.dart';
1214

15+
// 适配完毕
1316
class ZoneCodePickerPage extends StatefulWidget {
1417
ZoneCodePickerPage({Key key, @required this.value}) : super(key: key);
1518

@@ -65,14 +68,16 @@ class _ZoneCodePickerPageState extends State<ZoneCodePickerPage> {
6568
Widget _buildSusWidget(String susTag) {
6669
return Container(
6770
height: _suspensionHeight.toDouble(),
68-
padding: const EdgeInsets.only(left: 15.0),
71+
padding: EdgeInsets.only(
72+
left: FlutterScreenUtil.ScreenUtil().setWidth(15.0 * 3),
73+
),
6974
color: Color(0xfff3f4f5),
7075
alignment: Alignment.centerLeft,
7176
child: Text(
7277
'$susTag',
7378
softWrap: false,
7479
style: TextStyle(
75-
fontSize: 14.0,
80+
fontSize: FlutterScreenUtil.ScreenUtil().setSp(14.0 * 3),
7681
color: Color(0xff999999),
7782
),
7883
),
@@ -111,25 +116,34 @@ class _ZoneCodePickerPageState extends State<ZoneCodePickerPage> {
111116
void Function() onTap,
112117
}) {
113118
Widget middle = Padding(
114-
padding: EdgeInsets.only(right: Constant.pEdgeInset),
119+
padding: EdgeInsets.only(
120+
right: FlutterScreenUtil.ScreenUtil()
121+
.setWidth(Constant.pEdgeInset * 3.0)),
115122
child: Text(
116123
title,
117-
style: TextStyle(fontSize: 16.0, color: Style.pTextColor),
124+
style: TextStyle(
125+
fontSize: FlutterScreenUtil.ScreenUtil().setSp(16.0 * 3),
126+
color: Style.pTextColor),
118127
),
119128
);
120129
Widget trailing = Padding(
121-
padding: EdgeInsets.only(right: Constant.pEdgeInset * 2),
130+
padding: EdgeInsets.only(
131+
right: FlutterScreenUtil.ScreenUtil()
132+
.setWidth(Constant.pEdgeInset * 2 * 3)),
122133
child: Text(
123134
'+$telCode',
124-
style: TextStyle(fontSize: 16.0, color: Style.sTextColor),
135+
style: TextStyle(
136+
fontSize: FlutterScreenUtil.ScreenUtil().setSp(16.0 * 3),
137+
color: Style.sTextColor,
138+
),
125139
),
126140
);
127141
return MHListTile(
128142
onTap: onTap,
129143
middle: middle,
130144
trailing: trailing,
131145
height: _itemHeight.toDouble(),
132-
dividerIndent: 16.0,
146+
dividerIndent: FlutterScreenUtil.ScreenUtil().setWidth(16.0 * 3),
133147
);
134148
}
135149

@@ -162,12 +176,18 @@ class _ZoneCodePickerPageState extends State<ZoneCodePickerPage> {
162176
indexHintBuilder: (context, hint) {
163177
return Container(
164178
alignment: Alignment.center,
165-
width: 80.0,
166-
height: 80.0,
179+
width: FlutterScreenUtil.ScreenUtil().setWidth(80.0 * 3),
180+
height: FlutterScreenUtil.ScreenUtil().setWidth(80.0 * 3),
167181
decoration: BoxDecoration(
168182
color: Colors.red, shape: BoxShape.circle),
169-
child: Text(hint,
170-
style: TextStyle(color: Colors.white, fontSize: 30.0)),
183+
child: Text(
184+
hint,
185+
style: TextStyle(
186+
color: Colors.white,
187+
fontSize:
188+
FlutterScreenUtil.ScreenUtil().setSp(30.0 * 3),
189+
),
190+
),
171191
);
172192
},
173193
)),

‎lib/views/splash/splash_page.dart

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -220,18 +220,20 @@ class _SplashPageState extends State<SplashPage> {
220220
child: InkWell(
221221
child: Image.asset(
222222
Constant.assetsImagesNewFeature + 'skip_btn.png',
223-
width: 175.0,
224-
height: 55.0,
223+
width: FlutterScreenUtil.ScreenUtil().setWidth(175.0 * 3.0),
224+
height:
225+
FlutterScreenUtil.ScreenUtil().setHeight(55.0 * 3.0),
225226
),
226227
onTap: _switchRootView,
227228
highlightColor: Colors.transparent,
228229
splashColor: Colors.transparent,
229230
focusColor: Colors.transparent,
230231
),
231232
left: (ScreenUtil.getInstance().screenWidth - 175) * 0.5,
232-
bottom: 55.0,
233-
width: 175.0,
234-
height: 55.0,
233+
bottom: FlutterScreenUtil.ScreenUtil().setHeight(55.0 * 3.0) +
234+
FlutterScreenUtil.ScreenUtil.bottomBarHeight,
235+
width: FlutterScreenUtil.ScreenUtil().setWidth(175.0 * 3.0),
236+
height: FlutterScreenUtil.ScreenUtil().setHeight(55.0 * 3.0),
235237
),
236238
],
237239
);
@@ -289,7 +291,7 @@ class _SplashPageState extends State<SplashPage> {
289291
},
290292
),
291293
Positioned(
292-
top: FlutterScreenUtil.ScreenUtil.getInstance().setHeight(30.0) +
294+
top: FlutterScreenUtil.ScreenUtil.getInstance().setHeight(15.0) +
293295
FlutterScreenUtil.ScreenUtil.statusBarHeight,
294296
right: FlutterScreenUtil.ScreenUtil.getInstance().setWidth(60.0),
295297
child: InkWell(

0 commit comments

Comments
 (0)