Skip to content

Commit 66e09a2

Browse files
committed
fix: rebase with latest main
1 parent af1c209 commit 66e09a2

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

android/src/main/java/com/swmansion/enriched/utils/EnrichedSpanState.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@ class EnrichedSpanState(
311311
val activeStyles =
312312
listOfNotNull(
313313
if (boldStart != null) EnrichedSpans.BOLD else null,
314+
if (colorStart != null) EnrichedSpans.COLOR else null,
314315
if (italicStart != null) EnrichedSpans.ITALIC else null,
315316
if (underlineStart != null) EnrichedSpans.UNDERLINE else null,
316317
if (strikethroughStart != null) EnrichedSpans.STRIKETHROUGH else null,

apps/example/src/App.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ const DEFAULT_STYLES: StylesState = {
6767
mention: DEFAULT_STYLE_STATE,
6868
};
6969

70+
const PRIMARY_COLOR = '#000000';
71+
7072
const DEFAULT_LINK_STATE = {
7173
text: '',
7274
url: '',
@@ -514,6 +516,7 @@ const styles = StyleSheet.create({
514516
fontFamily: 'Nunito-Regular',
515517
paddingVertical: 12,
516518
paddingHorizontal: 14,
519+
color: PRIMARY_COLOR,
517520
},
518521
scrollPlaceholder: {
519522
marginTop: 24,

0 commit comments

Comments
 (0)