diff --git a/apps/enmeshed/.metadata b/apps/enmeshed/.metadata index 6560a05f7..f079fb32b 100644 --- a/apps/enmeshed/.metadata +++ b/apps/enmeshed/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: "78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9" + revision: "17025dd88227cd9532c33fa78f5250d548d87e9a" channel: "stable" project_type: app @@ -13,14 +13,17 @@ project_type: app migration: platforms: - platform: root - create_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9 - base_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9 + create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a + base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a - platform: android - create_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9 - base_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9 + create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a + base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a - platform: ios - create_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9 - base_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9 + create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a + base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a + - platform: windows + create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a + base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a # User provided section diff --git a/apps/enmeshed/assets/icon-512.png b/apps/enmeshed/assets/icon-512.png new file mode 100644 index 000000000..ddf6388ea Binary files /dev/null and b/apps/enmeshed/assets/icon-512.png differ diff --git a/apps/enmeshed/lib/account/contacts/contact_detail_screen.dart b/apps/enmeshed/lib/account/contacts/contact_detail_screen.dart index cd1b5c610..c6ecfd157 100644 --- a/apps/enmeshed/lib/account/contacts/contact_detail_screen.dart +++ b/apps/enmeshed/lib/account/contacts/contact_detail_screen.dart @@ -18,6 +18,8 @@ class ContactDetailScreen extends ContactSharedFilesWidget { } class _ContactDetailScreenState extends State with ContactSharedFilesMixin { + late final ScrollController _scrollController; + late final Session _session; IdentityDVO? _contact; @@ -33,6 +35,8 @@ class _ContactDetailScreenState extends State with ContactS void initState() { super.initState(); + _scrollController = ScrollController(); + _session = GetIt.I.get().getSession(widget.accountId); _reload(); @@ -50,6 +54,8 @@ class _ContactDetailScreenState extends State with ContactS @override void dispose() { + _scrollController.dispose(); + for (final subscription in _subscriptions) { subscription.cancel(); } @@ -77,8 +83,10 @@ class _ContactDetailScreenState extends State with ContactS await loadSharedFiles(syncBefore: true); }, child: Scrollbar( + controller: _scrollController, thumbVisibility: true, child: ListView( + controller: _scrollController, children: [ ContactDetailHeader(contact: contact), ContactStatusInfoContainer(contact: contact), diff --git a/apps/enmeshed/lib/account/home/home.dart b/apps/enmeshed/lib/account/home/home.dart index bc09f1798..53ceb9391 100644 --- a/apps/enmeshed/lib/account/home/home.dart +++ b/apps/enmeshed/lib/account/home/home.dart @@ -20,6 +20,8 @@ class HomeView extends StatefulWidget { } class _HomeViewState extends State { + late final ScrollController _scrollController; + int _unreadMessagesCount = 0; List? _messages; List? _requests; @@ -31,6 +33,8 @@ class _HomeViewState extends State { void initState() { super.initState(); + _scrollController = ScrollController(); + _reload(); final runtime = GetIt.I.get(); @@ -46,6 +50,8 @@ class _HomeViewState extends State { @override void dispose() { + _scrollController.dispose(); + for (final subscription in _subscriptions) { subscription.cancel(); } @@ -67,8 +73,10 @@ class _HomeViewState extends State { return RefreshIndicator( onRefresh: () => _reload(syncBefore: true), child: Scrollbar( + controller: _scrollController, thumbVisibility: true, child: ListView( + controller: _scrollController, children: [ Padding( padding: const EdgeInsets.symmetric(horizontal: 16), diff --git a/apps/enmeshed/lib/core/setup_push.dart b/apps/enmeshed/lib/core/setup_push.dart index 97d9e58d8..f43f0a0ed 100644 --- a/apps/enmeshed/lib/core/setup_push.dart +++ b/apps/enmeshed/lib/core/setup_push.dart @@ -9,6 +9,8 @@ import 'package:logger/logger.dart'; import 'package:push/push.dart'; Future setupPush(EnmeshedRuntime runtime) async { + if (Platform.isWindows) return; + final logger = GetIt.I.get(); // this will timeout e.g. on the ios simulator diff --git a/apps/enmeshed/lib/main.dart b/apps/enmeshed/lib/main.dart index bded750c7..b4b5a5fea 100644 --- a/apps/enmeshed/lib/main.dart +++ b/apps/enmeshed/lib/main.dart @@ -1,4 +1,5 @@ import 'dart:async'; +import 'dart:io'; import 'package:croppy/croppy.dart'; import 'package:enmeshed_runtime_bridge/enmeshed_runtime_bridge.dart'; @@ -26,7 +27,7 @@ import 'splash_screen.dart'; void main() async { final widgetsBinding = WidgetsFlutterBinding.ensureInitialized(); - FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding); + if (Platform.isAndroid || Platform.isIOS) FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding); timeago.setLocaleMessages('de', timeago.DeMessages()); timeago.setLocaleMessages('en', timeago.EnMessages()); diff --git a/apps/enmeshed/lib/splash_screen.dart b/apps/enmeshed/lib/splash_screen.dart index c98eb522d..18e02943e 100644 --- a/apps/enmeshed/lib/splash_screen.dart +++ b/apps/enmeshed/lib/splash_screen.dart @@ -11,6 +11,7 @@ import 'package:go_router/go_router.dart'; import 'package:logger/logger.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:renderers/renderers.dart'; +import 'package:win32_registry/win32_registry.dart'; import 'core/core.dart'; @@ -64,17 +65,20 @@ class _SplashScreenState extends State { Future _init(GoRouter router) async { await GetIt.I.reset(); + final logger = Logger(printer: SimplePrinter(colors: false)); + GetIt.I.registerSingleton(logger); + GetIt.I.registerSingleton(UrlLauncher()); + // TODO(jkoenig134): we should probably ask for permission when we need it - await Permission.camera.request(); + final cameraStatus = await Permission.camera.request(); + if (!cameraStatus.isGranted) { + logger.w('Camera permission is (permanently) denied'); + } if (Platform.isAndroid && kDebugMode) { await InAppWebViewController.setWebContentsDebuggingEnabled(true); } - final logger = Logger(printer: SimplePrinter(colors: false)); - GetIt.I.registerSingleton(logger); - GetIt.I.registerSingleton(UrlLauncher()); - final runtime = EnmeshedRuntime( logger: logger, runtimeConfig: ( @@ -87,6 +91,7 @@ class _SplashScreenState extends State { ), ); GetIt.I.registerSingletonAsync(() async => runtime.run()); + await GetIt.I.allReady(); await setupPush(runtime); @@ -101,10 +106,10 @@ class _SplashScreenState extends State { await runtime.registerUIBridge(AppUIBridge(logger: logger, router: router)); + await _registerWindowsSchemeForDebugMode('nmshd-dev'); + final appLinks = AppLinks(); - appLinks.uriLinkStream.listen((Uri? uri) { - if (uri != null) GetIt.I.get().stringProcessor.processURL(url: uri.toString()); - }); + appLinks.uriLinkStream.listen(_processUri); final accounts = await runtime.accountServices.getAccounts(); final accountsNotInDeletion = await runtime.accountServices.getAccountsNotInDeletion(); @@ -123,8 +128,33 @@ class _SplashScreenState extends State { } final initialAppLink = await appLinks.getInitialLink(); - if (initialAppLink != null) { - await GetIt.I.get().stringProcessor.processURL(url: initialAppLink.toString()); + await _processUri(initialAppLink); + } + + Future _processUri(Uri? uri) async { + if (uri == null) return; + + final uriString = uri.toString().replaceAll('nmshd-dev://', 'nmshd://').replaceAll('qr/#', 'qr#'); + GetIt.I.get().i("Processing URL '$uriString'"); + + final result = await GetIt.I.get().stringProcessor.processURL(url: uriString); + if (result.isError) { + GetIt.I.get().e("Processing URL '$uriString' failed with code '${result.error.code}' and message '${result.error.message}'"); } } } + +Future _registerWindowsSchemeForDebugMode(String scheme) async { + if (!Platform.isWindows || !kDebugMode) return; + + final appPath = Platform.resolvedExecutable; + + final protocolRegKey = 'Software\\Classes\\$scheme'; + const protocolRegValue = RegistryValue('URL Protocol', RegistryValueType.string, ''); + const protocolCmdRegKey = r'shell\open\command'; + final protocolCmdRegValue = RegistryValue('', RegistryValueType.string, '"$appPath" "%1"'); + + Registry.currentUser.createKey(protocolRegKey) + ..createValue(protocolRegValue) + ..createKey(protocolCmdRegKey).createValue(protocolCmdRegValue); +} diff --git a/apps/enmeshed/pubspec.lock b/apps/enmeshed/pubspec.lock index de4f93167..42bfa6018 100644 --- a/apps/enmeshed/pubspec.lock +++ b/apps/enmeshed/pubspec.lock @@ -137,6 +137,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.19.0" + console: + dependency: transitive + description: + name: console + sha256: e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a + url: "https://pub.dev" + source: hosted + version: "4.1.0" croppy: dependency: "direct main" description: @@ -762,6 +770,15 @@ packages: url: "https://pub.dev" source: hosted version: "6.0.2" + msix: + dependency: "direct dev" + description: + path: "." + ref: "Fix-Flutter-3.27" + resolved-ref: "955467338b11ddcd789a37d268e9cfd884a94b17" + url: "https://github.com/h4h13/msix.git" + source: git + version: "3.16.8" open_file: dependency: "direct main" description: @@ -826,6 +843,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.0.3" + package_config: + dependency: transitive + description: + name: package_config + sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67" + url: "https://pub.dev" + source: hosted + version: "2.1.1" package_info_plus: dependency: "direct main" description: @@ -1002,6 +1027,14 @@ packages: url: "https://pub.dev" source: hosted version: "5.13.4" + pub_semver: + dependency: transitive + description: + name: pub_semver + sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd" + url: "https://pub.dev" + source: hosted + version: "2.1.5" push: dependency: "direct main" description: @@ -1373,6 +1406,22 @@ packages: url: "https://pub.dev" source: hosted version: "5.10.0" + win32_registry: + dependency: "direct main" + description: + name: win32_registry + sha256: "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852" + url: "https://pub.dev" + source: hosted + version: "1.1.5" + windows_notification: + dependency: transitive + description: + name: windows_notification + sha256: be3e650874615f315402c9b9f3656e29af156709c4b5cc272cb4ca0ab7ba94a8 + url: "https://pub.dev" + source: hosted + version: "1.3.0" wolt_modal_sheet: dependency: "direct main" description: diff --git a/apps/enmeshed/pubspec.yaml b/apps/enmeshed/pubspec.yaml index a27603e2a..6143a3f4c 100644 --- a/apps/enmeshed/pubspec.yaml +++ b/apps/enmeshed/pubspec.yaml @@ -55,12 +55,17 @@ dependencies: value_renderer: ^1.0.0 vector_graphics: ^1.1.13 very_good_analysis: ^6.0.0 + win32_registry: ^1.1.5 wolt_modal_sheet: ^0.5.0 dev_dependencies: flutter_launcher_icons: ^0.14.1 flutter_test: sdk: flutter + msix: + git: + url: https://github.com/h4h13/msix.git + ref: Fix-Flutter-3.27 translations_cleaner: ^0.0.5 vector_graphics_compiler: ^1.1.12 @@ -81,6 +86,9 @@ flutter_icons: image_path: "assets/icon.png" android: true ios: true + windows: + generate: true + image_path: "assets/icon-512.png" remove_alpha_ios: true image_path_ios_dark_transparent: "assets/icon_dark.png" image_path_ios_tinted_grayscale: "assets/icon_grayscale.png" @@ -104,3 +112,19 @@ flutter_native_splash: android: true ios: true + +# dart run msix:create +msix_config: + display_name: enmeshed + publisher_display_name: js-soft + identity_name: js-soft.enmeshed + publisher: CN=CB3048C3-A086-471C-AF11-83ABB7396C98 + store: true + protocol_activation: nmshd + logo_path: assets/icon-512.png + start_menu_icon_path: assets/icon-512.png + tile_icon_path: assets/icon-512.png + icons_background_color: transparent + build_windows: false + languages: en-us, de-de + # capabilities: "internetClient,internetClientServer,privateNetworkClientServer" diff --git a/apps/enmeshed/windows/.gitignore b/apps/enmeshed/windows/.gitignore new file mode 100644 index 000000000..d492d0d98 --- /dev/null +++ b/apps/enmeshed/windows/.gitignore @@ -0,0 +1,17 @@ +flutter/ephemeral/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/apps/enmeshed/windows/CMakeLists.txt b/apps/enmeshed/windows/CMakeLists.txt new file mode 100644 index 000000000..4fd7a3edc --- /dev/null +++ b/apps/enmeshed/windows/CMakeLists.txt @@ -0,0 +1,108 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.14) +project(enmeshed LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "enmeshed") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(VERSION 3.14...3.25) + +# Define build configuration option. +get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) +if(IS_MULTICONFIG) + set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" + CACHE STRING "" FORCE) +else() + if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") + endif() +endif() +# Define settings for the Profile build mode. +set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") +set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") + +# Use Unicode for all projects. +add_definitions(-DUNICODE -D_UNICODE) + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_17) + target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") + target_compile_options(${TARGET} PRIVATE /EHsc) + target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") + target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# Support files are copied into place next to the executable, so that it can +# run in place. This is done instead of making a separate bundle (as on Linux) +# so that building and running from within Visual Studio will work. +set(BUILD_BUNDLE_DIR "$") +# Make the "install" step default, as it's required to run. +set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +if(PLUGIN_BUNDLED_LIBRARIES) + install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() + +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + CONFIGURATIONS Profile;Release + COMPONENT Runtime) diff --git a/apps/enmeshed/windows/flutter/CMakeLists.txt b/apps/enmeshed/windows/flutter/CMakeLists.txt new file mode 100644 index 000000000..903f4899d --- /dev/null +++ b/apps/enmeshed/windows/flutter/CMakeLists.txt @@ -0,0 +1,109 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.14) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. +set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") + +# Set fallback configurations for older versions of the flutter tool. +if (NOT DEFINED FLUTTER_TARGET_PLATFORM) + set(FLUTTER_TARGET_PLATFORM "windows-x64") +endif() + +# === Flutter Library === +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "flutter_export.h" + "flutter_windows.h" + "flutter_messenger.h" + "flutter_plugin_registrar.h" + "flutter_texture_registrar.h" +) +list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") +add_dependencies(flutter flutter_assemble) + +# === Wrapper === +list(APPEND CPP_WRAPPER_SOURCES_CORE + "core_implementations.cc" + "standard_codec.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_PLUGIN + "plugin_registrar.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_APP + "flutter_engine.cc" + "flutter_view_controller.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") + +# Wrapper sources needed for a plugin. +add_library(flutter_wrapper_plugin STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} +) +apply_standard_settings(flutter_wrapper_plugin) +set_target_properties(flutter_wrapper_plugin PROPERTIES + POSITION_INDEPENDENT_CODE ON) +set_target_properties(flutter_wrapper_plugin PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) +target_include_directories(flutter_wrapper_plugin PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_plugin flutter_assemble) + +# Wrapper sources needed for the runner. +add_library(flutter_wrapper_app STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_APP} +) +apply_standard_settings(flutter_wrapper_app) +target_link_libraries(flutter_wrapper_app PUBLIC flutter) +target_include_directories(flutter_wrapper_app PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_app flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") +set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} + ${PHONY_OUTPUT} + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" + ${FLUTTER_TARGET_PLATFORM} $ + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} +) diff --git a/apps/enmeshed/windows/flutter/generated_plugin_registrant.cc b/apps/enmeshed/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 000000000..757e57808 --- /dev/null +++ b/apps/enmeshed/windows/flutter/generated_plugin_registrant.cc @@ -0,0 +1,32 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include +#include +#include +#include +#include +#include +#include + +void RegisterPlugins(flutter::PluginRegistry* registry) { + AppLinksPluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("AppLinksPluginCApi")); + FileSelectorWindowsRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FileSelectorWindows")); + FlutterInappwebviewWindowsPluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FlutterInappwebviewWindowsPluginCApi")); + PermissionHandlerWindowsPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin")); + PrintingPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("PrintingPlugin")); + UrlLauncherWindowsRegisterWithRegistrar( + registry->GetRegistrarForPlugin("UrlLauncherWindows")); + WindowsNotificationPluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("WindowsNotificationPluginCApi")); +} diff --git a/apps/enmeshed/windows/flutter/generated_plugin_registrant.h b/apps/enmeshed/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 000000000..dc139d85a --- /dev/null +++ b/apps/enmeshed/windows/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void RegisterPlugins(flutter::PluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/apps/enmeshed/windows/flutter/generated_plugins.cmake b/apps/enmeshed/windows/flutter/generated_plugins.cmake new file mode 100644 index 000000000..f275b4fd0 --- /dev/null +++ b/apps/enmeshed/windows/flutter/generated_plugins.cmake @@ -0,0 +1,31 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + app_links + file_selector_windows + flutter_inappwebview_windows + permission_handler_windows + printing + url_launcher_windows + windows_notification +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST + croppy +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/apps/enmeshed/windows/runner/CMakeLists.txt b/apps/enmeshed/windows/runner/CMakeLists.txt new file mode 100644 index 000000000..394917c05 --- /dev/null +++ b/apps/enmeshed/windows/runner/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 3.14) +project(runner LANGUAGES CXX) + +# Define the application target. To change its name, change BINARY_NAME in the +# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer +# work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} WIN32 + "flutter_window.cpp" + "main.cpp" + "utils.cpp" + "win32_window.cpp" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" + "Runner.rc" + "runner.exe.manifest" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add preprocessor definitions for the build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + +# Disable Windows macros that collide with C++ standard library functions. +target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") + +# Add dependency libraries and include directories. Add any application-specific +# dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) +target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib") +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/apps/enmeshed/windows/runner/Runner.rc b/apps/enmeshed/windows/runner/Runner.rc new file mode 100644 index 000000000..4e0cb11c3 --- /dev/null +++ b/apps/enmeshed/windows/runner/Runner.rc @@ -0,0 +1,121 @@ +// Microsoft Visual C++ generated resource script. +// +#pragma code_page(65001) +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_APP_ICON ICON "resources\\app_icon.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD +#else +#define VERSION_AS_NUMBER 1,0,0,0 +#endif + +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION +#else +#define VERSION_AS_STRING "1.0.0" +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_AS_NUMBER + PRODUCTVERSION VERSION_AS_NUMBER + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "eu.enmeshed" "\0" + VALUE "FileDescription", "enmeshed" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "enmeshed" "\0" + VALUE "LegalCopyright", "Copyright (C) 2025 eu.enmeshed. All rights reserved." "\0" + VALUE "OriginalFilename", "enmeshed.exe" "\0" + VALUE "ProductName", "enmeshed" "\0" + VALUE "ProductVersion", VERSION_AS_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/apps/enmeshed/windows/runner/flutter_window.cpp b/apps/enmeshed/windows/runner/flutter_window.cpp new file mode 100644 index 000000000..955ee3038 --- /dev/null +++ b/apps/enmeshed/windows/runner/flutter_window.cpp @@ -0,0 +1,71 @@ +#include "flutter_window.h" + +#include + +#include "flutter/generated_plugin_registrant.h" + +FlutterWindow::FlutterWindow(const flutter::DartProject& project) + : project_(project) {} + +FlutterWindow::~FlutterWindow() {} + +bool FlutterWindow::OnCreate() { + if (!Win32Window::OnCreate()) { + return false; + } + + RECT frame = GetClientArea(); + + // The size here must match the window dimensions to avoid unnecessary surface + // creation / destruction in the startup path. + flutter_controller_ = std::make_unique( + frame.right - frame.left, frame.bottom - frame.top, project_); + // Ensure that basic setup of the controller was successful. + if (!flutter_controller_->engine() || !flutter_controller_->view()) { + return false; + } + RegisterPlugins(flutter_controller_->engine()); + SetChildContent(flutter_controller_->view()->GetNativeWindow()); + + flutter_controller_->engine()->SetNextFrameCallback([&]() { + this->Show(); + }); + + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + + return true; +} + +void FlutterWindow::OnDestroy() { + if (flutter_controller_) { + flutter_controller_ = nullptr; + } + + Win32Window::OnDestroy(); +} + +LRESULT +FlutterWindow::MessageHandler(HWND hwnd, UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + // Give Flutter, including plugins, an opportunity to handle window messages. + if (flutter_controller_) { + std::optional result = + flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, + lparam); + if (result) { + return *result; + } + } + + switch (message) { + case WM_FONTCHANGE: + flutter_controller_->engine()->ReloadSystemFonts(); + break; + } + + return Win32Window::MessageHandler(hwnd, message, wparam, lparam); +} diff --git a/apps/enmeshed/windows/runner/flutter_window.h b/apps/enmeshed/windows/runner/flutter_window.h new file mode 100644 index 000000000..6da0652f0 --- /dev/null +++ b/apps/enmeshed/windows/runner/flutter_window.h @@ -0,0 +1,33 @@ +#ifndef RUNNER_FLUTTER_WINDOW_H_ +#define RUNNER_FLUTTER_WINDOW_H_ + +#include +#include + +#include + +#include "win32_window.h" + +// A window that does nothing but host a Flutter view. +class FlutterWindow : public Win32Window { + public: + // Creates a new FlutterWindow hosting a Flutter view running |project|. + explicit FlutterWindow(const flutter::DartProject& project); + virtual ~FlutterWindow(); + + protected: + // Win32Window: + bool OnCreate() override; + void OnDestroy() override; + LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, + LPARAM const lparam) noexcept override; + + private: + // The project to run. + flutter::DartProject project_; + + // The Flutter instance hosted by this window. + std::unique_ptr flutter_controller_; +}; + +#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/apps/enmeshed/windows/runner/main.cpp b/apps/enmeshed/windows/runner/main.cpp new file mode 100644 index 000000000..773f4b28e --- /dev/null +++ b/apps/enmeshed/windows/runner/main.cpp @@ -0,0 +1,83 @@ +#include +#include +#include +#include "app_links/app_links_plugin_c_api.h" + +#include "flutter_window.h" +#include "utils.h" + +bool SendAppLinkToInstance(const std::wstring& title) { + // Find our exact window + HWND hwnd = ::FindWindow(L"FLUTTER_RUNNER_WIN32_WINDOW", title.c_str()); + + if (hwnd) { + // Dispatch new link to current window + SendAppLink(hwnd); + + // (Optional) Restore our window to front in same state + WINDOWPLACEMENT place = { sizeof(WINDOWPLACEMENT) }; + GetWindowPlacement(hwnd, &place); + + switch(place.showCmd) { + case SW_SHOWMAXIMIZED: + ShowWindow(hwnd, SW_SHOWMAXIMIZED); + break; + case SW_SHOWMINIMIZED: + ShowWindow(hwnd, SW_RESTORE); + break; + default: + ShowWindow(hwnd, SW_NORMAL); + break; + } + + SetWindowPos(0, HWND_TOP, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE); + SetForegroundWindow(hwnd); + // END (Optional) Restore + + // Window has been found, don't create another one. + return true; + } + + return false; +} + +int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, + _In_ wchar_t *command_line, _In_ int show_command) { + if (SendAppLinkToInstance(L"enmeshed")) { + return EXIT_SUCCESS; + } + + // Attach to console when present (e.g., 'flutter run') or create a + // new console when running with a debugger. + if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { + CreateAndAttachConsole(); + } + + // Initialize COM, so that it is available for use in the library and/or + // plugins. + ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + + flutter::DartProject project(L"data"); + + std::vector command_line_arguments = + GetCommandLineArguments(); + + project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); + + FlutterWindow window(project); + Win32Window::Point origin(10, 10); + Win32Window::Size size(1280, 720); + if (!window.Create(L"enmeshed", origin, size)) { + return EXIT_FAILURE; + } + window.SetQuitOnClose(true); + + ::MSG msg; + while (::GetMessage(&msg, nullptr, 0, 0)) { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + } + + ::CoUninitialize(); + return EXIT_SUCCESS; +} diff --git a/apps/enmeshed/windows/runner/resource.h b/apps/enmeshed/windows/runner/resource.h new file mode 100644 index 000000000..66a65d1e4 --- /dev/null +++ b/apps/enmeshed/windows/runner/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Runner.rc +// +#define IDI_APP_ICON 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/apps/enmeshed/windows/runner/resources/app_icon.ico b/apps/enmeshed/windows/runner/resources/app_icon.ico new file mode 100644 index 000000000..c5ba8c8df Binary files /dev/null and b/apps/enmeshed/windows/runner/resources/app_icon.ico differ diff --git a/apps/enmeshed/windows/runner/runner.exe.manifest b/apps/enmeshed/windows/runner/runner.exe.manifest new file mode 100644 index 000000000..153653e8d --- /dev/null +++ b/apps/enmeshed/windows/runner/runner.exe.manifest @@ -0,0 +1,14 @@ + + + + + PerMonitorV2 + + + + + + + + + diff --git a/apps/enmeshed/windows/runner/utils.cpp b/apps/enmeshed/windows/runner/utils.cpp new file mode 100644 index 000000000..3a0b46511 --- /dev/null +++ b/apps/enmeshed/windows/runner/utils.cpp @@ -0,0 +1,65 @@ +#include "utils.h" + +#include +#include +#include +#include + +#include + +void CreateAndAttachConsole() { + if (::AllocConsole()) { + FILE *unused; + if (freopen_s(&unused, "CONOUT$", "w", stdout)) { + _dup2(_fileno(stdout), 1); + } + if (freopen_s(&unused, "CONOUT$", "w", stderr)) { + _dup2(_fileno(stdout), 2); + } + std::ios::sync_with_stdio(); + FlutterDesktopResyncOutputStreams(); + } +} + +std::vector GetCommandLineArguments() { + // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use. + int argc; + wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); + if (argv == nullptr) { + return std::vector(); + } + + std::vector command_line_arguments; + + // Skip the first argument as it's the binary name. + for (int i = 1; i < argc; i++) { + command_line_arguments.push_back(Utf8FromUtf16(argv[i])); + } + + ::LocalFree(argv); + + return command_line_arguments; +} + +std::string Utf8FromUtf16(const wchar_t* utf16_string) { + if (utf16_string == nullptr) { + return std::string(); + } + unsigned int target_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + -1, nullptr, 0, nullptr, nullptr) + -1; // remove the trailing null character + int input_length = (int)wcslen(utf16_string); + std::string utf8_string; + if (target_length == 0 || target_length > utf8_string.max_size()) { + return utf8_string; + } + utf8_string.resize(target_length); + int converted_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + input_length, utf8_string.data(), target_length, nullptr, nullptr); + if (converted_length == 0) { + return std::string(); + } + return utf8_string; +} diff --git a/apps/enmeshed/windows/runner/utils.h b/apps/enmeshed/windows/runner/utils.h new file mode 100644 index 000000000..3879d5475 --- /dev/null +++ b/apps/enmeshed/windows/runner/utils.h @@ -0,0 +1,19 @@ +#ifndef RUNNER_UTILS_H_ +#define RUNNER_UTILS_H_ + +#include +#include + +// Creates a console for the process, and redirects stdout and stderr to +// it for both the runner and the Flutter library. +void CreateAndAttachConsole(); + +// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string +// encoded in UTF-8. Returns an empty std::string on failure. +std::string Utf8FromUtf16(const wchar_t* utf16_string); + +// Gets the command line arguments passed in as a std::vector, +// encoded in UTF-8. Returns an empty std::vector on failure. +std::vector GetCommandLineArguments(); + +#endif // RUNNER_UTILS_H_ diff --git a/apps/enmeshed/windows/runner/win32_window.cpp b/apps/enmeshed/windows/runner/win32_window.cpp new file mode 100644 index 000000000..60608d0fe --- /dev/null +++ b/apps/enmeshed/windows/runner/win32_window.cpp @@ -0,0 +1,288 @@ +#include "win32_window.h" + +#include +#include + +#include "resource.h" + +namespace { + +/// Window attribute that enables dark mode window decorations. +/// +/// Redefined in case the developer's machine has a Windows SDK older than +/// version 10.0.22000.0. +/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute +#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE +#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 +#endif + +constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; + +/// Registry key for app theme preference. +/// +/// A value of 0 indicates apps should use dark mode. A non-zero or missing +/// value indicates apps should use light mode. +constexpr const wchar_t kGetPreferredBrightnessRegKey[] = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; +constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme"; + +// The number of Win32Window objects that currently exist. +static int g_active_window_count = 0; + +using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); + +// Scale helper to convert logical scaler values to physical using passed in +// scale factor +int Scale(int source, double scale_factor) { + return static_cast(source * scale_factor); +} + +// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module. +// This API is only needed for PerMonitor V1 awareness mode. +void EnableFullDpiSupportIfAvailable(HWND hwnd) { + HMODULE user32_module = LoadLibraryA("User32.dll"); + if (!user32_module) { + return; + } + auto enable_non_client_dpi_scaling = + reinterpret_cast( + GetProcAddress(user32_module, "EnableNonClientDpiScaling")); + if (enable_non_client_dpi_scaling != nullptr) { + enable_non_client_dpi_scaling(hwnd); + } + FreeLibrary(user32_module); +} + +} // namespace + +// Manages the Win32Window's window class registration. +class WindowClassRegistrar { + public: + ~WindowClassRegistrar() = default; + + // Returns the singleton registrar instance. + static WindowClassRegistrar* GetInstance() { + if (!instance_) { + instance_ = new WindowClassRegistrar(); + } + return instance_; + } + + // Returns the name of the window class, registering the class if it hasn't + // previously been registered. + const wchar_t* GetWindowClass(); + + // Unregisters the window class. Should only be called if there are no + // instances of the window. + void UnregisterWindowClass(); + + private: + WindowClassRegistrar() = default; + + static WindowClassRegistrar* instance_; + + bool class_registered_ = false; +}; + +WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; + +const wchar_t* WindowClassRegistrar::GetWindowClass() { + if (!class_registered_) { + WNDCLASS window_class{}; + window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); + window_class.lpszClassName = kWindowClassName; + window_class.style = CS_HREDRAW | CS_VREDRAW; + window_class.cbClsExtra = 0; + window_class.cbWndExtra = 0; + window_class.hInstance = GetModuleHandle(nullptr); + window_class.hIcon = + LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); + window_class.hbrBackground = 0; + window_class.lpszMenuName = nullptr; + window_class.lpfnWndProc = Win32Window::WndProc; + RegisterClass(&window_class); + class_registered_ = true; + } + return kWindowClassName; +} + +void WindowClassRegistrar::UnregisterWindowClass() { + UnregisterClass(kWindowClassName, nullptr); + class_registered_ = false; +} + +Win32Window::Win32Window() { + ++g_active_window_count; +} + +Win32Window::~Win32Window() { + --g_active_window_count; + Destroy(); +} + +bool Win32Window::Create(const std::wstring& title, + const Point& origin, + const Size& size) { + Destroy(); + + const wchar_t* window_class = + WindowClassRegistrar::GetInstance()->GetWindowClass(); + + const POINT target_point = {static_cast(origin.x), + static_cast(origin.y)}; + HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); + UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); + double scale_factor = dpi / 96.0; + + HWND window = CreateWindow( + window_class, title.c_str(), WS_OVERLAPPEDWINDOW, + Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), + Scale(size.width, scale_factor), Scale(size.height, scale_factor), + nullptr, nullptr, GetModuleHandle(nullptr), this); + + if (!window) { + return false; + } + + UpdateTheme(window); + + return OnCreate(); +} + +bool Win32Window::Show() { + return ShowWindow(window_handle_, SW_SHOWNORMAL); +} + +// static +LRESULT CALLBACK Win32Window::WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + if (message == WM_NCCREATE) { + auto window_struct = reinterpret_cast(lparam); + SetWindowLongPtr(window, GWLP_USERDATA, + reinterpret_cast(window_struct->lpCreateParams)); + + auto that = static_cast(window_struct->lpCreateParams); + EnableFullDpiSupportIfAvailable(window); + that->window_handle_ = window; + } else if (Win32Window* that = GetThisFromHandle(window)) { + return that->MessageHandler(window, message, wparam, lparam); + } + + return DefWindowProc(window, message, wparam, lparam); +} + +LRESULT +Win32Window::MessageHandler(HWND hwnd, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + switch (message) { + case WM_DESTROY: + window_handle_ = nullptr; + Destroy(); + if (quit_on_close_) { + PostQuitMessage(0); + } + return 0; + + case WM_DPICHANGED: { + auto newRectSize = reinterpret_cast(lparam); + LONG newWidth = newRectSize->right - newRectSize->left; + LONG newHeight = newRectSize->bottom - newRectSize->top; + + SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, + newHeight, SWP_NOZORDER | SWP_NOACTIVATE); + + return 0; + } + case WM_SIZE: { + RECT rect = GetClientArea(); + if (child_content_ != nullptr) { + // Size and position the child window. + MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, + rect.bottom - rect.top, TRUE); + } + return 0; + } + + case WM_ACTIVATE: + if (child_content_ != nullptr) { + SetFocus(child_content_); + } + return 0; + + case WM_DWMCOLORIZATIONCOLORCHANGED: + UpdateTheme(hwnd); + return 0; + } + + return DefWindowProc(window_handle_, message, wparam, lparam); +} + +void Win32Window::Destroy() { + OnDestroy(); + + if (window_handle_) { + DestroyWindow(window_handle_); + window_handle_ = nullptr; + } + if (g_active_window_count == 0) { + WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); + } +} + +Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { + return reinterpret_cast( + GetWindowLongPtr(window, GWLP_USERDATA)); +} + +void Win32Window::SetChildContent(HWND content) { + child_content_ = content; + SetParent(content, window_handle_); + RECT frame = GetClientArea(); + + MoveWindow(content, frame.left, frame.top, frame.right - frame.left, + frame.bottom - frame.top, true); + + SetFocus(child_content_); +} + +RECT Win32Window::GetClientArea() { + RECT frame; + GetClientRect(window_handle_, &frame); + return frame; +} + +HWND Win32Window::GetHandle() { + return window_handle_; +} + +void Win32Window::SetQuitOnClose(bool quit_on_close) { + quit_on_close_ = quit_on_close; +} + +bool Win32Window::OnCreate() { + // No-op; provided for subclasses. + return true; +} + +void Win32Window::OnDestroy() { + // No-op; provided for subclasses. +} + +void Win32Window::UpdateTheme(HWND const window) { + DWORD light_mode; + DWORD light_mode_size = sizeof(light_mode); + LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey, + kGetPreferredBrightnessRegValue, + RRF_RT_REG_DWORD, nullptr, &light_mode, + &light_mode_size); + + if (result == ERROR_SUCCESS) { + BOOL enable_dark_mode = light_mode == 0; + DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE, + &enable_dark_mode, sizeof(enable_dark_mode)); + } +} diff --git a/apps/enmeshed/windows/runner/win32_window.h b/apps/enmeshed/windows/runner/win32_window.h new file mode 100644 index 000000000..e901dde68 --- /dev/null +++ b/apps/enmeshed/windows/runner/win32_window.h @@ -0,0 +1,102 @@ +#ifndef RUNNER_WIN32_WINDOW_H_ +#define RUNNER_WIN32_WINDOW_H_ + +#include + +#include +#include +#include + +// A class abstraction for a high DPI-aware Win32 Window. Intended to be +// inherited from by classes that wish to specialize with custom +// rendering and input handling +class Win32Window { + public: + struct Point { + unsigned int x; + unsigned int y; + Point(unsigned int x, unsigned int y) : x(x), y(y) {} + }; + + struct Size { + unsigned int width; + unsigned int height; + Size(unsigned int width, unsigned int height) + : width(width), height(height) {} + }; + + Win32Window(); + virtual ~Win32Window(); + + // Creates a win32 window with |title| that is positioned and sized using + // |origin| and |size|. New windows are created on the default monitor. Window + // sizes are specified to the OS in physical pixels, hence to ensure a + // consistent size this function will scale the inputted width and height as + // as appropriate for the default monitor. The window is invisible until + // |Show| is called. Returns true if the window was created successfully. + bool Create(const std::wstring& title, const Point& origin, const Size& size); + + // Show the current window. Returns true if the window was successfully shown. + bool Show(); + + // Release OS resources associated with window. + void Destroy(); + + // Inserts |content| into the window tree. + void SetChildContent(HWND content); + + // Returns the backing Window handle to enable clients to set icon and other + // window properties. Returns nullptr if the window has been destroyed. + HWND GetHandle(); + + // If true, closing this window will quit the application. + void SetQuitOnClose(bool quit_on_close); + + // Return a RECT representing the bounds of the current client area. + RECT GetClientArea(); + + protected: + // Processes and route salient window messages for mouse handling, + // size change and DPI. Delegates handling of these to member overloads that + // inheriting classes can handle. + virtual LRESULT MessageHandler(HWND window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Called when CreateAndShow is called, allowing subclass window-related + // setup. Subclasses should return false if setup fails. + virtual bool OnCreate(); + + // Called when Destroy is called. + virtual void OnDestroy(); + + private: + friend class WindowClassRegistrar; + + // OS callback called by message pump. Handles the WM_NCCREATE message which + // is passed when the non-client area is being created and enables automatic + // non-client DPI scaling so that the non-client area automatically + // responds to changes in DPI. All other messages are handled by + // MessageHandler. + static LRESULT CALLBACK WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Retrieves a class instance pointer for |window| + static Win32Window* GetThisFromHandle(HWND const window) noexcept; + + // Update the window frame's theme to match the system theme. + static void UpdateTheme(HWND const window); + + bool quit_on_close_ = false; + + // window handle for top level window. + HWND window_handle_ = nullptr; + + // window handle for hosted content. + HWND child_content_ = nullptr; +}; + +#endif // RUNNER_WIN32_WINDOW_H_ diff --git a/codemagic.yaml b/codemagic.yaml index a2593500c..e82b5c4ec 100644 --- a/codemagic.yaml +++ b/codemagic.yaml @@ -79,7 +79,7 @@ workflows: tag_patterns: - pattern: "enmeshed-v+([0-9]).+([0-9]).+([0-9])" include: true - cancel_previous_builds: true + cancel_previous_builds: false environment: groups: - config-secrets @@ -135,3 +135,66 @@ workflows: script: | npm install -g @js-soft/codemagic-tools@1.0.2 jscm teams-publish --platform "ios" --projectName "enmeshed" + + windows-release: + name: Windows Release + max_build_duration: 30 + instance_type: windows_x2 + environment: + groups: + - config-secrets + - webhook-secrets + flutter: stable + triggering: + events: [] + # - tag + # tag_patterns: + # - pattern: "enmeshed-v+([0-9]).+([0-9]).+([0-9])" + # include: true + # cancel_previous_builds: false + + scripts: + - name: Install melos + script: dart pub global activate melos + + - name: Bootstrap repository + script: melos bootstrap + + - name: Build appbundle with Flutter + script: | + $VERSION = $CM_TAG -replace "enmeshed-v", "" + + flutter config --enable-windows-desktop + flutter build windows --release --build-number=$PROJECT_BUILD_NUMBER --build-name=$VERSION --dart-define="app_baseUrl=$app_baseUrl" --dart-define="app_clientId=$app_clientId" --dart-define="app_clientSecret=$app_clientSecret" + cd build/windows/x64/runner/Release + 7z a -r ../release.zip ./* + working_directory: apps/enmeshed + + - name: Build msix package + script: | + $VERSION = $CM_TAG -replace "enmeshed-v", "" + + flutter pub run msix:create --version "$VERSION.0" + working_directory: apps/enmeshed + + - name: Build finished successfully + script: touch ~/SUCCESS + + artifacts: + - apps/enmeshed/build/windows/x64/runner/release.zip + - apps/enmeshed/build/windows/**/*.msix + + publishing: + email: + recipients: + - julian.koenig@js-soft.com + notify: + success: true + failure: true + + # TODO: this script does not support setting windows as a platform yet + # scripts: + # - name: Custom MS-Teams integration publish + # script: | + # npm install -g @js-soft/codemagic-tools@1.0.2 + # jscm teams-production --platform "windows" --projectName "enmeshed" diff --git a/packages/enmeshed_runtime_bridge/integration_test_runner/pubspec.lock b/packages/enmeshed_runtime_bridge/integration_test_runner/pubspec.lock index 134092720..6ea053faf 100644 --- a/packages/enmeshed_runtime_bridge/integration_test_runner/pubspec.lock +++ b/packages/enmeshed_runtime_bridge/integration_test_runner/pubspec.lock @@ -514,6 +514,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.4" + windows_notification: + dependency: transitive + description: + name: windows_notification + sha256: be3e650874615f315402c9b9f3656e29af156709c4b5cc272cb4ca0ab7ba94a8 + url: "https://pub.dev" + source: hosted + version: "1.3.0" xdg_directories: dependency: transitive description: diff --git a/packages/enmeshed_runtime_bridge/integration_test_runner/windows/flutter/generated_plugin_registrant.cc b/packages/enmeshed_runtime_bridge/integration_test_runner/windows/flutter/generated_plugin_registrant.cc index 3b4ee9033..29500ae63 100644 --- a/packages/enmeshed_runtime_bridge/integration_test_runner/windows/flutter/generated_plugin_registrant.cc +++ b/packages/enmeshed_runtime_bridge/integration_test_runner/windows/flutter/generated_plugin_registrant.cc @@ -7,8 +7,11 @@ #include "generated_plugin_registrant.h" #include +#include void RegisterPlugins(flutter::PluginRegistry* registry) { FlutterInappwebviewWindowsPluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("FlutterInappwebviewWindowsPluginCApi")); + WindowsNotificationPluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("WindowsNotificationPluginCApi")); } diff --git a/packages/enmeshed_runtime_bridge/integration_test_runner/windows/flutter/generated_plugins.cmake b/packages/enmeshed_runtime_bridge/integration_test_runner/windows/flutter/generated_plugins.cmake index 61c79a21d..f988e2f42 100644 --- a/packages/enmeshed_runtime_bridge/integration_test_runner/windows/flutter/generated_plugins.cmake +++ b/packages/enmeshed_runtime_bridge/integration_test_runner/windows/flutter/generated_plugins.cmake @@ -4,6 +4,7 @@ list(APPEND FLUTTER_PLUGIN_LIST flutter_inappwebview_windows + windows_notification ) list(APPEND FLUTTER_FFI_PLUGIN_LIST diff --git a/packages/enmeshed_runtime_bridge/lib/src/enmeshed_runtime.dart b/packages/enmeshed_runtime_bridge/lib/src/enmeshed_runtime.dart index c56107891..107948a0e 100644 --- a/packages/enmeshed_runtime_bridge/lib/src/enmeshed_runtime.dart +++ b/packages/enmeshed_runtime_bridge/lib/src/enmeshed_runtime.dart @@ -152,8 +152,12 @@ class EnmeshedRuntime { 'platformClientId': runtimeConfig.clientId, 'platformClientSecret': runtimeConfig.clientSecret, }, - 'pushToken': null, 'databaseFolder': runtimeConfig.databaseFolder, + if (Platform.isWindows) + 'modules': { + 'pushNotification': {'enabled': false}, + 'sse': {'enabled': true}, + } }, ); diff --git a/packages/enmeshed_runtime_bridge/lib/src/javascript_handlers.dart b/packages/enmeshed_runtime_bridge/lib/src/javascript_handlers.dart index 4acd946d7..df084aebf 100644 --- a/packages/enmeshed_runtime_bridge/lib/src/javascript_handlers.dart +++ b/packages/enmeshed_runtime_bridge/lib/src/javascript_handlers.dart @@ -1,7 +1,11 @@ +import 'dart:io'; + import 'package:enmeshed_types/enmeshed_types.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:logger/logger.dart'; +import 'package:windows_notification/notification_message.dart'; +import 'package:windows_notification/windows_notification.dart'; import 'event_bus.dart'; import 'events/events.dart'; @@ -330,6 +334,16 @@ extension Filesystem on InAppWebViewController { extension LocalNotifications on InAppWebViewController { void addLocalNotificationsJavaScriptHandlers() { + if (Platform.isAndroid || Platform.isIOS || Platform.isLinux || Platform.isMacOS) { + _addLocalNotificationsJavaScriptHandlers(); + } else if (Platform.isWindows) { + _addWindowsNotificationsJavaScriptHandlers(); + } else { + throw Exception('Unsupported platform'); + } + } + + void _addLocalNotificationsJavaScriptHandlers() { final flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin(); addJavaScriptHandler( @@ -367,4 +381,49 @@ extension LocalNotifications on InAppWebViewController { }, ); } + + void _addWindowsNotificationsJavaScriptHandlers() { + final winNotifyPlugin = WindowsNotification(applicationId: null); + + winNotifyPlugin.initNotificationCallBack((details) { + // TODO: handle notification click + }); + + addJavaScriptHandler( + handlerName: 'notifications_schedule', + callback: (args) async { + final title = args[0] as String; + final body = args[1] as String; + final id = args[2] as int; + + await winNotifyPlugin.showNotificationPluginTemplate( + NotificationMessage.fromPluginTemplate(id.toString(), title, body, group: 'nmshd'), + ); + }, + ); + + addJavaScriptHandler( + handlerName: 'notifications_clear', + callback: (args) async { + final id = args[0] as int; + + await winNotifyPlugin.removeNotificationId(id.toString(), 'nmshd'); + }, + ); + + addJavaScriptHandler( + handlerName: 'notifications_clearAll', + callback: (args) async { + await winNotifyPlugin.clearNotificationHistory(); + }, + ); + + addJavaScriptHandler( + handlerName: 'notifications_getAll', + callback: (args) { + // no support for listing notifications on Windows + return []; + }, + ); + } } diff --git a/packages/enmeshed_runtime_bridge/pubspec.yaml b/packages/enmeshed_runtime_bridge/pubspec.yaml index ffcda48be..4a2567433 100644 --- a/packages/enmeshed_runtime_bridge/pubspec.yaml +++ b/packages/enmeshed_runtime_bridge/pubspec.yaml @@ -18,6 +18,7 @@ dependencies: flutter_local_notifications: ^18.0.0 logger: ^2.4.0 path_provider: ^2.1.5 + windows_notification: ^1.3.0 dev_dependencies: flutter_lints: ^5.0.0