Skip to content

Adding explanation to suggestions #474

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

Merged
leandroBorgesFerreira merged 7 commits into from
Jun 26, 2025
Merged

Adding explanation to suggestions #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7b63e02
Adding explanation to suggestions
ftrtyfytfjh Jun 26, 2025
280eda4
fixing tab tap
ftrtyfytfjh Jun 26, 2025
0160a34
fixing persistence
ftrtyfytfjh Jun 26, 2025
ff8c88d
Translating ai explanation
ftrtyfytfjh Jun 26, 2025
cbd1a79
ktlint
ftrtyfytfjh Jun 26, 2025
598ba4d
Update DefaultDrawersAndroid.kt
ftrtyfytfjh Jun 26, 2025
ffba26b
Update DefaultDrawersJs.kt
ftrtyfytfjh Jun 26, 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
7,536 changes: 3,789 additions & 3,747 deletions application/core/resources/config/ktlint/baseline.xml
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions application/core/resources/src/commonMain/composeResources/values-en/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@
<string name="download_model">Download model</string>
<string name="choose_your_model">Write your AI model</string>
<string name="use_offline">Use in offline mode</string>
<string name="ai_explanation">[Tab - accept; Esc - remove]</string>
</resources>
1 change: 1 addition & 0 deletions application/core/resources/src/commonMain/composeResources/values-pt/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,5 @@
<string name="download_model">Baixar modelo</string>
<string name="choose_your_model">Escolhe seu modelo de IA</string>
<string name="use_offline">User offline</string>
<string name="ai_explanation">[Tab - aceitar; Esc - remover]</string>
</resources>
1 change: 1 addition & 0 deletions application/core/resources/src/commonMain/composeResources/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@
<string name="download_model">Download model</string>
<string name="choose_your_model">Write your AI model</string>
<string name="use_offline">Use in offline mode</string>
<string name="ai_explanation">[Tab - accept; Esc - remove]</string>
</resources>
4 changes: 4 additions & 0 deletions application/core/resources/src/commonMain/kotlin/io/writeopia/resources/WrStrings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import writeopia.application.core.resources.generated.resources.access_ollama_si
import writeopia.application.core.resources.generated.resources.account
import writeopia.application.core.resources.generated.resources.action_points
import writeopia.application.core.resources.generated.resources.actions
import writeopia.application.core.resources.generated.resources.ai_explanation
import writeopia.application.core.resources.generated.resources.are_you_sure
import writeopia.application.core.resources.generated.resources.arrangement
import writeopia.application.core.resources.generated.resources.ask_ai
Expand Down Expand Up @@ -403,4 +404,7 @@ object WrStrings {

@Composable
fun useOffline() = stringResource(Res.string.use_offline)

@Composable
fun aiExplanation() = stringResource(Res.string.ai_explanation)
}
2 changes: 2 additions & 0 deletions ...eatures/editor/src/commonMain/kotlin/io/writeopia/editor/features/editor/ui/TextEditor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import androidx.compose.ui.text.font.FontFamily
import io.writeopia.editor.configuration.ui.DrawConfigFactory
import io.writeopia.editor.features.editor.viewmodel.NoteEditorViewModel
import io.writeopia.model.Font
import io.writeopia.resources.WrStrings
import io.writeopia.ui.WriteopiaEditor
import io.writeopia.ui.drawer.factory.DrawersFactory
import io.writeopia.ui.model.DrawStory
Expand Down Expand Up @@ -70,6 +71,7 @@ internal fun TextEditor(
defaultBorder = clipShape,
onHeaderClick = noteEditorViewModel::onHeaderClick,
editable = isEditable,
aiExplanation = WrStrings.aiExplanation(),
isDarkTheme = isDarkTheme,
groupsBackgroundColor = Color.Transparent,
drawConfig = DrawConfigFactory.getDrawConfig(),
Expand Down
27 changes: 15 additions & 12 deletions writeopia/src/commonMain/kotlin/io/writeopia/sdk/manager/WriteopiaManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,18 +343,21 @@ class WriteopiaManager(

return if (suggestionsResult is ResultData.Complete) {
val suggestions = suggestionsResult.data
suggestions.map { suggestion ->
StoryStep(text = suggestion, type = storyType)
}.fold(storyState()) { state, story ->
addAtPosition(
state,
story.copy(
ephemeral = true,
tags = story.tags + TagInfo(Tag.AI_SUGGESTION)
),
position
)
}.copy(lastEdit = LastEdit.Whole)
suggestions.mapIndexed { i, suggestion ->
val tags = if (i == 0) {
setOf(TagInfo(Tag.AI_SUGGESTION), TagInfo(Tag.FIRST_AI_SUGGESTION))
} else {
setOf(TagInfo(Tag.AI_SUGGESTION))
}
StoryStep(text = suggestion, type = storyType, tags = tags)
}.reversed()
.fold(storyState()) { state, story ->
addAtPosition(
state,
story.copy(ephemeral = true),
position
)
}.copy(lastEdit = LastEdit.Whole)
} else {
storyState()
}
Expand Down
9 changes: 5 additions & 4 deletions writeopia_models/src/commonMain/kotlin/io/writeopia/sdk/models/story/Tag.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ enum class Tag(val label: String) {
HIGH_LIGHT_BLOCK("HIGH_LIGHT_BLOCK"),
HIDDEN_HX("HIGH_LIGHT_BLOCK"),
COLLAPSED("COLLAPSED"),
AI_SUGGESTION("AI_SUGGESTION");
AI_SUGGESTION("AI_SUGGESTION"),
FIRST_AI_SUGGESTION("FIRST_AI_SUGGESTION");

fun isTitle() =
when (this) {
Expand All @@ -23,17 +24,17 @@ enum class Tag(val label: String) {
}

fun hasPosition() = when (this) {
H1, H2, H3, H4, HIDDEN_HX, COLLAPSED, AI_SUGGESTION -> false
H1, H2, H3, H4, HIDDEN_HX, COLLAPSED, AI_SUGGESTION, FIRST_AI_SUGGESTION -> false
HIGH_LIGHT_BLOCK -> true
}

fun isErasable() = when (this) {
H1, H2, H3, H4, HIDDEN_HX, COLLAPSED, AI_SUGGESTION -> false
H1, H2, H3, H4, HIDDEN_HX, COLLAPSED, AI_SUGGESTION, FIRST_AI_SUGGESTION -> false
HIGH_LIGHT_BLOCK -> true
}

fun mustCarryOver() = when (this) {
H1, H2, H3, H4, HIDDEN_HX, COLLAPSED, AI_SUGGESTION -> false
H1, H2, H3, H4, HIDDEN_HX, COLLAPSED, AI_SUGGESTION, FIRST_AI_SUGGESTION -> false
HIGH_LIGHT_BLOCK -> true
}

Expand Down
3 changes: 2 additions & 1 deletion writeopia_ui/src/androidMain/kotlin/io/writeopia/ui/drawer/factory/DefaultDrawersAndroid.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ object DefaultDrawersAndroid : DrawersFactory {
manager: WriteopiaStateManager,
defaultBorder: Shape,
editable: Boolean,
aiExplanation: String,
isDarkTheme: Boolean,
groupsBackgroundColor: Color,
onHeaderClick: () -> Unit,
Expand All @@ -42,7 +43,7 @@ object DefaultDrawersAndroid : DrawersFactory {
val commonDrawers = CommonDrawers.create(
manager,
marginAtBottom = 500.dp,
defaultBorder,
aiExplanation = aiExplanation,
editable,
onHeaderClick,
lineBreakByContent = true,
Expand Down
3 changes: 2 additions & 1 deletion writeopia_ui/src/commonMain/kotlin/io/writeopia/ui/drawer/content/CheckItemDrawer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ fun CheckItemDrawerStepPreview() {
TextDrawer(
selectionState = MutableStateFlow(false),
onSelectionLister = {},
isDarkTheme = true
isDarkTheme = true,
aiExplanation = ""
)
}
).Step(
Expand Down
9 changes: 6 additions & 3 deletions writeopia_ui/src/commonMain/kotlin/io/writeopia/ui/drawer/content/HeaderDrawer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@ fun headerDrawer(
emptyErase = EmptyErase.DISABLED,
textStyle = { drawConfig.titleStyle(fontFamily) },
selectionState = selectionState,
onSelectionLister = {}
onSelectionLister = {},
aiExplanation = ""
)
},
headerClick = headerClick,
Expand All @@ -222,7 +223,8 @@ private fun HeaderDrawerStepPreview() {
)
},
selectionState = MutableStateFlow(false),
onSelectionLister = {}
onSelectionLister = {},
aiExplanation = ""
)
},
headerClick = {},
Expand All @@ -247,7 +249,8 @@ private fun HeaderDrawerStepPreviewNoColor() {
)
},
selectionState = MutableStateFlow(false),
onSelectionLister = {}
onSelectionLister = {},
aiExplanation = ""
)
},
headerClick = {},
Expand Down
3 changes: 2 additions & 1 deletion writeopia_ui/src/commonMain/kotlin/io/writeopia/ui/drawer/content/SwipeMessageDrawer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ private fun SwipeMessageDrawerPreview() {
TextDrawer(
selectionState = MutableStateFlow(false),
onSelectionLister = {},
isDarkTheme = true
isDarkTheme = true,
aiExplanation = ""
)
},
).Step(
Expand Down
Loading