diff --git a/analysis_options.yaml b/analysis_options.yaml index 0d29021..0f9a8d6 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -7,6 +7,9 @@ # The following line activates a set of recommended lints for Flutter apps, # packages, and plugins designed to encourage good coding practices. +analyzer: + errors: + unused_field: ignore include: package:flutter_lints/flutter.yaml linter: diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 9e29ff7..6267548 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,7 +1,12 @@ + + + - + + + + NSLocationWhenInUseUsageDescription + This app needs access to your location to find nearby gas stations and services. + NSLocationAlwaysUsageDescription + This app needs access to your location to track your position even when the app is in the background. + UIBackgroundModes + + location + CADisableMinimumFrameDurationOnPhone CFBundleDevelopmentRegion diff --git a/lib/icons/gasolineCyberpunk.png b/lib/icons/gasolineCyberpunk.png new file mode 100644 index 0000000..ebc3e71 Binary files /dev/null and b/lib/icons/gasolineCyberpunk.png differ diff --git a/lib/icons/kilometer.png b/lib/icons/kilometer.png new file mode 100644 index 0000000..db61e37 Binary files /dev/null and b/lib/icons/kilometer.png differ diff --git a/lib/images/backgroundPitstopBlack.png b/lib/images/backgroundPitstopBlack.png new file mode 100644 index 0000000..835dce0 Binary files /dev/null and b/lib/images/backgroundPitstopBlack.png differ diff --git a/lib/images/gasolineGuru.jpg b/lib/images/gasolineGuru.jpg new file mode 100644 index 0000000..7090a50 Binary files /dev/null and b/lib/images/gasolineGuru.jpg differ diff --git a/lib/ui/components/collapsible_bottomsheet.dart b/lib/ui/components/collapsible_bottomsheet.dart index 3e89312..d070e16 100644 --- a/lib/ui/components/collapsible_bottomsheet.dart +++ b/lib/ui/components/collapsible_bottomsheet.dart @@ -235,8 +235,8 @@ class ProjectSection extends StatelessWidget { padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), child: Column( children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + Wrap( + alignment: WrapAlignment.spaceBetween, children: [ ProjectRow(title: "Endpoint", value: projectInfo.endpoint), ProjectRow(title: "Project ID", value: projectInfo.projectId), diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 7758f55..3c11380 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -8,6 +8,7 @@ import Foundation import desktop_webview_window import device_info_plus import flutter_web_auth_2 +import geolocator_apple import package_info_plus import path_provider_foundation import screen_retriever_macos @@ -19,6 +20,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { DesktopWebviewWindowPlugin.register(with: registry.registrar(forPlugin: "DesktopWebviewWindowPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) FlutterWebAuth2Plugin.register(with: registry.registrar(forPlugin: "FlutterWebAuth2Plugin")) + GeolocatorPlugin.register(with: registry.registrar(forPlugin: "GeolocatorPlugin")) FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin")) diff --git a/pubspec.lock b/pubspec.lock index 0099d7a..608621e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -153,6 +153,14 @@ packages: url: "https://pub.dev" source: hosted version: "7.0.1" + fixnum: + dependency: transitive + description: + name: fixnum + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be + url: "https://pub.dev" + source: hosted + version: "1.1.1" flutter: dependency: "direct main" description: flutter @@ -167,7 +175,7 @@ packages: source: hosted version: "5.2.1" flutter_launcher_icons: - dependency: "direct dev" + dependency: "direct main" description: name: flutter_launcher_icons sha256: bfa04787c85d80ecb3f8777bde5fc10c3de809240c48fa061a2c2bf15ea5211c @@ -211,6 +219,70 @@ packages: description: flutter source: sdk version: "0.0.0" + geolocator: + dependency: "direct main" + description: + name: geolocator + sha256: f62bcd90459e63210bbf9c35deb6a51c521f992a78de19a1fe5c11704f9530e2 + url: "https://pub.dev" + source: hosted + version: "13.0.4" + geolocator_android: + dependency: transitive + description: + name: geolocator_android + sha256: fcb1760a50d7500deca37c9a666785c047139b5f9ee15aa5469fae7dbbe3170d + url: "https://pub.dev" + source: hosted + version: "4.6.2" + geolocator_apple: + dependency: transitive + description: + name: geolocator_apple + sha256: dbdd8789d5aaf14cf69f74d4925ad1336b4433a6efdf2fce91e8955dc921bf22 + url: "https://pub.dev" + source: hosted + version: "2.3.13" + geolocator_platform_interface: + dependency: transitive + description: + name: geolocator_platform_interface + sha256: "30cb64f0b9adcc0fb36f628b4ebf4f731a2961a0ebd849f4b56200205056fe67" + url: "https://pub.dev" + source: hosted + version: "4.2.6" + geolocator_web: + dependency: transitive + description: + name: geolocator_web + sha256: b1ae9bdfd90f861fde8fd4f209c37b953d65e92823cb73c7dee1fa021b06f172 + url: "https://pub.dev" + source: hosted + version: "4.1.3" + geolocator_windows: + dependency: transitive + description: + name: geolocator_windows + sha256: "175435404d20278ffd220de83c2ca293b73db95eafbdc8131fe8609be1421eb6" + url: "https://pub.dev" + source: hosted + version: "0.2.5" + get: + dependency: "direct main" + description: + name: get + sha256: c79eeb4339f1f3deffd9ec912f8a923834bec55f7b49c9e882b8fef2c139d425 + url: "https://pub.dev" + source: hosted + version: "4.7.2" + get_storage: + dependency: "direct main" + description: + name: get_storage + sha256: "39db1fffe779d0c22b3a744376e86febe4ade43bf65e06eab5af707dc84185a2" + url: "https://pub.dev" + source: hosted + version: "2.1.1" html: dependency: transitive description: @@ -220,13 +292,13 @@ packages: source: hosted version: "0.15.5" http: - dependency: transitive + dependency: "direct main" description: name: http - sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f + sha256: bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.5.0" http_parser: dependency: transitive description: @@ -259,6 +331,14 @@ packages: url: "https://pub.dev" source: hosted version: "4.9.0" + latlong2: + dependency: "direct main" + description: + name: latlong2 + sha256: "98227922caf49e6056f91b6c56945ea1c7b166f28ffcd5fb8e72fc0b453cc8fe" + url: "https://pub.dev" + source: hosted + version: "0.9.1" lints: dependency: transitive description: @@ -440,6 +520,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.10.0" + sprintf: + dependency: transitive + description: + name: sprintf + sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" + url: "https://pub.dev" + source: hosted + version: "7.0.0" stream_channel: dependency: transitive description: @@ -544,6 +632,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.4" + uuid: + dependency: transitive + description: + name: uuid + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff + url: "https://pub.dev" + source: hosted + version: "4.5.1" vector_math: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 845ab0c..12d1ab0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -8,6 +8,7 @@ environment: sdk: ^3.5.4 dependencies: + flutter_launcher_icons: ^0.14.3 appwrite: ^14.0.0 cupertino_icons: ^1.0.8 flutter: @@ -16,16 +17,27 @@ dependencies: intl: ^0.20.2 url_launcher: ^6.3.1 window_manager: ^0.4.3 + geolocator: ^13.0.1 + get: ^4.6.6 + get_storage: ^2.1.1 + http: ^1.4.0 + latlong2: ^0.9.1 dependency_overrides: flutter_web_auth_2: 4.1.0 dev_dependencies: - flutter_launcher_icons: ^0.14.3 flutter_lints: ^5.0.0 flutter_native_splash: ^2.4.4 +flutter_icons: + android: true + ios: true + image_path: "lib/icons/gasolineCyberpunk.png" + flutter: uses-material-design: true assets: - .env + - lib/images/ + - lib/icons/ diff --git a/web/favicon.png b/web/favicon.png new file mode 100644 index 0000000..77222aa Binary files /dev/null and b/web/favicon.png differ diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 4423f73..3a4fbf2 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -7,6 +7,7 @@ #include "generated_plugin_registrant.h" #include +#include #include #include #include @@ -15,6 +16,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { DesktopWebviewWindowPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("DesktopWebviewWindowPlugin")); + GeolocatorWindowsRegisterWithRegistrar( + registry->GetRegistrarForPlugin("GeolocatorWindows")); ScreenRetrieverWindowsPluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi")); UrlLauncherWindowsRegisterWithRegistrar( diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 61245f1..3dd5f71 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -4,6 +4,7 @@ list(APPEND FLUTTER_PLUGIN_LIST desktop_webview_window + geolocator_windows screen_retriever_windows url_launcher_windows window_manager