From ba17fb6b50199ae856cb84419034ba412b2bbcde Mon Sep 17 00:00:00 2001 From: randogoth Date: Wed, 19 Feb 2025 10:38:55 +0200 Subject: [PATCH] themed --- README.md | 17 +--- lib/main.dart | 27 +++---- macos/Flutter/GeneratedPluginRegistrant.swift | 2 + pubspec.lock | 80 +++++++++++++++++++ pubspec.yaml | 3 +- 5 files changed, 99 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index b4496e5..aafb109 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,3 @@ -# threeterms +# web3terms -A new Flutter project. - -## Getting Started - -This project is a starting point for a Flutter application. - -A few resources to get you started if this is your first Flutter project: - -- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) -- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) - -For help getting started with Flutter development, view the -[online documentation](https://docs.flutter.dev/), which offers tutorials, -samples, guidance on mobile development, and a full API reference. +A web app demo featuring [map3terms](https://github.com/randogoth/map3terms) \ No newline at end of file diff --git a/lib/main.dart b/lib/main.dart index 36b16f2..ab29562 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:go_router/go_router.dart'; +import 'package:google_fonts/google_fonts.dart'; import 'package:latlong2/latlong.dart'; import 'package:geolocator/geolocator.dart'; import 'package:map3terms/src/map3terms_scrambler.dart'; @@ -16,11 +17,9 @@ class Map3TermsApp extends StatelessWidget { return MaterialApp.router( title: 'Map3Terms Map', theme: ThemeData.dark().copyWith( - primaryColor: Colors.blue, - scaffoldBackgroundColor: Colors.black, - textTheme: TextTheme( - bodyMedium: TextStyle(color: Colors.white), - ), + primaryColor: Color(0xff5471a8), + scaffoldBackgroundColor: Color(0xff2d3138), + textTheme: GoogleFonts.poppinsTextTheme(), ), routerConfig: _router, ); @@ -182,14 +181,14 @@ class _Map3TermsHomeState extends State { textAlign: TextAlign.center, style: TextStyle(fontSize: 24, fontWeight: FontWeight.bold, color: Colors.white), decoration: InputDecoration( - labelText: 'Enter Words or Coordinates', + labelText: 'Enter 3 Terms or Coordinates', labelStyle: TextStyle( color: Colors.grey, fontSize: 16, fontWeight: FontWeight.w800 ), filled: true, - fillColor: Colors.grey[900], + fillColor: Color(0xff3d424e), border: OutlineInputBorder( borderRadius: BorderRadius.circular(15), borderSide: BorderSide.none, @@ -228,9 +227,9 @@ class _Map3TermsHomeState extends State { polygons: [ Polygon( points: _boundingBox(_center), - color: Colors.white.withOpacity(0.1), + color: Color(0xfffcba65).withValues(alpha: 0.1), borderStrokeWidth: 2, - borderColor: Colors.white, + borderColor: Color(0xfffcba65), ), ], ), @@ -253,8 +252,8 @@ class _Map3TermsHomeState extends State { right: 20, child: FloatingActionButton( onPressed: _centerOnUserLocation, - child: Icon(Icons.my_location, color: Colors.black), - backgroundColor: Colors.white, + child: Icon(Icons.my_location, color: Colors.white), + backgroundColor: Color(0xff5471a8), ), ), Positioned( @@ -269,8 +268,8 @@ class _Map3TermsHomeState extends State { SnackBar(content: Text("Copied to clipboard: $shareableUrl")), ); }, - child: Icon(Icons.share, color: Colors.black), - backgroundColor: Colors.white, + child: Icon(Icons.share, color: Colors.white), + backgroundColor: Color(0xff5471a8), ), ), ], @@ -295,7 +294,7 @@ class CrossOverlayPainter extends CustomPainter { @override void paint(Canvas canvas, Size size) { final paint = Paint() - ..color = Colors.white.withOpacity(0.5) // Adjust color & opacity + ..color = Color(0xff70a5d8).withValues(alpha: 0.5) // Adjust color & opacity ..strokeWidth = 1; // Draw horizontal line across the entire screen diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 977f380..32aadf6 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -6,7 +6,9 @@ import FlutterMacOS import Foundation import geolocator_apple +import path_provider_foundation func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { GeolocatorPlugin.register(with: registry.registrar(forPlugin: "GeolocatorPlugin")) + PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) } diff --git a/pubspec.lock b/pubspec.lock index d07a1a9..3a91412 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -73,6 +73,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.1" + ffi: + dependency: transitive + description: + name: ffi + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" + url: "https://pub.dev" + source: hosted + version: "2.1.3" fixnum: dependency: transitive description: @@ -168,6 +176,14 @@ packages: url: "https://pub.dev" source: hosted version: "14.8.0" + google_fonts: + dependency: "direct main" + description: + name: google_fonts + sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82 + url: "https://pub.dev" + source: hosted + version: "6.2.1" http: dependency: transitive description: @@ -305,6 +321,62 @@ packages: url: "https://pub.dev" source: hosted version: "1.9.0" + path_provider: + dependency: transitive + description: + name: path_provider + sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" + url: "https://pub.dev" + source: hosted + version: "2.1.5" + path_provider_android: + dependency: transitive + description: + name: path_provider_android + sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2" + url: "https://pub.dev" + source: hosted + version: "2.2.15" + path_provider_foundation: + dependency: transitive + description: + name: path_provider_foundation + sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + path_provider_linux: + dependency: transitive + description: + name: path_provider_linux + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 + url: "https://pub.dev" + source: hosted + version: "2.2.1" + path_provider_platform_interface: + dependency: transitive + description: + name: path_provider_platform_interface + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + path_provider_windows: + dependency: transitive + description: + name: path_provider_windows + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 + url: "https://pub.dev" + source: hosted + version: "2.3.0" + platform: + dependency: transitive + description: + name: platform + sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" + url: "https://pub.dev" + source: hosted + version: "3.1.6" plugin_platform_interface: dependency: transitive description: @@ -446,6 +518,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.0" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" + url: "https://pub.dev" + source: hosted + version: "1.1.0" sdks: dart: ">=3.6.0 <4.0.0" flutter: ">=3.27.0" diff --git a/pubspec.yaml b/pubspec.yaml index 1ec633f..8edf7bf 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,4 +1,4 @@ -name: threeterms +name: web3terms description: "A new Flutter project." # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. @@ -40,6 +40,7 @@ dependencies: git: git@github.com:randogoth/map3terms.git geolocator: ^13.0.2 go_router: ^14.8.0 + google_fonts: ^6.2.1 dev_dependencies: flutter_test: