M3-128 Feat : conflict 수정

SWM-M3PRO · Jun 27, 2024 · 0270781 · 0270781
1 parent 24d86b1
commit 0270781
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />
+
     <application
         android:label="ground_flip"
         android:name="${applicationName}"

diff --git a/lib/service/ios_walking_service.dart b/lib/service/ios_walking_service.dart
@@ -45,9 +45,4 @@ class IosWalkingService implements WalkingService {
     return dailySteps;
   }
 
-  @override
-  List<int> getWeeklySteps(startDate, endDate) {
-    // TODO: implement getWeeklySteps
-    throw UnimplementedError();
-  }
 }
diff --git a/pubspec.lock b/pubspec.lock
@@ -376,14 +376,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.9.0"
-  pedometer:
-    dependency: "direct main"
-    description:
-      name: pedometer
-      sha256: e8c574dae778276fa848873c6ea2015a636a91e8572a4a652b04a4fcd6c54259
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.1"
   permission_handler:
     dependency: "direct main"
     description: