diff --git a/Shorts Trailer #1 [WR0W2L4TLsM].webm b/Shorts Trailer #1 [WR0W2L4TLsM].webm deleted file mode 100644 index 9c4d01f..0000000 Binary files a/Shorts Trailer #1 [WR0W2L4TLsM].webm and /dev/null differ diff --git a/assets/fonts/Poppins-Black.ttf b/assets/fonts/Poppins-Black.ttf new file mode 100644 index 0000000..71c0f99 Binary files /dev/null and b/assets/fonts/Poppins-Black.ttf differ diff --git a/assets/fonts/Poppins-BlackItalic.ttf b/assets/fonts/Poppins-BlackItalic.ttf new file mode 100644 index 0000000..7aeb58b Binary files /dev/null and b/assets/fonts/Poppins-BlackItalic.ttf differ diff --git a/assets/fonts/Poppins-Bold.ttf b/assets/fonts/Poppins-Bold.ttf new file mode 100644 index 0000000..00559ee Binary files /dev/null and b/assets/fonts/Poppins-Bold.ttf differ diff --git a/assets/fonts/Poppins-BoldItalic.ttf b/assets/fonts/Poppins-BoldItalic.ttf new file mode 100644 index 0000000..e61e8e8 Binary files /dev/null and b/assets/fonts/Poppins-BoldItalic.ttf differ diff --git a/assets/fonts/Poppins-ExtraBold.ttf b/assets/fonts/Poppins-ExtraBold.ttf new file mode 100644 index 0000000..df70936 Binary files /dev/null and b/assets/fonts/Poppins-ExtraBold.ttf differ diff --git a/assets/fonts/Poppins-ExtraBoldItalic.ttf b/assets/fonts/Poppins-ExtraBoldItalic.ttf new file mode 100644 index 0000000..14d2b37 Binary files /dev/null and b/assets/fonts/Poppins-ExtraBoldItalic.ttf differ diff --git a/assets/fonts/Poppins-ExtraLight.ttf b/assets/fonts/Poppins-ExtraLight.ttf new file mode 100644 index 0000000..e76ec69 Binary files /dev/null and b/assets/fonts/Poppins-ExtraLight.ttf differ diff --git a/assets/fonts/Poppins-ExtraLightItalic.ttf b/assets/fonts/Poppins-ExtraLightItalic.ttf new file mode 100644 index 0000000..89513d9 Binary files /dev/null and b/assets/fonts/Poppins-ExtraLightItalic.ttf differ diff --git a/assets/fonts/Poppins-Italic.ttf b/assets/fonts/Poppins-Italic.ttf new file mode 100644 index 0000000..12b7b3c Binary files /dev/null and b/assets/fonts/Poppins-Italic.ttf differ diff --git a/assets/fonts/Poppins-Light.ttf b/assets/fonts/Poppins-Light.ttf new file mode 100644 index 0000000..bc36bcc Binary files /dev/null and b/assets/fonts/Poppins-Light.ttf differ diff --git a/assets/fonts/Poppins-LightItalic.ttf b/assets/fonts/Poppins-LightItalic.ttf new file mode 100644 index 0000000..9e70be6 Binary files /dev/null and b/assets/fonts/Poppins-LightItalic.ttf differ diff --git a/assets/fonts/Poppins-Medium.ttf b/assets/fonts/Poppins-Medium.ttf new file mode 100644 index 0000000..6bcdcc2 Binary files /dev/null and b/assets/fonts/Poppins-Medium.ttf differ diff --git a/assets/fonts/Poppins-MediumItalic.ttf b/assets/fonts/Poppins-MediumItalic.ttf new file mode 100644 index 0000000..be67410 Binary files /dev/null and b/assets/fonts/Poppins-MediumItalic.ttf differ diff --git a/assets/fonts/Poppins-Regular.ttf b/assets/fonts/Poppins-Regular.ttf new file mode 100644 index 0000000..9f0c71b Binary files /dev/null and b/assets/fonts/Poppins-Regular.ttf differ diff --git a/assets/fonts/Poppins-SemiBold.ttf b/assets/fonts/Poppins-SemiBold.ttf new file mode 100644 index 0000000..74c726e Binary files /dev/null and b/assets/fonts/Poppins-SemiBold.ttf differ diff --git a/assets/fonts/Poppins-SemiBoldItalic.ttf b/assets/fonts/Poppins-SemiBoldItalic.ttf new file mode 100644 index 0000000..3e6c942 Binary files /dev/null and b/assets/fonts/Poppins-SemiBoldItalic.ttf differ diff --git a/assets/fonts/Poppins-Thin.ttf b/assets/fonts/Poppins-Thin.ttf new file mode 100644 index 0000000..03e7366 Binary files /dev/null and b/assets/fonts/Poppins-Thin.ttf differ diff --git a/assets/fonts/Poppins-ThinItalic.ttf b/assets/fonts/Poppins-ThinItalic.ttf new file mode 100644 index 0000000..e26db5d Binary files /dev/null and b/assets/fonts/Poppins-ThinItalic.ttf differ diff --git a/assets/images/favicon.ico b/assets/images/favicon.ico new file mode 100644 index 0000000..35cdd40 Binary files /dev/null and b/assets/images/favicon.ico differ diff --git a/assets/images/favicon.png b/assets/images/favicon.png new file mode 100644 index 0000000..668bc47 Binary files /dev/null and b/assets/images/favicon.png differ diff --git a/lib/main.dart b/lib/main.dart index 5a8d8f2..c4047cc 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -2,10 +2,23 @@ import 'package:flutter/material.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:notube/wrapper.dart'; import 'package:notube/constants.dart'; +import 'package:window_manager/window_manager.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); await EasyLocalization.ensureInitialized(); + await windowManager.ensureInitialized(); + + WindowOptions windowOptions = WindowOptions( + size: Size(800, 600), + minimumSize: Size(320, 400), + title: 'NoTube', + ); + windowManager.waitUntilReadyToShow(windowOptions, () async { + await windowManager.setIcon('assets/images/icon.png'); + await windowManager.show(); + await windowManager.focus(); + }); runApp( EasyLocalization( @@ -24,6 +37,7 @@ class NoTubeApp extends StatelessWidget { return MaterialApp( title: 'NoTube', theme: ThemeData( + fontFamily: 'Poppins', useMaterial3: true, colorScheme: ColorScheme.fromSeed( seedColor: colorMainRed, brightness: Brightness.dark), diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 10e19fe..cad806e 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -7,9 +7,17 @@ #include "generated_plugin_registrant.h" #include +#include +#include void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) flutter_localization_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterLocalizationPlugin"); flutter_localization_plugin_register_with_registrar(flutter_localization_registrar); + g_autoptr(FlPluginRegistrar) screen_retriever_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverPlugin"); + screen_retriever_plugin_register_with_registrar(screen_retriever_registrar); + g_autoptr(FlPluginRegistrar) window_manager_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "WindowManagerPlugin"); + window_manager_plugin_register_with_registrar(window_manager_registrar); } diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 2284757..e63493e 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -4,6 +4,8 @@ list(APPEND FLUTTER_PLUGIN_LIST flutter_localization + screen_retriever + window_manager ) list(APPEND FLUTTER_FFI_PLUGIN_LIST diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 34745dc..3f4825d 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -7,10 +7,14 @@ import Foundation import flutter_localization import path_provider_foundation +import screen_retriever import shared_preferences_foundation +import window_manager func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { FlutterLocalizationPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalizationPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) + ScreenRetrieverPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) + WindowManagerPlugin.register(with: registry.registrar(forPlugin: "WindowManagerPlugin")) } diff --git a/pubspec.lock b/pubspec.lock index 6e0bf05..af1e1e8 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -309,6 +309,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + screen_retriever: + dependency: transitive + description: + name: screen_retriever + sha256: "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90" + url: "https://pub.dev" + source: hosted + version: "0.1.9" shared_preferences: dependency: transitive description: @@ -458,6 +466,14 @@ packages: url: "https://pub.dev" source: hosted version: "5.5.1" + window_manager: + dependency: "direct main" + description: + name: window_manager + sha256: "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf" + url: "https://pub.dev" + source: hosted + version: "0.3.9" xdg_directories: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 508b2f6..52ac197 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,6 +19,7 @@ dependencies: get: ^4.6.6 process_run: ^0.14.2 path_provider: ^2.1.3 + window_manager: ^0.3.9 dev_dependencies: flutter_test: @@ -27,6 +28,54 @@ dev_dependencies: flutter_lints: ^2.0.0 flutter: + fonts: + - family: Poppins + fonts: + - asset: assets/fonts/Poppins-Thin.ttf + weight: 100 + - asset: assets/fonts/Poppins-ExtraLight.ttf + weight: 200 + - asset: assets/fonts/Poppins-Light.ttf + weight: 300 + - asset: assets/fonts/Poppins-Regular.ttf + weight: 400 + - asset: assets/fonts/Poppins-Medium.ttf + weight: 500 + - asset: assets/fonts/Poppins-SemiBold.ttf + weight: 600 + - asset: assets/fonts/Poppins-Bold.ttf + weight: 700 + - asset: assets/fonts/Poppins-ExtraBold.ttf + weight: 800 + - asset: assets/fonts/Poppins-Black.ttf + weight: 900 + - asset: assets/fonts/Poppins-Thin.ttf + weight: 100 + style: italic + - asset: assets/fonts/Poppins-ExtraLight.ttf + weight: 200 + style: italic + - asset: assets/fonts/Poppins-Light.ttf + weight: 300 + style: italic + - asset: assets/fonts/Poppins-Italic.ttf + weight: 400 + style: italic + - asset: assets/fonts/Poppins-MediumItalic.ttf + weight: 500 + style: italic + - asset: assets/fonts/Poppins-SemiBoldItalic.ttf + weight: 600 + style: italic + - asset: assets/fonts/Poppins-BoldItalic.ttf + weight: 700 + style: italic + - asset: assets/fonts/Poppins-ExtraBoldItalic.ttf + weight: 800 + style: italic + - asset: assets/fonts/Poppins-BlackItalic.ttf + weight: 900 + style: italic uses-material-design: true assets: diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 9f5b3e5..f43ba23 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -7,8 +7,14 @@ #include "generated_plugin_registrant.h" #include +#include +#include void RegisterPlugins(flutter::PluginRegistry* registry) { FlutterLocalizationPluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("FlutterLocalizationPluginCApi")); + ScreenRetrieverPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("ScreenRetrieverPlugin")); + WindowManagerPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("WindowManagerPlugin")); } diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index f040a63..bec36c6 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -4,6 +4,8 @@ list(APPEND FLUTTER_PLUGIN_LIST flutter_localization + screen_retriever + window_manager ) list(APPEND FLUTTER_FFI_PLUGIN_LIST diff --git a/windows/runner/resources/app_icon.ico b/windows/runner/resources/app_icon.ico index c04e20c..35cdd40 100644 Binary files a/windows/runner/resources/app_icon.ico and b/windows/runner/resources/app_icon.ico differ