Skip to content

Commit fffb983

Browse files
X-WeiX-Wei
committed
add widget_with_code_view as subtree and make changes
1 parent a4931dd commit fffb983

File tree

6 files changed

+92
-59
lines changed

6 files changed

+92
-59
lines changed

Diff for: ‎packages/widget_with_codeview/example/lib/main.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class SomeWidget extends StatelessWidget {
4444
angle: Random().nextDouble(),
4545
child: Text(
4646
'Example',
47-
textScaleFactor: 2,
47+
textScaler: TextScaler.linear(2),
4848
),
4949
),
5050
),

Diff for: ‎packages/widget_with_codeview/lib/src/source_code_view.dart

+5-4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class SourceCodeView extends StatefulWidget {
3030
final Map<String, TextStyle>? darkTheme;
3131

3232
const SourceCodeView({
33-
Key? key,
33+
super.key,
3434
required this.filePath,
3535
this.codeContent,
3636
this.codeLinkPrefix,
@@ -43,7 +43,7 @@ class SourceCodeView extends StatefulWidget {
4343
this.footerWidget,
4444
this.lightTheme,
4545
this.darkTheme,
46-
}) : super(key: key);
46+
});
4747

4848
String? get codeLink => this.codeLinkPrefix == null
4949
? null
@@ -60,14 +60,15 @@ class SourceCodeViewState extends State<SourceCodeView> {
6060
ScrollController scrollController = ScrollController();
6161

6262
Widget _getCodeView(String codeContent, BuildContext context) {
63-
codeContent = codeContent.replaceAll('\r\n', '\n');
63+
final code = codeContent.replaceAll('\r\n', '\n');
6464
return Container(
6565
constraints: BoxConstraints.expand(),
6666
child: Scrollbar(
6767
controller: scrollController,
6868
child: SingleChildScrollView(
6969
controller: scrollController,
7070
child: Column(
71+
crossAxisAlignment: CrossAxisAlignment.stretch,
7172
children: [
7273
if (widget.headerWidget != null) ...[
7374
widget.headerWidget!,
@@ -77,7 +78,7 @@ class SourceCodeViewState extends State<SourceCodeView> {
7778
scrollDirection: Axis.horizontal,
7879
child: Selectable(
7980
child: HighlightView(
80-
codeContent,
81+
code,
8182
language: 'dart',
8283
theme: Theme.of(context).brightness == Brightness.light
8384
? widget.lightTheme ?? atomOneLightTheme

Diff for: ‎packages/widget_with_codeview/pubspec.lock

+78-46
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ packages:
3737
dependency: transitive
3838
description:
3939
name: collection
40-
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
40+
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
4141
url: "https://pub.dev"
4242
source: hosted
43-
version: "1.17.1"
43+
version: "1.18.0"
4444
crypto:
4545
dependency: transitive
4646
description:
@@ -85,10 +85,10 @@ packages:
8585
dependency: transitive
8686
description:
8787
name: float_column
88-
sha256: "86a4e93877403627613001b95b00e2230d3095b29600fbb312fe8a745b61a8e0"
88+
sha256: "62f0bba2de502ea5fabab6adf6ce704e27bcc7931de1202477ca852f8855def9"
8989
url: "https://pub.dev"
9090
source: hosted
91-
version: "2.0.1"
91+
version: "2.1.5"
9292
flutter:
9393
dependency: "direct main"
9494
description: flutter
@@ -152,46 +152,62 @@ packages:
152152
url: "https://pub.dev"
153153
source: hosted
154154
version: "4.0.2"
155-
js:
155+
leak_tracker:
156156
dependency: transitive
157157
description:
158-
name: js
159-
sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
158+
name: leak_tracker
159+
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
160160
url: "https://pub.dev"
161161
source: hosted
162-
version: "0.6.7"
162+
version: "10.0.0"
163+
leak_tracker_flutter_testing:
164+
dependency: transitive
165+
description:
166+
name: leak_tracker_flutter_testing
167+
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
168+
url: "https://pub.dev"
169+
source: hosted
170+
version: "2.0.1"
171+
leak_tracker_testing:
172+
dependency: transitive
173+
description:
174+
name: leak_tracker_testing
175+
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
176+
url: "https://pub.dev"
177+
source: hosted
178+
version: "2.0.1"
163179
matcher:
164180
dependency: transitive
165181
description:
166182
name: matcher
167-
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
183+
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
168184
url: "https://pub.dev"
169185
source: hosted
170-
version: "0.12.15"
186+
version: "0.12.16+1"
171187
material_color_utilities:
172188
dependency: transitive
173189
description:
174190
name: material_color_utilities
175-
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
191+
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
176192
url: "https://pub.dev"
177193
source: hosted
178-
version: "0.2.0"
194+
version: "0.8.0"
179195
meta:
180196
dependency: transitive
181197
description:
182198
name: meta
183-
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
199+
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
184200
url: "https://pub.dev"
185201
source: hosted
186-
version: "1.9.1"
202+
version: "1.11.0"
187203
path:
188204
dependency: transitive
189205
description:
190206
name: path
191-
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
207+
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
192208
url: "https://pub.dev"
193209
source: hosted
194-
version: "1.8.3"
210+
version: "1.9.0"
195211
path_provider:
196212
dependency: transitive
197213
description:
@@ -252,10 +268,10 @@ packages:
252268
dependency: transitive
253269
description:
254270
name: plugin_platform_interface
255-
sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a
271+
sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
256272
url: "https://pub.dev"
257273
source: hosted
258-
version: "2.1.3"
274+
version: "2.1.8"
259275
process:
260276
dependency: transitive
261277
description:
@@ -268,10 +284,10 @@ packages:
268284
dependency: "direct main"
269285
description:
270286
name: selectable
271-
sha256: "18432ba915b3e82a367e6ec9038666e0cc3147336cba125a9aa5768dc84296eb"
287+
sha256: "942b2b8fb68f093a8c9f5fefbecaeced88a16763f3298dfa4fcd48fba0e6be53"
272288
url: "https://pub.dev"
273289
source: hosted
274-
version: "0.3.0"
290+
version: "0.3.1"
275291
sky_engine:
276292
dependency: transitive
277293
description: flutter
@@ -281,26 +297,26 @@ packages:
281297
dependency: transitive
282298
description:
283299
name: source_span
284-
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
300+
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
285301
url: "https://pub.dev"
286302
source: hosted
287-
version: "1.9.1"
303+
version: "1.10.0"
288304
stack_trace:
289305
dependency: transitive
290306
description:
291307
name: stack_trace
292-
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
308+
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
293309
url: "https://pub.dev"
294310
source: hosted
295-
version: "1.11.0"
311+
version: "1.11.1"
296312
stream_channel:
297313
dependency: transitive
298314
description:
299315
name: stream_channel
300-
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
316+
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
301317
url: "https://pub.dev"
302318
source: hosted
303-
version: "2.1.1"
319+
version: "2.1.2"
304320
string_scanner:
305321
dependency: "direct main"
306322
description:
@@ -321,10 +337,10 @@ packages:
321337
dependency: transitive
322338
description:
323339
name: test_api
324-
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
340+
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
325341
url: "https://pub.dev"
326342
source: hosted
327-
version: "0.5.1"
343+
version: "0.6.1"
328344
typed_data:
329345
dependency: transitive
330346
description:
@@ -337,66 +353,66 @@ packages:
337353
dependency: "direct main"
338354
description:
339355
name: url_launcher
340-
sha256: "781bd58a1eb16069412365c98597726cd8810ae27435f04b3b4d3a470bacd61e"
356+
sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3"
341357
url: "https://pub.dev"
342358
source: hosted
343-
version: "6.1.12"
359+
version: "6.3.0"
344360
url_launcher_android:
345361
dependency: transitive
346362
description:
347363
name: url_launcher_android
348-
sha256: "9e262cbec69233717d5198f4d0b0c4961fa027e3685ba425442c43c64f38bb9b"
364+
sha256: "17cd5e205ea615e2c6ea7a77323a11712dffa0720a8a90540db57a01347f9ad9"
349365
url: "https://pub.dev"
350366
source: hosted
351-
version: "6.0.19"
367+
version: "6.3.2"
352368
url_launcher_ios:
353369
dependency: transitive
354370
description:
355371
name: url_launcher_ios
356-
sha256: "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2"
372+
sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89"
357373
url: "https://pub.dev"
358374
source: hosted
359-
version: "6.1.4"
375+
version: "6.3.0"
360376
url_launcher_linux:
361377
dependency: transitive
362378
description:
363379
name: url_launcher_linux
364-
sha256: "86f3f393cde6bed2a05bfc7f05e52aeaf4f9911a3ad9ff78a42e89e57e5a264a"
380+
sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811
365381
url: "https://pub.dev"
366382
source: hosted
367-
version: "2.0.0"
383+
version: "3.1.1"
368384
url_launcher_macos:
369385
dependency: transitive
370386
description:
371387
name: url_launcher_macos
372-
sha256: f72b523da791d519aed53c12fd99c7dc50fdd1e4913da904081f3666d06334b5
388+
sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de"
373389
url: "https://pub.dev"
374390
source: hosted
375-
version: "2.0.0"
391+
version: "3.2.0"
376392
url_launcher_platform_interface:
377393
dependency: transitive
378394
description:
379395
name: url_launcher_platform_interface
380-
sha256: bfdfa402f1f3298637d71ca8ecfe840b4696698213d5346e9d12d4ab647ee2ea
396+
sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029"
381397
url: "https://pub.dev"
382398
source: hosted
383-
version: "2.1.3"
399+
version: "2.3.2"
384400
url_launcher_web:
385401
dependency: transitive
386402
description:
387403
name: url_launcher_web
388-
sha256: "057e3458dfcc4276d171ae70cd98efc6d2485bf39b93a015349754e5dec0f657"
404+
sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a"
389405
url: "https://pub.dev"
390406
source: hosted
391-
version: "2.0.0"
407+
version: "2.3.1"
392408
url_launcher_windows:
393409
dependency: transitive
394410
description:
395411
name: url_launcher_windows
396-
sha256: f98b970a12236957881fa28df0c6700f03d9dc5f471cf5ca6d205b77e7ad92d2
412+
sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7
397413
url: "https://pub.dev"
398414
source: hosted
399-
version: "2.0.0"
415+
version: "3.1.1"
400416
vector_math:
401417
dependency: transitive
402418
description:
@@ -405,6 +421,22 @@ packages:
405421
url: "https://pub.dev"
406422
source: hosted
407423
version: "2.1.4"
424+
vm_service:
425+
dependency: transitive
426+
description:
427+
name: vm_service
428+
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
429+
url: "https://pub.dev"
430+
source: hosted
431+
version: "13.0.0"
432+
web:
433+
dependency: transitive
434+
description:
435+
name: web
436+
sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
437+
url: "https://pub.dev"
438+
source: hosted
439+
version: "0.5.1"
408440
win32:
409441
dependency: transitive
410442
description:
@@ -422,5 +454,5 @@ packages:
422454
source: hosted
423455
version: "0.2.0"
424456
sdks:
425-
dart: ">=3.0.0 <4.0.0"
426-
flutter: ">=3.10.0"
457+
dart: ">=3.3.0 <4.0.0"
458+
flutter: ">=3.19.0"

Diff for: ‎packages/widget_with_codeview/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ dependencies:
1212
flutter_highlight: ^0.7.0
1313
flutter_speed_dial: ^7.0.0
1414
google_fonts: ^5.1.0
15-
selectable: ^0.3.0
15+
selectable: ^0.3.1
1616
string_scanner: ^1.2.0
17-
url_launcher: ^6.1.7
17+
url_launcher: ^6.3.0
1818

1919
dev_dependencies:
2020
flutter_test:

Diff for: ‎pubspec.lock

+3-4
Original file line numberDiff line numberDiff line change
@@ -2389,10 +2389,9 @@ packages:
23892389
widget_with_codeview:
23902390
dependency: "direct main"
23912391
description:
2392-
name: widget_with_codeview
2393-
sha256: d485b1730a3c2360093b26d9fb34b2f4ffe44ebfa0c6b764a4e73e6405286b02
2394-
url: "https://pub.dev"
2395-
source: hosted
2392+
path: "packages/widget_with_codeview"
2393+
relative: true
2394+
source: path
23962395
version: "3.1.0"
23972396
win32:
23982397
dependency: transitive

Diff for: ‎pubspec.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ dependencies:
8383
like_button: ^2.0.5
8484
local_auth: ^2.2.0
8585
lottie: ^3.1.0
86-
# markdown: ^7.2.2
8786
markdown: ^7.2.2
8887
package_info_plus: ^7.0.0
8988
path: ^1.9.0
@@ -105,7 +104,9 @@ dependencies:
105104
url_launcher: ^6.2.6
106105
video_player: ^2.8.6
107106
webview_flutter: ^4.7.0
108-
widget_with_codeview: ^3.1.0
107+
widget_with_codeview:
108+
path: packages/widget_with_codeview
109+
109110
youtube_player_iframe: ^5.1.2
110111

111112
dev_dependencies:

0 commit comments

Comments
 (0)