diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart index 4553e01..e26bfcf 100644 --- a/lib/screens/home_screen.dart +++ b/lib/screens/home_screen.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map_animations/flutter_map_animations.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'package:provider/provider.dart'; import '../app_state.dart'; @@ -151,7 +152,11 @@ class _HomeScreenState extends State with TickerProviderStateMixin { child: Scaffold( key: _scaffoldKey, appBar: AppBar( - title: const Text('DeFlock'), + title: SvgPicture.asset( + 'assets/deflock-logo.svg', + height: 28, + fit: BoxFit.contain, + ), actions: [ IconButton( tooltip: _getFollowMeTooltip(appState.followMeMode), @@ -196,9 +201,15 @@ class _HomeScreenState extends State with TickerProviderStateMixin { ), child: Container( decoration: BoxDecoration( - color: Colors.white, + color: Theme.of(context).colorScheme.surface, borderRadius: BorderRadius.circular(16), - boxShadow: [BoxShadow(color: Colors.black26, blurRadius: 10, offset: Offset(0, -2))], + boxShadow: [ + BoxShadow( + color: Theme.of(context).shadowColor.withOpacity(0.3), + blurRadius: 10, + offset: Offset(0, -2), + ) + ], ), margin: EdgeInsets.only(bottom: kBottomButtonBarMargin), padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6), diff --git a/lib/widgets/map/map_overlays.dart b/lib/widgets/map/map_overlays.dart index 3d40eb9..a67334d 100644 --- a/lib/widgets/map/map_overlays.dart +++ b/lib/widgets/map/map_overlays.dart @@ -89,11 +89,17 @@ class MapOverlays extends StatelessWidget { bottom: kAttributionBottomOffset, left: 10, child: Container( - color: Colors.white70, + decoration: BoxDecoration( + color: Theme.of(context).colorScheme.surface.withOpacity(0.9), + borderRadius: BorderRadius.circular(4), + ), padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 4), child: Text( attribution!, - style: const TextStyle(fontSize: 11), + style: TextStyle( + fontSize: 11, + color: Theme.of(context).colorScheme.onSurface, + ), ), ), ), diff --git a/pubspec.lock b/pubspec.lock index 051d2a1..cc5d217 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -222,6 +222,14 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.0" + flutter_svg: + dependency: "direct main" + description: + name: flutter_svg + sha256: cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845 + url: "https://pub.dev" + source: hosted + version: "2.2.0" flutter_web_auth_2: dependency: "direct main" description: @@ -411,6 +419,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.9.1" + path_parsing: + dependency: transitive + description: + name: path_parsing + sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca" + url: "https://pub.dev" + source: hosted + version: "1.1.0" path_provider: dependency: transitive description: @@ -704,6 +720,30 @@ packages: url: "https://pub.dev" source: hosted version: "4.5.1" + vector_graphics: + dependency: transitive + description: + name: vector_graphics + sha256: a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6 + url: "https://pub.dev" + source: hosted + version: "1.1.19" + vector_graphics_codec: + dependency: transitive + description: + name: vector_graphics_codec + sha256: "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146" + url: "https://pub.dev" + source: hosted + version: "1.1.13" + vector_graphics_compiler: + dependency: transitive + description: + name: vector_graphics_compiler + sha256: d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc + url: "https://pub.dev" + source: hosted + version: "1.1.19" vector_math: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index fabb425..ebcb6d1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -17,6 +17,7 @@ dependencies: latlong2: ^0.9.0 geolocator: ^10.1.0 http: ^1.2.1 + flutter_svg: ^2.0.10 # Auth, storage, prefs oauth2_client: ^4.2.0 @@ -38,6 +39,7 @@ flutter: - assets/info.txt - assets/app_icon.png - assets/transparent_1x1.png + - assets/deflock-logo.svg flutter_native_splash: color: "#202020"