Skip to content

Commit aa0965b

Browse files
CodeDoctorDECodeDoctorDE
committed
Improve editor shell, upgrade dependencies
1 parent 07d18b5 commit aa0965b

File tree

13 files changed

+245
-469
lines changed

13 files changed

+245
-469
lines changed

‎api/pubspec.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ packages:
172172
path: "packages/dart_leap"
173173
ref: db69a03082e6811c58dc2d0e5c23d04305e1623f
174174
resolved-ref: db69a03082e6811c58dc2d0e5c23d04305e1623f
175-
url: "https://github.com/LinwoodDev/dart_pkgs"
175+
url: "https://github.com/LinwoodDev/dart_pkgs.git"
176176
source: git
177177
version: "1.0.0"
178178
dart_mappable:
@@ -309,7 +309,7 @@ packages:
309309
path: "packages/lw_file_system_api"
310310
ref: e4c17cb5e3a53c0cd02d4127458c2215f7c6e7d4
311311
resolved-ref: e4c17cb5e3a53c0cd02d4127458c2215f7c6e7d4
312-
url: "https://github.com/LinwoodDev/dart_pkgs"
312+
url: "https://github.com/LinwoodDev/dart_pkgs.git"
313313
source: git
314314
version: "1.0.0"
315315
macros:
@@ -348,9 +348,9 @@ packages:
348348
dependency: "direct main"
349349
description:
350350
path: "packages/networker/networker"
351-
ref: "071e02761bf55a47bcde0cdc2a711b8ff5fbbb18"
352-
resolved-ref: "071e02761bf55a47bcde0cdc2a711b8ff5fbbb18"
353-
url: "https://github.com/LinwoodDev/dart_pkgs"
351+
ref: "0bdc62d3af7f31e19a694d9cd39fe020dced8754"
352+
resolved-ref: "0bdc62d3af7f31e19a694d9cd39fe020dced8754"
353+
url: "https://github.com/LinwoodDev/dart_pkgs.git"
354354
source: git
355355
version: "1.0.0"
356356
package_config:

‎api/pubspec.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ dependencies:
1313
archive: ^4.0.2
1414
lw_file_system_api:
1515
git:
16-
url: https://github.com/LinwoodDev/dart_pkgs
16+
url: https://github.com/LinwoodDev/dart_pkgs.git
1717
ref: e4c17cb5e3a53c0cd02d4127458c2215f7c6e7d4
1818
path: packages/lw_file_system_api
1919
networker:
2020
git:
21-
url: https://github.com/LinwoodDev/dart_pkgs
22-
ref: 071e02761bf55a47bcde0cdc2a711b8ff5fbbb18
21+
url: https://github.com/LinwoodDev/dart_pkgs.git
22+
ref: 0bdc62d3af7f31e19a694d9cd39fe020dced8754
2323
path: packages/networker/networker
2424
dart_leap:
2525
git:
26-
url: https://github.com/LinwoodDev/dart_pkgs
26+
url: https://github.com/LinwoodDev/dart_pkgs.git
2727
path: packages/dart_leap
2828
ref: db69a03082e6811c58dc2d0e5c23d04305e1623f
2929
crypto: ^3.0.5

‎app/android/Gemfile.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ GEM
1010
artifactory (3.0.17)
1111
atomos (0.1.3)
1212
aws-eventstream (1.3.0)
13-
aws-partitions (1.1035.0)
14-
aws-sdk-core (3.215.0)
13+
aws-partitions (1.1040.0)
14+
aws-sdk-core (3.216.0)
1515
aws-eventstream (~> 1, >= 1.3.0)
1616
aws-partitions (~> 1, >= 1.992.0)
1717
aws-sigv4 (~> 1.9)
1818
jmespath (~> 1, >= 1.6.1)
19-
aws-sdk-kms (1.96.0)
20-
aws-sdk-core (~> 3, >= 3.210.0)
19+
aws-sdk-kms (1.97.0)
20+
aws-sdk-core (~> 3, >= 3.216.0)
2121
aws-sigv4 (~> 1.5)
22-
aws-sdk-s3 (1.177.0)
23-
aws-sdk-core (~> 3, >= 3.210.0)
22+
aws-sdk-s3 (1.178.0)
23+
aws-sdk-core (~> 3, >= 3.216.0)
2424
aws-sdk-kms (~> 1)
2525
aws-sigv4 (~> 1.5)
2626
aws-sigv4 (1.11.0)

‎app/android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version '8.7.3' apply false
21+
id "com.android.application" version '8.8.0' apply false
2222
id "org.jetbrains.kotlin.android" version "2.1.0" apply false
2323
}
2424

