Skip to content

Commit 98c102f

Browse files
provokateurinprovokateurin
committed
refactor(neon_framework,neon_rich_text): Move rich text rendering to neon_rich_text
Signed-off-by: provokateurin <kate@provokateurin.de>
1 parent f3d7b89 commit 98c102f

30 files changed

+151
-153
lines changed

‎.github/workflows/dependency_overrides.patch

Lines changed: 100 additions & 133 deletions
Large diffs are not rendered by default.

‎packages/neon_framework/example/pubspec.lock

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -881,6 +881,13 @@ packages:
881881
relative: true
882882
source: path
883883
version: "1.0.0"
884+
neon_rich_text:
885+
dependency: "direct overridden"
886+
description:
887+
path: "../packages/neon_rich_text"
888+
relative: true
889+
source: path
890+
version: "0.1.0"
884891
nested:
885892
dependency: transitive
886893
description:

‎packages/neon_framework/example/pubspec_overrides.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# melos_managed_dependency_overrides: account_repository,cookie_store,dashboard_app,dynamite_runtime,files_app,interceptor_http_client,neon_framework,neon_http_client,neon_lints,news_app,nextcloud,notes_app,notifications_app,notifications_push_repository,sort_box,talk_app
1+
# melos_managed_dependency_overrides: account_repository,cookie_store,dashboard_app,dynamite_runtime,files_app,interceptor_http_client,neon_framework,neon_http_client,neon_lints,neon_rich_text,news_app,nextcloud,notes_app,notifications_app,notifications_push_repository,sort_box,talk_app
22
dependency_overrides:
33
account_repository:
44
path: ../packages/account_repository
@@ -18,6 +18,8 @@ dependency_overrides:
1818
path: ../packages/neon_http_client
1919
neon_lints:
2020
path: ../../neon_lints
21+
neon_rich_text:
22+
path: ../packages/neon_rich_text
2123
news_app:
2224
path: ../packages/news_app
2325
nextcloud:

‎packages/neon_framework/lib/widgets.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export 'package:neon_framework/src/widgets/image.dart' hide NeonImage;
77
export 'package:neon_framework/src/widgets/linear_progress_indicator.dart';
88
export 'package:neon_framework/src/widgets/list_view.dart';
99
export 'package:neon_framework/src/widgets/relative_time.dart';
10-
export 'package:neon_framework/src/widgets/rich_text/rich_text.dart';
1110
export 'package:neon_framework/src/widgets/server_icon.dart';
1211
export 'package:neon_framework/src/widgets/user_avatar.dart' hide NeonUserStatusIndicator;
1312
export 'package:neon_framework/src/widgets/user_status_icon.dart';
13+
export 'package:neon_rich_text/neon_rich_text.dart';

‎packages/neon_framework/packages/account_repository/pubspec_overrides.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# melos_managed_dependency_overrides: cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,nextcloud,notifications_push_repository,sort_box
1+
# melos_managed_dependency_overrides: cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,neon_rich_text,nextcloud,notifications_push_repository,sort_box
22
dependency_overrides:
33
cookie_store:
44
path: ../../../cookie_store
@@ -12,6 +12,8 @@ dependency_overrides:
1212
path: ../neon_http_client
1313
neon_lints:
1414
path: ../../../neon_lints
15+
neon_rich_text:
16+
path: ../neon_rich_text
1517
nextcloud:
1618
path: ../../../nextcloud
1719
notifications_push_repository:

‎packages/neon_framework/packages/dashboard_app/pubspec_overrides.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,nextcloud,notifications_push_repository,sort_box
1+
# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,neon_rich_text,nextcloud,notifications_push_repository,sort_box
22
dependency_overrides:
33
account_repository:
44
path: ../account_repository
@@ -14,6 +14,8 @@ dependency_overrides:
1414
path: ../neon_http_client
1515
neon_lints:
1616
path: ../../../neon_lints
17+
neon_rich_text:
18+
path: ../neon_rich_text
1719
nextcloud:
1820
path: ../../../nextcloud
1921
notifications_push_repository:

‎packages/neon_framework/packages/files_app/pubspec_overrides.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,nextcloud,notifications_push_repository,sort_box
1+
# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,neon_rich_text,nextcloud,notifications_push_repository,sort_box
22
dependency_overrides:
33
account_repository:
44
path: ../account_repository
@@ -14,6 +14,8 @@ dependency_overrides:
1414
path: ../neon_http_client
1515
neon_lints:
1616
path: ../../../neon_lints
17+
neon_rich_text:
18+
path: ../neon_rich_text
1719
nextcloud:
1820
path: ../../../nextcloud
1921
notifications_push_repository:

