2021-1-capstone-design1 / RIT_Project1

Go to a project
Toggle navigation Toggle navigation pinning
고원빈
bab36bc7 1 parent 831f24da

[frontend] 새로 고침 + ui 변경

Expand all
Inline Side-by-side
Showing 7 changed files with 62 additions and 10 deletions
...@@ -89,4 +89,8 @@ appbar 관련 디자인은 추후 구현 예정 ...@@ -89,4 +89,8 @@ appbar 관련 디자인은 추후 구현 예정
89 + future buillder 변경 89 + future buillder 변경
90 90
91 ### 2021-05-27 91 ### 2021-05-27
92 -+ app 뒤로가기 설정 변경
...\ No newline at end of file ...\ No newline at end of file
92 ++ app 뒤로가기 설정 변경
93 +
94 +### 2021-05-29
95 ++ 약병 리스트 ui 변경
96 ++ DashBoard 새로고침
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -118,6 +118,13 @@ class _DashBoardState extends State<DashBoard> { ...@@ -118,6 +118,13 @@ class _DashBoardState extends State<DashBoard> {
118 ), 118 ),
119 ), 119 ),
120 body: _tabs[_selectedIndex], 120 body: _tabs[_selectedIndex],
121 + floatingActionButton: FloatingActionButton(
122 + onPressed: () {
123 + setState(() {});
124 + },
125 + child: const Icon(Icons.refresh_outlined),
126 + backgroundColor: Colors.blue,
127 + ),
121 bottomNavigationBar: BottomNavigationBar( 128 bottomNavigationBar: BottomNavigationBar(
122 type: BottomNavigationBarType.fixed, 129 type: BottomNavigationBarType.fixed,
123 backgroundColor: Colors.grey, 130 backgroundColor: Colors.grey,
...@@ -132,11 +139,12 @@ class _DashBoardState extends State<DashBoard> { ...@@ -132,11 +139,12 @@ class _DashBoardState extends State<DashBoard> {
132 }) 139 })
133 }, 140 },
134 items: [ 141 items: [
135 - BottomNavigationBarItem(icon: Icon(Icons.favorite), label: 'In'), 142 + BottomNavigationBarItem(
143 + icon: Icon(Icons.device_thermostat), label: 'In'),
136 BottomNavigationBarItem(icon: Icon(Icons.home), label: 'Home'), 144 BottomNavigationBarItem(icon: Icon(Icons.home), label: 'Home'),
137 BottomNavigationBarItem( 145 BottomNavigationBarItem(
138 label: 'Out', 146 label: 'Out',
139 - icon: Icon(Icons.favorite), 147 + icon: Icon(Icons.access_time),
140 ) 148 )
141 ], 149 ],
142 ), 150 ),
...@@ -146,8 +154,7 @@ class _DashBoardState extends State<DashBoard> { ...@@ -146,8 +154,7 @@ class _DashBoardState extends State<DashBoard> {
146 Navigator.push( 154 Navigator.push(
147 context, 155 context,
148 MaterialPageRoute( 156 MaterialPageRoute(
149 - builder: (BuildContext context) => 157 + builder: (BuildContext context) => BottleList(),
150 - BottleList(bottlelist: _bottleList),
151 )); 158 ));
152 }, 159 },
153 ); 160 );
......
...@@ -102,9 +102,7 @@ class _HubListState extends State<HubList> { ...@@ -102,9 +102,7 @@ class _HubListState extends State<HubList> {
102 context, 102 context,
103 MaterialPageRoute( 103 MaterialPageRoute(
104 builder: (BuildContext context) => 104 builder: (BuildContext context) =>
105 - BottleList( 105 + BottleList(),
106 - bottlelist: _bottleList,
107 - ),
108 )); 106 ));
109 } else if (result == "Not Found") { 107 } else if (result == "Not Found") {
110 showDialog( 108 showDialog(
......
1 +class UserBottle {
2 + String bottleId;
3 + String bottleName;
4 +
5 + UserBottle({this.bottleId, this.bottleName});
6 +}
...@@ -233,6 +233,13 @@ packages: ...@@ -233,6 +233,13 @@ packages:
233 url: "https://pub.dartlang.org" 233 url: "https://pub.dartlang.org"
234 source: hosted 234 source: hosted
235 version: "1.8.0-nullsafety.1" 235 version: "1.8.0-nullsafety.1"
236 + path_provider:
237 + dependency: "direct main"
238 + description:
239 + name: path_provider
240 + url: "https://pub.dartlang.org"
241 + source: hosted
242 + version: "1.6.28"
236 path_provider_linux: 243 path_provider_linux:
237 dependency: transitive 244 dependency: transitive
238 description: 245 description:
...@@ -240,6 +247,13 @@ packages: ...@@ -240,6 +247,13 @@ packages:
240 url: "https://pub.dartlang.org" 247 url: "https://pub.dartlang.org"
241 source: hosted 248 source: hosted
242 version: "0.0.1+2" 249 version: "0.0.1+2"
250 + path_provider_macos:
251 + dependency: transitive
252 + description:
253 + name: path_provider_macos
254 + url: "https://pub.dartlang.org"
255 + source: hosted
256 + version: "0.0.4+8"
243 path_provider_platform_interface: 257 path_provider_platform_interface:
244 dependency: transitive 258 dependency: transitive
245 description: 259 description:
...@@ -350,6 +364,20 @@ packages: ...@@ -350,6 +364,20 @@ packages:
350 url: "https://pub.dartlang.org" 364 url: "https://pub.dartlang.org"
351 source: hosted 365 source: hosted
352 version: "1.8.0-nullsafety.2" 366 version: "1.8.0-nullsafety.2"
367 + sqflite:
368 + dependency: "direct main"
369 + description:
370 + name: sqflite
371 + url: "https://pub.dartlang.org"
372 + source: hosted
373 + version: "1.3.2+4"
374 + sqflite_common:
375 + dependency: transitive
376 + description:
377 + name: sqflite_common
378 + url: "https://pub.dartlang.org"
379 + source: hosted
380 + version: "1.0.3+3"
353 stack_trace: 381 stack_trace:
354 dependency: transitive 382 dependency: transitive
355 description: 383 description:
...@@ -371,6 +399,13 @@ packages: ...@@ -371,6 +399,13 @@ packages:
371 url: "https://pub.dartlang.org" 399 url: "https://pub.dartlang.org"
372 source: hosted 400 source: hosted
373 version: "1.1.0-nullsafety.1" 401 version: "1.1.0-nullsafety.1"
402 + synchronized:
403 + dependency: transitive
404 + description:
405 + name: synchronized
406 + url: "https://pub.dartlang.org"
407 + source: hosted
408 + version: "2.2.0+2"
374 term_glyph: 409 term_glyph:
375 dependency: transitive 410 dependency: transitive
376 description: 411 description:
...@@ -421,5 +456,5 @@ packages: ...@@ -421,5 +456,5 @@ packages:
421 source: hosted 456 source: hosted
422 version: "0.1.2" 457 version: "0.1.2"
423 sdks: 458 sdks:
424 - dart: ">=2.10.0-110 <2.11.0" 459 + dart: ">=2.10.2 <2.11.0"
425 - flutter: ">=1.20.0 <2.0.0" 460 + flutter: ">=1.22.2 <2.0.0"
......
...@@ -39,6 +39,8 @@ dependencies: ...@@ -39,6 +39,8 @@ dependencies:
39 flutter_dotenv: ^2.1.0 39 flutter_dotenv: ^2.1.0
40 numberpicker: ^1.3.0 40 numberpicker: ^1.3.0
41 flutter_secure_storage: ^3.3.5 41 flutter_secure_storage: ^3.3.5
42 + sqflite: ^1.1.6
43 + path_provider: ^1.2.0
42 44
43 dev_dependencies: 45 dev_dependencies:
44 flutter_test: 46 flutter_test:
......