Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support nested lists #508

Merged
merged 15 commits into from
Feb 16, 2025
Merged

Support nested lists #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5b8f26e
added support for nested lists
Dec 20, 2024
ff29762
Merge pull request #470 from franz-sw/enhancement/nested-lists
MohamedRejeb Jan 1, 2025
214e997
Merge remote-tracking branch 'origin/nested-lists' into nested-lists
MohamedRejeb Jan 1, 2025
96c2a96
Implement nested lists
MohamedRejeb Feb 4, 2025
479a708
Fix crash on removing multiple paragraphs from the end edges
MohamedRejeb Feb 15, 2025
b8d3309
Add increase/decrease nested list level with tab/shift+tab key
MohamedRejeb Feb 16, 2025
57d281d
Remove unnecessary code
MohamedRejeb Feb 16, 2025
2942ffe
Add unordered list style type
MohamedRejeb Feb 16, 2025
4da52f9
Add ordered list style type
MohamedRejeb Feb 16, 2025
41f4eda
Correct paragraph type start text span style
MohamedRejeb Feb 16, 2025
585bf40
Merge remote-tracking branch 'origin/main' into nested-lists
MohamedRejeb Feb 16, 2025
aac3a5c
Remove unnecessary code
MohamedRejeb Feb 16, 2025
b0538af
Merge
MohamedRejeb Feb 16, 2025
72e6657
Change list nested level to list level
MohamedRejeb Feb 16, 2025
90d13c2
Run apiDump
MohamedRejeb Feb 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Gradle
org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
org.gradle.jvmargs=-Xmx4096M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx4096M"
org.gradle.caching=true
org.gradle.parallel=true

Expand Down
79 changes: 79 additions & 0 deletions richeditor-compose/api/android/richeditor-compose.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,17 +106,21 @@ public final class com/mohamedrejeb/richeditor/model/RichTextConfig {
public final fun getLinkTextDecoration ()Landroidx/compose/ui/text/style/TextDecoration;
public final fun getListIndent ()I
public final fun getOrderedListIndent ()I
public final fun getOrderedListStyleType ()Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType;
public final fun getPreserveStyleOnEmptyLine ()Z
public final fun getUnorderedListIndent ()I
public final fun getUnorderedListStyleType ()Lcom/mohamedrejeb/richeditor/paragraph/type/UnorderedListStyleType;
public final fun setCodeSpanBackgroundColor-8_81llA (J)V
public final fun setCodeSpanColor-8_81llA (J)V
public final fun setCodeSpanStrokeColor-8_81llA (J)V
public final fun setLinkColor-8_81llA (J)V
public final fun setLinkTextDecoration (Landroidx/compose/ui/text/style/TextDecoration;)V
public final fun setListIndent (I)V
public final fun setOrderedListIndent (I)V
public final fun setOrderedListStyleType (Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType;)V
public final fun setPreserveStyleOnEmptyLine (Z)V
public final fun setUnorderedListIndent (I)V
public final fun setUnorderedListStyleType (Lcom/mohamedrejeb/richeditor/paragraph/type/UnorderedListStyleType;)V
}

