Commit 9fbdcddb authored by Nicolas Richard Walter Boeckh's avatar Nicolas Richard Walter Boeckh 💬
Browse files

Proximal points and ui

parent 802a2f34
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_blue","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_blue-0.7.2\\\\","dependencies":[]},{"name":"geolocator","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator-5.2.1\\\\","dependencies":["google_api_availability","location_permissions"]},{"name":"google_api_availability","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_api_availability-2.0.2\\\\","dependencies":[]},{"name":"location_permissions","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location_permissions-2.0.4+1\\\\","dependencies":[]},{"name":"path_provider","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.0\\\\","dependencies":[]},{"name":"permission_handler","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\permission_handler-4.2.0+hotfix.3\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences-0.4.3\\\\","dependencies":[]},{"name":"sqflite","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\sqflite-1.2.0\\\\","dependencies":[]}],"android":[{"name":"flutter_blue","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_blue-0.7.2\\\\","dependencies":[]},{"name":"geolocator","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator-5.2.1\\\\","dependencies":["google_api_availability","location_permissions"]},{"name":"google_api_availability","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_api_availability-2.0.2\\\\","dependencies":[]},{"name":"location_permissions","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location_permissions-2.0.4+1\\\\","dependencies":[]},{"name":"path_provider","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.0\\\\","dependencies":[]},{"name":"permission_handler","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\permission_handler-4.2.0+hotfix.3\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences-0.4.3\\\\","dependencies":[]},{"name":"sqflite","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\sqflite-1.2.0\\\\","dependencies":[]}],"macos":[{"name":"sqflite","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\sqflite-1.2.0\\\\","dependencies":[]}],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_blue","dependencies":[]},{"name":"geolocator","dependencies":["google_api_availability","location_permissions"]},{"name":"google_api_availability","dependencies":[]},{"name":"location_permissions","dependencies":[]},{"name":"path_provider","dependencies":[]},{"name":"permission_handler","dependencies":[]},{"name":"shared_preferences","dependencies":[]},{"name":"sqflite","dependencies":[]}],"date_created":"2020-05-04 04:35:02.502371","version":"1.18.0-9.0.pre.58"} {"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_blue","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_blue-0.7.2\\\\","dependencies":[]},{"name":"geolocator","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator-5.2.1\\\\","dependencies":["google_api_availability","location_permissions"]},{"name":"google_api_availability","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_api_availability-2.0.2\\\\","dependencies":[]},{"name":"location_permissions","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location_permissions-2.0.4+1\\\\","dependencies":[]},{"name":"path_provider","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.0\\\\","dependencies":[]},{"name":"permission_handler","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\permission_handler-4.2.0+hotfix.3\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences-0.5.7+2\\\\","dependencies":[]},{"name":"sqflite","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\sqflite-1.2.0\\\\","dependencies":[]}],"android":[{"name":"flutter_blue","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_blue-0.7.2\\\\","dependencies":[]},{"name":"geolocator","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator-5.2.1\\\\","dependencies":["google_api_availability","location_permissions"]},{"name":"google_api_availability","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_api_availability-2.0.2\\\\","dependencies":[]},{"name":"location_permissions","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location_permissions-2.0.4+1\\\\","dependencies":[]},{"name":"path_provider","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.0\\\\","dependencies":[]},{"name":"permission_handler","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\permission_handler-4.2.0+hotfix.3\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences-0.5.7+2\\\\","dependencies":[]},{"name":"sqflite","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\sqflite-1.2.0\\\\","dependencies":[]}],"macos":[{"name":"shared_preferences_macos","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_macos-0.0.1+8\\\\","dependencies":[]},{"name":"sqflite","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\sqflite-1.2.0\\\\","dependencies":[]}],"linux":[],"windows":[],"web":[{"name":"shared_preferences_web","path":"C:\\\\src\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_web-0.1.2+5\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"flutter_blue","dependencies":[]},{"name":"geolocator","dependencies":["google_api_availability","location_permissions"]},{"name":"google_api_availability","dependencies":[]},{"name":"location_permissions","dependencies":[]},{"name":"path_provider","dependencies":[]},{"name":"permission_handler","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"sqflite","dependencies":[]}],"date_created":"2020-05-15 10:37:30.582661","version":"1.19.0-2.0.pre.71"}
\ No newline at end of file \ No newline at end of file
...@@ -17,21 +17,59 @@ Dates are in the sensible `DD/MM/YYYY` format. ...@@ -17,21 +17,59 @@ Dates are in the sensible `DD/MM/YYYY` format.
- Pre download only on WiFi - Pre download only on WiFi
- Prefs stored from one session to the next. - Prefs stored from one session to the next.
- Language switch possible (not just locale). - Language switch possible (not just locale).
- Add | (UI) Leaflet (flutter_map) | just the map (6h) + (overlay data || ) - Add | (overlay data || )
- Add | (Func) Cache file for data | 2+3-4h - Add | (Func) Cache file for data | 2+3-4h
- Add | (BS) Location (expansion needed) | ~ - Add |
- Add | (BS) Background service framework () | 2-6h (sticky notification system + ) - Add | (BS) Background service framework () | 2-6h (sticky notification system + )
- allow people to set their own service / characteristic UUID - allow people to set their own service / characteristic UUID
- Bluetooth (recents list.s) add to shared prefs on connect, keep max 10. - Bluetooth (recents list.s) add to shared prefs on connect, keep max 10.
## Unreleased ## Unreleased
## [0.0.3] - current ## [0.0.7] - current
### [0.0.7] Summary
Performance improvements on the map and acquisition of neighboring data points.
### [0.0.7] Added
### [0.0.7] Changed
### [0.0.7] Removed
## [0.0.6] - 08/05/2020
### [0.0.6] Summary
Integrated Geolocation to the app and visualization on the app.
### [0.0.6] Added
### [0.0.6] Changed
- `BTLEHandler`
### [0.0.6] Removed
## [0.0.5] - Server
## [0.0.4] - Server
## [0.0.3] - 28/04/2020
### [0.0.3] Summary ### [0.0.3] Summary
Add the data transmission to server and initial Location service. Add the data transmission to server and initial Location service.
### [0.0.3] Added
### [0.0.3] Changed
- Bluetooth Connection
### [0.0.3] Removed
## [0.0.2] - 25/02/2020 ## [0.0.2] - 25/02/2020
### [0.0.2] Summary ### [0.0.2] Summary
......
...@@ -11,6 +11,24 @@ The Application that handles the connection between LogAir devices and LogAir's ...@@ -11,6 +11,24 @@ The Application that handles the connection between LogAir devices and LogAir's
```bash ```bash
flutter pub get flutter pub get
flutter pub pub run intl_translation:extract_to_arb --output-dir=lib/l10n lib/localization/localization.dart flutter pub pub run intl_translation:extract_to_arb --output-dir=lib/localization/l10n lib/localization/localization.dart
flutter pub pub run intl_translation:generate_from_arb --output-dir=lib/l10n --no-use-deferred-loading lib/localization/localization.dart lib/l10n/intl_en.arb lib/l10n/intl_fr.arb flutter pub pub run intl_translation:generate_from_arb --output-dir=lib/localization/l10n --no-use-deferred-loading lib/localization/localization.dart lib/localization/l10n/intl_en.arb lib/localization/l10n/intl_fr.arb
``` ```
## File Structure
The project is divided in multiple components:
- `localization` contains the code enabling the software to transition from one locale to another:
- `l10n`: Language files.
- `logic` represents logical elements (advanced data types specific to the software's function):
- `controllers`: Fine control over a Widget even from outside of its scope ;
- `handlers`: Fine control over a logic segment from any scope.
- `services` contains code enabling the access to platform side content ;
- `ui` contains code for the Widgets ie. the Graphical components of the software ;
- `animation`: Transitions between pages ;
- `components`: Various tree end Widgets ;
- `dialog`: Dialogs for user interaction ;
- `routes`: Widget Tree root elements.
- `utils` contains decluttering code :
- `enums`: type representation ;
...@@ -5,9 +5,10 @@ ...@@ -5,9 +5,10 @@
In most cases you can leave this as-is, but you if you want to provide In most cases you can leave this as-is, but you if you want to provide
additional functionality it is fine to subclass or reimplement additional functionality it is fine to subclass or reimplement
FlutterApplication and put your custom class here. --> FlutterApplication and put your custom class here. -->
<uses-permission android:name="android.permission.INTERNET" />
<application <application
android:name="io.flutter.app.FlutterApplication" android:name="io.flutter.app.FlutterApplication"
android:label="logair_application" android:label="logair.io"
android:icon="@mipmap/ic_launcher"> android:icon="@mipmap/ic_launcher">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
......
<?xml version="1.0" encoding="utf-8"?>
<vector
android:height="108dp"
android:width="108dp"
android:viewportHeight="108"
android:viewportWidth="108"
xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#3DDC84"
android:pathData="M0,0h108v108h-108z"/>
<path android:fillColor="#00000000" android:pathData="M9,0L9,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,0L19,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M29,0L29,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M39,0L39,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M49,0L49,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M59,0L59,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M69,0L69,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M79,0L79,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M89,0L89,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M99,0L99,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,9L108,9"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,19L108,19"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,29L108,29"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,39L108,39"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,49L108,49"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,59L108,59"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,69L108,69"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,79L108,79"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,89L108,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,99L108,99"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,29L89,29"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,39L89,39"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,49L89,49"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,59L89,59"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,69L89,69"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,79L89,79"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M29,19L29,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M39,19L39,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M49,19L49,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M59,19L59,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M69,19L69,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M79,19L79,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
</vector>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="575dp"
android:height="575dp"
android:viewportWidth="5750"
android:viewportHeight="5750">
<path
android:pathData="M0,2875l0,-2875 2875,0 2875,0 0,2875 0,2875 -2875,0 -2875,0 0,-2875z"
android:fillColor="#303841"
android:strokeColor="#00000000"/>
<path
android:pathData="M0,2875l0,-2875 2875,0 2875,0 0,2875 0,2875 -2875,0 -2875,0 0,-2875zM2580,3951c6,-11 10,-87 10,-175l0,-156 -24,0c-13,0 -26,6 -29,13 -4,10 -7,10 -18,0 -17,-16 -71,-17 -87,-1 -8,8 -12,50 -12,125 0,101 2,113 19,123 25,13 68,13 76,0 12,-20 26,-9 23,18 -3,25 -7,27 -55,30 -45,3 -53,6 -53,23 0,17 7,19 70,19 58,0 71,-3 80,-19zM2060,3710l0,-190 -25,0 -25,0 0,190 0,190 25,0 25,0 0,-190zM2308,3884c20,-14 22,-23 22,-124 0,-132 -5,-140 -90,-140 -84,0 -93,16 -88,151 2,86 6,103 22,115 26,19 106,18 134,-2zM2773,3889c16,-9 22,-9 25,0 2,6 15,11 28,11l24,0 0,-140 0,-140 -24,0c-13,0 -26,6 -29,13 -4,10 -7,10 -18,0 -21,-20 -77,-16 -89,6 -5,11 -10,67 -10,125 0,97 2,106 22,120 27,19 42,20 71,5zM3000,3760l0,-140 -25,0 -25,0 0,140 0,140 25,0 25,0 0,-140zM3152,3788l3,-113 28,-3c21,-3 27,-9 27,-28 0,-28 -16,-31 -42,-7 -17,15 -18,15 -18,0 0,-11 -8,-17 -25,-17l-25,0 0,140 0,140 25,0c24,0 24,0 27,-112zM3330,3865c0,-31 -3,-35 -25,-35 -22,0 -25,4 -25,35 0,31 3,35 25,35 22,0 25,-4 25,-35zM3480,3760l0,-140 -25,0 -25,0 0,140 0,140 25,0 25,0 0,-140zM3730,3880c17,-17 20,-33 20,-124 0,-128 -6,-136 -90,-136 -84,0 -90,8 -90,136 0,127 10,144 90,144 37,0 55,-5 70,-20zM3000,3540c0,-16 -7,-20 -30,-20 -23,0 -30,4 -30,20 0,16 7,20 30,20 23,0 30,-4 30,-20zM3480,3540c0,-16 -7,-20 -30,-20 -23,0 -30,4 -30,20 0,16 7,20 30,20 23,0 30,-4 30,-20zM3008,3013c17,-9 32,-19 32,-22 -1,-11 -315,-389 -325,-391 -5,-2 -46,64 -91,146l-81,149 101,59c56,32 130,76 166,97l64,38 51,-30c27,-16 65,-37 83,-46zM3230,2882l151,-89 90,-167c50,-91 89,-173 87,-180 -6,-26 -423,-624 -430,-617 -4,3 -95,168 -202,365l-195,358 172,209c94,115 172,209 174,209 1,0 70,-40 153,-88zM2604,2711l84,-154 -119,-146c-66,-80 -122,-145 -126,-144 -11,4 -214,448 -206,450 4,2 64,37 133,78 69,41 131,73 138,72 7,-1 50,-71 96,-156zM3672,2621c8,-7 -71,-130 -83,-131 -5,0 -133,228 -147,262 -4,8 215,-116 230,-131zM2310,2455l107,-229 -185,-226c-102,-124 -191,-232 -198,-240 -12,-12 -14,50 -14,407l0,422 83,50c45,27 86,48 91,47 5,-1 57,-105 116,-231zM3730,2407l0,-182 -23,40c-13,22 -40,72 -61,111l-39,72 53,76c29,42 56,73 61,70 5,-3 9,-87 9,-187zM2720,2550c0,-5 -4,-10 -10,-10 -5,0 -10,5 -10,10 0,6 5,10 10,10 6,0 10,-4 10,-10zM2909,2149l199,-364 -116,-170c-64,-93 -123,-180 -132,-192 -16,-21 -22,-9 -208,388l-192,410 122,149c67,82 123,148 125,146 1,-1 92,-166 202,-367zM3594,2455c3,-8 1,-15 -4,-15 -6,0 -10,7 -10,15 0,8 2,15 4,15 2,0 6,-7 10,-15zM3730,1870l0,-286 -175,-102c-97,-57 -179,-100 -184,-98 -5,3 -56,94 -115,201l-107,196 218,318 218,318 72,-131 72,-131 1,-285zM2450,2219c0,-5 -4,-9 -10,-9 -5,0 -10,7 -10,16 0,8 5,12 10,9 6,-3 10,-10 10,-16zM2629,1776l192,-409 -53,-80c-29,-44 -56,-84 -60,-90 -4,-6 -147,72 -348,189l-341,199 3,52c3,53 4,54 207,303 113,137 206,248 207,247 1,-1 88,-186 193,-411zM3140,1780c0,-5 -4,-10 -10,-10 -5,0 -10,5 -10,10 0,6 5,10 10,10 6,0 10,-4 10,-10zM3235,1551c58,-107 104,-195 103,-196 -2,-1 -48,-28 -103,-60 -55,-32 -137,-80 -183,-107l-83,-48 -53,111 -53,111 131,193c72,106 132,192 133,191 2,-1 50,-89 108,-195zM2850,1364c0,-8 -5,-12 -10,-9 -6,4 -8,11 -5,16 9,14 15,11 15,-7zM2888,1226c23,-51 42,-97 42,-103 0,-6 -13,-16 -30,-23 -28,-11 -35,-9 -100,29l-70,42 52,74c29,41 55,75 58,75 3,0 24,-42 48,-94z"
android:fillColor="#5c6269"
android:strokeColor="#00000000"/>
<path
android:pathData="M2483,3843c-9,-3 -13,-31 -13,-89 0,-69 3,-86 16,-91 35,-13 49,11 52,86 4,89 -11,113 -55,94z"
android:fillColor="#5c6269"
android:strokeColor="#00000000"/>
<path
android:pathData="M2204,3837c-3,-8 -4,-49 -2,-93l3,-79 35,0 35,0 3,93 3,92 -36,0c-21,0 -38,-6 -41,-13z"
android:fillColor="#5c6269"
android:strokeColor="#00000000"/>
<path
android:pathData="M2734,3837c-2,-7 -4,-49 -2,-93l3,-79 30,0 30,0 0,90 0,90 -28,3c-16,2 -29,-2 -33,-11z"
android:fillColor="#5c6269"
android:strokeColor="#00000000"/>
<path
android:pathData="M3622,3758l3,-93 35,0 35,0 0,90 0,90 -38,3 -38,3 3,-93z"
android:fillColor="#5c6269"
android:strokeColor="#00000000"/>
<path
android:pathData="M0,2875l0,-2875 2875,0 2875,0 0,2875 0,2875 -2875,0 -2875,0 0,-2875zM2694,4517c3,-13 8,-49 12,-80 4,-32 10,-60 15,-62 4,-3 12,28 19,67 15,97 16,98 43,98 21,0 24,-7 41,-107 10,-60 20,-118 23,-130 4,-18 1,-23 -15,-23 -18,0 -21,11 -32,100 -7,55 -16,100 -20,100 -4,0 -13,-44 -21,-97 -13,-87 -17,-98 -35,-101 -20,-3 -23,4 -34,85 -17,117 -25,139 -33,87 -3,-21 -9,-69 -13,-106 -6,-59 -9,-68 -27,-68 -22,0 -22,-2 10,173 14,79 18,87 38,87 15,0 25,-7 29,-23zM2950,4410c0,-123 -1,-130 -20,-130 -19,0 -20,7 -20,130 0,123 1,130 20,130 19,0 20,-7 20,-130zM3060,4490l0,-50 39,0c26,0 41,-5 45,-16 11,-28 6,-120 -6,-132 -7,-7 -36,-12 -65,-12l-53,0 0,130c0,123 1,130 20,130 17,0 20,-7 20,-50zM2568,3964c21,-15 22,-21 22,-180l0,-164 -30,0c-17,0 -30,5 -31,13 0,10 -2,10 -6,0 -6,-15 -71,-17 -93,-3 -23,14 -28,202 -6,235 18,28 72,35 94,13 9,-9 12,-5 12,20l0,32 -55,0c-47,0 -55,3 -55,18 0,10 3,22 7,25 13,14 118,7 141,-9zM2068,3708l-3,-193 -27,-3 -28,-3 0,195 0,196 30,0 30,0 -2,-192zM2311,3890c17,-10 19,-22 19,-128 0,-79 -4,-122 -12,-130 -7,-7 -40,-12 -78,-12 -38,0 -71,5 -78,12 -19,19 -16,232 4,252 18,19 114,22 145,6zM2778,3888c9,-9 12,-9 12,0 0,7 14,12 35,12l35,0 0,-139 0,-139 -77,0c-43,-1 -83,4 -90,10 -9,7 -13,45 -13,129 0,102 2,119 18,128 23,14 65,14 80,-1zM3000,3760l0,-140 -30,0 -30,0 0,140 0,140 30,0 30,0 0,-140zM3150,3797c0,-106 7,-127 42,-127 13,0 18,-8 18,-25 0,-27 -26,-35 -48,-13 -9,9 -12,9 -12,0 0,-7 -13,-12 -30,-12l-30,0 0,140 0,140 30,0 30,0 0,-103zM3340,3860c0,-39 -1,-40 -35,-40 -34,0 -35,1 -35,40 0,39 1,40 35,40 34,0 35,-1 35,-40zM3480,3760l0,-140 -30,0 -30,0 0,140 0,140 30,0 30,0 0,-140zM3734,3884c20,-20 23,-233 4,-252 -7,-7 -40,-12 -78,-12 -38,0 -71,5 -78,12 -8,8 -12,50 -12,124 0,137 5,144 90,144 40,0 64,-5 74,-16zM3000,3540c0,-27 -3,-30 -30,-30 -27,0 -30,3 -30,30 0,27 3,30 30,30 27,0 30,-3 30,-30zM3480,3540c0,-27 -3,-30 -30,-30 -27,0 -30,3 -30,30 0,27 3,30 30,30 27,0 30,-3 30,-30zM2959,3043c45,-26 81,-50 81,-54 0,-4 -74,-97 -164,-208l-165,-200 -80,147c-44,81 -81,152 -83,159 -2,10 301,199 324,202 4,1 43,-20 87,-46zM3234,2882l149,-87 94,-172 93,-172 -143,-208c-79,-114 -176,-256 -216,-315 -40,-60 -76,-108 -79,-108 -4,0 -96,165 -205,365 -138,253 -196,369 -190,378 64,82 336,407 341,407 4,0 74,-40 156,-88zM2601,2722c67,-121 90,-156 104,-154 14,3 16,-1 11,-22 -5,-20 33,-97 194,-394l201,-369 -131,-191c-118,-173 -145,-222 -122,-222 4,0 66,86 137,190 71,105 132,187 136,183 9,-10 196,-353 204,-374 5,-12 -37,-41 -180,-124 -102,-59 -188,-106 -190,-103 -2,2 -27,53 -56,113 -28,61 -54,104 -56,97 -4,-10 -8,-10 -18,-2 -11,9 -26,-6 -71,-75 -32,-47 -63,-84 -70,-83 -7,2 -164,91 -348,198l-336,195 0,46c0,46 3,50 211,304 116,141 215,253 219,248 4,-4 91,-189 195,-410 163,-351 205,-428 205,-381 0,6 -86,194 -191,419 -136,289 -189,413 -182,421 6,7 60,74 122,150 98,120 128,169 104,168 -5,-1 -61,-66 -126,-145 -66,-80 -122,-143 -126,-141 -4,3 -54,105 -111,226 -85,182 -102,223 -90,231 119,71 266,158 270,158 3,0 44,-70 91,-157zM3680,2617c0,-5 -21,-38 -46,-73l-47,-65 -23,41c-13,23 -49,89 -80,146l-55,103 125,-72c69,-40 125,-76 126,-80zM2309,2463c83,-175 112,-227 124,-225 18,3 24,-23 7,-33 -5,-3 -10,-1 -10,4 0,6 -3,11 -8,11 -4,0 -95,-108 -202,-239 -107,-132 -198,-240 -202,-240 -5,-1 -8,190 -8,423l0,424 93,54c50,30 94,53 95,52 2,-1 52,-105 111,-231zM3736,2587c2,-7 3,-96 2,-197l-3,-185 -64,118c-44,82 -67,117 -77,113 -9,-4 -14,2 -14,16 0,16 3,18 14,9 10,-9 19,-2 41,31 67,103 89,124 101,95zM3664,2280l76,-140 0,-277 0,-278 -178,-102c-97,-57 -181,-104 -185,-105 -11,-4 -229,392 -225,408 3,10 430,634 434,634 2,0 37,-63 78,-140zM3140,1786c0,-8 -4,-18 -10,-21 -5,-3 -10,3 -10,14 0,12 5,21 10,21 6,0 10,-6 10,-14zM2885,1238c24,-51 45,-99 47,-106 2,-6 -10,-21 -27,-31l-30,-19 -70,40c-38,23 -72,42 -74,44 -3,3 101,163 107,164 2,0 23,-42 47,-92z"
android:fillColor="#a3a6aa"
android:strokeColor="#00000000"/>
<path
android:pathData="M3060,4360c0,-47 2,-50 25,-50 23,0 25,3 25,50 0,47 -2,50 -25,50 -23,0 -25,-3 -25,-50z"
android:fillColor="#a3a6aa"
android:strokeColor="#00000000"/>
<path
android:pathData="M2477,3833c-4,-3 -7,-41 -7,-84 0,-79 9,-96 45,-83 12,5 15,25 15,90 0,81 -1,84 -23,84 -13,0 -27,-3 -30,-7z"
android:fillColor="#a3a6aa"
android:strokeColor="#00000000"/>
<path
android:pathData="M2212,3758l3,-93 28,-3 27,-3 0,95 0,96 -30,0 -31,0 3,-92z"
android:fillColor="#a3a6aa"
android:strokeColor="#00000000"/>
<path
android:pathData="M2742,3758c3,-85 5,-93 23,-93 18,0 20,8 23,93l3,92 -26,0 -26,0 3,-92z"
android:fillColor="#a3a6aa"
android:strokeColor="#00000000"/>
<path
android:pathData="M3632,3758c3,-92 3,-93 28,-93 25,0 25,1 28,93l3,92 -31,0 -31,0 3,-92z"
android:fillColor="#a3a6aa"
android:strokeColor="#00000000"/>
<path
android:pathData="M0,2875l0,-2875 2875,0 2875,0 0,2875 0,2875 -2875,0 -2875,0 0,-2875zM2706,4483c11,-91 20,-106 28,-48 14,102 15,105 47,105 16,0 29,-1 29,-2 1,-2 11,-60 24,-130l22,-128 -22,0c-27,0 -31,10 -40,99 -3,39 -11,71 -15,71 -5,0 -9,-10 -9,-22 0,-12 -5,-50 -11,-85 -10,-56 -14,-63 -34,-63 -27,0 -28,4 -46,110l-13,75 -8,-60c-17,-126 -17,-125 -44,-125 -19,0 -24,4 -20,18 3,9 13,68 22,130l18,112 32,0c32,0 33,-1 40,-57zM2950,4410l0,-130 -25,0 -25,0 0,130 0,130 25,0 25,0 0,-130zM3060,4495c0,-43 1,-45 28,-45 52,0 63,-18 60,-95l-3,-70 -62,-3 -63,-3 0,131c0,123 1,130 20,130 17,0 20,-7 20,-45zM2580,3960c19,-19 20,-31 18,-183l-3,-162 -32,-3c-18,-2 -33,1 -33,6 0,6 -12,6 -30,-1 -25,-9 -36,-9 -58,4 -27,14 -27,16 -30,128 -3,135 1,144 70,139 44,-3 48,-1 46,17 -3,17 -12,21 -55,23 -49,3 -53,5 -53,28 0,23 2,24 70,24 57,0 74,-4 90,-20zM2070,3705l0,-195 -35,0 -35,0 0,195 0,195 35,0 35,0 0,-195zM2322,3883c15,-14 18,-32 18,-123 0,-133 -5,-142 -88,-148 -55,-4 -63,-2 -87,22 -26,26 -27,30 -23,130 2,68 8,109 17,119 19,24 137,24 163,0zM2860,3755l0,-143 -76,0c-108,0 -114,7 -114,145 0,138 4,142 111,142l79,0 0,-144zM3008,3758l-3,-143 -32,-3 -33,-3 0,145 0,146 35,0 36,0 -3,-142zM3160,3790l0,-110 30,-6c25,-5 30,-11 30,-35 0,-31 -10,-35 -40,-19 -13,7 -21,7 -25,0 -3,-5 -19,-10 -36,-10l-29,0 0,145 0,145 35,0 35,0 0,-110zM3340,3860c0,-39 -1,-40 -35,-40 -34,0 -35,1 -35,40 0,39 1,40 35,40 34,0 35,-1 35,-40zM3488,3758l-3,-143 -32,-3 -33,-3 0,145 0,146 35,0 36,0 -3,-142zM3744,3878c12,-17 16,-48 16,-123 0,-133 -5,-140 -100,-140 -95,0 -100,7 -100,140 0,135 7,145 100,145 60,0 71,-3 84,-22zM3010,3540c0,-28 -2,-30 -40,-30 -38,0 -40,2 -40,30 0,28 2,30 40,30 38,0 40,-2 40,-30zM3490,3540c0,-28 -2,-30 -40,-30 -38,0 -40,2 -40,30 0,28 2,30 40,30 38,0 40,-2 40,-30zM2990,3030c30,-18 57,-34 58,-35 2,-2 -70,-94 -160,-205 -144,-177 -193,-247 -160,-226 6,3 86,98 178,211 92,112 170,203 173,201 3,-1 74,-42 156,-90l150,-87 85,-156c93,-171 109,-196 110,-174 0,8 -34,77 -76,153 -42,77 -74,141 -72,143 4,4 173,-91 236,-131l23,-15 -44,-62c-57,-81 -59,-85 -49,-91 5,-3 32,28 61,69 77,111 81,105 81,-138 0,-110 -2,-198 -4,-196 -2,2 -33,57 -69,122 -35,66 -67,115 -70,110 -3,-5 28,-71 69,-146l74,-137 0,-284 0,-284 -173,-100c-94,-56 -179,-103 -187,-106 -11,-4 -44,47 -126,200 -62,115 -114,199 -117,191 -3,-7 44,-103 103,-213 60,-109 108,-199 107,-200 -1,-1 -87,-52 -192,-113l-190,-111 -52,110c-40,84 -56,108 -68,104 -9,-4 -15,-1 -15,7 0,11 -92,-112 -119,-159 -6,-11 -94,36 -354,188l-347,202 0,52 1,51 209,255c116,140 210,258 210,262 0,25 -38,-16 -215,-232 -109,-132 -199,-240 -201,-240 -2,0 -4,195 -4,433l0,432 92,52c51,28 95,50 98,48 3,-2 55,-108 115,-235 59,-127 111,-226 115,-219 4,6 -42,115 -101,242 -60,126 -108,231 -107,233 11,9 282,164 288,164 5,0 48,-73 97,-162 48,-89 89,-154 91,-145 2,10 -33,85 -78,168 -57,105 -79,154 -72,161 6,6 82,52 169,103l158,93 30,-18c17,-10 55,-32 85,-50zM2893,1228c26,-57 47,-105 47,-108 0,-3 -15,-13 -33,-23l-33,-18 -72,41c-40,23 -72,46 -72,51 0,12 102,159 110,159 4,0 28,-46 53,-102z"
android:fillColor="#f3f3f3"
android:strokeColor="#00000000"/>
<path
android:pathData="M3060,4365c0,-41 2,-45 25,-45 23,0 25,4 25,45 0,41 -2,45 -25,45 -23,0 -25,-4 -25,-45z"
android:fillColor="#f3f3f3"
android:strokeColor="#00000000"/>
<path
android:pathData="M2480,3755c0,-84 1,-86 23,-83 21,3 22,8 22,83 0,75 -1,80 -22,83 -22,3 -23,1 -23,-83z"
android:fillColor="#f3f3f3"
android:strokeColor="#00000000"/>
<path
android:pathData="M2217,3843c-4,-3 -7,-44 -7,-90l0,-83 30,0 30,0 0,90c0,88 -1,90 -23,90 -13,0 -27,-3 -30,-7z"
android:fillColor="#f3f3f3"
android:strokeColor="#00000000"/>
<path
android:pathData="M2747,3844c-4,-4 -7,-45 -7,-91 0,-82 0,-83 25,-83l26,0 -3,87c-2,70 -6,88 -18,91 -9,1 -19,0 -23,-4z"
android:fillColor="#f3f3f3"
android:strokeColor="#00000000"/>
<path
android:pathData="M3630,3760l0,-90 30,0 30,0 0,90 0,90 -30,0 -30,0 0,-90z"
android:fillColor="#f3f3f3"
android:strokeColor="#00000000"/>
<path
android:pathData="M2572,2404c-67,-81 -122,-154 -122,-161 0,-8 4,-12 10,-8 22,14 242,295 238,306 -2,6 -59,-55 -126,-137z"
android:fillColor="#f3f3f3"
android:strokeColor="#00000000"/>
<path
android:pathData="M2717,2537c-3,-7 86,-179 196,-383 115,-210 203,-361 205,-351 3,12 -366,710 -393,745 -1,2 -5,-3 -8,-11z"
android:fillColor="#f3f3f3"
android:strokeColor="#00000000"/>
<path
android:pathData="M3356,2133c-115,-169 -211,-316 -214,-327 -3,-14 -1,-18 6,-11 19,19 432,626 432,635 0,6 -3,10 -7,10 -5,0 -102,-138 -217,-307z"
android:fillColor="#f3f3f3"
android:strokeColor="#00000000"/>
<path
android:pathData="M2447,2207c-4,-11 360,-807 378,-825 29,-29 -11,67 -176,420 -106,227 -193,414 -194,416 -2,2 -5,-3 -8,-11z"
android:fillColor="#f3f3f3"
android:strokeColor="#00000000"/>
<path
android:pathData="M2980,1586c-128,-189 -138,-206 -122,-206 11,0 262,363 262,379 0,27 -23,-1 -140,-173z"
android:fillColor="#f3f3f3"
android:strokeColor="#00000000"/>
</vector>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Modify this file to customize your launch splash screen --> <!-- Modify this file to customize your launch splash screen -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@android:color/white" /> <item android:drawable="@color/splash_bg" />
<item
android:gravity="center|bottom|center_vertical|clip_vertical"
android:drawable="@drawable/ic_splash">
</item>
<!-- You can insert your own image assets here --> <!-- You can insert your own image assets here -->
<!-- <item> <!-- <item>
<bitmap <bitmap
......
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
\ No newline at end of file
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