‎packages/neon_framework/packages/neon_rich_text/lib/neon_rich_text.dart

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
export 'src/rich_objects/deck_card.dart';
2+
export 'src/rich_objects/fallback.dart';
3+
export 'src/rich_objects/file.dart';
4+
export 'src/rich_objects/mention.dart';
5+
export 'src/rich_text.dart';

‎packages/neon_framework/lib/src/widgets/rich_text/deck_card.dart renamed to ‎packages/neon_framework/packages/neon_rich_text/lib/src/rich_objects/deck_card.dart

File renamed without changes.

‎packages/neon_framework/lib/src/widgets/rich_text/fallback.dart renamed to ‎packages/neon_framework/packages/neon_rich_text/lib/src/rich_objects/fallback.dart

File renamed without changes.

‎packages/neon_framework/lib/src/widgets/rich_text/file.dart renamed to ‎packages/neon_framework/packages/neon_rich_text/lib/src/rich_objects/file.dart

File renamed without changes.

‎packages/neon_framework/lib/src/widgets/rich_text/mention.dart renamed to ‎packages/neon_framework/packages/neon_rich_text/lib/src/rich_objects/mention.dart

File renamed without changes.

‎packages/neon_framework/lib/src/widgets/rich_text/rich_text.dart renamed to ‎packages/neon_framework/packages/neon_rich_text/lib/src/rich_text.dart

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,12 @@ import 'package:built_value/json_object.dart';
33
import 'package:flutter/gestures.dart';
44
import 'package:flutter/widgets.dart';
55
import 'package:intersperse/intersperse.dart';
6-
import 'package:neon_framework/src/widgets/rich_text/deck_card.dart';
7-
import 'package:neon_framework/src/widgets/rich_text/fallback.dart';
8-
import 'package:neon_framework/src/widgets/rich_text/file.dart';
9-
import 'package:neon_framework/src/widgets/rich_text/mention.dart';
6+
import 'package:neon_rich_text/src/rich_objects/deck_card.dart';
7+
import 'package:neon_rich_text/src/rich_objects/fallback.dart';
8+
import 'package:neon_rich_text/src/rich_objects/file.dart';
9+
import 'package:neon_rich_text/src/rich_objects/mention.dart';
1010
import 'package:nextcloud/core.dart' as core;
1111

