diff --git a/trashspecto1/images/foodlayout1.png b/trashspecto1/images/foodlayout1.png new file mode 100644 index 0000000..f8a75e4 Binary files /dev/null and b/trashspecto1/images/foodlayout1.png differ diff --git a/trashspecto1/images/foodlayout1chicken.png b/trashspecto1/images/foodlayout1chicken.png new file mode 100644 index 0000000..22e65d7 Binary files /dev/null and b/trashspecto1/images/foodlayout1chicken.png differ diff --git a/trashspecto1/images/foodlayout1meat.png b/trashspecto1/images/foodlayout1meat.png new file mode 100644 index 0000000..a6d442a Binary files /dev/null and b/trashspecto1/images/foodlayout1meat.png differ diff --git a/trashspecto1/images/foodlayout1vegetarian.png b/trashspecto1/images/foodlayout1vegetarian.png new file mode 100644 index 0000000..3007c7a Binary files /dev/null and b/trashspecto1/images/foodlayout1vegetarian.png differ diff --git a/trashspecto1/lib/food.dart b/trashspecto1/lib/food.dart new file mode 100644 index 0000000..142d003 --- /dev/null +++ b/trashspecto1/lib/food.dart @@ -0,0 +1,245 @@ +import 'package:flutter/material.dart'; +import 'main.dart'; +import 'food.dart'; +import 'trash.dart'; +import 'water.dart'; + +class ScreenFoodWaste extends StatefulWidget { + @override + _ScreenFoodWasteState createState() => _ScreenFoodWasteState(); +} + +class _ScreenFoodWasteState extends State { + double _eatingOut = 4, _diet = 3, _compostingFreq = 0; + var _background = "images/foodlayout1.png"; + + @override + Widget build (BuildContext ctxt) { + + return Container( + + decoration: BoxDecoration( + image: DecorationImage( + image: AssetImage(_background), + fit: BoxFit.cover + ), + ), + child: new Scaffold( + appBar: new AppBar( + centerTitle: true, + leading: IconButton( + icon: Icon(Icons.arrow_back, color: Color(0xff778BF3)), + onPressed: () { + Navigator.pop(ctxt); + } + ), + title: new Text ("Screen Trash", textAlign: TextAlign.center), + ), + backgroundColor: Colors.transparent, + body: Padding( + padding: EdgeInsets.all(15.0), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + SizedBox(height:100), + Text( + 'How often do you eat out? (per week)', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + ), + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + '0', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + color: Color(0xff778BF3), + ), + ), + Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + SliderTheme( + data: SliderTheme.of(ctxt).copyWith( + activeTrackColor: Color(0xff778BF3), + inactiveTrackColor: Color(0xffd5e1fd), + trackShape: RectangularSliderTrackShape(), + trackHeight: 4.0, + thumbColor: Color(0xff778BF3), + thumbShape: RoundSliderThumbShape(enabledThumbRadius: 12.0), + overlayShape: RoundSliderOverlayShape(overlayRadius: 28.0), + ), + child: Slider( + value: _eatingOut, + onChanged: (value) { + setState(() { + _eatingOut = value; + }); + }, + min: 0, + max: 14, + ), + ), + ], + ), + Text( + '14', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + color: Color(0xff778BF3), + ), + ), + ], + ), + Text( + '\n\nWhat type of dietary restrictions do you conform to?', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + ), + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + 'Vegan', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + color: Color(0xff778BF3), + ), + ), + Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + SliderTheme( + data: SliderTheme.of(ctxt).copyWith( + activeTrackColor: Color(0xff778BF3), + inactiveTrackColor: Color(0xffd5e1fd), + trackShape: RectangularSliderTrackShape(), + trackHeight: 4.0, + thumbColor: Color(0xff778BF3), + thumbShape: RoundSliderThumbShape(enabledThumbRadius: 12.0), + overlayShape: RoundSliderOverlayShape(overlayRadius: 28.0), + ), + child: Slider( + divisions: 5, + value: _diet, + onChanged: (value) { + setState(() { + _diet = value; + }); + if (_diet < 3) { + _background = "images/foodlayout1.png"; + } + else if (_diet == 4) { + _background = "images/foodlayout1vegetarian.png"; + } + else if (_diet == 5) { + _background = "images/foodlayout1meat.png"; + } + }, + min: 0, + max: 5, + ), + ), + ], + ), + Text( + 'No Restrictions', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + color: Color(0xff778BF3), + ), + ), + ], + ), + Text( + '\n\nHow often do you compost your food waste? (days per week)', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + ), + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + '0', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + color: Color(0xff778BF3), + ), + ), + Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + SliderTheme( + data: SliderTheme.of(ctxt).copyWith( + activeTrackColor: Color(0xff778BF3), + inactiveTrackColor: Color(0xffd5e1fd), + trackShape: RectangularSliderTrackShape(), + trackHeight: 4.0, + thumbColor: Color(0xff778BF3), + thumbShape: RoundSliderThumbShape(enabledThumbRadius: 12.0), + overlayShape: RoundSliderOverlayShape(overlayRadius: 28.0), + ), + child: Slider( + divisions: 7, + value: _compostingFreq, + onChanged: (value) { + setState(() { + _compostingFreq = value; + }); + }, + min: 0, + max: 7, + ), + ), + ], + ), + Text( + '7', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + color: Color(0xff778BF3), + ), + ), + ], + ), + RaisedButton( + child: Text( + 'How much waste do I produce?', + style: TextStyle(fontSize: 20) + ), + onPressed: () { + Navigator.push( + ctxt, + MaterialPageRoute(builder: (ctxt) => ScreenARViewer()), + ); + } + ), + ], + ), + ) + ), + ); + } +} \ No newline at end of file diff --git a/trashspecto1/lib/main.dart b/trashspecto1/lib/main.dart index 126ae60..44def1c 100644 --- a/trashspecto1/lib/main.dart +++ b/trashspecto1/lib/main.dart @@ -13,71 +13,153 @@ class MyApp extends StatelessWidget { fontFamily: 'Georgia' ), +<<<<<<< Updated upstream home: new ScreenOne(), +======= + home: new MainScreen(), ); } } -class ScreenOne extends StatelessWidget { + +class MainScreen extends StatefulWidget { @override - Widget build (BuildContext ctxt) { + _MainScreenState createState() => _MainScreenState(); + +} + +class _MainScreenState extends State { + String chosenRegion = "North America"; + bool metric = true; + + @override + Widget build(BuildContext ctxt) { + return new Scaffold( appBar: new AppBar( title: new Center(child: new Text ("Home Page", textAlign: TextAlign.center)), ), - body: new Column( + body: new Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( - child: Text( - 'Overall Garbage', - style: TextStyle(fontSize: 20) - ), - onPressed: () { - Navigator.push( - ctxt, - MaterialPageRoute(builder: (ctxt) => ScreenTrash()), - ); - } + Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + RaisedButton( + child: Text( + 'Start!', + style: TextStyle(fontSize: 20) + ), + onPressed: () { + Navigator.push( + ctxt, + MaterialPageRoute(builder: (ctxt) => ScreenOne()), + ); + } + ), + RaisedButton( + child: Text( + 'Settings', + style: TextStyle(fontSize: 20) + ), + onPressed: () { + Navigator.push( + ctxt, + MaterialPageRoute(builder: (ctxt) => new Settings( + region: this.chosenRegion, + metric: this.metric, + updateRegion: (newRegion) { + setState(() { + this.chosenRegion = newRegion; + }); + }, + updateMetric: (value) { + setState(() { + this.metric = value; + }); + }, + )), + ); + } + ), + ], ), - RaisedButton( - child: Text( - 'Wastewater', - style: TextStyle(fontSize: 20) + + ] + ) +>>>>>>> Stashed changes + ); + } +} + +class ScreenOne extends StatelessWidget { + @override + Widget build (BuildContext ctxt) { + return new Scaffold( + appBar: new AppBar( + title: new Center(child: new Text ("Home Page", textAlign: TextAlign.center)), + ), + body: Container( + child: new Row( + mainAxisAlignment: MainAxisAlignment.center, + + children: [ + Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + RaisedButton( + child: Text( + 'Overall Garbage', + style: TextStyle(fontSize: 20) + ), + onPressed: () { + Navigator.push( + ctxt, + MaterialPageRoute(builder: (ctxt) => ScreenTrash()), + ); + } + ), + RaisedButton( + child: Text( + 'Wastewater', + style: TextStyle(fontSize: 20) + ), + onPressed: () { + Navigator.push( + ctxt, + MaterialPageRoute(builder: (ctxt) => ScreenWastewater()), + ); + } ), - onPressed: () { - Navigator.push( - ctxt, - MaterialPageRoute(builder: (ctxt) => ScreenWastewater()), - ); - } - ), - RaisedButton( - child: Text( - 'Food Waste', - style: TextStyle(fontSize: 20) + RaisedButton( + child: Text( + 'Food Waste', + style: TextStyle(fontSize: 20) + ), + onPressed: () { + Navigator.push( + ctxt, + MaterialPageRoute(builder: (ctxt) => ScreenFoodWaste()), + ); + } ), - onPressed: () { - Navigator.push( - ctxt, - MaterialPageRoute(builder: (ctxt) => ScreenFoodWaste()), - ); - } - ), - RaisedButton( - child: Text( - 'AR Viewer', - style: TextStyle(fontSize: 20) + RaisedButton( + child: Text( + 'AR Viewer', + style: TextStyle(fontSize: 20) + ), + onPressed: () { + Navigator.push( + ctxt, + MaterialPageRoute(builder: (ctxt) => ScreenARViewer()), + ); + } ), - onPressed: () { - Navigator.push( - ctxt, - MaterialPageRoute(builder: (ctxt) => ScreenARViewer()), - ); - } - ), - ] + ], + ), + ] + ), ) ); } @@ -97,7 +179,7 @@ class _ScreenTrashState extends State { appBar: new AppBar( centerTitle: true, leading: IconButton( - icon: Icon(Icons.arrow_back, color: Color(0xff9ee493)), + icon: Icon(Icons.arrow_back, color: Color(0xff778BF3)), onPressed: () { Navigator.pop(ctxt); } @@ -163,40 +245,529 @@ class _ScreenTrashState extends State { } } -class ScreenWastewater extends StatelessWidget { +class ScreenWastewater extends StatefulWidget { + @override + _ScreenWastewaterState createState() => _ScreenWastewaterState(); +} + +class _ScreenWastewaterState extends State { + double _showerTime = 10, _showerFreq = 7, _dishwashingType = 1, _clothesFreq = 4, _lawnSize = 1000; + @override Widget build (BuildContext ctxt) { return new Scaffold( appBar: new AppBar( centerTitle: true, leading: IconButton( - icon: Icon(Icons.arrow_back, color: Color(0xff9ee493)), + icon: Icon(Icons.arrow_back, color: Color(0xff778BF3)), onPressed: () { Navigator.pop(ctxt); } ), title: new Text ("Screen Wastewater", textAlign: TextAlign.center), ), - body: new Text("Here is where the wastewater form will be"), + body: Padding( + padding: EdgeInsets.all(15.0), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + 'How long is your average shower? (minutes)', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + ), + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + '5', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + color: Color(0xff778BF3), + ), + ), + Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + SliderTheme( + data: SliderTheme.of(ctxt).copyWith( + activeTrackColor: Color(0xff778BF3), + inactiveTrackColor: Color(0xffd5e1fd), + trackShape: RectangularSliderTrackShape(), + trackHeight: 4.0, + thumbColor: Color(0xff778BF3), + thumbShape: RoundSliderThumbShape(enabledThumbRadius: 12.0), + overlayShape: RoundSliderOverlayShape(overlayRadius: 28.0), + ), + child: Slider( + value: _showerTime, + onChanged: (value) { + setState(() { + _showerTime = value; + }); + }, + min: 5, + max: 30, + ), + ), + ], + ), + Text( + '30', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + color: Color(0xff778BF3), + ), + ), + ], + ), + Text( + '\n\nHow often do you shower? (per week)', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + ), + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + '0', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + color: Color(0xff778BF3), + ), + ), + Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + SliderTheme( + data: SliderTheme.of(ctxt).copyWith( + activeTrackColor: Color(0xff778BF3), + inactiveTrackColor: Color(0xffd5e1fd), + trackShape: RectangularSliderTrackShape(), + trackHeight: 4.0, + thumbColor: Color(0xff778BF3), + thumbShape: RoundSliderThumbShape(enabledThumbRadius: 12.0), + overlayShape: RoundSliderOverlayShape(overlayRadius: 28.0), + ), + child: Slider( + divisions: 14, + value: _showerFreq, + onChanged: (value) { + setState(() { + _showerFreq = value; + }); + }, + min: 0, + max: 14, + ), + ), + ], + ), + Text( + '14', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + color: Color(0xff778BF3), + ), + ), + ], + ), + Text( + '\n\nHow do you wash your dishes?', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + ), + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + 'Hand', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + color: Color(0xff778BF3), + ), + ), + Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + SliderTheme( + data: SliderTheme.of(ctxt).copyWith( + activeTrackColor: Color(0xff778BF3), + inactiveTrackColor: Color(0xffd5e1fd), + trackShape: RectangularSliderTrackShape(), + trackHeight: 4.0, + thumbColor: Color(0xff778BF3), + thumbShape: RoundSliderThumbShape(enabledThumbRadius: 12.0), + overlayShape: RoundSliderOverlayShape(overlayRadius: 28.0), + ), + child: Slider( + divisions: 1, + value: _dishwashingType, + onChanged: (value) { + setState(() { + _dishwashingType = value; + }); + }, + min: 0, + max: 1, + ), + ), + ], + ), + Text( + 'Machine', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + color: Color(0xff778BF3), + ), + ), + ], + ), + Text( + '\n\nHow often do you wash your clothes? (per month)', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + ), + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + '0', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + color: Color(0xff778BF3), + ), + ), + Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + SliderTheme( + data: SliderTheme.of(ctxt).copyWith( + activeTrackColor: Color(0xff778BF3), + inactiveTrackColor: Color(0xffd5e1fd), + trackShape: RectangularSliderTrackShape(), + trackHeight: 4.0, + thumbColor: Color(0xff778BF3), + thumbShape: RoundSliderThumbShape(enabledThumbRadius: 12.0), + overlayShape: RoundSliderOverlayShape(overlayRadius: 28.0), + ), + child: Slider( + divisions: 5, + value: _clothesFreq, + onChanged: (value) { + setState(() { + _clothesFreq = value; + }); + }, + min: 0, + max: 5, + ), + ), + ], + ), + Text( + '5', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + color: Color(0xff778BF3), + ), + ), + ], + ), + Text( + '\n\nHow large is your grass lawn? (meters squared)', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + ), + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + '0', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + color: Color(0xff778BF3), + ), + ), + Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + SliderTheme( + data: SliderTheme.of(ctxt).copyWith( + activeTrackColor: Color(0xff778BF3), + inactiveTrackColor: Color(0xffd5e1fd), + trackShape: RectangularSliderTrackShape(), + trackHeight: 4.0, + thumbColor: Color(0xff778BF3), + thumbShape: RoundSliderThumbShape(enabledThumbRadius: 12.0), + overlayShape: RoundSliderOverlayShape(overlayRadius: 28.0), + ), + child: Slider( + value: _lawnSize, + onChanged: (value) { + setState(() { + _lawnSize = value; + }); + }, + min: 0, + max: 10000, + ), + ), + ], + ), + Text( + '10,000', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + color: Color(0xff778BF3), + ), + ), + ], + ), + ], + ), + ) ); } } -class ScreenFoodWaste extends StatelessWidget { +class ScreenFoodWaste extends StatefulWidget { + @override + _ScreenFoodWasteState createState() => _ScreenFoodWasteState(); +} + +class _ScreenFoodWasteState extends State { + double _eatingOut = 4, _diet = 7, _compostingFreq = 0; + @override Widget build (BuildContext ctxt) { return new Scaffold( appBar: new AppBar( centerTitle: true, leading: IconButton( - icon: Icon(Icons.arrow_back, color: Color(0xff9ee493)), + icon: Icon(Icons.arrow_back, color: Color(0xff778BF3)), onPressed: () { Navigator.pop(ctxt); } ), title: new Text ("Screen Food Waste", textAlign: TextAlign.center), ), - body: new Text("Here is where the food waste form will be"), + body: Padding( + padding: EdgeInsets.all(15.0), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + 'How often do you eat out? (per week)', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + ), + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + '0', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + color: Color(0xff778BF3), + ), + ), + Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + SliderTheme( + data: SliderTheme.of(ctxt).copyWith( + activeTrackColor: Color(0xff778BF3), + inactiveTrackColor: Color(0xffd5e1fd), + trackShape: RectangularSliderTrackShape(), + trackHeight: 4.0, + thumbColor: Color(0xff778BF3), + thumbShape: RoundSliderThumbShape(enabledThumbRadius: 12.0), + overlayShape: RoundSliderOverlayShape(overlayRadius: 28.0), + ), + child: Slider( + value: _eatingOut, + onChanged: (value) { + setState(() { + _eatingOut = value; + }); + }, + min: 0, + max: 14, + ), + ), + ], + ), + Text( + '14', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + color: Color(0xff778BF3), + ), + ), + ], + ), + Text( + '\n\nWhat type of dietary restrictions do you conform to?', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + ), + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + 'Vegan', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + color: Color(0xff778BF3), + ), + ), + Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + SliderTheme( + data: SliderTheme.of(ctxt).copyWith( + activeTrackColor: Color(0xff778BF3), + inactiveTrackColor: Color(0xffd5e1fd), + trackShape: RectangularSliderTrackShape(), + trackHeight: 4.0, + thumbColor: Color(0xff778BF3), + thumbShape: RoundSliderThumbShape(enabledThumbRadius: 12.0), + overlayShape: RoundSliderOverlayShape(overlayRadius: 28.0), + ), + child: Slider( + divisions: 5, + value: _diet, + onChanged: (value) { + setState(() { + _diet = value; + }); + }, + min: 0, + max: 5, + ), + ), + ], + ), + Text( + 'No Restrictions', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + color: Color(0xff778BF3), + ), + ), + ], + ), + Text( + '\n\nHow often do you compost your food waste? (days per week)', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + ), + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + '0', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + color: Color(0xff778BF3), + ), + ), + Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + SliderTheme( + data: SliderTheme.of(ctxt).copyWith( + activeTrackColor: Color(0xff778BF3), + inactiveTrackColor: Color(0xffd5e1fd), + trackShape: RectangularSliderTrackShape(), + trackHeight: 4.0, + thumbColor: Color(0xff778BF3), + thumbShape: RoundSliderThumbShape(enabledThumbRadius: 12.0), + overlayShape: RoundSliderOverlayShape(overlayRadius: 28.0), + ), + child: Slider( + divisions: 7, + value: _compostingFreq, + onChanged: (value) { + setState(() { + _compostingFreq = value; + }); + }, + min: 0, + max: 7, + ), + ), + ], + ), + Text( + '7', + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + color: Color(0xff778BF3), + ), + ), + ], + ), + ], + ), + ) ); } } @@ -208,7 +779,7 @@ class ScreenARViewer extends StatelessWidget { appBar: new AppBar( centerTitle: true, leading: IconButton( - icon: Icon(Icons.arrow_back, color: Color(0xff9ee493)), + icon: Icon(Icons.arrow_back, color: Color(0xff778BF3)), onPressed: () { Navigator.pop(ctxt); } diff --git a/trashspecto1/pubspec.yaml b/trashspecto1/pubspec.yaml index aa5b937..90ea89e 100644 --- a/trashspecto1/pubspec.yaml +++ b/trashspecto1/pubspec.yaml @@ -40,6 +40,11 @@ flutter_icons: # The following section is specific to Flutter. flutter: + assets: + - images/foodlayout1.png + - images/foodlayout1meat.png + - images/foodlayout1vegetarian.png + - images/foodlayout1chicken.png # The following line ensures that the Material Icons font is # included with your application, so that you can use the icons in # the material Icons class.