Skip to content

Commit

Permalink
Merge pull request #7 from sirmammingtonham/frontend
Browse files Browse the repository at this point in the history
Merge frontend to master now that we have a decent prototype
  • Loading branch information
sirmammingtonham authored Apr 9, 2020
2 parents eb5de74 + 8581200 commit c29a5ae
Show file tree
Hide file tree
Showing 29 changed files with 7,097 additions and 665 deletions.
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -109,5 +109,7 @@ app.*.symbols
# Secrets (shhhh)
google-services.json
tokens.txt
**/api-keys.xml
android/app/src/main/res/values/api-keys.xml
api-keys.xml
android/app/src/main/res/values/api-keys.xml
strings.dart
android/app/src/main/res/api-keys.template
9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,12 @@ Interact with our [mockups](https://xd.adobe.com/view/8a421d6f-ad6f-4196-7089-ff
- For AMD CPUs: Enable the Windows Hypervisor Platform in Windows Features
4. Clone the smartrider repo with `git clone https://github.com/sirmammingtonham/smartrider.git`.
5. Download the `google-services.json` from the Firebase project and place it in the `android/app` folder.
6. Copy the API key for the Google Maps SDK from your Google Developers Console project and add it to `android/app/src/main/res/values/api-keys.xml`.
7. Download the required packages by following the steps in your editor of choice, or by running `flutter pub get` inside the cloned repository folder.
8. Open the emulator and run `lib/main.dart` in your editor, or run `flutter run` in the repo folder.
6. Copy and rename `android/app/src/main/res/api-keys.template` to `android/app/src/main/res/values/api-keys.xml` (Don't delete the template file!)
- Copy the API key for the Google Maps SDK from your Google Developers Console project and add it to `android/app/src/main/res/values/api-keys.xml`.
7. Create a file named `strings.dart` in the `lib/util` folder.
- Add the line `const google_api_key = "KEY_HERE";` and replace `KEY_HERE` with the same API key for Google Maps.
8. Download the required packages by following the steps in your editor of choice, or by running `flutter pub get` inside the cloned repository folder.
9. Open the emulator and run `lib/main.dart` in your editor, or run `flutter run` in the repo folder.

## Setting up (on Windows for iOS Development)
1. Follow the same steps to set up on windows for android development.
Expand Down
233 changes: 233 additions & 0 deletions assets/map_styles/aubergine.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,233 @@
[
{
"elementType": "geometry",
"stylers": [
{
"color": "#1d2c4d"
}
]
},
{
"elementType": "labels.text.fill",
"stylers": [
{
"color": "#8ec3b9"
}
]
},
{
"elementType": "labels.text.stroke",
"stylers": [
{
"color": "#1a3646"
}
]
},
{
"featureType": "administrative.country",
"elementType": "geometry.stroke",
"stylers": [
{
"color": "#4b6878"
}
]
},
{
"featureType": "administrative.land_parcel",
"elementType": "labels.text.fill",
"stylers": [
{
"color": "#64779e"
}
]
},
{
"featureType": "administrative.province",
"elementType": "geometry.stroke",
"stylers": [
{
"color": "#4b6878"
}
]
},
{
"featureType": "landscape.man_made",
"elementType": "geometry.stroke",
"stylers": [
{
"color": "#334e87"
}
]
},
{
"featureType": "landscape.natural",
"elementType": "geometry",
"stylers": [
{
"color": "#023e58"
}
]
},
{
"featureType": "poi",
"elementType": "geometry",
"stylers": [
{
"color": "#283d6a"
}
]
},
{
"featureType": "poi",
"elementType": "labels.text.fill",
"stylers": [
{
"color": "#6f9ba5"
}
]
},
{
"featureType": "poi",
"elementType": "labels.text.stroke",
"stylers": [
{
"color": "#1d2c4d"
}
]
},
{
"featureType": "poi.park",
"elementType": "geometry.fill",
"stylers": [
{
"color": "#023e58"
}
]
},
{
"featureType": "poi.park",
"elementType": "labels.text.fill",
"stylers": [
{
"color": "#3C7680"
}
]
},
{
"featureType": "road",
"elementType": "geometry",
"stylers": [
{
"color": "#304a7d"
}
]
},
{
"featureType": "road",
"elementType": "labels.text.fill",
"stylers": [
{
"color": "#98a5be"
}
]
},
{
"featureType": "road",
"elementType": "labels.text.stroke",
"stylers": [
{
"color": "#1d2c4d"
}
]
},
{
"featureType": "road.highway",
"elementType": "geometry",
"stylers": [
{
"color": "#2c6675"
}
]
},
{
"featureType": "road.highway",
"elementType": "geometry.stroke",
"stylers": [
{
"color": "#255763"
}
]
},
{
"featureType": "road.highway",
"elementType": "labels.text.fill",
"stylers": [
{
"color": "#b0d5ce"
}
]
},
{
"featureType": "road.highway",
"elementType": "labels.text.stroke",
"stylers": [
{
"color": "#023e58"
}
]
},
{
"featureType": "transit",
"elementType": "labels.text.fill",
"stylers": [
{
"color": "#98a5be"
}
]
},
{
"featureType": "transit",
"elementType": "labels.text.stroke",
"stylers": [
{
"color": "#1d2c4d"
}
]
},
{
"featureType": "transit.line",
"elementType": "geometry.fill",
"stylers": [
{
"color": "#283d6a"
}
]
},
{
"featureType": "transit.station",
"elementType": "geometry",
"stylers": [
{
"color": "#3a4762"
}
]
},
{
"featureType": "water",
"elementType": "geometry",
"stylers": [
{
"color": "#0e1626"
}
]
},
{
"featureType": "water",
"elementType": "labels.text.fill",
"stylers": [
{
"color": "#4e6d70"
}
]
}
]
Loading

0 comments on commit c29a5ae

Please sign in to comment.