diff --git a/README.md b/README.md index f6ed5187..4c5c1f1c 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,10 @@ Btw it's not just another Electron app 😉 --- +![Spotube Desktop](assets/branding/spotube-screenshot.png) + +![Spotube Mobile](assets/branding/mobile-screenshots/combined.jpg) + ## 🌃 Features diff --git a/assets/branding/mobile-screenshots/android-1.jpg b/assets/branding/mobile-screenshots/android-1.jpg index 574c86c8..16debbd7 100644 Binary files a/assets/branding/mobile-screenshots/android-1.jpg and b/assets/branding/mobile-screenshots/android-1.jpg differ diff --git a/assets/branding/mobile-screenshots/android-2.jpg b/assets/branding/mobile-screenshots/android-2.jpg index 62da3c86..d594227e 100644 Binary files a/assets/branding/mobile-screenshots/android-2.jpg and b/assets/branding/mobile-screenshots/android-2.jpg differ diff --git a/assets/branding/mobile-screenshots/android-3.jpg b/assets/branding/mobile-screenshots/android-3.jpg index ccdbee84..ed2d61f2 100644 Binary files a/assets/branding/mobile-screenshots/android-3.jpg and b/assets/branding/mobile-screenshots/android-3.jpg differ diff --git a/assets/branding/mobile-screenshots/android-4.jpg b/assets/branding/mobile-screenshots/android-4.jpg index 278aae21..36a3549f 100644 Binary files a/assets/branding/mobile-screenshots/android-4.jpg and b/assets/branding/mobile-screenshots/android-4.jpg differ diff --git a/assets/branding/mobile-screenshots/android-5.jpg b/assets/branding/mobile-screenshots/android-5.jpg index 563b26c6..29be481b 100644 Binary files a/assets/branding/mobile-screenshots/android-5.jpg and b/assets/branding/mobile-screenshots/android-5.jpg differ diff --git a/assets/branding/mobile-screenshots/android-6.jpg b/assets/branding/mobile-screenshots/android-6.jpg deleted file mode 100644 index fc8d4750..00000000 Binary files a/assets/branding/mobile-screenshots/android-6.jpg and /dev/null differ diff --git a/assets/branding/mobile-screenshots/combined.jpg b/assets/branding/mobile-screenshots/combined.jpg new file mode 100644 index 00000000..03740580 Binary files /dev/null and b/assets/branding/mobile-screenshots/combined.jpg differ diff --git a/assets/branding/mobile-screenshots/combined.png b/assets/branding/mobile-screenshots/combined.png deleted file mode 100644 index a7a394f6..00000000 Binary files a/assets/branding/mobile-screenshots/combined.png and /dev/null differ diff --git a/assets/branding/spotube-screenshot.png b/assets/branding/spotube-screenshot.png index c76d2f8a..c708e240 100644 Binary files a/assets/branding/spotube-screenshot.png and b/assets/branding/spotube-screenshot.png differ diff --git a/lib/modules/root/sidebar/sidebar.dart b/lib/modules/root/sidebar/sidebar.dart index 2b04b703..e4e7db3d 100644 --- a/lib/modules/root/sidebar/sidebar.dart +++ b/lib/modules/root/sidebar/sidebar.dart @@ -3,7 +3,6 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:shadcn_flutter/shadcn_flutter.dart'; -import 'package:spotube/collections/assets.gen.dart'; import 'package:spotube/collections/side_bar_tiles.dart'; import 'package:spotube/models/database/database.dart'; import 'package:spotube/extensions/constrains.dart'; @@ -20,19 +19,6 @@ class Sidebar extends HookConsumerWidget { super.key, }); - static Widget brandLogo(BuildContext context) { - return Container( - decoration: BoxDecoration( - color: Colors.black, - borderRadius: BorderRadius.circular(50), - ), - child: Assets.branding.spotubeLogoPng.image( - height: 50, - cacheHeight: (100 * MediaQuery.devicePixelRatioOf(context)).toInt(), - ), - ); - } - @override Widget build(BuildContext context, WidgetRef ref) { final ThemeData(:colorScheme) = Theme.of(context); diff --git a/lib/pages/home/home.dart b/lib/pages/home/home.dart index cdf057cf..a92c776e 100644 --- a/lib/pages/home/home.dart +++ b/lib/pages/home/home.dart @@ -3,8 +3,6 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:shadcn_flutter/shadcn_flutter.dart'; -import 'package:shadcn_flutter/shadcn_flutter_extension.dart'; -import 'package:spotube/collections/assets.gen.dart'; import 'package:spotube/collections/routes.gr.dart'; import 'package:spotube/collections/spotube_icons.dart'; import 'package:spotube/models/database/database.dart'; @@ -43,19 +41,17 @@ class HomePage extends HookConsumerWidget { if (mediaQuery.smAndDown || layoutMode == LayoutMode.compact) SliverAppBar( floating: true, - title: Image.asset( - theme.brightness == Brightness.dark - ? Assets.branding.spotubeLogoPng.path - : Assets.branding.spotubeLogoLight.path, - height: 45, - width: 45, - color: theme.colorScheme.background, - colorBlendMode: BlendMode.saturation, - cacheHeight: - (100 * MediaQuery.devicePixelRatioOf(context)).toInt(), + title: DefaultTextStyle( + style: TextStyle( + fontFamily: "Cookie", + fontSize: 30, + letterSpacing: 1.8, + color: theme.colorScheme.foreground, + ), + child: const Text("Spotube"), ), - backgroundColor: context.theme.colorScheme.background, - foregroundColor: context.theme.colorScheme.foreground, + backgroundColor: theme.colorScheme.background, + foregroundColor: theme.colorScheme.foreground, actions: [ const ConnectDeviceButton(), const Gap(10), diff --git a/metadata/en-US/images/icon.png b/metadata/en-US/images/icon.png index b24a8c23..d46d9ce5 100644 Binary files a/metadata/en-US/images/icon.png and b/metadata/en-US/images/icon.png differ diff --git a/metadata/en-US/images/phoneScreenshots/android-1.jpg b/metadata/en-US/images/phoneScreenshots/android-1.jpg index 574c86c8..16debbd7 100644 Binary files a/metadata/en-US/images/phoneScreenshots/android-1.jpg and b/metadata/en-US/images/phoneScreenshots/android-1.jpg differ diff --git a/metadata/en-US/images/phoneScreenshots/android-2.jpg b/metadata/en-US/images/phoneScreenshots/android-2.jpg index 62da3c86..d594227e 100644 Binary files a/metadata/en-US/images/phoneScreenshots/android-2.jpg and b/metadata/en-US/images/phoneScreenshots/android-2.jpg differ diff --git a/metadata/en-US/images/phoneScreenshots/android-3.jpg b/metadata/en-US/images/phoneScreenshots/android-3.jpg index ccdbee84..ed2d61f2 100644 Binary files a/metadata/en-US/images/phoneScreenshots/android-3.jpg and b/metadata/en-US/images/phoneScreenshots/android-3.jpg differ diff --git a/metadata/en-US/images/phoneScreenshots/android-4.jpg b/metadata/en-US/images/phoneScreenshots/android-4.jpg index 278aae21..36a3549f 100644 Binary files a/metadata/en-US/images/phoneScreenshots/android-4.jpg and b/metadata/en-US/images/phoneScreenshots/android-4.jpg differ diff --git a/metadata/en-US/images/phoneScreenshots/android-5.jpg b/metadata/en-US/images/phoneScreenshots/android-5.jpg index 563b26c6..29be481b 100644 Binary files a/metadata/en-US/images/phoneScreenshots/android-5.jpg and b/metadata/en-US/images/phoneScreenshots/android-5.jpg differ diff --git a/metadata/en-US/images/phoneScreenshots/android-6.jpg b/metadata/en-US/images/phoneScreenshots/android-6.jpg deleted file mode 100644 index fc8d4750..00000000 Binary files a/metadata/en-US/images/phoneScreenshots/android-6.jpg and /dev/null differ diff --git a/metadata/tr/images/icon.png b/metadata/tr/images/icon.png index b24a8c23..d46d9ce5 100644 Binary files a/metadata/tr/images/icon.png and b/metadata/tr/images/icon.png differ diff --git a/metadata/tr/images/phoneScreenshots/android-1.jpg b/metadata/tr/images/phoneScreenshots/android-1.jpg index 574c86c8..16debbd7 100644 Binary files a/metadata/tr/images/phoneScreenshots/android-1.jpg and b/metadata/tr/images/phoneScreenshots/android-1.jpg differ diff --git a/metadata/tr/images/phoneScreenshots/android-2.jpg b/metadata/tr/images/phoneScreenshots/android-2.jpg index 62da3c86..d594227e 100644 Binary files a/metadata/tr/images/phoneScreenshots/android-2.jpg and b/metadata/tr/images/phoneScreenshots/android-2.jpg differ diff --git a/metadata/tr/images/phoneScreenshots/android-3.jpg b/metadata/tr/images/phoneScreenshots/android-3.jpg index ccdbee84..ed2d61f2 100644 Binary files a/metadata/tr/images/phoneScreenshots/android-3.jpg and b/metadata/tr/images/phoneScreenshots/android-3.jpg differ diff --git a/metadata/tr/images/phoneScreenshots/android-4.jpg b/metadata/tr/images/phoneScreenshots/android-4.jpg index 278aae21..36a3549f 100644 Binary files a/metadata/tr/images/phoneScreenshots/android-4.jpg and b/metadata/tr/images/phoneScreenshots/android-4.jpg differ diff --git a/metadata/tr/images/phoneScreenshots/android-5.jpg b/metadata/tr/images/phoneScreenshots/android-5.jpg index 563b26c6..29be481b 100644 Binary files a/metadata/tr/images/phoneScreenshots/android-5.jpg and b/metadata/tr/images/phoneScreenshots/android-5.jpg differ diff --git a/metadata/tr/images/phoneScreenshots/android-6.jpg b/metadata/tr/images/phoneScreenshots/android-6.jpg deleted file mode 100644 index fc8d4750..00000000 Binary files a/metadata/tr/images/phoneScreenshots/android-6.jpg and /dev/null differ