map progress, added theme checks to theme model

UWICompSociety · Sep 1, 2020 · 4db41e1 · 4db41e1
1 parent 4f4b0c4
commit 4db41e1
Show file tree

Hide file tree

Showing 22 changed files with 441 additions and 117 deletions.
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
@@ -6,6 +6,7 @@
  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
  <uses-permission android:name="android.permission.READ_CONTACTS"/>
+ <uses-permission android:name="android.permission.WAKE_LOCK"/>
  <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
  <application>
  <provider android:name="androidx.core.content.FileProvider" android:authorities="${applicationId}.provider" android:exported="false" android:grantUriPermissions="true">

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -8,6 +8,7 @@
  location permissions for the "MyLocation" functionality.
  -->
  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+ <uses-permission android:name="android.permission.WAKE_LOCK"/>
 
  <!--
  io.flutter.app.FlutterApplication is an android.app.Application that

diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
@@ -16,6 +16,9 @@
  additional functionality it is fine to subclass or reimplement
  FlutterApplication and put your custom class here.
  -->
+
+ <uses-permission android:name="android.permission.WAKE_LOCK"/>
+
  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
  <uses-permission android:name="android.permission.READ_CONTACTS" />

diff --git a/lib/models/from_postgres/map/campus_map.dart b/lib/models/from_postgres/map/campus_map.dart
@@ -12,7 +12,6 @@ class CampusMap {
  var locations = FeatureCollection(
  features: await request.getResults(
  _herokuFeatures, true, (data) => Feature(data)));
- //print(locations);
  return locations;
  }
 

