From 02707812bbb44e437f2a1cbb675e089e2c0146ab Mon Sep 17 00:00:00 2001
From: cha-imag <100341870+tkdals802@users.noreply.github.com>
Date: Thu, 27 Jun 2024 17:53:14 +0900
Subject: [PATCH] =?UTF-8?q?M3-128=20Feat=20:=20conflict=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/app/src/main/AndroidManifest.xml | 4 ++++
 lib/service/ios_walking_service.dart     | 5 -----
 pubspec.lock                             | 8 --------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index e2fedd6c..8ef18d45 100644
--- 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
index 1d03aae0..8ec77039 100644
--- 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
index 1dfc7ecd..58659a84 100644
--- 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: