Starter/samples
1
0
Fork 0
mirror of https://github.com/flutter/samples.git synced 2025-11-09 06:18:49 +00:00
Code Issues Releases Wiki Activity

Revert "web: slide_puzzle - update to latest provider port"

Browse Source 
Seeing an issue with generics and dart2js (or DDC)

This reverts commit 7a42263344.
This commit is contained in:
Kevin Moore
2019-06-14 11:33:32 -07:00
parent 92b6848c3c
commit c78b873f7d
3 changed files with 84 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

156
web/slide_puzzle/lib/src/puzzle_home_state.dart
View File

@@ -90,7 +90,7 @@ class PuzzleHomeState extends State
providers: [ providers: [
Provider<AppState>.value(value: this), Provider<AppState>.value(value: this),
ListenableProvider<PuzzleControls>.value( ListenableProvider<PuzzleControls>.value(
value: _autoPlayListenable, listenable: _autoPlayListenable,
) )
], ],
child: Material( child: Material(
@@ -201,85 +201,91 @@ Widget _doBuildCore(bool small) => ValueTabController<SharedTheme>(
values: themes, values: themes,
child: Consumer<SharedTheme>( child: Consumer<SharedTheme>(
builder: (_, theme, __) => AnimatedContainer( builder: (_, theme, __) => AnimatedContainer(
duration: puzzleAnimationDuration, duration: puzzleAnimationDuration,
color: theme.puzzleThemeBackground, color: theme.puzzleThemeBackground,
child: Center( child: Center(
child: theme.styledWrapper( child: theme.styledWrapper(
small, small,
SizedBox( SizedBox(
width: 580, width: 580,
child: Consumer<AppState>( child: Consumer<AppState>(
builder: (context, appState, _) => Column( builder: (context, appState, _) => Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Container( Container(
decoration: const BoxDecoration( decoration: const BoxDecoration(
border: Border( border: Border(
bottom: BorderSide( bottom: BorderSide(
color: Colors.black26, color: Colors.black26,
width: 1, width: 1,
),
),
),
margin: const EdgeInsets.symmetric(horizontal: 20),
child: TabBar(
controller: ValueTabController.of(context),
labelPadding: const EdgeInsets.fromLTRB(0, 20, 0, 12),
labelColor: theme.puzzleAccentColor,
indicatorColor: theme.puzzleAccentColor,
indicatorWeight: 1.5,
unselectedLabelColor: Colors.black.withOpacity(0.6),
tabs: themes
.map((st) => Text(
st.name.toUpperCase(),
style: const TextStyle(
letterSpacing: 0.5,
), ),
)) ),
.toList(), ),
), margin:
), const EdgeInsets.symmetric(horizontal: 20),
Flexible( child: TabBar(
child: Container( controller: ValueTabController.of(context),
padding: const EdgeInsets.all(10), labelPadding:
child: Flow( const EdgeInsets.fromLTRB(0, 20, 0, 12),
delegate: PuzzleFlowDelegate( labelColor: theme.puzzleAccentColor,
small ? const Size(90, 90) : const Size(140, 140), indicatorColor: theme.puzzleAccentColor,
appState.puzzle, indicatorWeight: 1.5,
appState.animationNotifier, unselectedLabelColor:
), Colors.black.withOpacity(0.6),
children: List<Widget>.generate( tabs: themes
appState.puzzle.length, .map((st) => Text(
(i) => theme.tileButtonCore( st.name.toUpperCase(),
i, appState.puzzle, small), style: const TextStyle(
), letterSpacing: 0.5,
),
))
.toList(),
),
),
Flexible(
child: Container(
padding: const EdgeInsets.all(10),
child: Flow(
delegate: PuzzleFlowDelegate(
small
? const Size(90, 90)
: const Size(140, 140),
appState.puzzle,
appState.animationNotifier,
),
children: List<Widget>.generate(
appState.puzzle.length,
(i) => theme.tileButtonCore(
i, appState.puzzle, small),
),
),
),
),
Container(
decoration: const BoxDecoration(
border: Border(
top: BorderSide(
color: Colors.black26, width: 1),
),
),
padding: const EdgeInsets.only(
left: 10,
bottom: 6,
top: 2,
right: 10,
),
child: Consumer<PuzzleControls>(
builder: (_, controls, __) => Row(
children: theme.bottomControls(controls)),
),
)
],
), ),
), ),
),
Container(
decoration: const BoxDecoration(
border: Border(
top: BorderSide(color: Colors.black26, width: 1),
),
),
padding: const EdgeInsets.only(
left: 10,
bottom: 6,
top: 2,
right: 10,
),
child: Consumer<PuzzleControls>(
builder: (_, controls, __) =>
Row(children: theme.bottomControls(controls)),
),
)
],
), ),
), ),
), ),
), ),
),
),
), ),
); );

2
web/slide_puzzle/lib/src/value_tab_controller.dart
View File

@@ -68,7 +68,7 @@ class _ValueTabControllerState<T> extends State<ValueTabController<T>>
controller: _controller, controller: _controller,
enabled: TickerMode.of(context), enabled: TickerMode.of(context),
child: ValueListenableProvider.value( child: ValueListenableProvider.value(
value: _notifier, valueListenable: _notifier,
child: widget.child, child: widget.child,
), ),
); );

4
web/slide_puzzle/pubspec.lock
View File

@@ -339,10 +339,10 @@ packages:
description: description:
path: "." path: "."
ref: flutter_web ref: flutter_web
resolved-ref: e41db8e7d554360a6d8314c23b4fb4d5d5d9aac4 resolved-ref: "5cf4521d4d635d7d7ca8ddbd6e28048a7f319ee0"
url: "https://github.com/kevmoo/provider" url: "https://github.com/kevmoo/provider"
source: git source: git
version: "3.0.0+1" version: "2.1.0"
pub_semver: pub_semver:
dependency: transitive dependency: transitive
description: description: