Merge pull request #18 from mikjk97/master

fix pedometer
kookmin-sw · May 20, 2022 · cc51d1d · cc51d1d
2 parents 86e2340 + 40f549b
commit cc51d1d
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 12 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -27,7 +27,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion flutter.compileSdkVersion
+    compileSdkVersion 31
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.capstone_2022_48">
+
+   <uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />
+
    <application
         android:label="capstone_2022_48"
         android:name="${applicationName}"

diff --git a/lib/pages/HomeCalendar.dart b/lib/pages/HomeCalendar.dart
@@ -8,6 +8,8 @@ import 'package:capstone_2022_48/model/DataModel.dart';
 import 'dart:io';
 import 'package:capstone_2022_48/model/DataModel.dart';
 import 'package:capstone_2022_48/pages/Diet.dart';
+import 'package:pedometer/pedometer.dart';
+import 'package:permission_handler/permission_handler.dart';
 
 class HomeCalendar extends StatefulWidget {
   const HomeCalendar({Key? key}) : super(key: key);
@@ -77,15 +79,16 @@ class _HomeCalendarState extends State<HomeCalendar> {
     });
   }
 
-  void initPlatformState() {
-    _pedestrianStatusStream = Pedometer.pedestrianStatusStream;
-    _pedestrianStatusStream
-        .listen(onPedestrianStatusChanged)
-        .onError(onPedestrianStatusError);
-
-    _stepCountStream = Pedometer.stepCountStream;
-    _stepCountStream.listen(onStepCount).onError(onStepCountError);
+  void initPlatformState() async {
+    if (await Permission.activityRecognition.request().isGranted) {
+      _pedestrianStatusStream = Pedometer.pedestrianStatusStream;
+      _pedestrianStatusStream
+          .listen(onPedestrianStatusChanged)
+          .onError(onPedestrianStatusError);
 
+      _stepCountStream = Pedometer.stepCountStream;
+      _stepCountStream.listen(onStepCount).onError(onStepCountError);
+    } else {}
     if (!mounted) return;
   }
 
@@ -246,7 +249,8 @@ class _HomeCalendarState extends State<HomeCalendar> {
                     // child: (_selectedDay == DateTime.now())
                     //     ? TodayDiet()
                     //     : FutureDiet(),
-                    child: ConditionalDiet(Whatday(_selectedDay!)),
+                    child: ConditionalDiet(Whatday(_selectedDay)),
+                    //_sectedDay! 오류나서 _selectedDay로 수정
                   ),
                 ],
               ),

diff --git a/lib/pages/Signin_screen.dart b/lib/pages/Signin_screen.dart
@@ -20,7 +20,7 @@ class _SignInScreenState extends State<SignInScreen> {
       body: Container(
         width: MediaQuery.of(context).size.width,
         height: MediaQuery.of(context).size.height,
-        decoration: BoxDecoration(color: Color.fromARGB(255, 240, 231, 149)),
+        decoration: BoxDecoration(color: Colors.white),
         child: SingleChildScrollView(
           child: Padding(
             padding: EdgeInsets.fromLTRB(

diff --git a/pubspec.lock b/pubspec.lock
@@ -283,7 +283,7 @@ packages:
     source: hosted
     version: "1.8.1"
   path_provider:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: path_provider
       url: "https://pub.dartlang.org"
@@ -338,6 +338,41 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.0"
+  permission_handler:
+    dependency: "direct main"
+    description:
+      name: permission_handler
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "9.2.0"
+  permission_handler_android:
+    dependency: transitive
+    description:
+      name: permission_handler_android
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "9.0.2+1"
+  permission_handler_apple:
+    dependency: transitive
+    description:
+      name: permission_handler_apple
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "9.0.4"
+  permission_handler_platform_interface:
+    dependency: transitive
+    description:
+      name: permission_handler_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.7.0"
+  permission_handler_windows:
+    dependency: transitive
+    description:
+      name: permission_handler_windows
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.0"
   platform:
     dependency: transitive
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -49,6 +49,8 @@ dependencies:
   syncfusion_flutter_gauges: ^20.1.55
   firebase_core: ^1.17.0
   firebase_auth: ^3.3.18
+  path_provider: ^2.0.0
+  permission_handler: ^9.2.0
 
 dev_dependencies:
   flutter_test: