From 71baa373c2812e41e596ba5c5b3b8cdfd7e59500 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 25 Jun 2026 22:53:47 +1000 Subject: [PATCH] Use new icon file in app --- android/app/build.gradle | 2 +- lib/widget/drawer.dart | 3 ++- lib/widget/home.dart | 15 ++++++++----- pubspec.lock | 48 ++++++++++++++++++++++++++++++++++++---- pubspec.yaml | 2 +- 5 files changed, 57 insertions(+), 13 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 368e41b2..a7169cb0 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -57,7 +57,7 @@ android { defaultConfig { applicationId "inventree.inventree_app" - minSdkVersion 23 + minSdkVersion flutter.minSdkVersion targetSdkVersion 35 versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/lib/widget/drawer.dart b/lib/widget/drawer.dart index e25c7920..07e69e63 100644 --- a/lib/widget/drawer.dart +++ b/lib/widget/drawer.dart @@ -1,5 +1,6 @@ import "package:adaptive_theme/adaptive_theme.dart"; import "package:flutter/material.dart"; +import "package:flutter_svg/flutter_svg.dart"; import "package:flutter_tabler_icons/flutter_tabler_icons.dart"; import "package:package_info_plus/package_info_plus.dart"; @@ -220,7 +221,7 @@ class _InvenTreeDrawerState extends State { tiles.add( ListTile( - leading: Image.asset("assets/image/logo_transparent.png", height: 24), + leading: SvgPicture.asset("assets/image/inventree.svg", height: 24), title: Text( L10().appTitle, style: TextStyle(fontWeight: FontWeight.bold), diff --git a/lib/widget/home.dart b/lib/widget/home.dart index 7ed91564..d75eeecf 100644 --- a/lib/widget/home.dart +++ b/lib/widget/home.dart @@ -2,6 +2,7 @@ import "dart:async"; import "dart:math"; import "package:flutter/material.dart"; +import "package:flutter_svg/flutter_svg.dart"; import "package:flutter_tabler_icons/flutter_tabler_icons.dart"; import "package:inventree/api.dart"; @@ -480,11 +481,13 @@ class _InvenTreeHomePageState extends State child: Column( children: [ Spacer(), - Image.asset( - "assets/image/logo_transparent.png", - color: Colors.white.withValues(alpha: 0.05), - colorBlendMode: BlendMode.modulate, - scale: 0.5, + SvgPicture.asset( + "assets/image/inventree.svg", + colorFilter: ColorFilter.mode( + Colors.white.withValues(alpha: 0.05), + BlendMode.modulate, + ), + width: 200, ), Spacer(), ListTile( @@ -540,7 +543,7 @@ class _InvenTreeHomePageState extends State title: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - Image.asset("assets/image/logo_transparent.png", height: 24), + SvgPicture.asset("assets/image/inventree.svg", height: 24), SizedBox(width: 8), Text(L10().appTitle), ], diff --git a/pubspec.lock b/pubspec.lock index 9669c08c..17d52fa6 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "8d7ff3948166b8ec5da0fbb5962000926b8e02f2ed9b3e51d1738905fbd4c98d" + sha256: c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d url: "https://pub.dev" source: hosted - version: "93.0.0" + version: "91.0.0" adaptive_theme: dependency: "direct main" description: @@ -21,10 +21,10 @@ packages: dependency: transitive description: name: analyzer - sha256: de7148ed2fcec579b19f122c1800933dfa028f6d9fd38a152b04b1516cec120b + sha256: f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08 url: "https://pub.dev" source: hosted - version: "10.0.1" + version: "8.4.1" archive: dependency: transitive description: @@ -475,6 +475,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.0" + flutter_svg: + dependency: "direct main" + description: + name: flutter_svg + sha256: "35882981abcbfb8c15b286f0cd690ff25bac12d95eff3e25ee207f37d4c42e7f" + url: "https://pub.dev" + source: hosted + version: "2.3.0" flutter_tabler_icons: dependency: "direct main" description: @@ -805,6 +813,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: @@ -1266,6 +1282,30 @@ packages: url: "https://pub.dev" source: hosted version: "4.5.1" + vector_graphics: + dependency: transitive + description: + name: vector_graphics + sha256: "2306c03da2ba81724afeb589c351ebbc0aa7d86005925be8f8735856dbe5e42d" + url: "https://pub.dev" + source: hosted + version: "1.2.2" + 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: "142a9146f447d15b10bdc00e21d5f4d83e5b32bb5f8f8f5a04c75311344923a3" + url: "https://pub.dev" + source: hosted + version: "1.2.6" vector_math: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 63649a2f..c8f4d5f4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -28,6 +28,7 @@ dependencies: flutter_markdown: ^0.6.19 # Rendering markdown flutter_overlay_loader: ^2.0.0 # Overlay screen support flutter_speed_dial: ^6.2.0 # Speed dial / FAB implementation + flutter_svg: ^2.0.0 # SVG rendering flutter_tabler_icons: ^1.43.0 # Tabler icons http: ^1.4.0 image_picker: ^1.2.2 # Select or take photos @@ -67,7 +68,6 @@ flutter: assets: - assets/image/inventree.svg - - assets/image/logo_transparent.png - assets/release_notes.md - assets/credits.md - assets/sounds/barcode_scan.mp3