From 6ea85ce4b7397063805906e3952c9db35f238aef Mon Sep 17 00:00:00 2001 From: cha-imag <100341870+tkdals802@users.noreply.github.com> Date: Fri, 21 Jun 2024 18:13:55 +0900 Subject: [PATCH 01/11] M3-107 Feat : develop branch rebase --- android/app/src/main/AndroidManifest.xml | 4 --- lib/service/android_walk_interface.dart | 37 ++++++++++++++++++++++++ lib/utils/walking_service.dart | 2 ++ pubspec.lock | 10 ++++++- pubspec.yaml | 1 + 5 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 lib/service/android_walk_interface.dart diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 8ef18d45..e2fedd6c 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,9 +1,5 @@ - - - - _stepCountStream; + + @override + RxInt step = 0.obs; + + RxInt get steps => step; + + @override + void getCurrentStep(StepCount event){ + step.value = event.steps; + } + + void onStepCountError(error) { + //print('onStepCountError: $error'); + step.value = 0; + } + + void initPlatformState() { + _stepCountStream = Pedometer.stepCountStream; + _stepCountStream.listen(getCurrentStep).onError(onStepCountError); + } + + @override + List getWeeklySteps(startDate, endDate){ + List a = []; + return a; + } + +} \ No newline at end of file diff --git a/lib/utils/walking_service.dart b/lib/utils/walking_service.dart index 04d4c246..2c1b444c 100644 --- a/lib/utils/walking_service.dart +++ b/lib/utils/walking_service.dart @@ -1,6 +1,8 @@ abstract class WalkingService { + Future getCurrentStep(); + List getWeeklySteps(startDate, endDate); Future> getDailyStepsInInterval( DateTime startDate, DateTime endDate, diff --git a/pubspec.lock b/pubspec.lock index 4357db89..fd3cf56b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -424,6 +424,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.0" + pedometer: + dependency: "direct main" + description: + name: pedometer + sha256: e8c574dae778276fa848873c6ea2015a636a91e8572a4a652b04a4fcd6c54259 + url: "https://pub.dev" + source: hosted + version: "4.0.1" sky_engine: dependency: transitive description: flutter @@ -534,5 +542,5 @@ packages: source: hosted version: "1.1.3" sdks: - dart: ">=3.4.0 <4.0.0" + dart: ">=3.3.4 <4.0.0" flutter: ">=3.22.0" diff --git a/pubspec.yaml b/pubspec.yaml index 7037c6f4..aa2c1a11 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -21,6 +21,7 @@ dependencies: google_maps_flutter: ^2.6.1 flutter_config: ^2.0.2 health: ^10.2.0 + pedometer: ^4.0.1 dev_dependencies: flutter_test: From b14fda98a475ffd5238e7cae4c4d883347c66cac Mon Sep 17 00:00:00 2001 From: cha-imag <100341870+tkdals802@users.noreply.github.com> Date: Thu, 27 Jun 2024 14:08:58 +0900 Subject: [PATCH 02/11] =?UTF-8?q?M3-128=20Feat=20:=20=EC=97=90=EB=9F=AC=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/service/android_walk_interface.dart | 30 ------------------------- lib/service/ios_walking_service.dart | 6 +++++ lib/utils/walking_service.dart | 1 + pubspec.lock | 18 +++++++-------- 4 files changed, 16 insertions(+), 39 deletions(-) diff --git a/lib/service/android_walk_interface.dart b/lib/service/android_walk_interface.dart index 779e68d9..d2bcaf22 100644 --- a/lib/service/android_walk_interface.dart +++ b/lib/service/android_walk_interface.dart @@ -5,33 +5,3 @@ import 'package:pedometer/pedometer.dart'; import '../utils/walking_service.dart'; -class AndroidWalkInterface extends GetxController implements WalkingService{ - late Stream _stepCountStream; - - @override - RxInt step = 0.obs; - - RxInt get steps => step; - - @override - void getCurrentStep(StepCount event){ - step.value = event.steps; - } - - void onStepCountError(error) { - //print('onStepCountError: $error'); - step.value = 0; - } - - void initPlatformState() { - _stepCountStream = Pedometer.stepCountStream; - _stepCountStream.listen(getCurrentStep).onError(onStepCountError); - } - - @override - List getWeeklySteps(startDate, endDate){ - List a = []; - return a; - } - -} \ No newline at end of file diff --git a/lib/service/ios_walking_service.dart b/lib/service/ios_walking_service.dart index 9d07ed63..50d97172 100644 --- a/lib/service/ios_walking_service.dart +++ b/lib/service/ios_walking_service.dart @@ -45,4 +45,10 @@ class IosWalkingService implements WalkingService { return dailySteps; } + + @override + List getWeeklySteps(startDate, endDate) { + // TODO: implement getWeeklySteps + throw UnimplementedError(); + } } diff --git a/lib/utils/walking_service.dart b/lib/utils/walking_service.dart index 2c1b444c..7a208853 100644 --- a/lib/utils/walking_service.dart +++ b/lib/utils/walking_service.dart @@ -3,6 +3,7 @@ abstract class WalkingService { Future getCurrentStep(); List getWeeklySteps(startDate, endDate); + Future> getDailyStepsInInterval( DateTime startDate, DateTime endDate, diff --git a/pubspec.lock b/pubspec.lock index fd3cf56b..fba71b37 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -360,6 +360,14 @@ 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: @@ -424,14 +432,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.0" - pedometer: - dependency: "direct main" - description: - name: pedometer - sha256: e8c574dae778276fa848873c6ea2015a636a91e8572a4a652b04a4fcd6c54259 - url: "https://pub.dev" - source: hosted - version: "4.0.1" sky_engine: dependency: transitive description: flutter @@ -542,5 +542,5 @@ packages: source: hosted version: "1.1.3" sdks: - dart: ">=3.3.4 <4.0.0" + dart: ">=3.4.0 <4.0.0" flutter: ">=3.22.0" From 600a0eb2007b03ec49c9a64033e45d5bc6dd317d Mon Sep 17 00:00:00 2001 From: cha-imag <100341870+tkdals802@users.noreply.github.com> Date: Thu, 27 Jun 2024 15:56:23 +0900 Subject: [PATCH 03/11] =?UTF-8?q?M3-128=20Feat=20:=20=EA=B7=B8=EB=A3=B9=20?= =?UTF-8?q?=EA=B2=80=EC=83=89=20=EB=B0=94,=20=EA=B2=80=EC=83=89=20?= =?UTF-8?q?=EA=B2=B0=EA=B3=BC=20=ED=98=95=ED=83=9C=20UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/screens/group_screen.dart | 17 +++++++-- lib/screens/search_group_screen.dart | 52 ++++++++++++++++++++++++++++ lib/widgets/searched_group.dart | 11 ++++++ 3 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 lib/screens/search_group_screen.dart create mode 100644 lib/widgets/searched_group.dart diff --git a/lib/screens/group_screen.dart b/lib/screens/group_screen.dart index 465fb362..0608409c 100644 --- a/lib/screens/group_screen.dart +++ b/lib/screens/group_screen.dart @@ -1,13 +1,26 @@ import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +import 'search_group_screen.dart'; class GroupScreen extends StatelessWidget { const GroupScreen({super.key}); @override Widget build(BuildContext context) { - return const Column( + return Row( + mainAxisAlignment: MainAxisAlignment.center, children: [ - Text('그룹'), + Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + ElevatedButton(onPressed: () { + Navigator.push( + context, + MaterialPageRoute(builder:(context)=> SearchGroupScreen()), + ); + }, child: const Text('그룹검색'))], + ), ], ); } diff --git a/lib/screens/search_group_screen.dart b/lib/screens/search_group_screen.dart new file mode 100644 index 00000000..c324fd0c --- /dev/null +++ b/lib/screens/search_group_screen.dart @@ -0,0 +1,52 @@ +import 'package:flutter/material.dart'; + +import '../widgets/searched_group.dart'; + +class SearchGroupScreen extends StatelessWidget { + const SearchGroupScreen({super.key}); + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Row( + children: [ + SizedBox(width: 8), + Flexible( + flex: 1, + child: TextField( + decoration: InputDecoration( + contentPadding: EdgeInsets.symmetric( + vertical: 7, + horizontal: 16, + ), + ), + ), + ), + IconButton( + onPressed: () {}, + icon: Icon( + Icons.search, + color: Colors.black, + ), + ) + ], + ), + ), + body: Column( + children: [ + Expanded( + child: ListView( + padding: const EdgeInsets.all(10), + children: [ + SearchedGroup('홍익대학교'), + SearchedGroup('홍익대학교 세종캠'), + SearchedGroup('홍익대학교 부속고등학교'), + ], + ), + ) + ], + ), + ); + } +} diff --git a/lib/widgets/searched_group.dart b/lib/widgets/searched_group.dart new file mode 100644 index 00000000..dd7269e9 --- /dev/null +++ b/lib/widgets/searched_group.dart @@ -0,0 +1,11 @@ +import 'package:flutter/material.dart'; + +Widget SearchedGroup(String searchedGroupName) { + return Container( + height: 50, + color: Colors.white70, + child: Center( + child: Text('${searchedGroupName}'), + ), + ); +} From 1be9d9b265dc8ca28f5013964079a90114060213 Mon Sep 17 00:00:00 2001 From: cha-imag <100341870+tkdals802@users.noreply.github.com> Date: Thu, 27 Jun 2024 16:14:18 +0900 Subject: [PATCH 04/11] =?UTF-8?q?M3-128=20Feat=20:=20=EA=B7=B8=EB=A3=B9=20?= =?UTF-8?q?=EC=BB=A8=ED=8A=B8=EB=A1=A4=EB=9F=AC=20=EC=83=9D=EC=84=B1,=20?= =?UTF-8?q?=EA=B2=80=EC=83=89=20=EA=B2=B0=EA=B3=BC=20=ED=98=95=ED=83=9C=20?= =?UTF-8?q?=EA=B3=B5=ED=86=B5=20=EC=9C=84=EC=A0=AF=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/controllers/group_controller.dart | 14 ++++++++++++++ lib/screens/search_group_screen.dart | 12 +++++++++--- lib/widgets/searched_group.dart | 20 ++++++++++++-------- 3 files changed, 35 insertions(+), 11 deletions(-) create mode 100644 lib/controllers/group_controller.dart diff --git a/lib/controllers/group_controller.dart b/lib/controllers/group_controller.dart new file mode 100644 index 00000000..330d764a --- /dev/null +++ b/lib/controllers/group_controller.dart @@ -0,0 +1,14 @@ +import 'package:get/get.dart'; + +import '../widgets/searched_group.dart'; + + +class GroupController extends GetxController{ + + SearchedGroup searchedGroup = SearchedGroup(); + @override + void onInit(){ + super.onInit(); + } + +} \ No newline at end of file diff --git a/lib/screens/search_group_screen.dart b/lib/screens/search_group_screen.dart index c324fd0c..10ac8dd0 100644 --- a/lib/screens/search_group_screen.dart +++ b/lib/screens/search_group_screen.dart @@ -1,12 +1,18 @@ import 'package:flutter/material.dart'; +import '../controllers/group_controller.dart'; import '../widgets/searched_group.dart'; class SearchGroupScreen extends StatelessWidget { const SearchGroupScreen({super.key}); + + @override Widget build(BuildContext context) { + + SearchedGroup searchedGroup = SearchedGroup(); + return Scaffold( appBar: AppBar( title: Row( @@ -39,9 +45,9 @@ class SearchGroupScreen extends StatelessWidget { child: ListView( padding: const EdgeInsets.all(10), children: [ - SearchedGroup('홍익대학교'), - SearchedGroup('홍익대학교 세종캠'), - SearchedGroup('홍익대학교 부속고등학교'), + searchedGroup.searchedGroup('홍익대학교'), + searchedGroup.searchedGroup('홍익대학교 세종캠'), + searchedGroup.searchedGroup('홍익대학교 부속고등학교'), ], ), ) diff --git a/lib/widgets/searched_group.dart b/lib/widgets/searched_group.dart index dd7269e9..196d1da1 100644 --- a/lib/widgets/searched_group.dart +++ b/lib/widgets/searched_group.dart @@ -1,11 +1,15 @@ import 'package:flutter/material.dart'; -Widget SearchedGroup(String searchedGroupName) { - return Container( - height: 50, - color: Colors.white70, - child: Center( - child: Text('${searchedGroupName}'), - ), - ); + +class SearchedGroup { + Widget searchedGroup(String groupName){ + return Container( + height: 50, + color: Colors.white70, + child: Center( + child: Text(groupName), + ), + ); + } } + From 9ed38de8a66d3a4ca1eb3469435e02a4a7d38921 Mon Sep 17 00:00:00 2001 From: cha-imag <100341870+tkdals802@users.noreply.github.com> Date: Thu, 27 Jun 2024 17:01:11 +0900 Subject: [PATCH 05/11] =?UTF-8?q?M3-128=20Feat=20:=20=EB=A6=B0=ED=8A=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/controllers/group_controller.dart | 5 +---- lib/screens/search_group_screen.dart | 14 +++++--------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/lib/controllers/group_controller.dart b/lib/controllers/group_controller.dart index 330d764a..b13fdaca 100644 --- a/lib/controllers/group_controller.dart +++ b/lib/controllers/group_controller.dart @@ -6,9 +6,6 @@ import '../widgets/searched_group.dart'; class GroupController extends GetxController{ SearchedGroup searchedGroup = SearchedGroup(); - @override - void onInit(){ - super.onInit(); - } + } \ No newline at end of file diff --git a/lib/screens/search_group_screen.dart b/lib/screens/search_group_screen.dart index 10ac8dd0..edc175e2 100644 --- a/lib/screens/search_group_screen.dart +++ b/lib/screens/search_group_screen.dart @@ -1,24 +1,20 @@ import 'package:flutter/material.dart'; -import '../controllers/group_controller.dart'; import '../widgets/searched_group.dart'; class SearchGroupScreen extends StatelessWidget { const SearchGroupScreen({super.key}); - - @override Widget build(BuildContext context) { - SearchedGroup searchedGroup = SearchedGroup(); return Scaffold( appBar: AppBar( title: Row( children: [ - SizedBox(width: 8), - Flexible( + const SizedBox(width: 8), + const Flexible( flex: 1, child: TextField( decoration: InputDecoration( @@ -31,11 +27,11 @@ class SearchGroupScreen extends StatelessWidget { ), IconButton( onPressed: () {}, - icon: Icon( + icon: const Icon( Icons.search, color: Colors.black, ), - ) + ), ], ), ), @@ -50,7 +46,7 @@ class SearchGroupScreen extends StatelessWidget { searchedGroup.searchedGroup('홍익대학교 부속고등학교'), ], ), - ) + ), ], ), ); From d162280800ff4b75c595651610191b904fd6377c Mon Sep 17 00:00:00 2001 From: cha-imag <100341870+tkdals802@users.noreply.github.com> Date: Thu, 27 Jun 2024 17:03:57 +0900 Subject: [PATCH 06/11] =?UTF-8?q?M3-128=20Feat=20:=20=EB=A6=B0=ED=8A=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=952?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/service/android_walk_interface.dart | 7 ------- lib/service/android_walking_service.dart | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 7 deletions(-) delete mode 100644 lib/service/android_walk_interface.dart create mode 100644 lib/service/android_walking_service.dart diff --git a/lib/service/android_walk_interface.dart b/lib/service/android_walk_interface.dart deleted file mode 100644 index d2bcaf22..00000000 --- a/lib/service/android_walk_interface.dart +++ /dev/null @@ -1,7 +0,0 @@ -import 'dart:async'; - -import 'package:get/get.dart'; -import 'package:pedometer/pedometer.dart'; - -import '../utils/walking_service.dart'; - diff --git a/lib/service/android_walking_service.dart b/lib/service/android_walking_service.dart new file mode 100644 index 00000000..d94fee85 --- /dev/null +++ b/lib/service/android_walking_service.dart @@ -0,0 +1,24 @@ +import 'dart:async'; + +import '../utils/walking_service.dart'; + +class AndroidWalkingService implements WalkingService { + @override + Future getCurrentStep() { + // TODO: implement getCurrentStep + throw UnimplementedError(); + } + + @override + Future> getDailyStepsInInterval(DateTime startDate, DateTime endDate) { + // TODO: implement getDailyStepsInInterval + throw UnimplementedError(); + } + + @override + List getWeeklySteps(startDate, endDate) { + // TODO: implement getWeeklySteps + throw UnimplementedError(); + } + +} \ No newline at end of file From 053a39ae350d2706712de98511e37bcb7a960db8 Mon Sep 17 00:00:00 2001 From: cha-imag <100341870+tkdals802@users.noreply.github.com> Date: Thu, 27 Jun 2024 17:04:48 +0900 Subject: [PATCH 07/11] =?UTF-8?q?M3-128=20Feat=20:=20=EB=A6=B0=ED=8A=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=953?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/service/android_walking_service.dart | 6 +++--- lib/service/ios_walking_service.dart | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/service/android_walking_service.dart b/lib/service/android_walking_service.dart index d94fee85..610a8a90 100644 --- a/lib/service/android_walking_service.dart +++ b/lib/service/android_walking_service.dart @@ -5,19 +5,19 @@ import '../utils/walking_service.dart'; class AndroidWalkingService implements WalkingService { @override Future getCurrentStep() { - // TODO: implement getCurrentStep + throw UnimplementedError(); } @override Future> getDailyStepsInInterval(DateTime startDate, DateTime endDate) { - // TODO: implement getDailyStepsInInterval + throw UnimplementedError(); } @override List getWeeklySteps(startDate, endDate) { - // TODO: implement getWeeklySteps + throw UnimplementedError(); } diff --git a/lib/service/ios_walking_service.dart b/lib/service/ios_walking_service.dart index 50d97172..8fd5b0f0 100644 --- a/lib/service/ios_walking_service.dart +++ b/lib/service/ios_walking_service.dart @@ -48,7 +48,7 @@ class IosWalkingService implements WalkingService { @override List getWeeklySteps(startDate, endDate) { - // TODO: implement getWeeklySteps + throw UnimplementedError(); } } From 346d9253063b9cea1d96acac19bed11bb65a3c29 Mon Sep 17 00:00:00 2001 From: cha-imag <100341870+tkdals802@users.noreply.github.com> Date: Thu, 27 Jun 2024 17:04:59 +0900 Subject: [PATCH 08/11] =?UTF-8?q?M3-128=20Feat=20:=20=EB=A6=B0=ED=8A=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=953?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/service/ios_walking_service.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/service/ios_walking_service.dart b/lib/service/ios_walking_service.dart index 8fd5b0f0..50d97172 100644 --- a/lib/service/ios_walking_service.dart +++ b/lib/service/ios_walking_service.dart @@ -48,7 +48,7 @@ class IosWalkingService implements WalkingService { @override List getWeeklySteps(startDate, endDate) { - + // TODO: implement getWeeklySteps throw UnimplementedError(); } } From 6c38918e729f50fb2e3cffdc68fe58b1635e1858 Mon Sep 17 00:00:00 2001 From: cha-imag <100341870+tkdals802@users.noreply.github.com> Date: Thu, 27 Jun 2024 17:08:43 +0900 Subject: [PATCH 09/11] =?UTF-8?q?M3-128=20Feat=20:=20=EB=A6=B0=ED=8A=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=954?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/screens/group_screen.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/screens/group_screen.dart b/lib/screens/group_screen.dart index 0608409c..883812d0 100644 --- a/lib/screens/group_screen.dart +++ b/lib/screens/group_screen.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'search_group_screen.dart'; From e8af02a3db78c8d3845279a86fc2546d38adfa50 Mon Sep 17 00:00:00 2001 From: cha-imag <100341870+tkdals802@users.noreply.github.com> Date: Thu, 27 Jun 2024 17:09:36 +0900 Subject: [PATCH 10/11] =?UTF-8?q?M3-128=20Feat=20:=20=EB=A6=B0=ED=8A=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=955?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/screens/group_screen.dart | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/screens/group_screen.dart b/lib/screens/group_screen.dart index 883812d0..e5ea4007 100644 --- a/lib/screens/group_screen.dart +++ b/lib/screens/group_screen.dart @@ -13,12 +13,17 @@ class GroupScreen extends StatelessWidget { Column( mainAxisAlignment: MainAxisAlignment.center, children: [ - ElevatedButton(onPressed: () { - Navigator.push( - context, - MaterialPageRoute(builder:(context)=> SearchGroupScreen()), - ); - }, child: const Text('그룹검색'))], + ElevatedButton( + onPressed: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => const SearchGroupScreen(),), + ); + }, + child: const Text('그룹검색'), + ), + ], ), ], ); 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 11/11] =?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 @@ + + + + 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: