github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1336 from abarth/fn3_more_examples

Browse Source 
Port even more examples to fn3
This commit is contained in:
Adam Barth 2015-09-24 16:11:56 -07:00
commit 52ce67b977
6 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/widgets/drag_and_drop.dart
View File

@ -66,7 +66,7 @@ class Dot extends StatelessComponent {
}
class DragAndDropApp extends StatefulComponent {
DragAndDropAppState createState() => new DragAndDropAppState(this);
DragAndDropAppState createState() => new DragAndDropAppState();
}
class DragAndDropAppState extends State<DragAndDropApp> {

2
examples/widgets/pageable_list.dart
View File

@ -17,7 +17,7 @@ class CardModel {
}
class PageableListApp extends StatefulComponent {
PageableListAppState createState() => new PageableListAppState(this);
PageableListAppState createState() => new PageableListAppState();
}
class PageableListAppState extends State<PageableListApp> {

2
examples/widgets/progress_indicator.dart
View File

@ -7,7 +7,7 @@ import 'package:sky/material.dart';
import 'package:sky/src/fn3.dart';
class ProgressIndicatorApp extends StatefulComponent {
ProgressIndicatorAppState createState() => new ProgressIndicatorAppState(this);
ProgressIndicatorAppState createState() => new ProgressIndicatorAppState();
}
class ProgressIndicatorAppState extends State<ProgressIndicatorApp> {

2
examples/widgets/scale.dart
View File

@ -7,7 +7,7 @@ import 'package:sky/rendering.dart';
import 'package:sky/src/fn3.dart';
class ScaleApp extends StatefulComponent {
ScaleAppState createState() => new ScaleAppState(this);
ScaleAppState createState() => new ScaleAppState();
}
class ScaleAppState extends State<ScaleApp> {

25
examples/widgets/styled_text.dart
View File

@ -4,11 +4,14 @@
import 'package:sky/material.dart';
import 'package:sky/rendering.dart';
import 'package:sky/widgets.dart';
import 'package:sky/src/fn3.dart';
class StyledTextApp extends App {
class StyledTextApp extends StatefulComponent {
StyledTextAppState createState() => new StyledTextAppState();
}
StyledTextApp() {
class StyledTextAppState extends State<StyledTextApp> {
void initState(BuildContext context) {
toText = toStyledText;
nameLines = dialogText
.split('\n')
@ -41,7 +44,7 @@ HAL: This mission is too important for me to allow you to jeopardize it.''';
decorationStyle: TextDecorationStyle.wavy
);
Component toStyledText(String name, String text) {
Widget toStyledText(String name, String text) {
TextStyle lineStyle = (name == "Dave") ? daveStyle : halStyle;
return new StyledText(
key: new Key(text),
@ -49,9 +52,9 @@ HAL: This mission is too important for me to allow you to jeopardize it.''';
);
}
Component toPlainText(String name, String text) => new Text(name + ":" + text);
Widget toPlainText(String name, String text) => new Text(name + ":" + text);
Component createSeparator() {
Widget createSeparator() {
return new Container(
constraints: const BoxConstraints.expand(height: 0.0),
margin: const EdgeDims.symmetric(vertical: 10.0, horizontal: 64.0),
@ -69,20 +72,20 @@ HAL: This mission is too important for me to allow you to jeopardize it.''';
});
}
Widget build() {
List<Component> lines = nameLines
Widget build(BuildContext context) {
List<Widget> lines = nameLines
.map((nameAndText) => Function.apply(toText, nameAndText))
.toList();
List<Component> children = [];
for (Component line in lines) {
List<Widget> children = [];
for (Widget line in lines) {
children.add(line);
if (line != lines.last) {
children.add(createSeparator());
}
}
Container body = new Container(
Widget body = new Container(
padding: new EdgeDims.symmetric(horizontal: 8.0),
child: new Column(children,
justifyContent: FlexJustifyContent.center,

35
examples/widgets/tabs.dart
View File

@ -3,9 +3,14 @@
// found in the LICENSE file.
import 'package:sky/material.dart';
import 'package:sky/widgets.dart';
import 'package:sky/painting.dart';
import 'package:sky/src/fn3.dart';
class TabbedNavigatorApp extends App {
class TabbedNavigatorApp extends StatefulComponent {
TabbedNavigatorAppState createState() => new TabbedNavigatorAppState();
}
class TabbedNavigatorAppState extends State<TabbedNavigatorApp> {
// The index of the selected tab for each of the TabNavigators constructed below.
List<int> selectedIndices = new List<int>.filled(5, 0);
@ -32,7 +37,7 @@ class TabbedNavigatorApp extends App {
.map((text) {
return new TabNavigatorView(
label: new TabLabel(text: text),
builder: () => _buildContent(text)
builder: (BuildContext context) => _buildContent(text)
);
});
return _buildTabNavigator(n, views.toList(), const ValueKey<String>('textLabelsTabNavigator'));
@ -43,7 +48,7 @@ class TabbedNavigatorApp extends App {
.map((icon_name) {
return new TabNavigatorView(
label: new TabLabel(icon: "action/${icon_name}"),
builder: () => _buildContent(icon_name)
builder: (BuildContext context) => _buildContent(icon_name)
);
});
return _buildTabNavigator(n, views.toList(), const ValueKey<String>('iconLabelsTabNavigator'));
@ -53,15 +58,15 @@ class TabbedNavigatorApp extends App {
List<TabNavigatorView> views = <TabNavigatorView>[
new TabNavigatorView(
label: const TabLabel(text: 'STOCKS', icon: 'action/list'),
builder: () => _buildContent("Stocks")
builder: (BuildContext context) => _buildContent("Stocks")
),
new TabNavigatorView(
label: const TabLabel(text: 'PORTFOLIO', icon: 'action/account_circle'),
builder: () => _buildContent("Portfolio")
builder: (BuildContext context) => _buildContent("Portfolio")
),
new TabNavigatorView(
label: const TabLabel(text: 'SUMMARY', icon: 'action/assessment'),
builder: () => _buildContent("Summary")
builder: (BuildContext context) => _buildContent("Summary")
)
];
return _buildTabNavigator(n, views, const ValueKey<String>('textAndIconLabelsTabNavigator'));
@ -83,38 +88,38 @@ class TabbedNavigatorApp extends App {
.map((text) {
return new TabNavigatorView(
label: new TabLabel(text: text),
builder: () => _buildContent(text)
builder: (BuildContext context) => _buildContent(text)
);
});
return _buildTabNavigator(n, views.toList(), const ValueKey<String>('scrollableTabNavigator'), isScrollable: true);
}
Container _buildCard(TabNavigator tabNavigator) {
Container _buildCard(BuildContext context, TabNavigator tabNavigator) {
return new Container(
child: new Card(child: new Padding(child: tabNavigator, padding: const EdgeDims.all(8.0))),
padding: const EdgeDims.all(12.0),
decoration: new BoxDecoration(backgroundColor: Theme.of(this).primarySwatch[100])
decoration: new BoxDecoration(backgroundColor: Theme.of(context).primarySwatch[100])
);
}
Widget build() {
Widget build(BuildContext context) {
List<TabNavigatorView> views = <TabNavigatorView>[
new TabNavigatorView(
label: const TabLabel(text: 'TEXT'),
builder: () => _buildCard(_buildTextLabelsTabNavigator(0))
builder: (BuildContext context) => _buildCard(context, _buildTextLabelsTabNavigator(0))
),
new TabNavigatorView(
label: const TabLabel(text: 'ICONS'),
builder: () => _buildCard(_buildIconLabelsTabNavigator(1))
builder: (BuildContext context) => _buildCard(context, _buildIconLabelsTabNavigator(1))
),
new TabNavigatorView(
label: const TabLabel(text: 'BOTH'),
builder: () => _buildCard(_buildTextAndIconLabelsTabNavigator(2))
builder: (BuildContext context) => _buildCard(context, _buildTextAndIconLabelsTabNavigator(2))
),
new TabNavigatorView(
label: const TabLabel(text: 'SCROLL'),
builder: () => _buildCard(_buildScrollableTabNavigator(3))
builder: (BuildContext context) => _buildCard(context, _buildScrollableTabNavigator(3))
)
];