diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 80636d6..c9b0b9b 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:icon="@mipmap/launcher_icon"> { final l10n = AppLocalizations.of(context)!; final customAccentColor = Provider.of(context).accentColor; - return Scaffold( backgroundColor: Theme.of(context).primaryColor, body: RefreshIndicator( @@ -67,6 +65,14 @@ class _HomePageState extends State { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ + // Nouveau: Ajoutez le SvgPicture ici + SvgPicture.asset( + 'assets/images/rtimelogo.svg', // Chemin vers votre SVG + height: 48, // Ajustez la taille selon vos préférences + width: 48, // Ajustez la taille selon vos préférences + colorFilter: ColorFilter.mode(customAccentColor, BlendMode.srcIn), // Appliquez la couleur d'accentuation + ), + const SizedBox(width: 8), // Petit espace entre le logo et le titre Text( l10n.appTitle, style: TextStyle( @@ -76,6 +82,7 @@ class _HomePageState extends State { fontFamily: 'Montserrat', ), ), + const Spacer(), // Cela poussera l'icône de réglages à l'extrémité IconButton( icon: const Icon(Icons.settings, size: 30, color: Colors.white70), @@ -91,7 +98,6 @@ class _HomePageState extends State { ), const SizedBox(height: 30), - Text( l10n.yourDrones, style: Theme.of(context).textTheme.headlineSmall, @@ -194,7 +200,6 @@ class _HomePageState extends State { const Divider( height: 50, thickness: 2, indent: 0, endIndent: 0, color: Colors.white10), - Text( l10n.yourBatteries, style: Theme.of(context).textTheme.headlineSmall, @@ -297,7 +302,6 @@ class _HomePageState extends State { const Divider( height: 50, thickness: 2, indent: 0, endIndent: 0, color: Colors.white10), - Text( l10n.latestFlights, style: Theme.of(context).textTheme.headlineSmall, diff --git a/pubspec.lock b/pubspec.lock index b48a5d2..4669c64 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -129,6 +129,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.4" + cli_util: + dependency: transitive + description: + name: cli_util + sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c + url: "https://pub.dev" + source: hosted + version: "0.4.2" clock: dependency: transitive description: @@ -278,6 +286,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" + flutter_launcher_icons: + dependency: "direct main" + description: + name: flutter_launcher_icons + sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea" + url: "https://pub.dev" + source: hosted + version: "0.13.1" flutter_lints: dependency: "direct dev" description: @@ -307,6 +323,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.28" + flutter_svg: + dependency: "direct main" + description: + name: flutter_svg + sha256: cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845 + url: "https://pub.dev" + source: hosted + version: "2.2.0" flutter_test: dependency: "direct dev" description: flutter @@ -677,6 +701,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: "direct main" description: @@ -1066,6 +1098,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: "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331" + url: "https://pub.dev" + source: hosted + version: "1.1.17" vector_math: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 9b7f08e..24859ae 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -31,6 +31,7 @@ dependencies: flutter: sdk: flutter flutter_colorpicker: ^1.0.0 + flutter_launcher_icons: ^0.13.1 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.8 @@ -46,13 +47,14 @@ dependencies: json_serializable: ^6.9.5 image_cropper: ^9.1.0 intl: ^0.20.2 - provider: ^6.1.2 + provider: ^6.1.2 geolocator: ^12.0.0 flutter_map: ^8.0.0 latlong2: ^0.9.1 flutter_localizations: sdk: flutter shared_preferences: ^2.2.0 + flutter_svg: ^2.0.10+1 dev_dependencies: flutter_test: @@ -70,7 +72,6 @@ dev_dependencies: # The following section is specific to Flutter packages. flutter: - # The following line ensures that the Material Icons font is # included with your application, so that you can use the icons in # the material Icons class. @@ -78,9 +79,8 @@ flutter: generate: true # To add assets to your application, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg + assets: + - assets/images/ # This is the correct and only place to declare your assets folder. # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/to/resolution-aware-images @@ -107,3 +107,11 @@ flutter: # # For details regarding fonts from package dependencies, # see https://flutter.dev/to/font-from-package + +# This section needs to be at the root level, not under "flutter:" +flutter_launcher_icons: + android: "launcher_icon" + ios: true + image_path: "assets/images/rtimelogo.png" + min_sdk_android: 21 + remove_alpha_ios: true