diff --git a/lib/models/from_postgres/map/geometry_types/polygon.dart b/lib/models/from_postgres/map/geometry_types/polygon.dart
@@ -43,8 +43,6 @@ class GeoJsonPolygon extends GeoJsonGeometryObject {
  @override
  extractLatLng() {
  var list = coordinates.expand((e) => e.extractLatLng()).toList();
- print(list.runtimeType);
- print(list);
  return list;
  }
  /*

diff --git a/lib/models/from_postgres/map/properties.dart b/lib/models/from_postgres/map/properties.dart
@@ -6,7 +6,11 @@ class Properties {
  final String description;
  final String altName;
 
- Properties({this.title, this.description, this.associatedWith, this.altName});
+ Properties(
+ {this.title = '',
+ this.description = '',
+ this.associatedWith = Department.other,
+ this.altName = ''});
 
  toGeoJsonFile() {
  return {

diff --git a/lib/models/preferences/theme_model.dart b/lib/models/preferences/theme_model.dart
@@ -1,5 +1,5 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/scheduler.dart';
 import 'package:fst_app_flutter/models/preferences/theme_preference.dart';
 
 class ThemeModel with ChangeNotifier {
@@ -18,4 +18,16 @@ class ThemeModel with ChangeNotifier {
  _themePreference.setThemeMode(themeMode);
  notifyListeners();
  }
+
+ bool get isDark =>
+ (selectedTheme == ThemeMode.dark) ||
+ (selectedTheme == ThemeMode.system &&
+ SchedulerBinding.instance.window.platformBrightness ==
+ Brightness.dark);
+
+ bool get isLight =>
+ (selectedTheme == ThemeMode.light) ||
+ (selectedTheme == ThemeMode.system &&
+ SchedulerBinding.instance.window.platformBrightness ==
+ Brightness.light);
 }
diff --git a/lib/routing/generate_routes.dart b/lib/routing/generate_routes.dart
@@ -1,11 +1,13 @@
 import 'package:flutter/material.dart';
+import 'package:fst_app_flutter/models/preferences/theme_model.dart';
 import 'package:fst_app_flutter/routing/slide_up_route.dart';
 import 'package:fst_app_flutter/screens/app_preferences_screen/app_preferences_view.dart';
+import 'package:fst_app_flutter/screens/campus_map_screen/campus_map_view.dart';
 import 'package:fst_app_flutter/screens/contact_screen/contact_detail_page.dart';
 import 'package:fst_app_flutter/screens/contact_screen/contact_view.dart';
 import 'package:fst_app_flutter/screens/home_screen/home_view.dart';
-import 'package:fst_app_flutter/screens/map_screen/map_view.dart';
 import 'package:fst_app_flutter/screens/scholarship_screen/scholarship_view.dart';
+import 'package:provider/provider.dart';
 import 'routes.dart';
 
 /// Handles routing in the app
@@ -22,9 +24,7 @@ class Router {
  case appPreferencesRoute:
  return MaterialPageRoute(builder: (context) => AppPreferencesView());
  case mapRoute:
- return MaterialPageRoute(
- builder: (context) => CampusMapView(),
- );
+ return MaterialPageRoute(builder: (context) => CampusMapView());
  default:
  return MaterialPageRoute(builder: (context) => HomeView());
  }

diff --git a/lib/screens/campus_map_screen/campus_map_view.dart b/lib/screens/campus_map_screen/campus_map_view.dart
@@ -0,0 +1,23 @@
+import 'package:flutter/material.dart';
+import 'package:fst_app_flutter/screens/campus_map_screen/campus_map_view_mobile.dart';
+import 'package:fst_app_flutter/screens/campus_map_screen/campus_map_view_tablet.dart';
+import 'package:fst_app_flutter/widgets/orientation_layout.dart';
+import 'package:fst_app_flutter/widgets/screen_type_layout.dart';
+
+class CampusMapView extends StatelessWidget {
+ @override
+ Widget build(BuildContext context) {
+ return ScreenTypeLayout(
+ mobile: OrientationLayout(
+ portrait: (context) => CampusMapViewMobilePortrait(),
+ landscape: (context) => CampusMapViewMobileLandscape(),
+ ),
+ tablet: OrientationLayout(
+ portrait: (context) => CampusMapViewTabletPortrait(),
+ landscape: (context) => CampusMapViewTabletLandscape(),
+ ),
+ );
+ }
+}
+
+
diff --git a/lib/screens/campus_map_screen/campus_map_view_mobile.dart b/lib/screens/campus_map_screen/campus_map_view_mobile.dart
@@ -0,0 +1,31 @@
+import 'package:flutter/material.dart';
+import 'package:fst_app_flutter/models/preferences/theme_model.dart';
+import 'package:fst_app_flutter/screens/campus_map_screen/campus_map_view_mobile_state.dart';
+import 'package:fst_app_flutter/screens/campus_map_screen/campus_map_view_stateful.dart';
+import 'package:provider/provider.dart';
+
+class CampusMapViewMobileLandscape extends StatelessWidget {
+ @override
+ Widget build(BuildContext context) {
+ return Scaffold(
+ body: Consumer<ThemeModel>(
+ builder: (context, themeModel, child) => CampusMapViewStateful(
+ state: CampusMapViewMobileLandscapeState(themeModel: themeModel),
+ ),
+ ),
+ );
+ }
+}
+
+class CampusMapViewMobilePortrait extends StatelessWidget {
+ @override
+ Widget build(BuildContext context) {
+ return Scaffold(
+ body: Consumer<ThemeModel>(
+ builder: (context, themeModel, child) => CampusMapViewStateful(
+ state: CampusMapViewMobilePortraitState(themeModel: themeModel),
+ ),
+ ),
+ );
+ }
+}
diff --git a/lib/screens/campus_map_screen/campus_map_view_mobile_state.dart b/lib/screens/campus_map_screen/campus_map_view_mobile_state.dart
@@ -0,0 +1,11 @@
+import 'package:flutter/material.dart';
+import 'package:fst_app_flutter/models/preferences/theme_model.dart';
+import 'package:fst_app_flutter/screens/campus_map_screen/campus_map_view_state.dart';
+
+class CampusMapViewMobileLandscapeState extends CampusMapViewState {
+ CampusMapViewMobileLandscapeState({@required ThemeModel themeModel}) : super(themeModel);
+}
+
+class CampusMapViewMobilePortraitState extends CampusMapViewState {
+ CampusMapViewMobilePortraitState({@required ThemeModel themeModel}) : super(themeModel);
+}