Skip to content

Commit

Permalink
Merge branch 'master' into web
Browse files Browse the repository at this point in the history
# Conflicts:
#	example/lib/main.dart
#	example/pubspec.lock
#	flutter_osm_interface/lib/src/channel/osm_method_channel.dart
#	flutter_osm_interface/lib/src/map_controller/base_map_controller.dart
#	lib/src/common/utilities.dart
#	lib/src/controller/osm/osm_controller.dart
#	lib/src/widgets/picker_location.dart
#	lib/src/widgets/platform/web_osm_widget.dart
#	pubspec.lock
#	pubspec.yaml
  • Loading branch information
liodali committed Sep 28, 2021
2 parents 76026b4 + 555bde3 commit de4c788
Show file tree
Hide file tree
Showing 37 changed files with 1,658 additions and 785 deletions.
22 changes: 21 additions & 1 deletion .github/workflows/dart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,22 @@ jobs:
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
runs-on: ubuntu-latest
container:
image: google/dart:latest
image: python:3
#image: google/dart:latest
steps:
- uses: actions/checkout@v1
# - name: set Python environment variable
# run: echo '::set-env name=LD_LIBRARY_PATH::/tmp/runner/work/_tool/Python/3.8.11/x64/lib'
# - name: setup python
# uses: actions/setup-python@v2
# with:
# python-version: 3.8.11
- name: install dependencies
run: |
python -m pip install --upgrade pip
pip install requests
- name: setup dart
uses: dart-lang/setup-dart@v1
- name: Setup credentials
run: |
mkdir -p ~/.pub-cache
Expand All @@ -21,5 +34,12 @@ jobs:
"expiration": 1583530852703
}
EOF
- name: preparation release
run: python check_pubspec_release.py
- name: clear before release
run: |
rm -f *.gif
rm -rf flutter_osm_interface
rm -f check_pubspec_release.py
- name: Publish package
run: pub publish -f
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
## 0.21.0 :
* fix crash app when close page contain mapView and make request to PlatformChannel [#157]
* fix integrate version of flutter_osm_interface in flutter_osm_plugin
## 0.21.0-rc.2 :
## 0.21.0-rc :
* fix crash app when close page contain mapView and make request to PlatformChannel [#157]
## 0.20.0+2 :
*fix pubspec
## 0.20.0+1 :
* format files
* update dependencies
## 0.20.0 :
* separate osm_interface in another flutter package
* add IBaseMapController and make BaseMapController api more flexible to be used in custom controller
* create MobileOSMController as inner controller for mobile platform
* create MobileWidget for mobile platform
* fix hotreload problem [#77]
## 0.16.0 : update kotlin version and gralde,add listener on polylines
* update kotlin version to `1.5.21` (migration instruction in the readme)
* update gradle version to `7.0.2` (migration instruction in the readme)
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020 Mohamed Ali Hamza
Copyright (c) 2021 Mohamed Ali Hamza

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
29 changes: 27 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# flutter_osm_plugin
![pub](https://img.shields.io/badge/pub-v0.16.0-orange)
![pub](https://img.shields.io/badge/pub-v0.21.0-orange)

## Platform Support
| Android | iOS | Web |
Expand Down Expand Up @@ -36,7 +36,7 @@
Add the following to your `pubspec.yaml` file:

dependencies:
flutter_osm_plugin: ^0.16.0
flutter_osm_plugin: ^0.21.0

### Migration to `0.16.0` (Android Only)
> if you are using this plugin before Flutter 2
Expand Down Expand Up @@ -397,6 +397,31 @@ await controller.drawRoadManually(
| `isPicker` | (bool) enable advanced picker from init of the map (default = false) |
| `showContributorBadgeForOSM` | (bool) enable to show copyright widget of osm in the map |


### Custom Controller
> To create your own MapController to need to extends from `BaseMapController`,
> if you want to make a custom initialization to need to call init() and put your code after super.init()
* example
```dart
class CustomMapController extends BaseMapController {
@override
void dispose() {
/// TODO put you logic here
super.dispose();
}
@override
void init() {
super.init();
/// TODO put you logic here
}
}
```



## STATIC METHODS:

<b>1) Calculate distance between 2 geoPoint position </b>
Expand Down
Loading

0 comments on commit de4c788

Please sign in to comment.