2021-1-capstone-design1 / RIT_Project1

Go to a project
Toggle navigation Toggle navigation pinning
고원빈
78a8147c 1 parent d8b8fa39

[frontend]

Inline Side-by-side
Showing 10 changed files with 110 additions and 24 deletions
...@@ -49,3 +49,5 @@ appbar 관련 디자인은 추후 구현 예정 ...@@ -49,3 +49,5 @@ appbar 관련 디자인은 추후 구현 예정
49 ### 2021-05-15 49 ### 2021-05-15
50 + 회원 정보 수정 Page 구현 50 + 회원 정보 수정 Page 구현
51 + API 연동 중에 추가로 개발 예정 51 + API 연동 중에 추가로 개발 예정
52 ++ build용 파일 구현
53 +
......
...@@ -8,10 +8,12 @@ ...@@ -8,10 +8,12 @@
8 FlutterApplication and put your custom class here. --> 8 FlutterApplication and put your custom class here. -->
9 <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> 9 <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
10 <uses-permission android:name="android.permission.VIBRATE" /> 10 <uses-permission android:name="android.permission.VIBRATE" />
11 - <uses-permission android:name="android.permission.VIBRATE" /> 11 + <uses-permission android:name="android.permission.BLUETOOTH" />
12 + <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
13 + <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
12 <application 14 <application
13 android:name="io.flutter.app.FlutterApplication" 15 android:name="io.flutter.app.FlutterApplication"
14 - android:label="flutter_application_1" 16 + android:label="Smart_Medicine_Box"
15 android:icon="@mipmap/ic_launcher"> 17 android:icon="@mipmap/ic_launcher">
16 <activity 18 <activity
17 android:name=".MainActivity" 19 android:name=".MainActivity"
......
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
2 -import 'package:flutter/services.dart'; 2 +import 'package:Smart_Medicine_Box/src/screens/SettingPage.dart';
3 -import 'package:flutter_application_1/src/screens/SettingPage.dart';
4 3
5 class DashBoard extends StatefulWidget { 4 class DashBoard extends StatefulWidget {
6 int pageNumber = 1; 5 int pageNumber = 1;
......
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
2 -import 'package:flutter/services.dart'; 2 +import 'package:Smart_Medicine_Box/src/screens/DashBoard.dart';
3 -import 'package:flutter_application_1/src/screens/DashBoard.dart'; 3 +import 'package:Smart_Medicine_Box/src/screens/SettingPage/Alarm.dart';
4 -import '../shared/colors.dart'; 4 +import 'package:Smart_Medicine_Box/src/screens/SettingPage/Bluetooth.dart';
5 -import 'package:flutter_screenutil/flutter_screenutil.dart'; 5 +import 'package:Smart_Medicine_Box/src/screens/SettingPage/DEVInformation.dart';
6 -import 'package:flutter_application_1/src/screens/SettingPage/Alarm.dart'; 6 +import 'package:Smart_Medicine_Box/src/screens/SettingPage/InformationModify.dart';
7 -import 'package:flutter_application_1/src/screens/SettingPage/Bluetooth.dart';
8 -import 'package:flutter_application_1/src/screens/SettingPage/DEVInformation.dart';
9 -import 'package:flutter_application_1/src/screens/SettingPage/InformationModify.dart';
10 7
11 class SettingPage extends StatefulWidget { 8 class SettingPage extends StatefulWidget {
12 @override 9 @override
......
...@@ -4,8 +4,8 @@ import 'package:shared_preferences/shared_preferences.dart'; ...@@ -4,8 +4,8 @@ import 'package:shared_preferences/shared_preferences.dart';
4 import 'package:flutter/cupertino.dart'; 4 import 'package:flutter/cupertino.dart';
5 import 'package:flutter_datetime_picker/flutter_datetime_picker.dart'; 5 import 'package:flutter_datetime_picker/flutter_datetime_picker.dart';
6 import 'package:flutter_local_notifications/flutter_local_notifications.dart'; 6 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
7 -import 'package:flutter_application_1/src/screens/SettingPage.dart'; 7 +import 'package:Smart_Medicine_Box/src/screens/SettingPage.dart';
8 -import 'package:flutter_application_1/src/screens/SettingPage/customTimepicker.dart'; 8 +import 'package:Smart_Medicine_Box/src/screens/SettingPage/customTimepicker.dart';
9 9
10 final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = 10 final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
11 FlutterLocalNotificationsPlugin(); 11 FlutterLocalNotificationsPlugin();
......
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
2 -import 'package:flutter/services.dart'; 2 +import 'package:Smart_Medicine_Box/src/screens/SettingPage.dart';
3 -import '../../shared/colors.dart'; 3 +import 'package:flutter_blue/flutter_blue.dart';
4 -import 'package:flutter_screenutil/flutter_screenutil.dart';
5 4
6 class Bluetooth extends StatefulWidget { 5 class Bluetooth extends StatefulWidget {
7 @override 6 @override
8 _BluetoothState createState() => _BluetoothState(); 7 _BluetoothState createState() => _BluetoothState();
9 } 8 }
10 9
10 +FlutterBlue flutterBlue;
11 +
11 class _BluetoothState extends State<Bluetooth> { 12 class _BluetoothState extends State<Bluetooth> {
12 Widget build(BuildContext context) { 13 Widget build(BuildContext context) {
13 return MaterialApp( 14 return MaterialApp(
14 title: 'Welcome to Flutter', 15 title: 'Welcome to Flutter',
15 home: Scaffold( 16 home: Scaffold(
16 appBar: AppBar( 17 appBar: AppBar(
17 - title: Text('Welcome to Flutter'), 18 + iconTheme: IconThemeData(color: Colors.black),
19 + backgroundColor: Colors.white,
20 + title: Text(
21 + 'Smart Medicine Box',
22 + style: TextStyle(
23 + color: Colors.black,
24 + fontSize: 20,
25 + fontFamily: 'Noto',
26 + fontWeight: FontWeight.bold),
27 + ),
28 + actions: [
29 + IconButton(
30 + icon: Icon(
31 + Icons.settings,
32 + color: Colors.black,
33 + ),
34 + onPressed: () {
35 + Navigator.push(
36 + context,
37 + MaterialPageRoute(
38 + builder: (BuildContext context) => SettingPage(),
39 + ));
40 + },
41 + )
42 + ],
43 + ),
44 + drawer: Drawer(
45 + child: ListView(
46 + children: [
47 + DrawerHeader(
48 + child: Text('Drawer Header'),
49 + decoration: BoxDecoration(
50 + color: Colors.blue,
51 + ),
52 + ),
53 + ListTile(
54 + title: Text('Test 1'),
55 + onTap: () {},
56 + ),
57 + ListTile(
58 + title: Text('Test 2'),
59 + onTap: () {},
60 + ),
61 + ListTile(
62 + title: Text('Test 3'),
63 + onTap: () {},
64 + ),
65 + ],
66 + ),
18 ), 67 ),
19 body: Center( 68 body: Center(
20 child: Text('약병 내부 페이지 작업 영역'), 69 child: Text('약병 내부 페이지 작업 영역'),
......
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
2 import 'package:flutter/services.dart'; 2 import 'package:flutter/services.dart';
3 -import 'package:flutter_application_1/src/screens/SettingPage.dart'; 3 +import 'package:Smart_Medicine_Box/src/screens/SettingPage.dart';
4 4
5 class InformationModify extends StatefulWidget { 5 class InformationModify extends StatefulWidget {
6 @override 6 @override
......
...@@ -43,6 +43,20 @@ packages: ...@@ -43,6 +43,20 @@ packages:
43 url: "https://pub.dartlang.org" 43 url: "https://pub.dartlang.org"
44 source: hosted 44 source: hosted
45 version: "1.15.0-nullsafety.3" 45 version: "1.15.0-nullsafety.3"
46 + convert:
47 + dependency: transitive
48 + description:
49 + name: convert
50 + url: "https://pub.dartlang.org"
51 + source: hosted
52 + version: "2.1.1"
53 + cupertino_icons:
54 + dependency: "direct main"
55 + description:
56 + name: cupertino_icons
57 + url: "https://pub.dartlang.org"
58 + source: hosted
59 + version: "0.1.3"
46 fake_async: 60 fake_async:
47 dependency: transitive 61 dependency: transitive
48 description: 62 description:
...@@ -64,11 +78,25 @@ packages: ...@@ -64,11 +78,25 @@ packages:
64 url: "https://pub.dartlang.org" 78 url: "https://pub.dartlang.org"
65 source: hosted 79 source: hosted
66 version: "5.2.1" 80 version: "5.2.1"
81 + fixnum:
82 + dependency: transitive
83 + description:
84 + name: fixnum
85 + url: "https://pub.dartlang.org"
86 + source: hosted
87 + version: "0.10.11"
67 flutter: 88 flutter:
68 dependency: "direct main" 89 dependency: "direct main"
69 description: flutter 90 description: flutter
70 source: sdk 91 source: sdk
71 version: "0.0.0" 92 version: "0.0.0"
93 + flutter_blue:
94 + dependency: "direct main"
95 + description:
96 + name: flutter_blue
97 + url: "https://pub.dartlang.org"
98 + source: hosted
99 + version: "0.7.3"
72 flutter_datetime_picker: 100 flutter_datetime_picker:
73 dependency: "direct main" 101 dependency: "direct main"
74 description: 102 description:
...@@ -212,13 +240,20 @@ packages: ...@@ -212,13 +240,20 @@ packages:
212 url: "https://pub.dartlang.org" 240 url: "https://pub.dartlang.org"
213 source: hosted 241 source: hosted
214 version: "3.0.13" 242 version: "3.0.13"
243 + protobuf:
244 + dependency: transitive
245 + description:
246 + name: protobuf
247 + url: "https://pub.dartlang.org"
248 + source: hosted
249 + version: "1.1.3"
215 rxdart: 250 rxdart:
216 dependency: "direct main" 251 dependency: "direct main"
217 description: 252 description:
218 name: rxdart 253 name: rxdart
219 url: "https://pub.dartlang.org" 254 url: "https://pub.dartlang.org"
220 source: hosted 255 source: hosted
221 - version: "0.23.1" 256 + version: "0.24.1"
222 shared_preferences: 257 shared_preferences:
223 dependency: "direct main" 258 dependency: "direct main"
224 description: 259 description:
...@@ -345,4 +380,4 @@ packages: ...@@ -345,4 +380,4 @@ packages:
345 version: "0.1.2" 380 version: "0.1.2"
346 sdks: 381 sdks:
347 dart: ">=2.10.0-110 <2.11.0" 382 dart: ">=2.10.0-110 <2.11.0"
348 - flutter: ">=1.12.13+hotfix.5 <2.0.0" 383 + flutter: ">=1.12.13+hotfix.6 <2.0.0"
......
1 -name: flutter_application_1 1 +name: Smart_Medicine_Box
2 description: A new Flutter project. 2 description: A new Flutter project.
3 3
4 # The following line prevents the package from being accidentally published to 4 # The following line prevents the package from being accidentally published to
...@@ -28,11 +28,13 @@ dependencies: ...@@ -28,11 +28,13 @@ dependencies:
28 page_transition: '^1.1.5' 28 page_transition: '^1.1.5'
29 mailer: '^3.0.4' 29 mailer: '^3.0.4'
30 flutter_local_notifications: ^1.4.4+5 30 flutter_local_notifications: ^1.4.4+5
31 - rxdart: ^0.23.1 31 + rxdart: ^0.24.0
32 flutter_datetime_picker: ^1.3.4 32 flutter_datetime_picker: ^1.3.4
33 timezone: ^0.6.0 33 timezone: ^0.6.0
34 intl : ^0.16.1 34 intl : ^0.16.1
35 shared_preferences: ^0.5.6+1 35 shared_preferences: ^0.5.6+1
36 + flutter_blue: ^0.7.2
37 + cupertino_icons: ^0.1.3
36 38
37 dev_dependencies: 39 dev_dependencies:
38 flutter_test: 40 flutter_test:
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 import 'package:flutter/material.dart'; 8 import 'package:flutter/material.dart';
9 import 'package:flutter_test/flutter_test.dart'; 9 import 'package:flutter_test/flutter_test.dart';
10 10
11 -import 'package:flutter_application_1/main.dart'; 11 +import 'package:Smart_Medicine_Box/main.dart';
12 12
13 void main() { 13 void main() {
14 testWidgets('Counter increments smoke test', (WidgetTester tester) async { 14 testWidgets('Counter increments smoke test', (WidgetTester tester) async {
......