Skip to content

Free drawing mobile #584

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 2 commits into from
Apr 12, 2026
Merged

Free drawing mobile #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
201f806
Fixing navigation
leandroBorgesFerreira Apr 12, 2026
760286f
Fixing paddings
leandroBorgesFerreira Apr 12, 2026
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 ...rawing/src/androidMain/kotlin/io/writeopia/drawing/ui/components/DrawingCanvas.android.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ actual fun DrawingCanvas(
) {
var currentPoints by remember { mutableStateOf<List<DrawPoint>>(emptyList()) }
var isDrawing by remember { mutableStateOf(false) }
val canvasBackground = MaterialTheme.colorScheme.surface
val canvasBackground = MaterialTheme.colorScheme.background

Canvas(
modifier = modifier
Expand Down
12 changes: 10 additions & 2 deletions ...on/features/drawing/src/commonMain/kotlin/io/writeopia/drawing/ui/screen/DrawingScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@ import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.asPaddingValues
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.statusBars
import androidx.compose.foundation.layout.systemBars
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Button
import androidx.compose.material3.MaterialTheme
Expand Down Expand Up @@ -76,12 +80,14 @@ fun DrawingScreen(
onColorSelected = viewModel::setColor,
onStrokeWidthSelected = viewModel::setStrokeWidth,
onUndo = viewModel::undo,
onClear = viewModel::clear
onClear = viewModel::clear,
modifier = Modifier.padding(WindowInsets.systemBars.asPaddingValues())
)
}
) { paddingValues ->
Box(
modifier = Modifier
.padding(paddingValues)
.fillMaxSize()
.background(
MaterialTheme.colorScheme.surfaceVariant,
Expand All @@ -92,7 +98,6 @@ fun DrawingScreen(
DrawingCanvas(
modifier = Modifier
.fillMaxSize()
.padding(paddingValues)
.onSizeChanged { size ->
viewModel.setCanvasSize(size.width, size.height)
},
Expand All @@ -112,10 +117,13 @@ private fun DrawingTopBar(
onCancel: () -> Unit,
modifier: Modifier = Modifier
) {
val statusBarPadding = WindowInsets.statusBars.asPaddingValues()

Row(
modifier = modifier
.fillMaxWidth()
.background(MaterialTheme.colorScheme.background)
.padding(statusBarPadding)
.padding(horizontal = 16.dp, vertical = 8.dp),
verticalAlignment = Alignment.CenterVertically
) {
Expand Down
10 changes: 7 additions & 3 deletions ...roidMain/kotlin/io/writeopia/editor/features/editor/ui/screen/NoteEditorScreen.android.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ internal fun NoteEditorScreen(
noteEditorViewModel: NoteEditorViewModel,
navigateBack: () -> Unit,
onDocumentLinkClick: (String) -> Unit,
onNewDrawingClick: () -> Unit = {},
onDrawingClick: (StoryStep, Int) -> Unit = { _, _ -> },
modifier: Modifier = Modifier,
) {
Expand Down Expand Up @@ -168,7 +169,8 @@ internal fun NoteEditorScreen(
noteEditorViewModel::onAddCodeBlockClick,
noteEditorViewModel::addPage,
noteEditorViewModel::toggleHighLightBlock,
noteEditorViewModel::titleClick
noteEditorViewModel::titleClick,
onDrawingClick = onNewDrawingClick
)
}

Expand Down Expand Up @@ -331,7 +333,8 @@ private fun BottomScreen(
onCodeBlock: () -> Unit = {},
onAddPage: () -> Unit = {},
onHighlight: () -> Unit,
titleClick: (Tag) -> Unit
titleClick: (Tag) -> Unit,
onDrawingClick: () -> Unit = {}
) {
val edit by editState.collectAsState()

Expand Down Expand Up @@ -364,7 +367,8 @@ private fun BottomScreen(
onBackPress = unDo,
onForwardPress = reDo,
canUndoState = canUndo,
canRedoState = canRedo
canRedoState = canRedo,
onDrawingClick = onDrawingClick
)
}

Expand Down
1 change: 1 addition & 0 deletions ...roidMain/kotlin/io/writeopia/editor/features/editor/ui/screen/TextEditorScreen.android.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ actual fun TextEditorScreen(
noteEditorViewModel = noteEditorViewModel,
navigateBack = navigateBack,
onDocumentLinkClick = onDocumentLinkClick,
onNewDrawingClick = onNewDrawingClick,
onDrawingClick = onDrawingClick,
modifier = modifier
)
Expand Down
18 changes: 10 additions & 8 deletions application/features/editor/src/androidMain/kotlin/io/writeopia/editor/input/InputScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,17 @@ internal fun InputScreen(
onForwardPress: () -> Unit = {},
canUndoState: StateFlow<Boolean>,
canRedoState: StateFlow<Boolean>,
onDrawingClick: () -> Unit = {},
) {
MobileInputScreen(
modifier,
isDarkTheme,
metadataState,
onAddSpan,
onBackPress,
onForwardPress,
canUndoState,
canRedoState,
modifier = modifier,
isDarkTheme = isDarkTheme,
metadataState = metadataState,
onAddSpan = onAddSpan,
onBackPress = onBackPress,
onForwardPress = onForwardPress,
canUndoState = canUndoState,
canRedoState = canRedoState,
onDrawingClick = onDrawingClick,
)
}
4 changes: 3 additions & 1 deletion ...ication/features/editor/src/commonMain/kotlin/io/writeopia/editor/ui/MobileInputScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,9 @@ internal fun MobileInputScreen(
Icon(
modifier = Modifier
.clip(buttonShape)
.clickable { onDrawingClick() }
.clickable {
onDrawingClick()
}
.padding(iconPadding),
imageVector = WrIcons.drawing,
contentDescription = "Drawing",
Expand Down
8 changes: 6 additions & 2 deletions ...ativeMain/kotlin/io/writeopia/editor/features/editor/ui/screen/NoteEditorScreen.native.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ internal fun NoteEditorScreen(
noteEditorViewModel: NoteEditorViewModel,
navigateBack: () -> Unit,
onDocumentLinkClick: (String) -> Unit,
onNewDrawingClick: () -> Unit = {},
onDrawingClick: (StoryStep, Int) -> Unit = { _, _ -> },
modifier: Modifier = Modifier,
) {
Expand Down Expand Up @@ -141,7 +142,8 @@ internal fun NoteEditorScreen(
noteEditorViewModel::onAddCodeBlockClick,
noteEditorViewModel::addPage,
noteEditorViewModel::toggleHighLightBlock,
noteEditorViewModel::titleClick
noteEditorViewModel::titleClick,
onDrawingClick = onNewDrawingClick
)
}

Expand Down Expand Up @@ -287,7 +289,8 @@ private fun BottomScreen(
onCodeBlock: () -> Unit = {},
onAddPage: () -> Unit = {},
onHighlight: () -> Unit = {},
titleClick: (Tag) -> Unit
titleClick: (Tag) -> Unit,
onDrawingClick: () -> Unit = {}
) {
val edit by editState.collectAsState()

Expand Down Expand Up @@ -321,6 +324,7 @@ private fun BottomScreen(
onForwardPress = reDo,
canUndoState = canUndo,
canRedoState = canRedo,
onDrawingClick = onDrawingClick
)
}

Expand Down
1 change: 1 addition & 0 deletions ...ativeMain/kotlin/io/writeopia/editor/features/editor/ui/screen/TextEditorScreen.native.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ actual fun TextEditorScreen(
noteEditorViewModel = noteEditorViewModel,
navigateBack = navigateBack,
onDocumentLinkClick = onDocumentLinkClick,
onNewDrawingClick = onNewDrawingClick,
onDrawingClick = onDrawingClick,
modifier = modifier
)
Expand Down
18 changes: 10 additions & 8 deletions application/features/editor/src/nativeMain/kotlin/io/writeopia/editor/input/InputScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,17 @@ internal fun InputScreen(
onForwardPress: () -> Unit = {},
canUndoState: StateFlow<Boolean>,
canRedoState: StateFlow<Boolean>,
onDrawingClick: () -> Unit = {},
) {
MobileInputScreen(
modifier,
isDarkTheme,
metadataState,
onAddSpan,
onBackPress,
onForwardPress,
canUndoState,
canRedoState,
modifier = modifier,
isDarkTheme = isDarkTheme,
metadataState = metadataState,
onAddSpan = onAddSpan,
onBackPress = onBackPress,
onForwardPress = onForwardPress,
canUndoState = canUndoState,
canRedoState = canRedoState,
onDrawingClick = onDrawingClick,
)
}
Loading