diff --git a/example/.metadata b/example/.metadata index 31073f7..64bbdc6 100644 --- a/example/.metadata +++ b/example/.metadata @@ -1,10 +1,30 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled and should not be manually edited. +# This file should be version controlled. version: - revision: 1ad9baa8b99a2897c20f9e6e54d3b9b359ade314 + revision: d9111f64021372856901a1fd5bfbc386cade3318 channel: stable project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: d9111f64021372856901a1fd5bfbc386cade3318 + base_revision: d9111f64021372856901a1fd5bfbc386cade3318 + - platform: linux + create_revision: d9111f64021372856901a1fd5bfbc386cade3318 + base_revision: d9111f64021372856901a1fd5bfbc386cade3318 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/example/README.md b/example/README.md new file mode 100644 index 0000000..2b3fce4 --- /dev/null +++ b/example/README.md @@ -0,0 +1,16 @@ +# example + +A new Flutter project. + +## Getting Started + +This project is a starting point for a Flutter application. + +A few resources to get you started if this is your first Flutter project: + +- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) +- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) + +For help getting started with Flutter development, view the +[online documentation](https://docs.flutter.dev/), which offers tutorials, +samples, guidance on mobile development, and a full API reference. diff --git a/example/analysis_options.yaml b/example/analysis_options.yaml new file mode 100644 index 0000000..61b6c4d --- /dev/null +++ b/example/analysis_options.yaml @@ -0,0 +1,29 @@ +# This file configures the analyzer, which statically analyzes Dart code to +# check for errors, warnings, and lints. +# +# The issues identified by the analyzer are surfaced in the UI of Dart-enabled +# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be +# invoked from the command line by running `flutter analyze`. + +# The following line activates a set of recommended lints for Flutter apps, +# packages, and plugins designed to encourage good coding practices. +include: package:flutter_lints/flutter.yaml + +linter: + # The lint rules applied to this project can be customized in the + # section below to disable rules from the `package:flutter_lints/flutter.yaml` + # included above or to enable additional rules. A list of all available lints + # and their documentation is published at + # https://dart-lang.github.io/linter/lints/index.html. + # + # Instead of disabling a lint rule for the entire project in the + # section below, it can also be suppressed for a single line of code + # or a specific dart file by using the `// ignore: name_of_lint` and + # `// ignore_for_file: name_of_lint` syntax on the line or in the file + # producing the lint. + rules: + # avoid_print: false # Uncomment to disable the `avoid_print` rule + # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/example/linux/.gitignore b/example/linux/.gitignore new file mode 100644 index 0000000..d3896c9 --- /dev/null +++ b/example/linux/.gitignore @@ -0,0 +1 @@ +flutter/ephemeral diff --git a/example/linux/CMakeLists.txt b/example/linux/CMakeLists.txt new file mode 100644 index 0000000..787207d --- /dev/null +++ b/example/linux/CMakeLists.txt @@ -0,0 +1,138 @@ +# 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 "example") +# The unique GTK application identifier for this application. See: +# https://wiki.gnome.org/HowDoI/ChooseApplicationID +set(APPLICATION_ID "com.cleveroad.example") + +# 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) + +# 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/example/linux/flutter/CMakeLists.txt b/example/linux/flutter/CMakeLists.txt new file mode 100644 index 0000000..d5bd016 --- /dev/null +++ b/example/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/example/linux/flutter/generated_plugin_registrant.cc b/example/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..e71a16d --- /dev/null +++ b/example/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,11 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + + +void fl_register_plugins(FlPluginRegistry* registry) { +} diff --git a/example/linux/flutter/generated_plugin_registrant.h b/example/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..e0f0a47 --- /dev/null +++ b/example/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/example/linux/flutter/generated_plugins.cmake b/example/linux/flutter/generated_plugins.cmake new file mode 100644 index 0000000..2e1de87 --- /dev/null +++ b/example/linux/flutter/generated_plugins.cmake @@ -0,0 +1,23 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST +) + +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/example/linux/main.cc b/example/linux/main.cc new file mode 100644 index 0000000..e7c5c54 --- /dev/null +++ b/example/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/example/linux/my_application.cc b/example/linux/my_application.cc new file mode 100644 index 0000000..0ba8f43 --- /dev/null +++ b/example/linux/my_application.cc @@ -0,0 +1,104 @@ +#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))); + + // 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, "example"); + 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, "example"); + } + + 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 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_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/example/linux/my_application.h b/example/linux/my_application.h new file mode 100644 index 0000000..72271d5 --- /dev/null +++ b/example/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_ diff --git a/example/test/widget_test.dart b/example/test/widget_test.dart new file mode 100644 index 0000000..092d222 --- /dev/null +++ b/example/test/widget_test.dart @@ -0,0 +1,30 @@ +// This is a basic Flutter widget test. +// +// To perform an interaction with a widget in your test, use the WidgetTester +// utility in the flutter_test package. For example, you can send tap and scroll +// gestures. You can also use WidgetTester to find child widgets in the widget +// tree, read text, and verify that the values of widget properties are correct. + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; + +import 'package:example/main.dart'; + +void main() { + testWidgets('Counter increments smoke test', (WidgetTester tester) async { + // Build our app and trigger a frame. + await tester.pumpWidget(const MyApp()); + + // Verify that our counter starts at 0. + expect(find.text('0'), findsOneWidget); + expect(find.text('1'), findsNothing); + + // Tap the '+' icon and trigger a frame. + await tester.tap(find.byIcon(Icons.add)); + await tester.pump(); + + // Verify that our counter has incremented. + expect(find.text('0'), findsNothing); + expect(find.text('1'), findsOneWidget); + }); +} diff --git a/lib/src/cr_calendar.dart b/lib/src/cr_calendar.dart index 45a35a9..e21e05d 100644 --- a/lib/src/cr_calendar.dart +++ b/lib/src/cr_calendar.dart @@ -41,7 +41,7 @@ typedef OnRangeSelectedCallback = Function( typedef OnDateSelectCallback = Function(DateTime selectedDate); /// Controller for [CrCalendar]. -class CrCalendarController extends ChangeNotifier { +class CrCalendarController extends ChangeNotifier { /// Default constructor. CrCalendarController({ this.onSwipe, @@ -49,7 +49,7 @@ class CrCalendarController extends ChangeNotifier { }); /// All calendar event currently stored by controller. - final List? events; + List>? events; /// Current opened date in calendar. late DateTime date; @@ -90,13 +90,15 @@ class CrCalendarController extends ChangeNotifier { ValueNotifier get isShowingEvents => _doShowEvents; /// Add list of events. - void addEvents(List events) { - events.addAll(events); + void addEvents(List> events) { + this.events ??= []; + this.events?.addAll(events); _redrawCalendar(); } /// Add one event. - void addEvent(CalendarEventModel event) { + void addEvent(CalendarEventModel event) { + events ??= []; events?.add(event); _redrawCalendar(); } @@ -198,7 +200,7 @@ enum TouchMode { /// Stateful calendar widget. /// /// Each month is represented by one page in [PageView]. -class CrCalendar extends StatefulWidget { +class CrCalendar extends StatefulWidget { /// Default constructor. CrCalendar({ required this.controller, @@ -229,7 +231,7 @@ class CrCalendar extends StatefulWidget { final DateTime? maxDate; /// Calendar controller. - final CrCalendarController controller; + final CrCalendarController controller; /// Start day of the week. Default is [WeekDay.sunday]. final WeekDay firstDayOfWeek; @@ -261,7 +263,7 @@ class CrCalendar extends StatefulWidget { final Color? backgroundColor; /// See [EventBuilder]. - final EventBuilder? eventBuilder; + final EventBuilder? eventBuilder; /// Padding over events widgets to for correction of their alignment. final double eventsTopPadding; @@ -280,10 +282,10 @@ class CrCalendar extends StatefulWidget { final int onSwipeCallbackDebounceMs; @override - _CrCalendarState createState() => _CrCalendarState(); + _CrCalendarState createState() => _CrCalendarState(); } -class _CrCalendarState extends State { +class _CrCalendarState extends State> { late Debounce _onSwipeDebounce; late DateTime _initialDate; @@ -321,7 +323,7 @@ class _CrCalendarState extends State { final month = Jiffy(_initialDate).add(months: offset).dateTime; return Container( color: widget.backgroundColor, - child: MonthItem( + child: MonthItem( eventTopPadding: widget.eventsTopPadding, displayMonth: month, controller: widget.controller, diff --git a/lib/src/customization/builders.dart b/lib/src/customization/builders.dart index 0f31d67..d984b83 100644 --- a/lib/src/customization/builders.dart +++ b/lib/src/customization/builders.dart @@ -9,7 +9,7 @@ typedef DayItemBuilder = Widget Function(DayItemProperties properties); /// Builder for customization of events. Events look like lines over calendar /// days. -typedef EventBuilder = Widget Function(EventProperties eventDrawer); +typedef EventBuilder = Widget Function(EventProperties eventDrawer); /// Builder for [YearPickerWidget] item. typedef YearPickerItemBuilder = Widget Function(int year, bool isSelected); diff --git a/lib/src/events_overlay.dart b/lib/src/events_overlay.dart index 2d3fa70..16e2ce7 100644 --- a/lib/src/events_overlay.dart +++ b/lib/src/events_overlay.dart @@ -5,7 +5,7 @@ import 'package:flutter/material.dart'; import 'package:jiffy/jiffy.dart'; /// Events layer -class EventsOverlay extends StatelessWidget { +class EventsOverlay extends StatelessWidget { const EventsOverlay({ required this.weekList, required this.begin, @@ -18,14 +18,14 @@ class EventsOverlay extends StatelessWidget { super.key, }); - final List weekList; + final List> weekList; final Jiffy begin; final double itemWidth; final double itemHeight; final double topPadding; final int maxLines; final EdgeInsets? padding; - final EventBuilder? eventBuilder; + final EventBuilder? eventBuilder; @override Widget build(BuildContext context) { @@ -35,7 +35,7 @@ class EventsOverlay extends StatelessWidget { itemBuilder: (context, index) { final lineHeight = (itemHeight - topPadding) / maxLines; - return WeekEventsWidget( + return WeekEventsWidget( eventBuilder: eventBuilder, row: index, eventLines: weekList[index].lines, diff --git a/lib/src/models/calendar_event_model.dart b/lib/src/models/calendar_event_model.dart index 361bea6..e8065e8 100644 --- a/lib/src/models/calendar_event_model.dart +++ b/lib/src/models/calendar_event_model.dart @@ -1,10 +1,12 @@ import 'package:flutter/material.dart'; -class CalendarEventModel { +class CalendarEventModel { CalendarEventModel({ required this.name, required this.begin, required this.end, + this.id, + this.value, this.eventColor = Colors.green, }); @@ -12,4 +14,6 @@ class CalendarEventModel { DateTime begin; DateTime end; Color eventColor; + T? value; + int? id; } diff --git a/lib/src/models/drawers.dart b/lib/src/models/drawers.dart index fd5163a..38f0dd2 100644 --- a/lib/src/models/drawers.dart +++ b/lib/src/models/drawers.dart @@ -3,24 +3,25 @@ import 'dart:ui'; import 'package:cr_calendar/cr_calendar.dart'; import 'package:flutter/material.dart'; -class WeekDrawer { +class WeekDrawer { WeekDrawer(this.lines); - List lines; + List> lines; } -class EventsLineDrawer { - List events = []; // max 7 +class EventsLineDrawer { + List> events = []; // max 7 } /// Event widget properties used in [EventBuilder]. -class EventProperties { - EventProperties({ - required this.begin, - required this.end, - required this.name, - required this.backgroundColor, - }); +class EventProperties { + EventProperties( + {required this.begin, + required this.end, + required this.name, + required this.backgroundColor, + this.id, + this.value}); /// Begin day number. int begin; // min 1 / max 7 @@ -33,4 +34,7 @@ class EventProperties { String name; int size() => end - begin + 1; + + T? value; + int? id; } diff --git a/lib/src/month_item.dart b/lib/src/month_item.dart index 63ce720..ee5593d 100644 --- a/lib/src/month_item.dart +++ b/lib/src/month_item.dart @@ -13,7 +13,7 @@ import 'package:jiffy/jiffy.dart'; import 'cr_date_picker_dialog.dart'; /// Calendar page -class MonthItem extends StatefulWidget { +class MonthItem extends StatefulWidget { const MonthItem({ required this.controller, required this.displayMonth, @@ -40,18 +40,18 @@ class MonthItem extends StatefulWidget { final WeekDaysBuilder? weekDaysBuilder; final DayItemBuilder? dayItemBuilder; final bool forceSixWeek; - final EventBuilder? eventBuilder; - final CrCalendarController controller; + final EventBuilder? eventBuilder; + final CrCalendarController controller; final DateTime displayMonth; final double? eventTopPadding; final TouchMode touchMode; final WeekDay firstWeekDay; @override - MonthItemState createState() => MonthItemState(); + MonthItemState createState() => MonthItemState(); } -class MonthItemState extends State { +class MonthItemState extends State> { final _monthKey = GlobalKey(); final _overflowedEvents = NotFittedPageEventCount(); @@ -60,7 +60,7 @@ class MonthItemState extends State { late Jiffy _endRange; late int _beginOffset; late int _daysInMonth; - late List _weeksEvents; + late List> _weeksEvents; @override void initState() { @@ -76,7 +76,7 @@ class MonthItemState extends State { } @override - void didUpdateWidget(MonthItem oldWidget) { + void didUpdateWidget(MonthItem oldWidget) { initEvents(); super.didUpdateWidget(oldWidget); } @@ -137,18 +137,16 @@ class MonthItemState extends State { itemWidth, itemHeight, ), - IgnorePointer( - child: EventsOverlay( - eventBuilder: widget.eventBuilder, - maxLines: widget.maxEventLines, - topPadding: widget.eventTopPadding ?? - (itemHeight / - Contract.kDayItemTopPaddingCoef), - itemWidth: itemWidth, - itemHeight: itemHeight, - begin: _beginRange, - weekList: _weeksEvents, - ), + EventsOverlay( + eventBuilder: widget.eventBuilder, + maxLines: widget.maxEventLines, + topPadding: widget.eventTopPadding ?? + (itemHeight / + Contract.kDayItemTopPaddingCoef), + itemWidth: itemWidth, + itemHeight: itemHeight, + begin: _beginRange, + weekList: _weeksEvents, ), ], ); @@ -218,19 +216,19 @@ class MonthItemState extends State { } /// Returns list of events for current month - List _calculateWeeks() { + List> _calculateWeeks() { final begin = _beginRange; final end = _endRange; _weekCount = widget.forceSixWeek ? Contract.kMaxWeekPerMoth : (end.diff(begin, Units.WEEK) + 1).toInt(); // inclusive - final drawersForWeek = >[]; + final drawersForWeek = >>[]; final weeks = List.generate(_weekCount, (index) { - final eventDrawers = resolveEventDrawersForWeek( + final eventDrawers = resolveEventDrawersForWeek( index, _beginRange, widget.controller.events ?? []); final placedEvents = - placeEventsToLines(eventDrawers, widget.maxEventLines); + placeEventsToLines(eventDrawers, widget.maxEventLines); drawersForWeek.add(eventDrawers); return WeekDrawer(placedEvents); }); diff --git a/lib/src/utils/event_utils.dart b/lib/src/utils/event_utils.dart index 74b0ad0..e74d3a6 100644 --- a/lib/src/utils/event_utils.dart +++ b/lib/src/utils/event_utils.dart @@ -45,9 +45,9 @@ List calculateAvailableEventsForRange( } /// Returns drawers for [week] -List resolveEventDrawersForWeek( - int week, Jiffy monthStart, List events) { - final drawers = []; +List> resolveEventDrawersForWeek( + int week, Jiffy monthStart, List> events) { + final drawers = >[]; final beginDate = Jiffy(monthStart).add(weeks: week); final endDate = Jiffy(beginDate).add(days: Contract.kWeekDaysCount - 1); @@ -63,8 +63,8 @@ List resolveEventDrawersForWeek( } /// This method maps CalendarEventItem to EventDrawer and calculates drawer begin and end -EventProperties? _mapSimpleEventToDrawerOrNull( - CalendarEventModel event, Jiffy begin, Jiffy end) { +EventProperties? _mapSimpleEventToDrawerOrNull( + CalendarEventModel event, Jiffy begin, Jiffy end) { final jBegin = DateTime.utc( event.begin.year, event.begin.month, @@ -102,19 +102,21 @@ EventProperties? _mapSimpleEventToDrawerOrNull( begin: beginDay, end: endDay, name: event.name, + value: event.value, + id: event.id, backgroundColor: event.eventColor); } /// Map EventDrawers to EventsLineDrawer and sort them by duration on current week -List placeEventsToLines( - List events, int maxLines) { - final copy = [...events] +List> placeEventsToLines( + List> events, int maxLines) { + final copy = >[...events] ..sort((a, b) => b.size().compareTo(a.size())); final lines = List.generate(maxLines, (index) { - final lineDrawer = EventsLineDrawer(); + final lineDrawer = EventsLineDrawer(); for (var day = 1; day <= Contract.kWeekDaysCount; day++) { - final candidates = []; + final candidates = >[]; copy.forEach((e) { if (day == e.begin) { candidates.add(e); diff --git a/lib/src/week_events_widget.dart b/lib/src/week_events_widget.dart index 968ea4c..7358ca5 100644 --- a/lib/src/week_events_widget.dart +++ b/lib/src/week_events_widget.dart @@ -3,7 +3,7 @@ import 'package:cr_calendar/src/customization/builders.dart'; import 'package:cr_calendar/src/models/drawers.dart'; import 'package:flutter/material.dart'; -class WeekEventsWidget extends StatelessWidget { +class WeekEventsWidget extends StatelessWidget { WeekEventsWidget({ required this.itemHeight, required this.itemWidth, @@ -23,9 +23,9 @@ class WeekEventsWidget extends StatelessWidget { final double itemWidth; final double topPadding; final int row; - final List eventLines; + final List> eventLines; late final EdgeInsets padding; - final EventBuilder? eventBuilder; + final EventBuilder? eventBuilder; @override Widget build(BuildContext context) { diff --git a/pubspec.yaml b/pubspec.yaml index 144c55f..0c9acf0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,11 +1,11 @@ name: cr_calendar description: Awesome calendar with customizations, range picking and event showing. -version: 1.0.0+1 +version: 1.1.0+2 homepage: https://cleveroad.com repository: https://github.com/Cleveroad/cr_calendar environment: - sdk: '>=2.17.0 <3.0.0' + sdk: ">=2.17.0 <3.0.0" flutter: ">=3.0.0" dependencies: @@ -21,4 +21,3 @@ dev_dependencies: sdk: flutter flutter_lints: ^2.0.1 -