From 5cab52c7244f47be3a936d442b3a01d825d625e8 Mon Sep 17 00:00:00 2001 From: Miroslav Mazel Date: Fri, 3 May 2024 15:03:30 +0200 Subject: [PATCH 1/5] Linux: Notifications --- lib/reminders/notification_channel.dart | 39 +++++++++++++++++++++++-- lib/reminders/notification_service.dart | 5 ++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/lib/reminders/notification_channel.dart b/lib/reminders/notification_channel.dart index 0564f48..780da4d 100644 --- a/lib/reminders/notification_channel.dart +++ b/lib/reminders/notification_channel.dart @@ -136,31 +136,66 @@ class NotificationIosChannelData categoryIdentifier: NotificationChannelId.habitReminder.category); } +class NotificationLinuxChannelData + implements NotificationChannelDataABC { + final LinuxNotificationDetails? _debug; + final LinuxNotificationDetails? _habitReminder; + final LinuxNotificationDetails? _appReminder; + + const NotificationLinuxChannelData({ + LinuxNotificationDetails? debug, + LinuxNotificationDetails? habitReminder, + LinuxNotificationDetails? appReminder, + }) : _debug = debug, + _habitReminder = habitReminder, + _appReminder = appReminder; + + @override + LinuxNotificationDetails get debug => + _debug ?? const LinuxNotificationDetails(); + + @override + LinuxNotificationDetails get habitReminder => + _habitReminder ?? const LinuxNotificationDetails(); + + @override + LinuxNotificationDetails get appReminder => + _appReminder ?? const LinuxNotificationDetails(); +} + class NotificationChannelData extends ChangeNotifier implements NotificationChannelDataABC { final NotificationAndroidChannelData _androidChannel; final NotificationIosChannelData _iosChannel; + final NotificationLinuxChannelData _linuxChannel; NotificationChannelData({ NotificationAndroidChannelData? androidChannel, NotificationIosChannelData? iosChannel, + NotificationLinuxChannelData? linuxChannel, }) : _androidChannel = androidChannel ?? const NotificationAndroidChannelData(), - _iosChannel = iosChannel ?? const NotificationIosChannelData(); + _iosChannel = iosChannel ?? const NotificationIosChannelData(), + _linuxChannel = linuxChannel ?? const NotificationLinuxChannelData(); @override NotificationDetails get debug => NotificationDetails( android: _androidChannel.debug, iOS: _iosChannel.debug, + linux: _linuxChannel.debug, ); @override NotificationDetails get habitReminder => NotificationDetails( - android: _androidChannel.habitReminder, iOS: _iosChannel.habitReminder); + android: _androidChannel.habitReminder, + iOS: _iosChannel.habitReminder, + linux: _linuxChannel.habitReminder, + ); @override NotificationDetails get appReminder => NotificationDetails( android: _androidChannel.appReminder, iOS: _iosChannel.appReminder, + linux: _linuxChannel.appReminder, ); } diff --git a/lib/reminders/notification_service.dart b/lib/reminders/notification_service.dart index e99f5a9..047c99b 100644 --- a/lib/reminders/notification_service.dart +++ b/lib/reminders/notification_service.dart @@ -120,11 +120,16 @@ final class NotificationServiceImpl implements NotificationService { ], ); + // linux setting + const linuxSettings = + LinuxInitializationSettings(defaultActionName: "Open notification"); + // combine settings final initializationSettings = InitializationSettings( android: androidSettings, iOS: darwinSettings, macOS: darwinSettings, + linux: linuxSettings, ); await plugin.initialize(initializationSettings); From 0eebf912090d63af8ddd6799d4ca40d3b206922a Mon Sep 17 00:00:00 2001 From: Miroslav Mazel Date: Fri, 3 May 2024 15:25:38 +0200 Subject: [PATCH 2/5] Linux build --- linux/.gitignore | 1 + linux/CMakeLists.txt | 145 +++++++++++++++++++ linux/flutter/CMakeLists.txt | 88 +++++++++++ linux/flutter/generated_plugin_registrant.cc | 19 +++ linux/flutter/generated_plugin_registrant.h | 15 ++ linux/flutter/generated_plugins.cmake | 25 ++++ linux/main.cc | 6 + linux/my_application.cc | 99 +++++++++++++ linux/my_application.h | 18 +++ 9 files changed, 416 insertions(+) create mode 100644 linux/.gitignore create mode 100644 linux/CMakeLists.txt create mode 100644 linux/flutter/CMakeLists.txt create mode 100644 linux/flutter/generated_plugin_registrant.cc create mode 100644 linux/flutter/generated_plugin_registrant.h create mode 100644 linux/flutter/generated_plugins.cmake create mode 100644 linux/main.cc create mode 100644 linux/my_application.cc create mode 100644 linux/my_application.h diff --git a/linux/.gitignore b/linux/.gitignore new file mode 100644 index 0000000..d3896c9 --- /dev/null +++ b/linux/.gitignore @@ -0,0 +1 @@ +flutter/ephemeral diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt new file mode 100644 index 0000000..84bb174 --- /dev/null +++ b/linux/CMakeLists.txt @@ -0,0 +1,145 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.10) +project(runner 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 "mhabit") +# The unique GTK application identifier for this application. See: +# https://wiki.gnome.org/HowDoI/ChooseApplicationID +set(APPLICATION_ID "io.github.friesi23.mhabit") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(SET CMP0063 NEW) + +# Load bundled libraries from the lib/ directory relative to the binary. +set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") + +# Root filesystem for cross-building. +if(FLUTTER_TARGET_PLATFORM_SYSROOT) + set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endif() + +# Define build configuration options. +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() + +# 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_14) + target_compile_options(${TARGET} PRIVATE -Wall -Werror) + target_compile_options(${TARGET} PRIVATE "$<$>:-O3>") + target_compile_definitions(${TARGET} PRIVATE "$<$>:NDEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) + +add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") + +# Define the application target. To change its name, change BINARY_NAME above, +# 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} + "main.cc" + "my_application.cc" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add dependency libraries. Add any application-specific dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter) +target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) + +# Only the install-generated bundle's copy of the executable will launch +# correctly, since the resources must in the right relative locations. To avoid +# people trying to run the unbundled copy, put it in a subdirectory instead of +# the default top-level location. +set_target_properties(${BINARY_NAME} + PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run" +) + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# By default, "installing" just makes a relocatable bundle in the build +# directory. +set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle") +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +# Start with a clean build bundle directory every time. +install(CODE " + file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\") + " COMPONENT Runtime) + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") + +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) + +foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES}) + install(FILES "${bundled_library}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endforeach(bundled_library) + +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/linux/") +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. +if(NOT CMAKE_BUILD_TYPE MATCHES "Debug") + install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() diff --git a/linux/flutter/CMakeLists.txt b/linux/flutter/CMakeLists.txt new file mode 100644 index 0000000..d5bd016 --- /dev/null +++ b/linux/flutter/CMakeLists.txt @@ -0,0 +1,88 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.10) + +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. + +# Serves the same purpose as list(TRANSFORM ... PREPEND ...), +# which isn't available in 3.10. +function(list_prepend LIST_NAME PREFIX) + set(NEW_LIST "") + foreach(element ${${LIST_NAME}}) + list(APPEND NEW_LIST "${PREFIX}${element}") + endforeach(element) + set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE) +endfunction() + +# === Flutter Library === +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) +pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) +pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) + +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") + +# 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/lib/libapp.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "fl_basic_message_channel.h" + "fl_binary_codec.h" + "fl_binary_messenger.h" + "fl_dart_project.h" + "fl_engine.h" + "fl_json_message_codec.h" + "fl_json_method_codec.h" + "fl_message_codec.h" + "fl_method_call.h" + "fl_method_channel.h" + "fl_method_codec.h" + "fl_method_response.h" + "fl_plugin_registrar.h" + "fl_plugin_registry.h" + "fl_standard_message_codec.h" + "fl_standard_method_codec.h" + "fl_string_codec.h" + "fl_value.h" + "fl_view.h" + "flutter_linux.h" +) +list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}") +target_link_libraries(flutter INTERFACE + PkgConfig::GTK + PkgConfig::GLIB + PkgConfig::GIO +) +add_dependencies(flutter 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. +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/_phony_ + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh" + ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE} + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} +) diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..fe56f8d --- /dev/null +++ b/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,19 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include +#include + +void fl_register_plugins(FlPluginRegistry* registry) { + g_autoptr(FlPluginRegistrar) dynamic_color_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "DynamicColorPlugin"); + dynamic_color_plugin_register_with_registrar(dynamic_color_registrar); + g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); + url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); +} diff --git a/linux/flutter/generated_plugin_registrant.h b/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..e0f0a47 --- /dev/null +++ b/linux/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 fl_register_plugins(FlPluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake new file mode 100644 index 0000000..1836621 --- /dev/null +++ b/linux/flutter/generated_plugins.cmake @@ -0,0 +1,25 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + dynamic_color + url_launcher_linux +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux 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}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/linux/main.cc b/linux/main.cc new file mode 100644 index 0000000..e7c5c54 --- /dev/null +++ b/linux/main.cc @@ -0,0 +1,6 @@ +#include "my_application.h" + +int main(int argc, char** argv) { + g_autoptr(MyApplication) app = my_application_new(); + return g_application_run(G_APPLICATION(app), argc, argv); +} diff --git a/linux/my_application.cc b/linux/my_application.cc new file mode 100644 index 0000000..af63575 --- /dev/null +++ b/linux/my_application.cc @@ -0,0 +1,99 @@ +#include "my_application.h" + +#include +#ifdef GDK_WINDOWING_X11 +#include +#endif + +#include "flutter/generated_plugin_registrant.h" + +struct _MyApplication { + GtkApplication parent_instance; + char** dart_entrypoint_arguments; +}; + +G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) + +// Implements GApplication::activate. +static void my_application_activate(GApplication* application) { + MyApplication* self = MY_APPLICATION(application); + GtkWindow* window = + GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); + + gtk_window_set_title(window, "Table Habit"); + + gtk_window_set_default_size(window, 1280, 720); + gtk_widget_show(GTK_WIDGET(window)); + + g_autoptr(FlDartProject) project = fl_dart_project_new(); + fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments); + + FlView* view = fl_view_new(project); + gtk_widget_show(GTK_WIDGET(view)); + gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); + + fl_register_plugins(FL_PLUGIN_REGISTRY(view)); + + gtk_widget_grab_focus(GTK_WIDGET(view)); +} + +// Implements GApplication::local_command_line. +static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) { + MyApplication* self = MY_APPLICATION(application); + // Strip out the first argument as it is the binary name. + self->dart_entrypoint_arguments = g_strdupv(*arguments + 1); + + g_autoptr(GError) error = nullptr; + if (!g_application_register(application, nullptr, &error)) { + g_warning("Failed to register: %s", error->message); + *exit_status = 1; + return TRUE; + } + + g_application_activate(application); + *exit_status = 0; + + return TRUE; +} + +// Implements GApplication::startup. +static void my_application_startup(GApplication* application) { + //MyApplication* self = MY_APPLICATION(object); + + // Perform any actions required at application startup. + + G_APPLICATION_CLASS(my_application_parent_class)->startup(application); +} + +// Implements GApplication::shutdown. +static void my_application_shutdown(GApplication* application) { + //MyApplication* self = MY_APPLICATION(object); + + // Perform any actions required at application shutdown. + + G_APPLICATION_CLASS(my_application_parent_class)->shutdown(application); +} + +// Implements GObject::dispose. +static void my_application_dispose(GObject* object) { + MyApplication* self = MY_APPLICATION(object); + g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev); + G_OBJECT_CLASS(my_application_parent_class)->dispose(object); +} + +static void my_application_class_init(MyApplicationClass* klass) { + G_APPLICATION_CLASS(klass)->activate = my_application_activate; + G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line; + G_APPLICATION_CLASS(klass)->startup = my_application_startup; + G_APPLICATION_CLASS(klass)->shutdown = my_application_shutdown; + G_OBJECT_CLASS(klass)->dispose = my_application_dispose; +} + +static void my_application_init(MyApplication* self) {} + +MyApplication* my_application_new() { + return MY_APPLICATION(g_object_new(my_application_get_type(), + "application-id", APPLICATION_ID, + "flags", G_APPLICATION_NON_UNIQUE, + nullptr)); +} diff --git a/linux/my_application.h b/linux/my_application.h new file mode 100644 index 0000000..72271d5 --- /dev/null +++ b/linux/my_application.h @@ -0,0 +1,18 @@ +#ifndef FLUTTER_MY_APPLICATION_H_ +#define FLUTTER_MY_APPLICATION_H_ + +#include + +G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION, + GtkApplication) + +/** + * my_application_new: + * + * Creates a new Flutter-based application. + * + * Returns: a new #MyApplication. + */ +MyApplication* my_application_new(); + +#endif // FLUTTER_MY_APPLICATION_H_ From aa27399a3cc035289a4beb19ef450a93bd09ca89 Mon Sep 17 00:00:00 2001 From: Miroslav Mazel Date: Fri, 3 May 2024 15:25:47 +0200 Subject: [PATCH 3/5] Linux build documentation --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index b266048..0c0fb73 100644 --- a/README.md +++ b/README.md @@ -81,6 +81,10 @@ multiple versions on your local machine, or simply use this submodule to build i 2. open an android or ios emulator 3. run `flutter run --debug` +Building for Linux requires installing the following packages for the [SQFlite database](https://pub.dev/packages/sqflite_common_ffi#linux): + +```sudo apt-get -y install libsqlite3-0 libsqlite3-dev``` + ## Contributing I am an independent developer and do not have professional expertise in writing From 947bdeb0e3c6425bdb94f96aa0d9dc8e40d2ae42 Mon Sep 17 00:00:00 2001 From: weooh Date: Tue, 28 May 2024 15:27:25 +0800 Subject: [PATCH 4/5] fix: generate template use v3.13.9 --- .metadata | 3 ++ lib/provider/app_reminder.dart | 2 +- lib/reminders/notification_service.dart | 31 ++++++++++++++++ linux/CMakeLists.txt | 6 ---- linux/my_application.cc | 47 ++++++++++++++----------- 5 files changed, 61 insertions(+), 28 deletions(-) diff --git a/.metadata b/.metadata index ba068b3..2eb9fdf 100644 --- a/.metadata +++ b/.metadata @@ -15,6 +15,9 @@ migration: - platform: root create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + - platform: linux + create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 + base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 - platform: windows create_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 base_revision: d211f42860350d914a5ad8102f9ec32764dc6d06 diff --git a/lib/provider/app_reminder.dart b/lib/provider/app_reminder.dart index 726d42a..926e210 100644 --- a/lib/provider/app_reminder.dart +++ b/lib/provider/app_reminder.dart @@ -91,7 +91,7 @@ class AppReminderViewModel extends ChangeNotifier Future processAppReminder(L10n? l10n) async { final reminder = this.reminder; if (reminder.enabled && l10n != null) { - if (await NotificationService().requestPermissions() != true) { + if (await NotificationService().requestPermissions() == false) { return false; } switch (reminder.type) { diff --git a/lib/reminders/notification_service.dart b/lib/reminders/notification_service.dart index 047c99b..538c5ba 100644 --- a/lib/reminders/notification_service.dart +++ b/lib/reminders/notification_service.dart @@ -73,6 +73,7 @@ abstract interface class NotificationService implements AsyncInitialization { factory NotificationService() { if (_instance != null) return _instance!; if (Platform.isWindows) return _instance = const FakeNotificationService(); + if (Platform.isLinux) return _instance = const LinuxNotificationService(); return _instance = const NotificationServiceImpl(); } } @@ -322,6 +323,36 @@ final class NotificationServiceImpl implements NotificationService { } } +final class LinuxNotificationService extends NotificationServiceImpl { + const LinuxNotificationService(); + + //TODO: Lame implementation; plugin doesn't support scheduling on Linux, + // need to find some solutions. + @override + Future regrAppReminderInDaily( + {required String title, + required String subtitle, + required TimeOfDay timeOfDay, + required NotificationDetails details, + Duration? timeout = NotificationServiceImpl.defaultTimeout}) => + Future.value(false); + + //TODO: Lame implementation; plugin doesn't support scheduling on Linux, + // need to find some solutions. + @override + Future regrHabitReminder( + {required DBID id, + required HabitUUID uuid, + required String name, + String? quest, + required HabitReminder reminder, + required HabitDate? lastUntrackDate, + required NotificationDetails details, + DateTime? crtDate, + Duration? timeout = NotificationServiceImpl.defaultTimeout}) => + Future.value(false); +} + final class FakeNotificationService implements NotificationService { const FakeNotificationService(); diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 84bb174..05b28c5 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -123,12 +123,6 @@ foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES}) COMPONENT Runtime) endforeach(bundled_library) -# Copy the native assets provided by the build.dart from all packages. -set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/linux/") -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") diff --git a/linux/my_application.cc b/linux/my_application.cc index af63575..e6fa972 100644 --- a/linux/my_application.cc +++ b/linux/my_application.cc @@ -20,7 +20,32 @@ static void my_application_activate(GApplication* application) { GtkWindow* window = GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); - gtk_window_set_title(window, "Table Habit"); + // Use a header bar when running in GNOME as this is the common style used + // by applications and is the setup most users will be using (e.g. Ubuntu + // desktop). + // If running on X and not using GNOME then just use a traditional title bar + // in case the window manager does more exotic layout, e.g. tiling. + // If running on Wayland assume the header bar will work (may need changing + // if future cases occur). + gboolean use_header_bar = TRUE; +#ifdef GDK_WINDOWING_X11 + GdkScreen* screen = gtk_window_get_screen(window); + if (GDK_IS_X11_SCREEN(screen)) { + const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen); + if (g_strcmp0(wm_name, "GNOME Shell") != 0) { + use_header_bar = FALSE; + } + } +#endif + if (use_header_bar) { + GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); + gtk_widget_show(GTK_WIDGET(header_bar)); + gtk_header_bar_set_title(header_bar, "mhabit"); + gtk_header_bar_set_show_close_button(header_bar, TRUE); + gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); + } else { + gtk_window_set_title(window, "mhabit"); + } gtk_window_set_default_size(window, 1280, 720); gtk_widget_show(GTK_WIDGET(window)); @@ -56,24 +81,6 @@ static gboolean my_application_local_command_line(GApplication* application, gch return TRUE; } -// Implements GApplication::startup. -static void my_application_startup(GApplication* application) { - //MyApplication* self = MY_APPLICATION(object); - - // Perform any actions required at application startup. - - G_APPLICATION_CLASS(my_application_parent_class)->startup(application); -} - -// Implements GApplication::shutdown. -static void my_application_shutdown(GApplication* application) { - //MyApplication* self = MY_APPLICATION(object); - - // Perform any actions required at application shutdown. - - G_APPLICATION_CLASS(my_application_parent_class)->shutdown(application); -} - // Implements GObject::dispose. static void my_application_dispose(GObject* object) { MyApplication* self = MY_APPLICATION(object); @@ -84,8 +91,6 @@ static void my_application_dispose(GObject* object) { static void my_application_class_init(MyApplicationClass* klass) { G_APPLICATION_CLASS(klass)->activate = my_application_activate; G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line; - G_APPLICATION_CLASS(klass)->startup = my_application_startup; - G_APPLICATION_CLASS(klass)->shutdown = my_application_shutdown; G_OBJECT_CLASS(klass)->dispose = my_application_dispose; } From 806998094ee5b7c45a82c5481a19d4244361df15 Mon Sep 17 00:00:00 2001 From: Fries_I23 Date: Tue, 28 May 2024 16:01:45 +0800 Subject: [PATCH 5/5] fix: conflict --- lib/reminders/notification_channel.dart | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/reminders/notification_channel.dart b/lib/reminders/notification_channel.dart index 8ef13e3..0ee1c48 100644 --- a/lib/reminders/notification_channel.dart +++ b/lib/reminders/notification_channel.dart @@ -177,14 +177,17 @@ class NotificationLinuxChannelData final LinuxNotificationDetails? _debug; final LinuxNotificationDetails? _habitReminder; final LinuxNotificationDetails? _appReminder; + final LinuxNotificationDetails? _appDebugger; const NotificationLinuxChannelData({ LinuxNotificationDetails? debug, LinuxNotificationDetails? habitReminder, LinuxNotificationDetails? appReminder, + LinuxNotificationDetails? appDebugger, }) : _debug = debug, _habitReminder = habitReminder, - _appReminder = appReminder; + _appReminder = appReminder, + _appDebugger = appDebugger; @override LinuxNotificationDetails get debug => @@ -197,6 +200,10 @@ class NotificationLinuxChannelData @override LinuxNotificationDetails get appReminder => _appReminder ?? const LinuxNotificationDetails(); + + @override + LinuxNotificationDetails get appDebugger => + _appDebugger ?? const LinuxNotificationDetails(); } class NotificationChannelData extends ChangeNotifier