12-
export 'package:neon_framework/src/widgets/rich_text/deck_card.dart';
13-
export 'package:neon_framework/src/widgets/rich_text/fallback.dart';
14-
export 'package:neon_framework/src/widgets/rich_text/file.dart';
15-
export 'package:neon_framework/src/widgets/rich_text/mention.dart';
16-
1712
/// Renders the [text] as a rich [TextSpan].
1813
TextSpan buildRichTextSpan({
1914
required String text,

‎packages/neon_framework/test/goldens/rich_text_object_deck_card.png renamed to ‎packages/neon_framework/packages/neon_rich_text/test/goldens/rich_text_object_deck_card.png

File renamed without changes.

‎packages/neon_framework/test/goldens/rich_text_object_fallback_with_icon.png renamed to ‎packages/neon_framework/packages/neon_rich_text/test/goldens/rich_text_object_fallback_with_icon.png

File renamed without changes.

‎packages/neon_framework/test/goldens/rich_text_object_fallback_without_icon.png renamed to ‎packages/neon_framework/packages/neon_rich_text/test/goldens/rich_text_object_fallback_without_icon.png

File renamed without changes.

‎packages/neon_framework/test/goldens/rich_text_object_mention_call.png renamed to ‎packages/neon_framework/packages/neon_rich_text/test/goldens/rich_text_object_mention_call.png

File renamed without changes.

‎packages/neon_framework/test/goldens/rich_text_object_mention_guest.png renamed to ‎packages/neon_framework/packages/neon_rich_text/test/goldens/rich_text_object_mention_guest.png

File renamed without changes.

‎packages/neon_framework/test/goldens/rich_text_object_mention_user-group_highlight.png renamed to ‎packages/neon_framework/packages/neon_rich_text/test/goldens/rich_text_object_mention_user-group_highlight.png

File renamed without changes.

‎packages/neon_framework/test/goldens/rich_text_object_mention_user-group_other.png renamed to ‎packages/neon_framework/packages/neon_rich_text/test/goldens/rich_text_object_mention_user-group_other.png

File renamed without changes.

‎packages/neon_framework/test/goldens/rich_text_object_mention_user_highlight.png renamed to ‎packages/neon_framework/packages/neon_rich_text/test/goldens/rich_text_object_mention_user_highlight.png

File renamed without changes.

‎packages/neon_framework/test/goldens/rich_text_object_mention_user_other.png renamed to ‎packages/neon_framework/packages/neon_rich_text/test/goldens/rich_text_object_mention_user_other.png

File renamed without changes.

‎packages/neon_framework/test/rich_text_test.dart renamed to ‎packages/neon_framework/packages/neon_rich_text/test/rich_text_test.dart

File renamed without changes.

‎packages/neon_framework/packages/news_app/pubspec_overrides.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,nextcloud,notifications_push_repository,sort_box
1+
# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,neon_rich_text,nextcloud,notifications_push_repository,sort_box
22
dependency_overrides:
33
account_repository:
44
path: ../account_repository
@@ -14,6 +14,8 @@ dependency_overrides:
1414
path: ../neon_http_client
1515
neon_lints:
1616
path: ../../../neon_lints
17+
neon_rich_text:
18+
path: ../neon_rich_text
1719
nextcloud:
1820
path: ../../../nextcloud
1921
notifications_push_repository:

‎packages/neon_framework/packages/notes_app/pubspec_overrides.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,nextcloud,notifications_push_repository,sort_box
1+
# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,neon_rich_text,nextcloud,notifications_push_repository,sort_box
22
dependency_overrides:
33
account_repository:
44
path: ../account_repository
@@ -14,6 +14,8 @@ dependency_overrides:
1414
path: ../neon_http_client
1515
neon_lints:
1616
path: ../../../neon_lints
17+
neon_rich_text:
18+
path: ../neon_rich_text
1719
nextcloud:
1820
path: ../../../nextcloud
1921
notifications_push_repository:

‎packages/neon_framework/packages/notifications_app/pubspec_overrides.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,nextcloud,notifications_push_repository,sort_box
1+
# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,neon_rich_text,nextcloud,notifications_push_repository,sort_box
22
dependency_overrides:
33
account_repository:
44
path: ../account_repository
@@ -14,6 +14,8 @@ dependency_overrides:
1414
path: ../neon_http_client
1515
neon_lints:
1616
path: ../../../neon_lints
17+
neon_rich_text:
18+
path: ../neon_rich_text
1719
nextcloud:
1820
path: ../../../nextcloud
1921
notifications_push_repository:

‎packages/neon_framework/packages/notifications_push_repository/pubspec_overrides.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,nextcloud,sort_box
1+
# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,neon_rich_text,nextcloud,sort_box
22
dependency_overrides:
33
account_repository:
44
path: ../account_repository
@@ -14,6 +14,8 @@ dependency_overrides:
1414
path: ../neon_http_client
1515
neon_lints:
1616
path: ../../../neon_lints
17+
neon_rich_text:
18+
path: ../neon_rich_text
1719
nextcloud:
1820
path: ../../../nextcloud
1921
sort_box:

‎packages/neon_framework/packages/talk_app/pubspec_overrides.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,nextcloud,notifications_push_repository,sort_box
1+
# melos_managed_dependency_overrides: account_repository,cookie_store,dynamite_runtime,interceptor_http_client,neon_framework,neon_http_client,neon_lints,neon_rich_text,nextcloud,notifications_push_repository,sort_box
22
dependency_overrides:
33
account_repository:
44
path: ../account_repository
@@ -14,6 +14,8 @@ dependency_overrides:
1414
path: ../neon_http_client
1515
neon_lints:
1616
path: ../../../neon_lints
17+
neon_rich_text:
18+
path: ../neon_rich_text
1719
nextcloud:
1820
path: ../../../nextcloud
1921
notifications_push_repository:

‎packages/neon_framework/pubspec.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ dependencies:
4949
git:
5050
url: https://github.com/nextcloud/neon
5151
path: packages/neon_http_client
52+
neon_rich_text:
53+
git:
54+
url: https://github.com/nextcloud/neon
55+
path: packages/neon_framework/packages/neon_rich_text
5256
nextcloud: ^8.1.0
5357
notifications_push_repository:
5458
git:

‎packages/neon_framework/pubspec_overrides.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# melos_managed_dependency_overrides: account_repository,cookie_store,cookie_store_conformance_tests,dynamite_runtime,interceptor_http_client,neon_http_client,neon_lints,nextcloud,notifications_push_repository,sort_box
1+
# melos_managed_dependency_overrides: account_repository,cookie_store,cookie_store_conformance_tests,dynamite_runtime,interceptor_http_client,neon_http_client,neon_lints,neon_rich_text,nextcloud,notifications_push_repository,sort_box
22
dependency_overrides:
33
account_repository:
44
path: packages/account_repository
@@ -14,6 +14,8 @@ dependency_overrides:
1414
path: packages/neon_http_client
1515
neon_lints:
1616
path: ../neon_lints
17+
neon_rich_text:
18+
path: packages/neon_rich_text
1719
nextcloud:
1820
path: ../nextcloud
1921
notifications_push_repository:

0 commit comments

Comments
 (0)