Skip to content

Commit

Permalink
change helpDetailRoute layout
Browse files Browse the repository at this point in the history
  • Loading branch information
liamkuan committed Apr 28, 2019
1 parent 5a8c9c9 commit 508e05e
Show file tree
Hide file tree
Showing 10 changed files with 115 additions and 70 deletions.
Binary file removed assets/image/help1.png
Binary file not shown.
Binary file removed assets/image/help2.png
Binary file not shown.
Binary file added assets/image/inputData.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/image/inputData2.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/image/inputMethod.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/image/invMatrix.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/image/sin.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
179 changes: 110 additions & 69 deletions lib/src/view/route/helpDetailRoute.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,106 +5,147 @@ import 'package:xiaoming/src/data/settingData.dart';
import 'package:xiaoming/src/language/xiaomingLocalizations.dart';

class HelpDetailRoute extends StatefulWidget {
HelpDetailRoute(this.index, {Key key}) : super(key: key);
HelpDetailRoute(this._index, {Key key}) : super(key: key);

final int index;
final int _index;

@override
_HelpDetailRouteState createState() => _HelpDetailRouteState(index);
_HelpDetailRouteState createState() => _HelpDetailRouteState();
}

class _HelpDetailRouteState extends State<HelpDetailRoute> {
_HelpDetailRouteState(this.index);

final int index;
Text text;

@override
void initState() {
SettingData.nowPage = 2;
super.initState();
SettingData.nowPage = 2;
}

@override
Widget build(BuildContext context) {
SettingData.pageContext = context;

switch (index) {
List<Widget> list = <Widget>[];

switch (widget._index) {
case 1:
text = Text(XiaomingLocalizations.of(context).helpTabData1);
list.addAll(<Widget>[
Text(XiaomingLocalizations.of(context).helpTabData1),
SizedBox(
height: 50.0,
),
Card(
child: Image.asset(
'assets/image/inputData.png',
fit: BoxFit.fitWidth,
),
),
SizedBox(
height: 50.0,
),
Card(
child: Image.asset(
'assets/image/inputData2.png',
fit: BoxFit.fitWidth,
),
),
]);
break;
case 2:
text = Text(XiaomingLocalizations.of(context).helpTabData2);
list.addAll(<Widget>[
Text(XiaomingLocalizations.of(context).helpTabData2),
]);
break;
case 3:
text = Text(XiaomingLocalizations.of(context).helpTabData3);
list.addAll(<Widget>[
Text(XiaomingLocalizations.of(context).helpTabData3),
SizedBox(
height: 50.0,
),
Card(
child: Image.asset(
'assets/image/inputMethod.png',
fit: BoxFit.fitWidth,
),
),
SizedBox(
height: 50.0,
),
Card(
child: Image.asset(
'assets/image/invMatrix.png',
fit: BoxFit.fitWidth,
),
),
SizedBox(
height: 50.0,
),
Card(
child: Image.asset(
'assets/image/sin.png',
fit: BoxFit.fitWidth,
),
),
]);
break;
case 4:
text = Text(XiaomingLocalizations.of(context).helpTabData4);
list.addAll(<Widget>[
Text(XiaomingLocalizations.of(context).helpTabData4),
]);
break;
case 5:
text = Text(XiaomingLocalizations.of(context).helpTabData5);
list.addAll(<Widget>[
Text(XiaomingLocalizations.of(context).helpTabData5),
]);
break;
case 6:
text = Text(XiaomingLocalizations.of(context).helpTabData6);
list.addAll(<Widget>[
Text(XiaomingLocalizations.of(context).helpTabData6),
]);
break;
}

return DefaultTextStyle(
style: const TextStyle(
fontFamily: '.SF UI Text',
inherit: false,
fontSize: 17.0,
color: CupertinoColors.black,
),
child: Provide<SettingData>(
builder: (context, child, sd) {
return sd.theme == "IOS"
? CupertinoPageScaffold(
backgroundColor: CupertinoColors.lightBackgroundGray,
navigationBar: const CupertinoNavigationBar(
middle: Text("HelpDetail"),
previousPageTitle: 'Help',
),
child: child,
)
: Scaffold(
appBar: AppBar(
backgroundColor: Colors.blueGrey,
title: Text("HelpDetail"),
centerTitle: true,
),
body: child,
);
},
child: ListView(children: <Widget>[
Container(
padding: const EdgeInsets.all(20.0),
child: Card(
margin: const EdgeInsets.all(20.0),
elevation: 0.0,
child:
Container(padding: const EdgeInsets.all(20.0), child: text),
),
),
Row(mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
Image.asset(
'assets/image/help1.png',
width: MediaQuery.of(context).size.width / 3,
height: 200.0,
fit: BoxFit.fitWidth,
),
SizedBox(
width: MediaQuery.of(context).size.width / 12,
),
Image.asset(
'assets/image/help2.png',
width: MediaQuery.of(context).size.width / 3,
height: 200.0,
fit: BoxFit.fitWidth,
return Provide<SettingData>(
builder: (context, child, sd) {
return sd.theme == "IOS"
? CupertinoPageScaffold(
backgroundColor: CupertinoColors.lightBackgroundGray,
navigationBar: const CupertinoNavigationBar(
middle: Text("HelpDetail"),
previousPageTitle: 'Help',
),
child: child,
)
]),
]),
));
: Scaffold(
backgroundColor: CupertinoColors.lightBackgroundGray,
appBar: AppBar(
backgroundColor: Colors.blueGrey,
title: Text("HelpDetail"),
centerTitle: true,
),
body: child,
);
},
child: Center(
child: Container(
padding: const EdgeInsets.all(20.0),
child: Card(
child: Padding(
padding: const EdgeInsets.all(8.0),
child: DefaultTextStyle(
style: const TextStyle(
fontFamily: '.SF UI Text',
fontWeight: FontWeight.w400,
inherit: false,
fontSize: 20.0,
color: CupertinoColors.black,
),
child: ListView(children: list)),
),
),
),
),
);
}
}
1 change: 0 additions & 1 deletion lib/src/view/route/integralRoute.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import 'package:xiaoming/src/data/settingData.dart';
import 'package:xiaoming/src/data/userData.dart';
import 'package:xiaoming/src/language/xiaomingLocalizations.dart';
import 'dart:async';

import 'package:xiaoming/src/view/widget/myTextComposer.dart';

class IntegralRoute extends StatefulWidget {
Expand Down
5 changes: 5 additions & 0 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ flutter:
assets:
- assets/image/help1.png
- assets/image/help2.png
- assets/image/inputData.png
- assets/image/inputData2.png
- assets/image/inputMethod.png
- assets/image/invMatrix.png
- assets/image/sin.png
# To add assets to your application, add an assets section, like this:
# assets:
# - images/a_dot_burr.jpeg
Expand Down

0 comments on commit 508e05e

Please sign in to comment.