diff --git a/assets/svgs/app_logo/app_logo_colored.svg b/assets/svgs/app_logo/app_logo_colored.svg new file mode 100644 index 0000000..57700c6 --- /dev/null +++ b/assets/svgs/app_logo/app_logo_colored.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/svgs/app_logo/app_logo_white.svg b/assets/svgs/app_logo/app_logo_white.svg new file mode 100644 index 0000000..26b52ef --- /dev/null +++ b/assets/svgs/app_logo/app_logo_white.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/app.dart b/lib/app.dart index e48069f..0f584c8 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -9,7 +9,7 @@ class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { return MaterialApp( - title: 'Made with Flutter', + title: 'Made with Flutter?', theme: ThemeData( useMaterial3: true, primaryColor: ColorsPalette.primaryColor, diff --git a/lib/ui/widgets/app_logo.dart b/lib/ui/widgets/app_logo.dart index cf8add4..11ece99 100644 --- a/lib/ui/widgets/app_logo.dart +++ b/lib/ui/widgets/app_logo.dart @@ -1,15 +1,34 @@ import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:made_with_flutter/utils/assets_manager.dart'; + +enum AppLogoType { colored, white } class AppLogo extends StatelessWidget { + final AppLogoType type; final double size; - const AppLogo({super.key, this.size = 50}); + + const AppLogo({ + super.key, + this.type = AppLogoType.colored, + this.size = 50, + }); @override Widget build(BuildContext context) { - // TODO: Replace with your own logo - return ColorFiltered( - colorFilter: const ColorFilter.mode(Colors.white, BlendMode.srcIn), - child: FlutterLogo(size: size), + return SvgPicture.asset( + _logo, + width: size, + height: size, ); } + + String get _logo { + switch (type) { + case AppLogoType.colored: + return AssetsManager.appLogoColored; + case AppLogoType.white: + return AssetsManager.appLogoWhite; + } + } } diff --git a/lib/ui/widgets/base_scaffold/base_scaffold_desktop/scaffold_desktop_header/scaffold_desktop_header.dart b/lib/ui/widgets/base_scaffold/base_scaffold_desktop/scaffold_desktop_header/scaffold_desktop_header.dart index 9c74c2a..76a0b96 100644 --- a/lib/ui/widgets/base_scaffold/base_scaffold_desktop/scaffold_desktop_header/scaffold_desktop_header.dart +++ b/lib/ui/widgets/base_scaffold/base_scaffold_desktop/scaffold_desktop_header/scaffold_desktop_header.dart @@ -11,10 +11,12 @@ class ScaffoldDesktopHeader extends StatelessWidget { @override Widget build(BuildContext context) { return Padding( - padding: const EdgeInsets.all(16), + padding: const EdgeInsets.all(24), child: Row( children: [ - const AppLogo(), + const AppLogo( + type: AppLogoType.white, + ), const Spacer(), HeaderButtonsBar( buttons: [ diff --git a/lib/ui/widgets/base_scaffold/base_scaffold_mobile/mobile_drawer/mobile_drawer.dart b/lib/ui/widgets/base_scaffold/base_scaffold_mobile/mobile_drawer/mobile_drawer.dart index 516847f..082986a 100644 --- a/lib/ui/widgets/base_scaffold/base_scaffold_mobile/mobile_drawer/mobile_drawer.dart +++ b/lib/ui/widgets/base_scaffold/base_scaffold_mobile/mobile_drawer/mobile_drawer.dart @@ -12,15 +12,24 @@ class MobileDrawer extends StatelessWidget { @override Widget build(BuildContext context) { return Drawer( + shape: const RoundedRectangleBorder( + borderRadius: BorderRadius.only( + topRight: Radius.circular(10), + bottomRight: Radius.circular(10), + ), + ), backgroundColor: ColorsPalette.white, surfaceTintColor: Colors.transparent, child: SafeArea( child: Padding( - padding: const EdgeInsets.symmetric(vertical: 32), + padding: const EdgeInsets.only( + top: 64, + bottom: 24, + ), child: Column( children: [ - const AppLogo(size: 50), - const SizedBox(height: 32), + const AppLogo(size: 125), + const SizedBox(height: 48), MobileDrawerItem( label: 'About', onTap: () {}, diff --git a/lib/utils/assets_manager.dart b/lib/utils/assets_manager.dart index 7e1f297..4f6dbb9 100644 --- a/lib/utils/assets_manager.dart +++ b/lib/utils/assets_manager.dart @@ -1,14 +1,22 @@ class AssetsManager { AssetsManager._(); - // Folders + // Main Folders static const _assetsFolder = 'assets'; static const _imagesFolder = '$_assetsFolder/images'; + static const _svgsFolder = 'svgs'; static const _lottieFolder = '$_assetsFolder/lottie'; + // Sub Folders + static const _appLogoFolder = '$_svgsFolder/app_logo'; + // Images static const desktopBackground = '$_imagesFolder/desktop_background.jpg'; + // SVGs + static const appLogoColored = '$_appLogoFolder/app_logo_colored.svg'; + static const appLogoWhite = '$_appLogoFolder/app_logo_white.svg'; + // Lottie static const filesProcessing = '$_lottieFolder/files_processing.json'; } diff --git a/lib/utils/colors_palette.dart b/lib/utils/colors_palette.dart index a5d6a8b..5f2cfc3 100644 --- a/lib/utils/colors_palette.dart +++ b/lib/utils/colors_palette.dart @@ -23,7 +23,7 @@ class ColorsPalette { // Main Colors static const primaryColor = Color(_primaryColorValue); - static const secondaryColor = Color(0xFF42A5F6); + static const secondaryColor = Color(0xFFFCB732); // Whites and Blacks static const white = Color(0xFFFFFFFF); diff --git a/pubspec.lock b/pubspec.lock index 5933d91..4117d74 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -17,6 +17,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.3.6" + args: + dependency: transitive + description: + name: args + sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440" + url: "https://pub.dev" + source: hosted + version: "2.4.0" async: dependency: transitive description: @@ -158,6 +166,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.1" + flutter_svg: + dependency: "direct main" + description: + name: flutter_svg + sha256: "12006889e2987c549c4c1ec1a5ba4ec4b24d34d2469ee5f9476c926dcecff266" + url: "https://pub.dev" + source: hosted + version: "2.0.4" flutter_test: dependency: "direct dev" description: flutter @@ -248,6 +264,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.1" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4" + url: "https://pub.dev" + source: hosted + version: "5.1.0" plugin_platform_interface: dependency: transitive description: @@ -405,6 +429,30 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.5" + vector_graphics: + dependency: transitive + description: + name: vector_graphics + sha256: "4cf8e60dbe4d3a693d37dff11255a172594c0793da542183cbfe7fe978ae4aaa" + url: "https://pub.dev" + source: hosted + version: "1.1.4" + vector_graphics_codec: + dependency: transitive + description: + name: vector_graphics_codec + sha256: "278ad5f816f58b1967396d1f78ced470e3e58c9fe4b27010102c0a595c764468" + url: "https://pub.dev" + source: hosted + version: "1.1.4" + vector_graphics_compiler: + dependency: transitive + description: + name: vector_graphics_compiler + sha256: "0bf61ad56e6fd6688a2865d3ceaea396bc6a0a90ea0d7ad5049b1b76c09d6163" + url: "https://pub.dev" + source: hosted + version: "1.1.4" vector_math: dependency: transitive description: @@ -413,6 +461,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + xml: + dependency: transitive + description: + name: xml + sha256: "979ee37d622dec6365e2efa4d906c37470995871fe9ae080d967e192d88286b5" + url: "https://pub.dev" + source: hosted + version: "6.2.2" sdks: dart: ">=2.19.3 <3.0.0" - flutter: ">=3.3.0" + flutter: ">=3.7.0-0" diff --git a/pubspec.yaml b/pubspec.yaml index 2371a75..cb9bf82 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: made_with_flutter -description: Made with Flutter is a tool that lets you know if an APK/APP was made with Flutter or not. +description: Made with Flutter is an open source tool that lets you know if an APK/APP was made with Flutter or not. publish_to: "none" @@ -22,6 +22,7 @@ dependencies: flutter_dropzone: ^3.0.5 archive: ^3.3.6 elegant_notification: ^1.8.1 + flutter_svg: ^2.0.4 dev_dependencies: flutter_test: diff --git a/web/favicon.ico b/web/favicon.ico new file mode 100644 index 0000000..a532e8b Binary files /dev/null and b/web/favicon.ico differ diff --git a/web/favicon.png b/web/favicon.png deleted file mode 100644 index 8aaa46a..0000000 Binary files a/web/favicon.png and /dev/null differ diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png deleted file mode 100644 index b749bfe..0000000 Binary files a/web/icons/Icon-192.png and /dev/null differ diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png deleted file mode 100644 index 88cfd48..0000000 Binary files a/web/icons/Icon-512.png and /dev/null differ diff --git a/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png deleted file mode 100644 index eb9b4d7..0000000 Binary files a/web/icons/Icon-maskable-192.png and /dev/null differ diff --git a/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png deleted file mode 100644 index d69c566..0000000 Binary files a/web/icons/Icon-maskable-512.png and /dev/null differ diff --git a/web/icons/android-chrome-192x192.png b/web/icons/android-chrome-192x192.png new file mode 100644 index 0000000..0cc9c91 Binary files /dev/null and b/web/icons/android-chrome-192x192.png differ diff --git a/web/icons/android-chrome-512x512.png b/web/icons/android-chrome-512x512.png new file mode 100644 index 0000000..feb3025 Binary files /dev/null and b/web/icons/android-chrome-512x512.png differ diff --git a/web/icons/apple-touch-icon.png b/web/icons/apple-touch-icon.png new file mode 100644 index 0000000..4af2b42 Binary files /dev/null and b/web/icons/apple-touch-icon.png differ diff --git a/web/icons/favicon-16x16.png b/web/icons/favicon-16x16.png new file mode 100644 index 0000000..97c47b0 Binary files /dev/null and b/web/icons/favicon-16x16.png differ diff --git a/web/icons/favicon-32x32.png b/web/icons/favicon-32x32.png new file mode 100644 index 0000000..a07c05a Binary files /dev/null and b/web/icons/favicon-32x32.png differ diff --git a/web/index.html b/web/index.html index cbe846a..cb819dc 100644 --- a/web/index.html +++ b/web/index.html @@ -1,5 +1,6 @@ + - - + + - + - made_with_flutter + Made with Flutter? + - + + \ No newline at end of file diff --git a/web/manifest.json b/web/manifest.json index ab86b86..80ccd52 100644 --- a/web/manifest.json +++ b/web/manifest.json @@ -1,35 +1,23 @@ { - "name": "made_with_flutter", - "short_name": "made_with_flutter", + "name": "Made with Flutter?", + "short_name": "Made with Flutter?", "start_url": ".", "display": "standalone", - "background_color": "#0175C2", - "theme_color": "#0175C2", - "description": "A new Flutter project.", + "background_color": "#0E47A1", + "theme_color": "#0E47A1", + "description": "Made with Flutter is an open source tool that lets you know if an APK/APP was made with Flutter or not.", "orientation": "portrait-primary", "prefer_related_applications": false, "icons": [ { - "src": "icons/Icon-192.png", + "src": "icons/android-chrome-192x192.png", "sizes": "192x192", "type": "image/png" }, { - "src": "icons/Icon-512.png", + "src": "icons/android-chrome-512x512.png", "sizes": "512x512", "type": "image/png" - }, - { - "src": "icons/Icon-maskable-192.png", - "sizes": "192x192", - "type": "image/png", - "purpose": "maskable" - }, - { - "src": "icons/Icon-maskable-512.png", - "sizes": "512x512", - "type": "image/png", - "purpose": "maskable" } ] -} +} \ No newline at end of file