public final class com/mohamedrejeb/richeditor/model/RichTextState {
Expand All @@ -143,7 +147,10 @@ public final class com/mohamedrejeb/richeditor/model/RichTextState {
public final fun clearSpanStyles ()V
public final fun clearSpanStyles-5zc-tL8 (J)V
public final fun copy ()Lcom/mohamedrejeb/richeditor/model/RichTextState;
public final fun decreaseListLevel ()V
public final fun getAnnotatedString ()Landroidx/compose/ui/text/AnnotatedString;
public final fun getCanDecreaseListLevel ()Z
public final fun getCanIncreaseListLevel ()Z
public final fun getComposition-MzsxiRA ()Landroidx/compose/ui/text/TextRange;
public final fun getConfig ()Lcom/mohamedrejeb/richeditor/model/RichTextConfig;
public final fun getCurrentParagraphStyle ()Landroidx/compose/ui/text/ParagraphStyle;
Expand All @@ -155,9 +162,11 @@ public final class com/mohamedrejeb/richeditor/model/RichTextState {
public final fun getSelectedLinkUrl ()Ljava/lang/String;
public final fun getSelection-d9O1mEE ()J
public final fun getSpanStyle-5zc-tL8 (J)Landroidx/compose/ui/text/SpanStyle;
public final fun increaseListLevel ()V
public final fun isCode ()Z
public final fun isCodeSpan ()Z
public final fun isLink ()Z
public final fun isList ()Z
public final fun isOrderedList ()Z
public final fun isRichSpan (Lcom/mohamedrejeb/richeditor/model/RichSpanStyle;)Z
public final fun isRichSpan (Lkotlin/reflect/KClass;)Z
Expand Down Expand Up @@ -218,6 +227,76 @@ public final class com/mohamedrejeb/richeditor/model/TextPaddingValues {
public fun toString ()Ljava/lang/String;
}

public abstract interface class com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType {
public abstract fun format (II)Ljava/lang/String;
public abstract fun getSuffix (I)Ljava/lang/String;
}

public final class com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$Decimal : com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType {
public static final field $stable I
public static final field INSTANCE Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$Decimal;
public fun format (II)Ljava/lang/String;
public fun getSuffix (I)Ljava/lang/String;
}

public final class com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$DefaultImpls {
public static fun format (Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType;II)Ljava/lang/String;
public static fun getSuffix (Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType;I)Ljava/lang/String;
}

public final class com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$LowerAlpha : com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType {
public static final field $stable I
public static final field INSTANCE Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$LowerAlpha;
public fun format (II)Ljava/lang/String;
public fun getSuffix (I)Ljava/lang/String;
}

public final class com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$LowerRoman : com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType {
public static final field $stable I
public static final field INSTANCE Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$LowerRoman;
public fun format (II)Ljava/lang/String;
public fun getSuffix (I)Ljava/lang/String;
}

public final class com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$Multiple : com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType {
public static final field $stable I
public fun <init> ([Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType;)V
public fun format (II)Ljava/lang/String;
public final fun getStyles ()[Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType;
public fun getSuffix (I)Ljava/lang/String;
}

public final class com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$UpperAlpha : com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType {
public static final field $stable I
public static final field INSTANCE Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$UpperAlpha;
public fun format (II)Ljava/lang/String;
public fun getSuffix (I)Ljava/lang/String;
}

public final class com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$UpperRoman : com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType {
public static final field $stable I
public static final field INSTANCE Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$UpperRoman;
public fun format (II)Ljava/lang/String;
public fun getSuffix (I)Ljava/lang/String;
}

public final class com/mohamedrejeb/richeditor/paragraph/type/UnorderedListStyleType {
public static final field $stable I
public static final field Companion Lcom/mohamedrejeb/richeditor/paragraph/type/UnorderedListStyleType$Companion;
public synthetic fun <init> (Ljava/util/List;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
public fun equals (Ljava/lang/Object;)Z
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
}

public final class com/mohamedrejeb/richeditor/paragraph/type/UnorderedListStyleType$Companion {
public final fun from (Ljava/util/List;)Lcom/mohamedrejeb/richeditor/paragraph/type/UnorderedListStyleType;
public final fun from ([Ljava/lang/String;)Lcom/mohamedrejeb/richeditor/paragraph/type/UnorderedListStyleType;
public final fun getCircle ()Lcom/mohamedrejeb/richeditor/paragraph/type/UnorderedListStyleType;
public final fun getDisc ()Lcom/mohamedrejeb/richeditor/paragraph/type/UnorderedListStyleType;
public final fun getSquare ()Lcom/mohamedrejeb/richeditor/paragraph/type/UnorderedListStyleType;
}

public final class com/mohamedrejeb/richeditor/ui/BasicRichTextEditorKt {
public static final fun BasicRichTextEditor (Lcom/mohamedrejeb/richeditor/model/RichTextState;Landroidx/compose/ui/Modifier;ZZLandroidx/compose/ui/text/TextStyle;Landroidx/compose/foundation/text/KeyboardOptions;Landroidx/compose/foundation/text/KeyboardActions;ZIIILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Landroidx/compose/foundation/interaction/MutableInteractionSource;Landroidx/compose/ui/graphics/Brush;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;III)V
public static final fun BasicRichTextEditor (Lcom/mohamedrejeb/richeditor/model/RichTextState;Landroidx/compose/ui/Modifier;ZZLandroidx/compose/ui/text/TextStyle;Landroidx/compose/foundation/text/KeyboardOptions;Landroidx/compose/foundation/text/KeyboardActions;ZZIIILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Landroidx/compose/foundation/interaction/MutableInteractionSource;Landroidx/compose/ui/graphics/Brush;Lkotlin/jvm/functions/Function3;Landroidx/compose/foundation/layout/PaddingValues;Landroidx/compose/runtime/Composer;III)V
Expand Down
79 changes: 79 additions & 0 deletions richeditor-compose/api/desktop/richeditor-compose.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,17 +106,21 @@ public final class com/mohamedrejeb/richeditor/model/RichTextConfig {
public final fun getLinkTextDecoration ()Landroidx/compose/ui/text/style/TextDecoration;
public final fun getListIndent ()I
public final fun getOrderedListIndent ()I
public final fun getOrderedListStyleType ()Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType;
public final fun getPreserveStyleOnEmptyLine ()Z
public final fun getUnorderedListIndent ()I
public final fun getUnorderedListStyleType ()Lcom/mohamedrejeb/richeditor/paragraph/type/UnorderedListStyleType;
public final fun setCodeSpanBackgroundColor-8_81llA (J)V
public final fun setCodeSpanColor-8_81llA (J)V
public final fun setCodeSpanStrokeColor-8_81llA (J)V
public final fun setLinkColor-8_81llA (J)V
public final fun setLinkTextDecoration (Landroidx/compose/ui/text/style/TextDecoration;)V
public final fun setListIndent (I)V
public final fun setOrderedListIndent (I)V
public final fun setOrderedListStyleType (Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType;)V
public final fun setPreserveStyleOnEmptyLine (Z)V
public final fun setUnorderedListIndent (I)V
public final fun setUnorderedListStyleType (Lcom/mohamedrejeb/richeditor/paragraph/type/UnorderedListStyleType;)V
}

public final class com/mohamedrejeb/richeditor/model/RichTextState {
Expand All @@ -143,7 +147,10 @@ public final class com/mohamedrejeb/richeditor/model/RichTextState {
public final fun clearSpanStyles ()V
public final fun clearSpanStyles-5zc-tL8 (J)V
public final fun copy ()Lcom/mohamedrejeb/richeditor/model/RichTextState;
public final fun decreaseListLevel ()V
public final fun getAnnotatedString ()Landroidx/compose/ui/text/AnnotatedString;
public final fun getCanDecreaseListLevel ()Z
public final fun getCanIncreaseListLevel ()Z
public final fun getComposition-MzsxiRA ()Landroidx/compose/ui/text/TextRange;
public final fun getConfig ()Lcom/mohamedrejeb/richeditor/model/RichTextConfig;
public final fun getCurrentParagraphStyle ()Landroidx/compose/ui/text/ParagraphStyle;
Expand All @@ -155,9 +162,11 @@ public final class com/mohamedrejeb/richeditor/model/RichTextState {
public final fun getSelectedLinkUrl ()Ljava/lang/String;
public final fun getSelection-d9O1mEE ()J
public final fun getSpanStyle-5zc-tL8 (J)Landroidx/compose/ui/text/SpanStyle;
public final fun increaseListLevel ()V
public final fun isCode ()Z
public final fun isCodeSpan ()Z
public final fun isLink ()Z
public final fun isList ()Z
public final fun isOrderedList ()Z
public final fun isRichSpan (Lcom/mohamedrejeb/richeditor/model/RichSpanStyle;)Z
public final fun isRichSpan (Lkotlin/reflect/KClass;)Z
Expand Down Expand Up @@ -218,6 +227,76 @@ public final class com/mohamedrejeb/richeditor/model/TextPaddingValues {
public fun toString ()Ljava/lang/String;
}

public abstract interface class com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType {
public abstract fun format (II)Ljava/lang/String;
public abstract fun getSuffix (I)Ljava/lang/String;
}

public final class com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$Decimal : com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType {
public static final field $stable I
public static final field INSTANCE Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$Decimal;
public fun format (II)Ljava/lang/String;
public fun getSuffix (I)Ljava/lang/String;
}

public final class com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$DefaultImpls {
public static fun format (Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType;II)Ljava/lang/String;
public static fun getSuffix (Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType;I)Ljava/lang/String;
}

public final class com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$LowerAlpha : com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType {
public static final field $stable I
public static final field INSTANCE Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$LowerAlpha;
public fun format (II)Ljava/lang/String;
public fun getSuffix (I)Ljava/lang/String;
}

public final class com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$LowerRoman : com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType {
public static final field $stable I
public static final field INSTANCE Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$LowerRoman;
public fun format (II)Ljava/lang/String;
public fun getSuffix (I)Ljava/lang/String;
}

public final class com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$Multiple : com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType {
public static final field $stable I
public fun <init> ([Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType;)V
public fun format (II)Ljava/lang/String;
public final fun getStyles ()[Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType;
public fun getSuffix (I)Ljava/lang/String;
}

public final class com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$UpperAlpha : com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType {
public static final field $stable I
public static final field INSTANCE Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$UpperAlpha;
public fun format (II)Ljava/lang/String;
public fun getSuffix (I)Ljava/lang/String;
}

public final class com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$UpperRoman : com/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType {
public static final field $stable I
public static final field INSTANCE Lcom/mohamedrejeb/richeditor/paragraph/type/OrderedListStyleType$UpperRoman;
public fun format (II)Ljava/lang/String;
public fun getSuffix (I)Ljava/lang/String;
}

public final class com/mohamedrejeb/richeditor/paragraph/type/UnorderedListStyleType {
public static final field $stable I
public static final field Companion Lcom/mohamedrejeb/richeditor/paragraph/type/UnorderedListStyleType$Companion;
public synthetic fun <init> (Ljava/util/List;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
public fun equals (Ljava/lang/Object;)Z
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
}

public final class com/mohamedrejeb/richeditor/paragraph/type/UnorderedListStyleType$Companion {
public final fun from (Ljava/util/List;)Lcom/mohamedrejeb/richeditor/paragraph/type/UnorderedListStyleType;
public final fun from ([Ljava/lang/String;)Lcom/mohamedrejeb/richeditor/paragraph/type/UnorderedListStyleType;
public final fun getCircle ()Lcom/mohamedrejeb/richeditor/paragraph/type/UnorderedListStyleType;
public final fun getDisc ()Lcom/mohamedrejeb/richeditor/paragraph/type/UnorderedListStyleType;
public final fun getSquare ()Lcom/mohamedrejeb/richeditor/paragraph/type/UnorderedListStyleType;
}

public final class com/mohamedrejeb/richeditor/ui/BasicRichTextEditorKt {
public static final fun BasicRichTextEditor (Lcom/mohamedrejeb/richeditor/model/RichTextState;Landroidx/compose/ui/Modifier;ZZLandroidx/compose/ui/text/TextStyle;Landroidx/compose/foundation/text/KeyboardOptions;Landroidx/compose/foundation/text/KeyboardActions;ZIIILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Landroidx/compose/foundation/interaction/MutableInteractionSource;Landroidx/compose/ui/graphics/Brush;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;III)V
public static final fun BasicRichTextEditor (Lcom/mohamedrejeb/richeditor/model/RichTextState;Landroidx/compose/ui/Modifier;ZZLandroidx/compose/ui/text/TextStyle;Landroidx/compose/foundation/text/KeyboardOptions;Landroidx/compose/foundation/text/KeyboardActions;ZZIIILkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Landroidx/compose/foundation/interaction/MutableInteractionSource;Landroidx/compose/ui/graphics/Brush;Lkotlin/jvm/functions/Function3;Landroidx/compose/foundation/layout/PaddingValues;Landroidx/compose/runtime/Composer;III)V
Expand Down
Loading
Loading