‎app/lib/l10n/app_en.arb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,5 +225,6 @@
225225
"category": "Category",
226226
"figure": "Figure",
227227
"variation": "Variation",
228-
"position": "Position"
228+
"position": "Position",
229+
"tiles": "Tiles"
229230
}

‎app/lib/pages/editor/boards.dart

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
44
import 'package:material_leap/material_leap.dart';
55
import 'package:phosphor_flutter/phosphor_flutter.dart';
66
import 'package:setonix/bloc/editor.dart';
7+
import 'package:setonix/helpers/vector.dart';
78
import 'package:setonix/pages/editor/textures.dart';
89
import 'package:setonix_api/setonix_api.dart';
910

@@ -129,6 +130,16 @@ class _BoardEditorDialogState extends State<BoardEditorDialog> {
129130
},
130131
),
131132
const SizedBox(height: 8),
133+
OffsetListTile(
134+
value: value.tiles.toOffset(),
135+
fractionDigits: 0,
136+
onChanged: (value) {
137+
setState(() {
138+
_value = _value?.copyWith(tiles: value.toDefinition());
139+
});
140+
},
141+
title: Text(AppLocalizations.of(context).tiles),
142+
),
132143
VisualEditingView(
133144
value: value,
134145
onChanged: (value) {

‎app/lib/pages/editor/shell.dart

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -195,27 +195,28 @@ class _EditorShellState extends State<EditorShell> {
195195
return BlocProvider(
196196
create: (context) =>
197197
EditorCubit(widget.name, context.read<SetonixFileSystem>(), data),
198-
child: Row(
199-
children: [
200-
if (!isMobile) ...[
201-
EditorNavigatorView(currentPage: currentPage),
202-
const SizedBox(width: 4)
203-
],
204-
Expanded(
205-
child: Scaffold(
206-
appBar: WindowTitleBar<SettingsCubit, SetonixSettings>(
207-
title: Text(currentPage.getLocalizedName(context)),
208-
),
209-
drawer: isMobile
210-
? EditorNavigatorView(
211-
currentPage: currentPage,
212-
isMobile: true,
213-
)
214-
: null,
215-
body: widget.child,
198+
child: Scaffold(
199+
appBar: WindowTitleBar<SettingsCubit, SetonixSettings>(
200+
title: Text(
201+
isMobile ? currentPage.getLocalizedName(context) : widget.name),
202+
),
203+
drawer: isMobile
204+
? EditorNavigatorView(
205+
currentPage: currentPage,
206+
isMobile: true,
207+
)
208+
: null,
209+
body: Row(
210+
children: [
211+
if (!isMobile) ...[
212+
EditorNavigatorView(currentPage: currentPage),
213+
const SizedBox(width: 2)
214+
],
215+
Expanded(
216+
child: widget.child,
216217
),
217-
),
218-
],
218+
],
219+
),
219220
),
220221
);
221222
}

‎app/lib/pages/packs/editor.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class _EditorPacksViewState extends State<_EditorPacksView> {
5757
subtitle: Text(file.identifier),
5858
onTap: () => GoRouter.of(context)
5959
.goNamed('editor', pathParameters: {
60-
'name': file.identifier,
60+
'name': file.pathWithoutLeadingSlash,
6161
}),
6262
trailing: widget,
6363
);

‎app/pubspec.lock

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ packages:
220220
path: "packages/dart_leap"
221221
ref: db69a03082e6811c58dc2d0e5c23d04305e1623f
222222
resolved-ref: db69a03082e6811c58dc2d0e5c23d04305e1623f
223-
url: "https://github.com/LinwoodDev/dart_pkgs"
223+
url: "https://github.com/LinwoodDev/dart_pkgs.git"
224224
source: git
225225
version: "1.0.0"
226226
dart_mappable:
@@ -251,10 +251,10 @@ packages:
251251
dependency: "direct main"
252252
description:
253253
name: device_info_plus
254-
sha256: "4fa68e53e26ab17b70ca39f072c285562cfc1589df5bb1e9295db90f6645f431"
254+
sha256: b37d37c2f912ad4e8ec694187de87d05de2a3cb82b465ff1f65f65a2d05de544
255255
url: "https://pub.dev"
256256
source: hosted
257-
version: "11.2.0"
257+
version: "11.2.1"
258258
device_info_plus_platform_interface:
259259
dependency: transitive
260260
description:
@@ -474,10 +474,10 @@ packages:
474474
dependency: transitive
475475
description:
476476
name: flutter_secure_storage_linux
477-
sha256: b777e220fbf21c149574aa31f9e4ed56dcf025c4ef196664fe90954c265105dc
477+
sha256: "9b4b73127e857cd3117d43a70fa3dddadb6e0b253be62e6a6ab85caa0742182c"
478478
url: "https://pub.dev"
479479
source: hosted
480-
version: "2.0.0"
480+
version: "2.0.1"
481481
flutter_secure_storage_platform_interface:
482482
dependency: transitive
483483
description:
@@ -670,9 +670,9 @@ packages:
670670
dependency: "direct main"
671671
description:
672672
path: "packages/lw_file_system"
673-
ref: "760972dc351ab9aecd3df37e8679b2b029f34e80"
674-
resolved-ref: "760972dc351ab9aecd3df37e8679b2b029f34e80"
675-
url: "https://github.com/LinwoodDev/dart_pkgs"
673+
ref: ada8a1a9ef9624cb0c546b318247626c7514b6ea
674+
resolved-ref: ada8a1a9ef9624cb0c546b318247626c7514b6ea
675+
url: "https://github.com/LinwoodDev/dart_pkgs.git"
676676
source: git
677677
version: "1.0.0"
678678
lw_file_system_api:
@@ -681,7 +681,7 @@ packages:
681681
path: "packages/lw_file_system_api"
682682
ref: e4c17cb5e3a53c0cd02d4127458c2215f7c6e7d4
683683
resolved-ref: e4c17cb5e3a53c0cd02d4127458c2215f7c6e7d4
684-
url: "https://github.com/LinwoodDev/dart_pkgs"
684+
url: "https://github.com/LinwoodDev/dart_pkgs.git"
685685
source: git
686686
version: "1.0.0"
687687
lw_sysapi:
@@ -690,7 +690,7 @@ packages:
690690
path: "packages/lw_sysapi"
691691
ref: "742b507106900b65490551d42a2ef4c7d049889a"
692692
resolved-ref: "742b507106900b65490551d42a2ef4c7d049889a"
693-
url: "https://github.com/LinwoodDev/dart_pkgs"
693+
url: "https://github.com/LinwoodDev/dart_pkgs.git"
694694
source: git
695695
version: "0.0.1"
696696
macros:
@@ -705,10 +705,10 @@ packages:
705705
dependency: "direct main"
706706
description:
707707
name: markdown
708-
sha256: ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051
708+
sha256: "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1"
709709
url: "https://pub.dev"
710710
source: hosted
711-
version: "7.2.2"
711+
version: "7.3.0"
712712
matcher:
713713
dependency: transitive
714714
description:
@@ -729,8 +729,8 @@ packages:
729729
dependency: "direct main"
730730
description:
731731
path: "packages/material_leap"
732-
ref: "742b507106900b65490551d42a2ef4c7d049889a"
733-
resolved-ref: "742b507106900b65490551d42a2ef4c7d049889a"
732+
ref: ada8a1a9ef9624cb0c546b318247626c7514b6ea
733+
resolved-ref: ada8a1a9ef9624cb0c546b318247626c7514b6ea
734734
url: "https://github.com/LinwoodDev/dart_pkgs.git"
735735
source: git
736736
version: "0.0.1"
@@ -762,18 +762,18 @@ packages:
762762
dependency: "direct main"
763763
description:
764764
path: "packages/networker/networker"
765-
ref: "071e02761bf55a47bcde0cdc2a711b8ff5fbbb18"
766-
resolved-ref: "071e02761bf55a47bcde0cdc2a711b8ff5fbbb18"
767-
url: "https://github.com/LinwoodDev/dart_pkgs"
765+
ref: "0bdc62d3af7f31e19a694d9cd39fe020dced8754"
766+
resolved-ref: "0bdc62d3af7f31e19a694d9cd39fe020dced8754"
767+
url: "https://github.com/LinwoodDev/dart_pkgs.git"
768768
source: git
769769
version: "1.0.0"
770770
networker_socket:
771771
dependency: "direct main"
772772
description:
773773
path: "packages/networker/networker_socket"
774-
ref: "2400638352d6c877d09b97dd4030382f88deb2a4"
775-
resolved-ref: "2400638352d6c877d09b97dd4030382f88deb2a4"
776-
url: "https://github.com/LinwoodDev/dart_pkgs"
774+
ref: fa036587c2a26db6455dd063701aef32b3531800
775+
resolved-ref: fa036587c2a26db6455dd063701aef32b3531800
776+
url: "https://github.com/LinwoodDev/dart_pkgs.git"
777777
source: git
778778
version: "1.0.0"
779779
ordered_set:
@@ -796,10 +796,10 @@ packages:
796796
dependency: "direct main"
797797
description:
798798
name: package_info_plus
799-
sha256: "70c421fe9d9cc1a9a7f3b05ae56befd469fe4f8daa3b484823141a55442d858d"
799+
sha256: "739e0a5c3c4055152520fa321d0645ee98e932718b4c8efeeb51451968fe0790"
800800
url: "https://pub.dev"
801801
source: hosted
802-
version: "8.1.2"
802+
version: "8.1.3"
803803
package_info_plus_platform_interface:
804804
dependency: transitive
805805
description:
@@ -1027,10 +1027,10 @@ packages:
10271027
dependency: transitive
10281028
description:
10291029
name: share_plus
1030-
sha256: "6327c3f233729374d0abaafd61f6846115b2a481b4feddd8534211dc10659400"
1030+
sha256: fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da
10311031
url: "https://pub.dev"
10321032
source: hosted
1033-
version: "10.1.3"
1033+
version: "10.1.4"
10341034
share_plus_platform_interface:
10351035
dependency: transitive
10361036
description:
@@ -1051,10 +1051,10 @@ packages:
10511051
dependency: transitive
10521052
description:
10531053
name: shared_preferences_android
1054-
sha256: bf808be89fe9dc467475e982c1db6c2faf3d2acf54d526cd5ec37d86c99dbd84
1054+
sha256: "138b7bbbc7f59c56236e426c37afb8f78cbc57b094ac64c440e0bb90e380a4f5"
10551055
url: "https://pub.dev"
10561056
source: hosted
1057-
version: "2.4.1"
1057+
version: "2.4.2"
10581058
shared_preferences_foundation:
10591059
dependency: transitive
10601060
description:
@@ -1439,4 +1439,4 @@ packages:
14391439
version: "3.1.3"
14401440
sdks:
14411441
dart: ">=3.6.0 <4.0.0"
1442-
flutter: ">=3.27.1"
1442+
flutter: ">=3.27.2"

‎app/pubspec.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ publish_to: none
1616

1717
environment:
1818
sdk: ">=3.5.0 <4.0.0"
19-
flutter: 3.27.1
19+
flutter: 3.27.2
2020

2121
dependencies:
2222
flutter:
@@ -32,7 +32,7 @@ dependencies:
3232
material_leap:
3333
git:
3434
url: https://github.com/LinwoodDev/dart_pkgs.git
35-
ref: 742b507106900b65490551d42a2ef4c7d049889a
35+
ref: ada8a1a9ef9624cb0c546b318247626c7514b6ea
3636
path: packages/material_leap
3737
flex_color_scheme: ^8.1.0
3838
flutter_svg: ^2.0.10+1
@@ -54,13 +54,13 @@ dependencies:
5454
web_socket_channel: ^3.0.0
5555
networker:
5656
git:
57-
url: https://github.com/LinwoodDev/dart_pkgs
58-
ref: 071e02761bf55a47bcde0cdc2a711b8ff5fbbb18
57+
url: https://github.com/LinwoodDev/dart_pkgs.git
58+
ref: 0bdc62d3af7f31e19a694d9cd39fe020dced8754
5959
path: packages/networker/networker
6060
networker_socket:
6161
git:
62-
url: https://github.com/LinwoodDev/dart_pkgs
63-
ref: 2400638352d6c877d09b97dd4030382f88deb2a4
62+
url: https://github.com/LinwoodDev/dart_pkgs.git
63+
ref: fa036587c2a26db6455dd063701aef32b3531800
6464
path: packages/networker/networker_socket
6565
# System Information
6666
dynamic_color: ^1.7.0
@@ -72,12 +72,12 @@ dependencies:
7272
flutter_secure_storage: ^10.0.0-beta.1
7373
lw_file_system:
7474
git:
75-
url: https://github.com/LinwoodDev/dart_pkgs
76-
ref: 760972dc351ab9aecd3df37e8679b2b029f34e80
75+
url: https://github.com/LinwoodDev/dart_pkgs.git
76+
ref: ada8a1a9ef9624cb0c546b318247626c7514b6ea
7777
path: packages/lw_file_system
7878
lw_sysapi:
7979
git:
80-
url: https://github.com/LinwoodDev/dart_pkgs
80+
url: https://github.com/LinwoodDev/dart_pkgs.git
8181
ref: 742b507106900b65490551d42a2ef4c7d049889a
8282
path: packages/lw_sysapi
8383
setonix_api:

0 commit comments

Comments
 (0)