2024-11-27 06:39:25 +01:00 · 2022-12-21 20:23:10 +01:00 · 2022-12-21 20:23:10 +01:00 · 417f09ea5c
commit 417f09ea5c
parent bc298c8748
8 changed files with 77 additions and 54 deletions
--- a/.metadata
+++ b/.metadata
@ -4,7 +4,7 @@
 # This file should be version controlled.

 version:
-  revision: 85684f9300908116a78138ea4c6036c35c9a1236
+  revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
  channel: stable

 project_type: app
@ -13,11 +13,26 @@ project_type: app
 migration:
  platforms:
    - platform: root
-      create_revision: 85684f9300908116a78138ea4c6036c35c9a1236
-      base_revision: 85684f9300908116a78138ea4c6036c35c9a1236
+      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+    - platform: android
+      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+    - platform: ios
+      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+    - platform: linux
+      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+    - platform: macos
+      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+    - platform: web
+      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
    - platform: windows
-      create_revision: 85684f9300908116a78138ea4c6036c35c9a1236
-      base_revision: 85684f9300908116a78138ea4c6036c35c9a1236
+      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849

  # User provided section

--- a/linux/CMakeLists.txt
+++ b/linux/CMakeLists.txt
@ -1,11 +1,19 @@
+# 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 "fluffychat")
+# The unique GTK application identifier for this application. See:
+# https://wiki.gnome.org/HowDoI/ChooseApplicationID
 set(APPLICATION_ID "chat.fluffy.fluffychat")

+# 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.
@ -18,7 +26,7 @@ if(FLUTTER_TARGET_PLATFORM_SYSROOT)
  set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 endif()

-# Configure build options.
+# 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)
@ -27,6 +35,10 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
 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)
@ -34,9 +46,8 @@ function(APPLY_STANDARD_SETTINGS TARGET)
  target_compile_definitions(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:NDEBUG>")
 endfunction()

-set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")
-
 # Flutter library and tool build rules.
+set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")
 add_subdirectory(${FLUTTER_MANAGED_DIR})

 # System-level dependencies.
@ -45,16 +56,27 @@ pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)

 add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}")

-# Application build
+# 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
@ -94,11 +116,11 @@ install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}
 install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
  COMPONENT Runtime)

-if(PLUGIN_BUNDLED_LIBRARIES)
-  install(FILES "${PLUGIN_BUNDLED_LIBRARIES}"
+foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES})
+  install(FILES "${bundled_library}"
    DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
    COMPONENT Runtime)
-endif()
+endforeach(bundled_library)

 # Fully re-copy the assets directory on each build to avoid having stale files
 # from a previous install.
--- a/linux/flutter/CMakeLists.txt
+++ b/linux/flutter/CMakeLists.txt
@ -1,3 +1,4 @@
+# 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")
--- a/linux/flutter/generated_plugin_registrant.cc
+++ b/linux/flutter/generated_plugin_registrant.cc
@ -13,7 +13,6 @@
 #include <flutter_secure_storage_linux/flutter_secure_storage_linux_plugin.h>
 #include <flutter_webrtc/flutter_web_r_t_c_plugin.h>
 #include <handy_window/handy_window_plugin.h>
-#include <record_linux/record_linux_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>

 void fl_register_plugins(FlPluginRegistry* registry) {
@ -38,9 +37,6 @@ void fl_register_plugins(FlPluginRegistry* registry) {
  g_autoptr(FlPluginRegistrar) handy_window_registrar =
      fl_plugin_registry_get_registrar_for_plugin(registry, "HandyWindowPlugin");
  handy_window_plugin_register_with_registrar(handy_window_registrar);
-  g_autoptr(FlPluginRegistrar) record_linux_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "RecordLinuxPlugin");
-  record_linux_plugin_register_with_registrar(record_linux_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);
--- a/linux/flutter/generated_plugins.cmake
+++ b/linux/flutter/generated_plugins.cmake
@ -10,7 +10,6 @@ list(APPEND FLUTTER_PLUGIN_LIST
  flutter_secure_storage_linux
  flutter_webrtc
  handy_window
-  record_linux
  url_launcher_linux
 )

--- a/linux/my_application.cc
+++ b/linux/my_application.cc
@ -28,50 +28,42 @@ static void my_application_activate(GApplication* application) {
  // If running on Wayland assume the header bar will work (may need changing
  // if future cases occur).
  gboolean use_header_bar = TRUE;
-  const gchar* gtk_csd_env = g_getenv("GTK_CSD");
-  if (gtk_csd_env != nullptr && g_strcmp0(gtk_csd_env, "1") != 0)
-    use_header_bar = FALSE;
 #ifdef GDK_WINDOWING_X11
-  GdkScreen *screen = gtk_window_get_screen(window);
+  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;
-       // Disable libhandy here, otherwise the close button disappears on KDE X11
-       g_setenv("GTK_CSD", "0", TRUE);
    }
  }
 #endif
  if (use_header_bar) {
-    GtkHeaderBar *header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
+    GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
    gtk_widget_show(GTK_WIDGET(header_bar));
-    gtk_header_bar_set_title(header_bar, "FluffyChat");
+    gtk_header_bar_set_title(header_bar, "fluffychat");
    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, "FluffyChat");
+  } else {
+    gtk_window_set_title(window, "fluffychat");
  }

  gtk_window_set_default_size(window, 864, 600);
+  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));

-  // rendering app after libhandy was loaded in order to have magic stuff happening before
-  gtk_widget_show(GTK_WIDGET(window));
-  gtk_widget_show(GTK_WIDGET(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) {
+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);
@ -90,7 +82,7 @@ static gboolean my_application_local_command_line(GApplication* application, gch
 }

 // Implements GObject::dispose.
-static void my_application_dispose(GObject *object) {
+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);
--- a/pubspec.lock
+++ b/pubspec.lock
@ -1347,45 +1347,40 @@ packages:
  record:
    dependency: "direct main"
    description:
-      name: record
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "4.3.2"
-  record_linux:
-    dependency: transitive
-    description:
-      name: record_linux
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.3.2"
+      path: record
+      ref: HEAD
+      resolved-ref: "95e3e8a08e54698a41ab49d50d1d3cb42cecb4e7"
+      url: "https://github.com/krillefear/record.git"
+    source: git
+    version: "4.4.3"
  record_macos:
    dependency: transitive
    description:
      name: record_macos
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.2.1"
+    version: "0.2.2"
  record_platform_interface:
    dependency: transitive
    description:
      name: record_platform_interface
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.4.0"
+    version: "0.5.0"
  record_web:
    dependency: transitive
    description:
      name: record_web
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.4.0"
+    version: "0.5.0"
  record_windows:
    dependency: transitive
    description:
      name: record_windows
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.6.1"
+    version: "0.6.2"
  remove_emoji:
    dependency: transitive
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -73,7 +73,10 @@ dependencies:
  qr_code_scanner: ^1.0.0
  qr_flutter: ^4.0.0
  receive_sharing_intent: ^1.4.5
-  record: ^4.3.2
+  record: # Because of https://github.com/llfbandit/record/issues/95
+    git:
+      url: https://github.com/krillefear/record.git
+      path: record
  scroll_to_index: ^3.0.1
  share_plus: ^4.0.10+1
  shared_preferences: ^2.0.13