리팩토링 & 캘린더 수정

lib/crud_page.dart → lib/api/input_api.dart

@@ -2,26 +2,25 @@ import 'package:flutter/material.dart';
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:intl/intl.dart';
-import 'crud_page_view.dart';
+import '../screens/input/input_screen.dart';
 
-class CrudPage extends StatefulWidget {
+class InputApi extends StatefulWidget {
   @override
-  _CrudPageState createState() => _CrudPageState();
+  _InputApiState createState() => _InputApiState();
 }
 
-class _CrudPageState extends State<CrudPage> {
+class _InputApiState extends State<InputApi> {
   FirebaseFirestore firestore = FirebaseFirestore.instance;
   FirebaseAuth auth = FirebaseAuth.instance;
   Stream<QuerySnapshot> currentStream;
 
   void initState() {
     super.initState();
-    currentStream =
-        firestore
-            .collection("user")
-            .doc(auth.currentUser.uid)
-            .collection(DateFormat('yyyy-MM').format(DateTime.now()))
-            .snapshots();
+    currentStream = firestore
+        .collection("user")
+        .doc(auth.currentUser.uid)
+        .collection(DateFormat('yyyy-MM').format(DateTime.now()))
+        .snapshots();
   }
 
   @override
@@ -32,7 +31,8 @@ class _CrudPageState extends State<CrudPage> {
         builder: (context, AsyncSnapshot<QuerySnapshot> snapshot) {
           if (!snapshot.hasData) {
             return CircularProgressIndicator();
-          } return CrudPageView(snapshot.data.docs);
+          }
+          return InputScreen(snapshot.data.docs);
         },
       ),
     );

lib/home_page.dart → lib/api/main_api.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:firebase_auth/firebase_auth.dart';
-import 'home_page_view.dart';
+import '../screens/main/main_screen.dart';
 import 'package:intl/intl.dart';
 
 class DateInfo {
@@ -15,14 +15,15 @@ class DateInfo {
   }
 }
 
-class HomePage extends StatefulWidget {
+// ignore: must_be_immutable
+class MainApi extends StatefulWidget {
   num totalCurrent = 0;
 
   @override
-  _HomePageState createState() => _HomePageState();
+  _MainApiState createState() => _MainApiState();
 }
 
-class _HomePageState extends State<HomePage> {
+class _MainApiState extends State<MainApi> {
   FirebaseFirestore firestore = FirebaseFirestore.instance;
   FirebaseAuth auth = FirebaseAuth.instance;
   Stream<QuerySnapshot> currentStream;
@@ -59,20 +60,18 @@ class _HomePageState extends State<HomePage> {
 
   initSecondState() {
     // [2-1] view에 줄 사용자 한 명의 정보 받기
-    Stream<DocumentSnapshot> currentStream = firestore
-        .collection("user")
-        .doc(auth.currentUser.uid)
-        .snapshots();
+    Stream<DocumentSnapshot> currentStream =
+        firestore.collection("user").doc(auth.currentUser.uid).snapshots();
     // [2-2] 현재 총 소비 전력 또는 전기세와 유저 정보 모두 view 에 보내기
     return StreamBuilder(
-        stream: currentStream,
-        builder: (context, AsyncSnapshot<DocumentSnapshot> snapshot) {
-          if (!snapshot.hasData) {
-            return CircularProgressIndicator();
-          }
-          num result = widget.totalCurrent;
-          return HomePageView(snapshot.data, result);
-        },
+      stream: currentStream,
+      builder: (context, AsyncSnapshot<DocumentSnapshot> snapshot) {
+        if (!snapshot.hasData) {
+          return CircularProgressIndicator();
+        }
+        num result = widget.totalCurrent;
+        return MainScreen(snapshot.data, result);
+      },
     );
   }
 }

lib/my_page.dart → lib/api/mypage_api.dart

@@ -1,14 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:firebase_auth/firebase_auth.dart';
-import 'my_page_view.dart';
+import '../screens/mypage/my_page_screen.dart';
 
-class MyPage extends StatefulWidget {
+class MyPageApi extends StatefulWidget {
   @override
-  _MyPageState createState() => _MyPageState();
+  _MyPageApiState createState() => _MyPageApiState();
 }
 
-class _MyPageState extends State<MyPage> {
+class _MyPageApiState extends State<MyPageApi> {
   FirebaseFirestore firestore = FirebaseFirestore.instance;
   FirebaseAuth auth = FirebaseAuth.instance;
   Stream<DocumentSnapshot> currentStream;
@@ -27,7 +27,8 @@ class _MyPageState extends State<MyPage> {
         builder: (context, AsyncSnapshot<DocumentSnapshot> snapshot) {
           if (!snapshot.hasData) {
             return CircularProgressIndicator();
-          } return MyPageView(snapshot.data);
+          }
+          return MyPageScreen(snapshot.data);
         },
       ),
     );

lib/my_power_page.dart → lib/api/power_calculated_result_api.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:intl/intl.dart';
-import 'my_power_page_view.dart';
+import '../screens/calculate_result/power_calculated_result_screen.dart';
 
 class DateInfo {
   String currentDate, currentMonth, currentYear;
@@ -37,19 +37,20 @@ class DateInfo {
 }
 
 // ignore: must_be_immutable
-class MyPowerPage extends StatefulWidget {
+class PowerCalculatedResultApi extends StatefulWidget {
   final String date;
 
-  MyPowerPage(this.date);
+  PowerCalculatedResultApi(this.date);
 
   num totalLast = 0;
   num totalCurrent = 0;
 
   @override
-  _MyPowerPageState createState() => _MyPowerPageState();
+  _PowerCalculatedResultApiState createState() =>
+      _PowerCalculatedResultApiState();
 }
 
-class _MyPowerPageState extends State<MyPowerPage> {
+class _PowerCalculatedResultApiState extends State<PowerCalculatedResultApi> {
   FirebaseFirestore firestore = FirebaseFirestore.instance;
   FirebaseAuth auth = FirebaseAuth.instance;
   Stream<QuerySnapshot> currentStream;
@@ -92,11 +93,13 @@ class _MyPowerPageState extends State<MyPowerPage> {
               (widget.totalLast *
                   num.parse(dateInfo.currentDate) /
                   num.parse(dateInfo.lastMonthOfDay));
-          return MyPowerPageView(widget.date, snapshot.data.docs, result);
+          return PowerCalculatedResultScreen(
+              widget.date, snapshot.data.docs, result);
         } else {
           // 과거의 달을 호출한 경우 -> 계산방식: 과거의 달 사용량 - 과거의 달의 직 전달 사용량
           var result = widget.totalCurrent - widget.totalLast;
-          return MyPowerPageView(widget.date, snapshot.data.docs, result);
+          return PowerCalculatedResultScreen(
+              widget.date, snapshot.data.docs, result);
         }
       },
     );

lib/my_power2_page.dart → lib/api/power_calculated_second_result_api.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:intl/intl.dart';
-import 'my_power2_page_view.dart';
+import '../screens/calculate_result/power_calculated_second_result_screen.dart';
 
 class DateInfo {
   String currentDate, currentMonth, currentYear;
@@ -35,19 +35,21 @@ class DateInfo {
 }
 
 // ignore: must_be_immutable
-class MyPower2Page extends StatefulWidget {
+class PowerCalculatedSecondResultApi extends StatefulWidget {
   final String date;
 
-  MyPower2Page(this.date);
+  PowerCalculatedSecondResultApi(this.date);
 
   num totalLast = 0;
   num totalCurrent = 0;
 
   @override
-  _MyPower2PageState createState() => _MyPower2PageState();
+  _PowerCalculatedSecondResultApiState createState() =>
+      _PowerCalculatedSecondResultApiState();
 }
 
-class _MyPower2PageState extends State<MyPower2Page> {
+class _PowerCalculatedSecondResultApiState
+    extends State<PowerCalculatedSecondResultApi> {
   FirebaseFirestore firestore = FirebaseFirestore.instance;
   FirebaseAuth auth = FirebaseAuth.instance;
   Stream<QuerySnapshot> currentStream;
@@ -109,11 +111,13 @@ class _MyPower2PageState extends State<MyPower2Page> {
               (widget.totalLast *
                   num.parse(dateInfo.currentDate) /
                   num.parse(dateInfo.lastMonthOfDay));
-          return MyPower2PageView(widget.date, snapshot.data.docs, result);
+          return PowerCalculatedSecondResultScreen(
+              widget.date, snapshot.data.docs, result);
         } else {
           // 과거의 달을 호출한 경우 -> 계산방식: 과거의 달 사용량 - 과거의 달의 직 전달 사용량
           var result = widget.totalCurrent - widget.totalLast;
-          return MyPower2PageView(widget.date, snapshot.data.docs, result);
+          return PowerCalculatedSecondResultScreen(
+              widget.date, snapshot.data.docs, result);
         }
       },
     );