Skip to content

Commit

Permalink
feature: Added new icon (#140)
Browse files Browse the repository at this point in the history
Co-authored-by: PartyDonut <PartyDonut@users.noreply.github.com>
  • Loading branch information
PartyDonut and PartyDonut authored Nov 11, 2024
1 parent 5c560e5 commit b8ad2a4
Show file tree
Hide file tree
Showing 118 changed files with 66 additions and 76 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,8 @@ app.*.map.json
/android/app/release

# FVM Version Cache
.fvm/
.fvm/

# Affinity lock
*.afdesign~lock~
*.afphoto~lock~
Binary file modified android/app/src/development/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/development/res/drawable-hdpi/ic_notification.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/development/res/drawable-mdpi/ic_notification.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/development/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/development/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/development/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/development/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/development/res/mipmap-xxxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/production/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/production/res/drawable-hdpi/ic_notification.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/production/res/drawable-mdpi/ic_notification.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/production/res/mipmap-hdpi/ic_launcher.png
Binary file modified android/app/src/production/res/mipmap-mdpi/ic_launcher.png
Binary file modified android/app/src/production/res/mipmap-mdpi/ic_launcher_monochrome.png
Binary file modified android/app/src/production/res/mipmap-xhdpi/ic_launcher.png
Binary file modified android/app/src/production/res/mipmap-xxhdpi/ic_launcher.png
Binary file modified android/app/src/production/res/mipmap-xxxhdpi/ic_launcher.png
Binary file added assets/Icon.afdesign
Binary file not shown.
Binary file added assets/fladder_icon.afphoto
Binary file not shown.
Binary file added assets/fladder_icon_general.afphoto
Binary file not shown.
Binary file modified assets/marketing/banner.png
Binary file added assets/marketing/banner_store.png
Binary file modified icons/development/fladder_adaptive_icon.png
Binary file modified icons/development/fladder_icon.png
Binary file modified icons/development/fladder_icon_desktop.png
Binary file modified icons/development/fladder_macos_icon.png
Binary file removed icons/development/fladder_store_icon.jpg
Diff not rendered.
Binary file added icons/development/fladder_store_icon.png
Binary file removed icons/fladder_icon.afphoto
Binary file not shown.
20 changes: 11 additions & 9 deletions icons/fladder_icon.svg
27 changes: 10 additions & 17 deletions icons/fladder_icon_grayscale.svg

Large diffs are not rendered by default.

12 changes: 8 additions & 4 deletions icons/fladder_icon_outline.svg

Large diffs are not rendered by default.

Binary file modified icons/fladder_notification_icon.png
Binary file modified icons/production/fladder_adaptive_icon.png
Binary file modified icons/production/fladder_icon.png
Binary file modified icons/production/fladder_icon_desktop.png
Binary file modified icons/production/fladder_macos_icon.png
Binary file removed icons/production/fladder_store_icon.jpg
Diff not rendered.
Binary file added icons/production/fladder_store_icon.png
2 changes: 1 addition & 1 deletion icons_launcher-development.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ icons_launcher:
notification_image: icons/fladder_notification_icon.png
enable: true
ios:
image_path: "icons/development/fladder_store_icon.jpg"
image_path: "icons/development/fladder_store_icon.png"
enable: true
windows:
image_path: "icons/development/fladder_icon_desktop.png"
Expand Down
3 changes: 2 additions & 1 deletion icons_launcher-production.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ icons_launcher:
adaptive_background_color: "#3a2101"
adaptive_monochrome_image: "icons/production/fladder_adaptive_icon.png"
notification_image: icons/fladder_notification_icon.png

enable: true
ios:
image_path: "icons/production/fladder_store_icon.jpg"
image_path: "icons/production/fladder_store_icon.png"
enable: true
windows:
image_path: "icons/production/fladder_icon_desktop.png"
Expand Down
19 changes: 3 additions & 16 deletions lib/screens/settings/about_settings_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';

import 'package:fladder/screens/settings/settings_scaffold.dart';
import 'package:fladder/screens/shared/fladder_icon.dart';
import 'package:fladder/screens/shared/fladder_logo.dart';
import 'package:fladder/screens/shared/media/external_urls.dart';
import 'package:fladder/util/application_info.dart';
import 'package:fladder/util/list_padding.dart';
Expand Down Expand Up @@ -44,21 +45,7 @@ class AboutSettingsPage extends ConsumerWidget {
child: SettingsScaffold(
label: "",
items: [
Wrap(
runAlignment: WrapAlignment.center,
alignment: WrapAlignment.center,
crossAxisAlignment: WrapCrossAlignment.center,
runSpacing: 24,
spacing: 24,
children: [
const FladderIcon(size: 85),
Text(
"Fladder",
textAlign: TextAlign.center,
style: Theme.of(context).textTheme.displayLarge?.copyWith(fontWeight: FontWeight.bold),
),
],
),
const FladderLogo(),
Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expand Down Expand Up @@ -101,7 +88,7 @@ class AboutSettingsPage extends ConsumerWidget {
FilledButton.tonal(
onPressed: () => showLicensePage(
context: context,
applicationIcon: const FladderIcon(size: 85),
applicationIcon: const FladderIcon(size: 55),
applicationVersion: applicationInfo.versionPlatformBuild,
applicationLegalese: "DonutWare",
),
Expand Down
31 changes: 14 additions & 17 deletions lib/screens/shared/fladder_icon.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
import 'package:fladder/util/theme_extensions.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'dart:ui' as ui;

import 'package:flutter/material.dart';

import 'package:flutter_svg/flutter_svg.dart';

import 'package:fladder/util/theme_extensions.dart';

class FladderIcon extends StatelessWidget {
final double size;
const FladderIcon({this.size = 100, super.key});
Expand All @@ -24,13 +27,10 @@ class FladderIcon extends StatelessWidget {
],
);
},
child: RotatedBox(
quarterTurns: 1,
child: SvgPicture.asset(
"icons/fladder_icon_grayscale.svg",
width: size,
colorFilter: const ColorFilter.mode(Colors.white, BlendMode.srcIn),
),
child: SvgPicture.asset(
"icons/fladder_icon_grayscale.svg",
width: size,
colorFilter: const ColorFilter.mode(Colors.white, BlendMode.srcIn),
),
),
],
Expand All @@ -45,13 +45,10 @@ class FladderIconOutlined extends StatelessWidget {

@override
Widget build(BuildContext context) {
return RotatedBox(
quarterTurns: 1,
child: SvgPicture.asset(
"icons/fladder_icon_outline.svg",
width: size,
colorFilter: ColorFilter.mode(color ?? context.colors.onSurfaceVariant, BlendMode.srcATop),
),
return SvgPicture.asset(
"icons/fladder_icon_outline.svg",
width: size,
colorFilter: ColorFilter.mode(color ?? context.colors.onSurfaceVariant, BlendMode.srcATop),
);
}
}
8 changes: 5 additions & 3 deletions lib/screens/shared/fladder_logo.dart
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import 'package:flutter/material.dart';

import 'package:flutter_riverpod/flutter_riverpod.dart';

import 'package:fladder/screens/shared/fladder_icon.dart';
import 'package:fladder/util/application_info.dart';
import 'package:fladder/util/string_extensions.dart';
import 'package:fladder/util/theme_extensions.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';

class FladderLogo extends ConsumerWidget {
const FladderLogo({super.key});
Expand All @@ -19,7 +21,7 @@ class FladderLogo extends ConsumerWidget {
spacing: 16,
runSpacing: 8,
children: [
const FladderIcon(),
Transform.translate(offset: const Offset(0, -8), child: const FladderIcon(size: 75)),
Text(
ref.read(applicationInfoProvider).name.capitalize(),
style: context.textTheme.displayLarge,
Expand Down
Binary file modified macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png
Binary file modified macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png
Binary file modified macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png
12 changes: 6 additions & 6 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -676,10 +676,10 @@ packages:
dependency: "direct main"
description:
name: flutter_svg
sha256: "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2"
sha256: "578bd8c508144fdaffd4f77b8ef2d8c523602275cd697cc3db284dbd762ef4ce"
url: "https://pub.dev"
source: hosted
version: "2.0.10+1"
version: "2.0.14"
flutter_test:
dependency: "direct dev"
description: flutter
Expand Down Expand Up @@ -1987,10 +1987,10 @@ packages:
dependency: transitive
description:
name: vector_graphics
sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3"
sha256: "773c9522d66d523e1c7b25dfb95cc91c26a1e17b107039cfe147285e92de7878"
url: "https://pub.dev"
source: hosted
version: "1.1.11+1"
version: "1.1.14"
vector_graphics_codec:
dependency: transitive
description:
Expand All @@ -2003,10 +2003,10 @@ packages:
dependency: transitive
description:
name: vector_graphics_compiler
sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81"
sha256: ab9ff38fc771e9ee1139320adbe3d18a60327370c218c60752068ebee4b49ab1
url: "https://pub.dev"
source: hosted
version: "1.1.11+1"
version: "1.1.15"
vector_math:
dependency: transitive
description:
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ dependencies:

# UI Components
dynamic_color: ^1.7.0
flutter_svg: ^2.0.4
flutter_svg: ^2.0.14
drop_shadow: ^0.1.0
animations: ^2.0.7
automatic_animated_list: ^1.1.0
Expand Down
Binary file modified snap/gui/app_icon.png
Binary file modified web/favicon.png
Binary file modified web/icons/Icon-192.png
Binary file modified web/icons/Icon-512.png
Binary file modified web/icons/Icon-maskable-192.png
Binary file modified web/icons/Icon-maskable-512.png
Binary file modified windows/runner/resources/app_icon.ico
Binary file not shown.

0 comments on commit b8ad2a4

Please sign in to comment.