Fakultas Ilmu Komputer UI

Commit 42a2f648 authored by Fakhira Devina's avatar Fakhira Devina
Browse files

Merge branch 'staging' into PBI-2-pencarian_lokasi

parents 574b9ae8 2530a4f2
{"_info":"// This is a generated file; do not edit or check into version control.","dependencyGraph":[{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"google_maps_flutter","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"location","dependencies":[]},{"name":"path_provider","dependencies":[]}]}
\ No newline at end of file
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"google_maps_flutter","path":"D:\\\\Flutter\\\\flutter_windows_v1.9.1+hotfix.2-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_maps_flutter-0.5.24+1\\\\","dependencies":[]},{"name":"location","path":"D:\\\\Flutter\\\\flutter_windows_v1.9.1+hotfix.2-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location-2.5.3\\\\","dependencies":[]}],"android":[{"name":"flutter_plugin_android_lifecycle","path":"D:\\\\Flutter\\\\flutter_windows_v1.9.1+hotfix.2-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_plugin_android_lifecycle-1.0.6\\\\","dependencies":[]},{"name":"google_maps_flutter","path":"D:\\\\Flutter\\\\flutter_windows_v1.9.1+hotfix.2-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_maps_flutter-0.5.24+1\\\\","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"location","path":"D:\\\\Flutter\\\\flutter_windows_v1.9.1+hotfix.2-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location-2.5.3\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"google_maps_flutter","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"location","dependencies":[]}],"date_created":"2020-03-25 13:25:56.091885","version":"1.15.17"}
\ No newline at end of file
......@@ -287,3 +287,5 @@ modules.xml
.venv/
# End of https://www.gitignore.io/api/linux,django,python,pycharm+all
tests.output
......@@ -3,11 +3,15 @@ stages:
- test
- sonarqube
- deploy
- show
variables:
APP_NAME: "bisaGo"
before_script:
- export PATH=$PATH:/sdk/android-sdk-linux/platform-tools/
- echo flutter.sdk=/sdk/flutter > android/local.properties
- flutter pub get
image: michael09/flutter:latest
Lint:
......@@ -21,11 +25,12 @@ Test:
- flutter test --machine > tests.output
- flutter test --coverage
- lcov --summary coverage/lcov.info
coverage: '/lines......: \d+\.\d+\%/'
- genhtml coverage/lcov.info --output=coverage
artifacts:
name: mobile-coverage
expire_in: 1 hour
paths:
- $CI_PROJECT_DIR/coverage
- coverage/lcov.info
- tests.output
Sonarqube:
dependencies:
......@@ -35,10 +40,7 @@ Sonarqube:
- export PATH=$PATH:/sdk/flutter/bin/cache/dart-sdk/bin
- flutter pub get
script:
- sonar-scanner -Dsonar.login=$SONARQUBE_TOKEN -Dsonar.branch.name=$CI_COMMIT_REF_NAME -Dsonar.projectKey=$SONARQUBE_PROJECT_KEY
only:
- master
- staging
- sonar-scanner -Dsonar.login=$SONARQUBE_TOKEN -Dsonar.branch.name=$CI_COMMIT_REF_NAME -Dsonar.projectKey=$SONARQUBE_PROJECT_KEY -X
DeployToProduction:
......@@ -53,6 +55,7 @@ DeployToProduction:
refs:
- master
before_script:
- wget --quiet --output-document=flutter.tar.xz https://storage.googleapis.com/flutter_infra/releases/stable/linux/flutter_linux_v1.12.13+hotfix.7-stable.tar.xz && tar xf flutter.tar.xz -C /
- export PATH=$PATH:/flutter/bin
- apt-get update && apt-get install gnupg -y
- curl -sL https://deb.nodesource.com/setup_12.x | bash - && apt-get install -y nodejs
......@@ -78,6 +81,7 @@ DeployToStaging:
refs:
- staging
before_script:
- wget --quiet --output-document=flutter.tar.xz https://storage.googleapis.com/flutter_infra/releases/stable/linux/flutter_linux_v1.12.13+hotfix.8-stable.tar.xz && tar xf flutter.tar.xz -C /
- export PATH=$PATH:/flutter/bin
- apt-get update && apt-get install gnupg -y
- curl -sL https://deb.nodesource.com/setup_12.x | bash - && apt-get install -y nodejs
......@@ -103,6 +107,7 @@ DeployToDevelopment:
refs:
- /^US-.*$/
before_script:
- wget --quiet --output-document=flutter.tar.xz https://storage.googleapis.com/flutter_infra/releases/stable/linux/flutter_linux_v1.12.13+hotfix.8-stable.tar.xz && tar xf flutter.tar.xz -C /
- export PATH=$PATH:/flutter/bin
- apt-get update && apt-get install gnupg -y
- curl -sL https://deb.nodesource.com/setup_12.x | bash - && apt-get install -y nodejs
......@@ -115,18 +120,4 @@ DeployToDevelopment:
- appcenter login --token=$APPCENTER_API_TOKEN
- appcenter distribute release -f build/app/outputs/apk/release/app-release.apk --app $APPCENTER_APP_NAME_DEV --group $APPCENTER_GROUP_TARGET
environment:
name: development
ShowCoverage:
image: alpine
stage: show
dependencies:
- Test
script:
- mkdir -p mobile-coverage/
- mv coverage/* mobile-coverage/
artifacts:
paths:
- $CI_PROJECT_DIR/mobile-coverage/
\ No newline at end of file
name: development
\ No newline at end of file
# PPLapangan Tembak & PoiPoLe - DTB Layanan Siswa Disabilitas (Front End)
# PPLapangan Tembak & PoiPoLe - DTB Layanan Siswa Disabilitas (Front End) - bisaGo
Code Coverage
--------------
[![coverage report](https://gitlab.cs.ui.ac.id/ppl-fasilkom-ui/2020/ppl-c/dtb-beasiswa-miskin-dan-disabilitas/pplapangan-tembak-dtb-layanan-siswa-disabilitas/badges/staging/coverage.svg)](https://gitlab.cs.ui.ac.id/ppl-fasilkom-ui/2020/ppl-c/dtb-beasiswa-miskin-dan-disabilitas/pplapangan-tembak-dtb-layanan-siswa-disabilitas/commits/staging)
[![coverage report](https://gitlab.cs.ui.ac.id/ppl-fasilkom-ui/2020/ppl-c/dtb-beasiswa-miskin-dan-disabilitas/pplapangan-tembak-dtb-layanan-siswa-disabilitas/badges/staging/coverage.svg?job=Test)](https://gitlab.cs.ui.ac.id/ppl-fasilkom-ui/2020/ppl-c/dtb-beasiswa-miskin-dan-disabilitas/pplapangan-tembak-dtb-layanan-siswa-disabilitas/commits/staging)
>bisaGo is a mobile application made with Flutter and Django REST API to gather information from users about disability friendly facilities.
## Developers
PPLapanganTembak
1. [Adzkia Aisyah Afrah Hardian](https://gitlab.cs.ui.ac.id/adzkia.aisyah)
2. [Agnes Handoko](https://gitlab.cs.ui.ac.id/agneshandoko)
3. [Fakhira Devina](https://gitlab.cs.ui.ac.id/hiradevina)
4. [Faza Siti Sabira Prakoso](https://gitlab.cs.ui.ac.id/fazasabirappl)
5. [Firriyal bin Yahya](https://gitlab.cs.ui.ac.id/feriyalbinyahya)
PoiPoLeGan
1. [Bimo Iman Smartadi](https://gitlab.cs.ui.ac.id/bimo.iman)
2. [Bayukanta Iqbal Gunawan](https://gitlab.cs.ui.ac.id/Bayukanta)
3. [Dzaky Noor Hasyim](https://gitlab.cs.ui.ac.id/NoorHasyim)
4. [Muhammad Abdurrahman](https://gitlab.cs.ui.ac.id/muhammad.abdurrahman71)
5. [Usman Sidiq](https://gitlab.cs.ui.ac.id/usman.sidiq71)
## Table of Content
* Install
* Running Development Mode
## Install
The front end side uses Flutter, for installing please head to the [official documentation of Flutter](https://flutter.dev/docs/get-started/install)
Make sure you already installed everything to work with Flutter with command:
```bash
flutter doctor -v
```
Install all the package dependencies in `pubspec.yaml`
```bash
flutter pub get
```
Get your [Maps API Key](https://developers.google.com/maps/documentation/android-sdk/get-api-key) and put the key on `android/local.properties`
```bash
MAPS_API_KEY=Bu***************
```
## Running Development Mode
Run the app using the development flavor
```bash
flutter run -t lib/main_dev.dart
```
\ No newline at end of file
......@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
......@@ -20,6 +20,16 @@ class DashboardState extends State<Dashboard> {
Set<Marker> _markers = Set<Marker>();
LocationData currentLocation;
BitmapDescriptor currentLocationIcon;
bool _serviceEnabled;
PermissionStatus _permissionGranted;
Marker contohMarker = Marker(
markerId: MarkerId("contoh1"),
position: LatLng(-6.365474, 106.828157),
infoWindow: InfoWindow(title: "Fasilkom"),
icon: BitmapDescriptor.defaultMarkerWithHue(
BitmapDescriptor.hueViolet,
),
);
@override
void initState() {
......@@ -36,9 +46,6 @@ class DashboardState extends State<Dashboard> {
}
void enableLocationService() async {
bool _serviceEnabled;
PermissionStatus _permissionGranted;
_serviceEnabled = await location.serviceEnabled();
if (!_serviceEnabled) {
_serviceEnabled = await location.requestService();
......@@ -46,7 +53,6 @@ class DashboardState extends State<Dashboard> {
return;
}
}
_permissionGranted = await location.hasPermission();
if (_permissionGranted == PermissionStatus.DENIED) {
_permissionGranted = await location.requestPermission();
......@@ -117,15 +123,6 @@ class DashboardState extends State<Dashboard> {
);
}
Marker contohMarker = Marker(
markerId: MarkerId("contoh1"),
position: LatLng(-6.365474, 106.828157),
infoWindow: InfoWindow(title: "Fasilkom"),
icon: BitmapDescriptor.defaultMarkerWithHue(
BitmapDescriptor.hueViolet,
),
);
Widget _buildGoogleMap(BuildContext context) {
CameraPosition initialCameraPosition = CameraPosition(
target: defaultLocation,
......
......@@ -7,6 +7,7 @@ class Pencarian extends StatefulWidget {
}
class PencarianState extends State<Pencarian> {
Icon searchIcon = Icon(Icons.search);
Widget appBarText = Text("Pencarian Lokasi");
@override
......
......@@ -20,10 +20,10 @@ dependencies:
flutter:
sdk: flutter
http: ^0.12.0+2
path_provider: ^0.4.1
mockito: ^4.1.1
intl:
location: ^2.5.3
flutter_plugin_android_lifecycle: ^1.0.6
flutter_polyline_points: ^0.1.0
# The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons.
......@@ -35,6 +35,8 @@ dev_dependencies:
flutter_test:
sdk: flutter
flutter_launcher_icons: ^0.7.4
# Linter dependency
pedantic: ^1.8.0 # The default Linter package used in Google
flutter_icons:
android: "launcher_icon"
......@@ -42,7 +44,6 @@ flutter_icons:
image_path: "assets/icon/icon_launcher.png"
#mockito: ^4.1.1
# For information on the generic Dart part of this file, see the
# following page: https://dart.dev/tools/pub/pubspec
......
# SonarScanner properties file
## Server
sonar.host.url=https://pmpl.cs.ui.ac.id/sonarqube
## Path to sources
sonar.sources=lib
#sonar.exclusions=
#sonar.inclusions=
## Path to tests
sonar.tests=test
#sonar.test.exclusions=
#sonar.test.inclusions=
## Source encoding
sonar.sourceEncoding=UTF-8
## Branch analysis
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment