From 65c17e5cbcc2fd141159da716dc9be0c795f56ca Mon Sep 17 00:00:00 2001 From: Rody Davis Date: Thu, 28 Feb 2019 11:01:57 -0500 Subject: [PATCH] Updating Light Theme --- .../lib/utils/example_code.dart | 234 ++++++++++++++++++ lib/ui/app/layouts/tablet_desktop.dart | 4 +- lib/ui/app/status_bar.dart | 4 +- lib/ui/app/work_area.dart | 59 +++-- 4 files changed, 278 insertions(+), 23 deletions(-) create mode 100644 ios/Flutter/App.framework/flutter_assets/lib/utils/example_code.dart diff --git a/ios/Flutter/App.framework/flutter_assets/lib/utils/example_code.dart b/ios/Flutter/App.framework/flutter_assets/lib/utils/example_code.dart new file mode 100644 index 0000000..3b9ba90 --- /dev/null +++ b/ios/Flutter/App.framework/flutter_assets/lib/utils/example_code.dart @@ -0,0 +1,234 @@ +// Copyright 2016 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Note: This code is not runnable, it contains code snippets displayed in the +// gallery. + +import 'package:flutter/material.dart'; + +class ButtonsDemo { + void setState(VoidCallback callback) {} + BuildContext context; + + void buttons() { +// START buttons_raised +// Create a raised button. + RaisedButton( + child: const Text('BUTTON TITLE'), + onPressed: () { + // Perform some action + }); + +// Create a disabled button. +// Buttons are disabled when onPressed isn't +// specified or is null. + const RaisedButton(child: Text('BUTTON TITLE'), onPressed: null); + +// Create a button with an icon and a +// title. + RaisedButton.icon( + icon: const Icon(Icons.add, size: 18.0), + label: const Text('BUTTON TITLE'), + onPressed: () { + // Perform some action + }, + ); +// END + +// START buttons_outline +// Create an outline button. + OutlineButton( + child: const Text('BUTTON TITLE'), + onPressed: () { + // Perform some action + }); + +// Create a disabled button. +// Buttons are disabled when onPressed isn't +// specified or is null. + const OutlineButton(child: Text('BUTTON TITLE'), onPressed: null); + +// Create a button with an icon and a +// title. + OutlineButton.icon( + icon: const Icon(Icons.add, size: 18.0), + label: const Text('BUTTON TITLE'), + onPressed: () { + // Perform some action + }, + ); +// END + +// START buttons_flat +// Create a flat button. + FlatButton( + child: const Text('BUTTON TITLE'), + onPressed: () { + // Perform some action + }); + +// Create a disabled button. +// Buttons are disabled when onPressed isn't +// specified or is null. + const FlatButton(child: Text('BUTTON TITLE'), onPressed: null); +// END + +// START buttons_dropdown +// Member variable holding value. + String dropdownValue; + +// Dropdown button with string values. + DropdownButton( + value: dropdownValue, + onChanged: (String newValue) { + // null indicates the user didn't select a + // new value. + setState(() { + if (newValue != null) dropdownValue = newValue; + }); + }, + items: ['One', 'Two', 'Free', 'Four'] + .map>((String value) { + return DropdownMenuItem(value: value, child: Text(value)); + }).toList()); +// END + +// START buttons_icon +// Member variable holding toggle value. + bool value; + +// Toggleable icon button. + IconButton( + icon: const Icon(Icons.thumb_up), + onPressed: () { + setState(() => value = !value); + }, + color: value ? Theme.of(context).primaryColor : null); +// END + +// START buttons_action +// Floating action button in Scaffold. + Scaffold( + appBar: AppBar(title: const Text('Demo')), + floatingActionButton: const FloatingActionButton( + child: Icon(Icons.add), onPressed: null)); +// END + } +} + +class SelectionControls { + void setState(VoidCallback callback) {} + + void selectionControls() { +// START selectioncontrols_checkbox +// Member variable holding the checkbox's value. + bool checkboxValue = false; + +// Create a checkbox. + Checkbox( + value: checkboxValue, + onChanged: (bool value) { + setState(() { + checkboxValue = value; + }); + }, + ); + +// Create a tristate checkbox. + Checkbox( + tristate: true, + value: checkboxValue, + onChanged: (bool value) { + setState(() { + checkboxValue = value; + }); + }, + ); + +// Create a disabled checkbox. +// Checkboxes are disabled when onChanged isn't +// specified or null. + const Checkbox(value: false, onChanged: null); +// END + +// START selectioncontrols_radio +// Member variable holding value. + int radioValue = 0; + +// Method setting value. + void handleRadioValueChanged(int value) { + setState(() { + radioValue = value; + }); + } + +// Creates a set of radio buttons. + Row(children: [ + Radio( + value: 0, groupValue: radioValue, onChanged: handleRadioValueChanged), + Radio( + value: 1, groupValue: radioValue, onChanged: handleRadioValueChanged), + Radio( + value: 2, groupValue: radioValue, onChanged: handleRadioValueChanged) + ]); + +// Creates a disabled radio button. + const Radio(value: 0, groupValue: 0, onChanged: null); +// END + +// START selectioncontrols_switch +// Member variable holding value. + bool switchValue = false; + +// Create a switch. + Switch( + value: switchValue, + onChanged: (bool value) { + setState(() { + switchValue = value; + }); + }); + +// Create a disabled switch. +// Switches are disabled when onChanged isn't +// specified or null. + const Switch(value: false, onChanged: null); +// END + } +} + +class GridLists { + void gridlists() { +// START gridlists +// Creates a scrollable grid list with images +// loaded from the web. + GridView.count( + crossAxisCount: 3, + childAspectRatio: 1.0, + padding: const EdgeInsets.all(4.0), + mainAxisSpacing: 4.0, + crossAxisSpacing: 4.0, + children: [ + 'https://example.com/image-0.jpg', + 'https://example.com/image-1.jpg', + 'https://example.com/image-2.jpg', + '...', + 'https://example.com/image-n.jpg' + ].map((String url) { + return GridTile( + footer: GridTileBar(title: Text(url)), + child: Image.network(url, fit: BoxFit.cover)); + }).toList(), + ); +// END + } +} + +class AnimatedImage { + void animatedImage() { +// START animated_image + Image.network('https://example.com/animated-image.gif'); +// END + } +} diff --git a/lib/ui/app/layouts/tablet_desktop.dart b/lib/ui/app/layouts/tablet_desktop.dart index 4050021..bceaa33 100644 --- a/lib/ui/app/layouts/tablet_desktop.dart +++ b/lib/ui/app/layouts/tablet_desktop.dart @@ -41,7 +41,9 @@ class TabletDesktopLayout extends StatelessWidget { ), Flexible( flex: 20, - child: WorkArea(), + child: SingleChildScrollView( + child: WorkArea(), + ), ), Flexible( flex: 5, diff --git a/lib/ui/app/status_bar.dart b/lib/ui/app/status_bar.dart index 6fe8cc0..ce0006e 100644 --- a/lib/ui/app/status_bar.dart +++ b/lib/ui/app/status_bar.dart @@ -8,7 +8,9 @@ class StatusBar extends StatelessWidget { @override Widget build(BuildContext context) { return Container( - color: Colors.purple, + color: Theme.of(context).brightness == Brightness.light + ? Colors.purple[100] + : Colors.purple, child: SafeArea( top: false, child: Row( diff --git a/lib/ui/app/work_area.dart b/lib/ui/app/work_area.dart index 28a1998..7e5269f 100644 --- a/lib/ui/app/work_area.dart +++ b/lib/ui/app/work_area.dart @@ -39,30 +39,47 @@ class _WorkAreaState extends State { ? SyntaxHighlighterStyle.darkThemeStyle() : SyntaxHighlighterStyle.lightThemeStyle(); - Widget body; if (_exampleCode == null) { - body = const Center(child: CircularProgressIndicator()); - } else { - body = SingleChildScrollView( - child: Padding( - padding: const EdgeInsets.all(16.0), - child: RichText( - text: TextSpan( - style: const TextStyle( - fontFamily: 'monospace', fontSize: 10.0), - children: [ - DartSyntaxHighlighter(style).format(_exampleCode) - ])))); + return const Center(child: CircularProgressIndicator()); } + // else { + // body = SingleChildScrollView( + // child: Padding( + // padding: const EdgeInsets.all(16.0), + // child: RichText( + // text: TextSpan( + // style: const TextStyle(fontFamily: 'monospace', fontSize: 10.0), + // children: [ + // DartSyntaxHighlighter(style).format(_exampleCode) + // ], + // ), + // ), + // ), + // ); + // } return Container( - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - body, - ], - ), - ); + child: Column( + children: [ + Row( + children: [ + Padding( + padding: const EdgeInsets.all(16.0), + child: RichText( + textAlign: TextAlign.start, + text: TextSpan( + style: + const TextStyle(fontFamily: 'monospace', fontSize: 10.0), + children: [ + DartSyntaxHighlighter(style).format(_exampleCode) + ], + ), + ), + ), + ], + ), + Container(height: MediaQuery.of(context).size.height), + ], + )); } }