msb-public
/
samples
mirror of https://github.com/flutter/samples.git
1
0
Code Issues Projects Releases Wiki Activity

web/slide_puzzle updates

Browse Source 
spelling fix
Use SingleTickerProviderStateMixin
Handle vertical constrained size
pull/88/head
Kevin Moore 5 years ago
parent 7a8fd19e26
commit 902da5c82a
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File

52
web/slide_puzzle/lib/src/puzzle_home_state.dart
Unescape View File

@ -44,7 +44,8 @@ class _PuzzleControls extends ChangeNotifier implements PuzzleControls {
void reset() => _parent.puzzle.reset(); void reset() => _parent.puzzle.reset();
} }
class PuzzleHomeState extends State with TickerProviderStateMixin, AppState { class PuzzleHomeState extends State
with SingleTickerProviderStateMixin, AppState {
@override @override
final PuzzleAnimator puzzle; final PuzzleAnimator puzzle;
@ -57,7 +58,7 @@ class PuzzleHomeState extends State with TickerProviderStateMixin, AppState {
StreamSubscription _puzzleEventSubscription; StreamSubscription _puzzleEventSubscription;
bool _autoPlay = false; bool _autoPlay = false;
_PuzzleControls _autoPlayListsenable; _PuzzleControls _autoPlayListenable;
PuzzleHomeState(this.puzzle) { PuzzleHomeState(this.puzzle) {
_puzzleEventSubscription = puzzle.onEvent.listen(_onPuzzleEvent); _puzzleEventSubscription = puzzle.onEvent.listen(_onPuzzleEvent);
@ -66,7 +67,7 @@ class PuzzleHomeState extends State with TickerProviderStateMixin, AppState {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_autoPlayListsenable = _PuzzleControls(this); _autoPlayListenable = _PuzzleControls(this);
_ticker ??= createTicker(_onTick); _ticker ??= createTicker(_onTick);
_ensureTicking(); _ensureTicking();
} }
@ -75,7 +76,7 @@ class PuzzleHomeState extends State with TickerProviderStateMixin, AppState {
if (newValue != _autoPlay) { if (newValue != _autoPlay) {
setState(() { setState(() {
// Only allow enabling autoPlay if the puzzle is not solved // Only allow enabling autoPlay if the puzzle is not solved
_autoPlayListsenable._notify(); _autoPlayListenable._notify();
_autoPlay = newValue && !puzzle.solved; _autoPlay = newValue && !puzzle.solved;
if (_autoPlay) { if (_autoPlay) {
_ensureTicking(); _ensureTicking();
@ -89,7 +90,7 @@ class PuzzleHomeState extends State with TickerProviderStateMixin, AppState {
providers: [ providers: [
Provider<AppState>.value(value: this), Provider<AppState>.value(value: this),
ListenableProvider<PuzzleControls>.value( ListenableProvider<PuzzleControls>.value(
listenable: _autoPlayListsenable, listenable: _autoPlayListenable,
) )
], ],
child: Material( child: Material(
@ -113,13 +114,13 @@ class PuzzleHomeState extends State with TickerProviderStateMixin, AppState {
void dispose() { void dispose() {
animationNotifier.dispose(); animationNotifier.dispose();
_ticker?.dispose(); _ticker?.dispose();
_autoPlayListsenable?.dispose(); _autoPlayListenable?.dispose();
_puzzleEventSubscription.cancel(); _puzzleEventSubscription.cancel();
super.dispose(); super.dispose();
} }
void _onPuzzleEvent(PuzzleEvent e) { void _onPuzzleEvent(PuzzleEvent e) {
_autoPlayListsenable._notify(); _autoPlayListenable._notify();
if (e != PuzzleEvent.random) { if (e != PuzzleEvent.random) {
_setAutoPlay(false); _setAutoPlay(false);
} }
@ -187,7 +188,10 @@ Widget _updateConstraints(
final constraintWidth = final constraintWidth =
constraints.hasBoundedWidth ? constraints.maxWidth : 1000.0; constraints.hasBoundedWidth ? constraints.maxWidth : 1000.0;
return builder(constraintWidth < _smallWidth); final constraintHeight =
constraints.hasBoundedHeight ? constraints.maxHeight : 1000.0;
return builder(constraintWidth < _smallWidth || constraintHeight < 690);
} }
Widget _doBuild(BuildContext _, BoxConstraints constraints) => Widget _doBuild(BuildContext _, BoxConstraints constraints) =>
@ -239,22 +243,22 @@ Widget _doBuildCore(bool small) => ValueTabController<SharedTheme>(
.toList(), .toList(),
), ),
), ),
Container( Flexible(
constraints: child: Container(
const BoxConstraints.tightForFinite(), padding: const EdgeInsets.all(10),
padding: const EdgeInsets.all(10), child: Flow(
child: Flow( delegate: PuzzleFlowDelegate(
delegate: PuzzleFlowDelegate( small
small ? const Size(90, 90)
? const Size(90, 90) : const Size(140, 140),
: const Size(140, 140), appState.puzzle,
appState.puzzle, appState.animationNotifier,
appState.animationNotifier, ),
), children: List<Widget>.generate(
children: List<Widget>.generate( appState.puzzle.length,
appState.puzzle.length, (i) => theme.tileButtonCore(
(i) => theme.tileButtonCore( i, appState.puzzle, small),
i, appState.puzzle, small), ),
), ),
), ),
), ),

Write Preview
Loading…
Cancel
Save