Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #11 #14

Merged
merged 2 commits into from
Dec 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions lib/components/beacon_card.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import 'dart:io';

import 'package:beacon/locator.dart';
import 'package:beacon/models/beacon/beacon.dart';
import 'package:beacon/utilities/constants.dart';
Expand Down
1 change: 0 additions & 1 deletion lib/components/hike_screen_widget.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'package:beacon/components/dialog_boxes.dart';
import 'package:beacon/components/hike_button.dart';
import 'package:beacon/locator.dart';
import 'package:beacon/utilities/constants.dart';
Expand Down
2 changes: 0 additions & 2 deletions lib/models/beacon/beacon.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import 'dart:ffi';

import 'package:beacon/models/landmarks/landmark.dart';
import 'package:beacon/models/location/location.dart';
import 'package:beacon/models/user/user_info.dart';
Expand Down
3 changes: 0 additions & 3 deletions lib/models/landmarks/landmark.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
import 'dart:ffi';

import 'package:beacon/models/location/location.dart';
import 'package:beacon/models/user/user_info.dart';
import 'package:flutter/material.dart';
import 'package:hive/hive.dart';
part 'landmark.g.dart';
Expand Down
2 changes: 0 additions & 2 deletions lib/models/location/location.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import 'dart:ffi';

import 'package:flutter/material.dart';
import 'package:hive/hive.dart';
part 'location.g.dart';
Expand Down
2 changes: 0 additions & 2 deletions lib/models/user/user_info.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import 'dart:ffi';

import 'package:beacon/models/beacon/beacon.dart';
import 'package:beacon/models/location/location.dart';
import 'package:flutter/material.dart';
Expand Down
2 changes: 0 additions & 2 deletions lib/queries/auth.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import 'dart:ffi';

class AuthQueries {
String registerUser(String name, String email, String password) {
return '''
Expand Down
2 changes: 0 additions & 2 deletions lib/queries/beacon.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import 'dart:ffi';

import 'package:graphql_flutter/graphql_flutter.dart';

class BeaconQueries {
Expand Down
1 change: 0 additions & 1 deletion lib/router.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'package:beacon/models/beacon/beacon.dart';
import 'package:beacon/splash_screen.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
Expand Down
2 changes: 0 additions & 2 deletions lib/services/database_mutation_functions.dart
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import 'dart:async';
import 'dart:ffi';
import 'package:beacon/models/beacon/beacon.dart';
import 'package:beacon/models/landmarks/landmark.dart';
import 'package:beacon/models/location/location.dart';
import 'package:beacon/queries/auth.dart';
import 'package:beacon/queries/beacon.dart';
import 'package:beacon/services/navigation_service.dart';
import 'package:beacon/utilities/constants.dart';
import 'package:flutter/material.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
Expand Down
3 changes: 0 additions & 3 deletions lib/services/validators.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:http/http.dart' as http;

class Validator {
static String validateEmail(String email) {
// If email is empty return.
Expand Down
1 change: 0 additions & 1 deletion lib/splash_screen.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import 'dart:async';

import 'package:beacon/models/beacon/beacon.dart';
import 'package:beacon/views/hike_screen.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
Expand Down
2 changes: 0 additions & 2 deletions lib/view_model/hike_screen_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@ import 'dart:async';

import 'package:beacon/models/location/location.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:fluttertoast/fluttertoast.dart';
import 'package:geocoder/geocoder.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';

import 'package:beacon/components/dialog_boxes.dart';
import 'package:beacon/enums/view_state.dart';
import 'package:share/share.dart';
import 'package:beacon/models/beacon/beacon.dart';
Expand Down
17 changes: 11 additions & 6 deletions lib/views/auth_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,11 @@ class _AuthScreenState extends State<AuthScreen>
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: <Widget>[
Expanded(
child: FlatButton(
splashColor: Colors.white,
highlightColor: Colors.white,
child: TextButton(
style: ButtonStyle(
overlayColor: MaterialStateProperty.all(Colors.transparent),
),
//highlightColor: Colors.white,
onPressed: model.onSignInButtonPress,
child: Text(
"Existing",
Expand All @@ -115,9 +117,12 @@ class _AuthScreenState extends State<AuthScreen>
),
//Container(height: 33.0, width: 1.0, color: Colors.white),
Expanded(
child: FlatButton(
splashColor: Colors.transparent,
highlightColor: Colors.transparent,
child: TextButton(
style: ButtonStyle(
overlayColor: MaterialStateProperty.all(Colors.transparent),
),
//splashColor: Colors.transparent,
//highlightColor: Colors.transparent,
onPressed: model.onSignUpButtonPress,
child: Text(
"New",
Expand Down
2 changes: 1 addition & 1 deletion lib/views/home.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:beacon/components/beacon_card.dart';
import 'package:beacon/components/create_join_dialog.dart';
import 'package:beacon/components/dialog_boxes.dart';

import 'package:beacon/components/hike_button.dart';
import 'package:beacon/components/shape_painter.dart';
import 'package:beacon/locator.dart';
Expand Down