Trim app down for prototype work

2grep · Mar 19, 2020 · 1880ed2 · 1880ed2
1 parent 95184e8
commit 1880ed2
Show file tree

Hide file tree

Showing 36 changed files with 61 additions and 1,872 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -25,10 +25,6 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
-// flutter_background_geolocation
-Project background_geolocation = project(':flutter_background_geolocation')
-apply from: "${background_geolocation.projectDir}/background_geolocation.gradle"
-
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
 
@@ -55,8 +51,6 @@ android {
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig signingConfigs.debug
-            shrinkResources false
-            proguardFiles "${background_geolocation.projectDir}/proguard-rules.pro"
         }
     }
 }

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,14 +1,12 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="com.coronavirus_diary.app">
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        tools:replace="android:label"
         android:name="io.flutter.app.FlutterApplication"
         android:label="coronavirus_diary"
         android:icon="@mipmap/ic_launcher">
@@ -30,5 +28,4 @@
             android:name="flutterEmbedding"
             android:value="2" />
     </application>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 </manifest>
diff --git a/dependencies/moor b/dependencies/moor
diff --git a/dependencies/sqflite_sqlcipher b/dependencies/sqflite_sqlcipher
diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -2,10 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>BGTaskSchedulerPermittedIdentifiers</key>
-	<array>
-		<string>com.transistorsoft.fetch</string>
-	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
@@ -26,18 +22,6 @@
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-	<string>This app needs access to location when open and in the background.</string>
-	<key>NSLocationAlwaysUsageDescription</key>
-	<string>This app needs access to location when in the background.</string>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>This app needs access to location when open.</string>
-	<key>UIBackgroundModes</key>
-	<array>
-		<string>audio</string>
-		<string>fetch</string>
-		<string>location</string>
-	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>

diff --git a/lib/src/app.dart b/lib/src/app.dart
@@ -1,47 +1,28 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:provider/provider.dart';
 
-import 'blocs/activity/activity.dart';
 import 'blocs/preferences/preferences.dart';
-import 'data/database/database.dart';
 import 'ui/router.dart';
-import 'utils/geofencing.dart';
 
 class DiaryApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    return Provider<AppDatabase>(
-      create: (context) => AppDatabase(),
-      dispose: (context, db) => db.close(),
-      child: MultiBlocProvider(
-        providers: [
-          BlocProvider<PreferencesBloc>(
-            create: (context) {
-              return PreferencesBloc();
-            },
-          ),
-          BlocProvider<ActivityBloc>(
-            create: (context) {
-              return ActivityBloc(
-                database: Provider.of<AppDatabase>(
-                  context,
-                  listen: false,
-                ),
-              );
-            },
-          ),
-        ],
-        child: BlocBuilder<PreferencesBloc, PreferencesState>(
-          builder: (context, state) {
-            initGeofencing(state, context.bloc<ActivityBloc>());
-            return MaterialApp(
-              title: 'Coronavirus Diary',
-              routes: appRoutes,
-              initialRoute: initialRoute,
-            );
+    return MultiBlocProvider(
+      providers: [
+        BlocProvider<PreferencesBloc>(
+          create: (context) {
+            return PreferencesBloc();
           },
         ),
+      ],
+      child: BlocBuilder<PreferencesBloc, PreferencesState>(
+        builder: (context, state) {
+          return MaterialApp(
+            title: 'Coronavirus Diary',
+            routes: appRoutes,
+            initialRoute: initialRoute,
+          );
+        },
       ),
     );
   }

diff --git a/lib/src/blocs/activity/activity.dart b/lib/src/blocs/activity/activity.dart
diff --git a/lib/src/blocs/activity/activity_bloc.dart b/lib/src/blocs/activity/activity_bloc.dart
diff --git a/lib/src/blocs/activity/activity_event.dart b/lib/src/blocs/activity/activity_event.dart
diff --git a/lib/src/blocs/activity/activity_state.dart b/lib/src/blocs/activity/activity_state.dart
diff --git a/lib/src/blocs/checkup/checkup_bloc.dart b/lib/src/blocs/checkup/checkup_bloc.dart
@@ -1,17 +1,11 @@
 import 'dart:async';
 
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:meta/meta.dart';
-import 'package:moor/moor.dart';
-
-import 'package:coronavirus_diary/src/data/database/database.dart';
 
 import 'checkup.dart';
 
 class CheckupBloc extends Bloc<CheckupEvent, CheckupState> {
-  final AppDatabase database;
-
-  CheckupBloc({@required this.database});
+  CheckupBloc();
 
   @override
   CheckupState get initialState => CheckupStateNotCreated();
@@ -26,14 +20,6 @@ class CheckupBloc extends Bloc<CheckupEvent, CheckupState> {
   }
 
   Stream<CheckupState> _mapAddCheckupToState(AddCheckup event) async* {
-    int checkupId = await database.addCheckup(CheckupsCompanion());
-    yield* _watchCheckup(checkupId);
-  }
-
-  Stream<CheckupState> _watchCheckup(int checkupId) async* {
-    Stream<Checkup> stream = database.watchCheckup(checkupId);
-    await for (var checkup in stream) {
-      yield CheckupStateCreated(checkup);
-    }
+    // Send checkup to API and return its ID
   }
 }
diff --git a/lib/src/blocs/checkup/checkup_event.dart b/lib/src/blocs/checkup/checkup_event.dart
@@ -1,4 +1,3 @@
-import 'package:coronavirus_diary/src/data/database/database.dart';
 import 'package:equatable/equatable.dart';
 
 abstract class CheckupEvent extends Equatable {

diff --git a/lib/src/blocs/checkup/checkup_state.dart b/lib/src/blocs/checkup/checkup_state.dart
@@ -1,6 +1,6 @@
 import 'package:equatable/equatable.dart';
 
-import 'package:coronavirus_diary/src/data/database/database.dart';
+import 'package:coronavirus_diary/src/data/models/checkups.dart';
 
 abstract class CheckupState extends Equatable {
   const CheckupState();

diff --git a/lib/src/data/database/database.dart b/lib/src/data/database/database.dart