Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Flutter upgrade

This commit is contained in:
Hillel Coren 2023-12-07 13:00:17 +02:00
parent 5669b36fb7
commit c6d5cd1d67
3 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.metadata
View File

@ -4,7 +4,7 @@
# This file should be version controlled and should not be manually edited. # This file should be version controlled and should not be manually edited.
version: version:
revision: "ead455963c12b453cdb2358cad34969c76daf180" revision: "9e1c857886f07d342cf106f2cd588bcd5e031bb2"
channel: "stable" channel: "stable"
project_type: app project_type: app
@ -13,11 +13,11 @@ project_type: app
migration: migration:
platforms: platforms:
- platform: root - platform: root
create_revision: ead455963c12b453cdb2358cad34969c76daf180 create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
base_revision: ead455963c12b453cdb2358cad34969c76daf180 base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
- platform: windows - platform: windows
create_revision: ead455963c12b453cdb2358cad34969c76daf180 create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
base_revision: ead455963c12b453cdb2358cad34969c76daf180 base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
# User provided section # User provided section

30
lib/utils/super_editor/toolbar.dart
View File

@ -1,6 +1,7 @@
import 'dart:math'; import 'dart:math';
//import 'package:example/logging.dart'; //import 'package:example/logging.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
//import 'package:flutter_gen/gen_l10n/app_localizations.dart'; //import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:follow_the_leader/follow_the_leader.dart'; import 'package:follow_the_leader/follow_the_leader.dart';
@ -543,6 +544,7 @@ class _EditorToolbarState extends State<EditorToolbar> {
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
/*
// Only allow the user to select a new type of text node if // Only allow the user to select a new type of text node if
// the currently selected node can be converted. // the currently selected node can be converted.
if (_isConvertibleNode()) ...[ if (_isConvertibleNode()) ...[
@ -573,6 +575,7 @@ class _EditorToolbarState extends State<EditorToolbar> {
), ),
_buildVerticalDivider(), _buildVerticalDivider(),
], ],
*/
Center( Center(
child: IconButton( child: IconButton(
onPressed: _toggleBold, onPressed: _toggleBold,
@ -600,19 +603,21 @@ class _EditorToolbarState extends State<EditorToolbar> {
tooltip: 'Strikethrough', tooltip: 'Strikethrough',
), ),
), ),
Center( if (kIsWeb)
child: IconButton( Center(
onPressed: child: IconButton(
_areMultipleLinksSelected() ? null : _onLinkPressed, onPressed:
icon: const Icon(Icons.link), _areMultipleLinksSelected() ? null : _onLinkPressed,
color: _isSingleLinkSelected() icon: const Icon(Icons.link),
? const Color(0xFF007AFF) color: _isSingleLinkSelected()
: IconTheme.of(context).color, ? const Color(0xFF007AFF)
splashRadius: 16, : IconTheme.of(context).color,
//tooltip: AppLocalizations.of(context)!.labelLink, splashRadius: 16,
tooltip: 'Link', //tooltip: AppLocalizations.of(context)!.labelLink,
tooltip: 'Link',
),
), ),
), /*
// Only display alignment controls if the currently selected text // Only display alignment controls if the currently selected text
// node respects alignment. List items, for example, do not. // node respects alignment. List items, for example, do not.
if (_isTextAlignable()) ...[ if (_isTextAlignable()) ...[
@ -658,6 +663,7 @@ class _EditorToolbarState extends State<EditorToolbar> {
tooltip: 'More Options', tooltip: 'More Options',
), ),
), ),
*/
], ],
), ),
), ),

6
windows/CMakeLists.txt
View File

@ -89,6 +89,12 @@ if(PLUGIN_BUNDLED_LIBRARIES)
COMPONENT Runtime) COMPONENT Runtime)
endif() 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 # Fully re-copy the assets directory on each build to avoid having stale files
# from a previous install. # from a previous install.
set(FLUTTER_ASSET_DIR_NAME "flutter_assets") set(FLUTTER_ASSET_DIR_NAME "flutter_assets")