Extract the same container for iOS and Android

This commit is contained in:
Rongjian Zhang 2018-04-25 21:07:44 +08:00
parent 675d39a966
commit d6aeb873f1
3 changed files with 66 additions and 79 deletions

View File

@ -1,39 +1,8 @@
import 'package:flutter/material.dart';
class AndroidApp extends StatelessWidget {
// This widget is the root of your application.
@override
Widget build(BuildContext context) {
return new MaterialApp(
title: 'Flutter Demo',
theme: new ThemeData(
// This is the theme of your application.
//
// Try running your application with "flutter run". You'll see the
// application has a blue toolbar. Then, without quitting the app, try
// changing the primarySwatch below to Colors.green and then invoke
// "hot reload" (press "r" in the console where you ran "flutter run",
// or press Run > Flutter Hot Reload in IntelliJ). Notice that the
// counter didn't reset back to zero; the application is not restarted.
primarySwatch: Colors.blue,
),
home: new AndroidHomePage(title: 'Flutter Demo Home Page'),
);
}
}
class AndroidHomePage extends StatefulWidget {
AndroidHomePage({Key key, this.title}) : super(key: key);
// This widget is the home page of your application. It is stateful, meaning
// that it has a State object (defined below) that contains fields that affect
// how it looks.
// This class is the configuration for the state. It holds the values (in this
// case the title) provided by the parent (in this case the App widget) and
// used by the build method of the State. Fields in a Widget subclass are
// always marked "final".
final String title;
@override
@ -45,46 +14,63 @@ class _AndroidHomePageState extends State<AndroidHomePage> {
void _incrementCounter() {
setState(() {
// This call to setState tells the Flutter framework that something has
// changed in this State, which causes it to rerun the build method below
// so that the display can reflect the updated values. If we changed
// _counter without calling setState(), then the build method would not be
// called again, and so nothing would appear to happen.
_counter++;
});
}
@override
Widget build(BuildContext context) {
// This method is rerun every time setState is called, for instance as done
// by the _incrementCounter method above.
//
// The Flutter framework has been optimized to make rerunning build methods
// fast, so that you can just rebuild anything that needs updating rather
// than having to individually change instances of widgets.
return new Scaffold(
drawer: new Drawer(
child: new Column(
children: [
new UserAccountsDrawerHeader(
accountName: const Text('xxx'),
accountEmail: const Text('xxx@gmail.com'),
currentAccountPicture: const CircleAvatar(
backgroundImage: const NetworkImage(
'https://avatars0.githubusercontent.com/u/9524411',
),
),
margin: EdgeInsets.zero,
// onDetailsPressed: () {
// },
),
new MediaQuery.removePadding(
context: context,
// DrawerHeader consumes top MediaQuery padding.
removeTop: true,
child: new Expanded(
child: new ListView(
padding: const EdgeInsets.only(top: 8.0),
children: <Widget>[
new Stack(
children: [
new Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: ['A', 'B'].map((String id) {
return new ListTile(
leading: new CircleAvatar(child: new Text(id)),
title: new Text('Drawer item $id'),
onTap: () {},
);
}).toList(),
)
],
),
],
),
),
),
],
),
),
appBar: new AppBar(
// Here we take the value from the MyHomePage object that was created by
// the App.build method, and use it to set our appbar title.
title: new Text(widget.title),
),
body: new Center(
// Center is a layout widget. It takes a single child and positions it
// in the middle of the parent.
child: new Column(
// Column is also layout widget. It takes a list of children and
// arranges them vertically. By default, it sizes itself to fit its
// children horizontally, and tries to be as tall as its parent.
//
// Invoke "debug paint" (press "p" in the console where you ran
// "flutter run", or select "Toggle Debug Paint" from the Flutter tool
// window in IntelliJ) to see the wireframe for each widget.
//
// Column has various properties to control how it sizes itself and
// how it positions its children. Here we use mainAxisAlignment to
// center the children vertically; the main axis here is the vertical
// axis because Columns are vertical (the cross axis would be
// horizontal).
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
new Text(
@ -101,7 +87,7 @@ class _AndroidHomePageState extends State<AndroidHomePage> {
onPressed: _incrementCounter,
tooltip: 'Increment',
child: new Icon(Icons.add),
), // This trailing comma makes auto-formatting nicer for build methods.
),
);
}
}

View File

@ -5,24 +5,6 @@ import 'notification.dart';
import 'profile.dart';
import 'issue.dart';
class IosApp extends StatelessWidget {
@override
build(context) {
return new MaterialApp(
title: 'Flutter Demo',
theme: new ThemeData(
primarySwatch: Colors.blue,
),
home: new IosHomePage(title: 'GitFlux'),
routes: {
'/issue': (context) => new IosIssue()
// '/notification': (context) => new IosNotificationTab(),
// '/profile': (context) => new IosProfileTab(),
},
);
}
}
class IosHomePage extends StatefulWidget {
IosHomePage({Key key, this.title}) : super(key: key);

View File

@ -2,4 +2,23 @@ import 'package:flutter/material.dart';
import 'android/main.dart';
import 'ios/main.dart';
void main() => runApp(new IosApp());
class App extends StatelessWidget {
final isIos = true;
@override
build(context) {
return new MaterialApp(
title: 'GitFlux',
theme: new ThemeData(
primarySwatch: Colors.blue,
),
home: isIos ? new IosHomePage(title: 'GitFlux') : new AndroidHomePage(title: 'GitFlux'),
routes: {
// '/notification': (context) => new IosNotificationTab(),
// '/profile': (context) => new IosProfileTab(),
},
);
}
}
void main() => runApp(new App());