diff --git a/app/src/main/java/com/example/cahier/developer/brushdesigner/ui/BrushDesignerTopBar.kt b/app/src/main/java/com/example/cahier/developer/brushdesigner/ui/BrushDesignerTopBar.kt
index f7b2b9c..73714ca 100644
--- a/app/src/main/java/com/example/cahier/developer/brushdesigner/ui/BrushDesignerTopBar.kt
+++ b/app/src/main/java/com/example/cahier/developer/brushdesigner/ui/BrushDesignerTopBar.kt
@@ -115,7 +115,7 @@ internal fun BrushDesignerTopBar(
)
} else {
TextButton(onClick = onShowSaveDialog) {
- Text(stringResource(R.string.brush_designer_save_to_palette))
+ Text(stringResource(R.string.brush_designer_save))
}
TextButton(onClick = onClearCanvas) {
Text(stringResource(R.string.clear))
@@ -146,7 +146,10 @@ private fun BrushLibraryMenu(
R.string.marker to StockBrushes.marker(),
R.string.pressure_pen to StockBrushes.pressurePen(),
R.string.dashed_line to StockBrushes.dashedLine(),
- R.string.emoji_highlighter to StockBrushes.emojiHighlighter("emoji-heart", showMiniEmojiTrail = true),
+ R.string.emoji_highlighter to StockBrushes.emojiHighlighter(
+ "emoji-heart",
+ showMiniEmojiTrail = true
+ ),
)
}
@@ -166,22 +169,23 @@ private fun BrushLibraryMenu(
onClick = {},
enabled = false
)
- stockBrushes.filter { it.first != R.string.emoji_highlighter }.forEach { (nameResId, brushFamily) ->
- DropdownMenuItem(
- text = { Text(stringResource(nameResId)) },
- onClick = {
- onLoadBrush(brushFamily)
- expanded = false
- }
- )
- }
-
+ stockBrushes.filter { it.first != R.string.emoji_highlighter }
+ .forEach { (nameResId, brushFamily) ->
+ DropdownMenuItem(
+ text = { Text(stringResource(nameResId)) },
+ onClick = {
+ onLoadBrush(brushFamily)
+ expanded = false
+ }
+ )
+ }
+
var showEmojiSubMenu by remember { mutableStateOf(false) }
var itemWidth by remember { mutableStateOf(0) }
var itemHeight by remember { mutableStateOf(0) }
val density = LocalDensity.current
-
- Box(modifier = Modifier.onSizeChanged {
+
+ Box(modifier = Modifier.onSizeChanged {
itemWidth = it.width
itemHeight = it.height
}) {
@@ -195,13 +199,20 @@ private fun BrushLibraryMenu(
DropdownMenu(
expanded = showEmojiSubMenu,
onDismissRequest = { showEmojiSubMenu = false },
- offset = DpOffset(x = density.run { itemWidth.toDp() }, y = density.run { -itemHeight.toDp() }),
+ offset = DpOffset(
+ x = density.run { itemWidth.toDp() },
+ y = density.run { -itemHeight.toDp() }),
properties = PopupProperties(focusable = true)
) {
DropdownMenuItem(
text = { Text(stringResource(R.string.emoji_heart)) },
onClick = {
- onLoadBrush(StockBrushes.emojiHighlighter("emoji-heart", showMiniEmojiTrail = true))
+ onLoadBrush(
+ StockBrushes.emojiHighlighter(
+ "emoji-heart",
+ showMiniEmojiTrail = true
+ )
+ )
showEmojiSubMenu = false
expanded = false
}
@@ -209,7 +220,12 @@ private fun BrushLibraryMenu(
DropdownMenuItem(
text = { Text(stringResource(R.string.emoji_star)) },
onClick = {
- onLoadBrush(StockBrushes.emojiHighlighter("emoji-star", showMiniEmojiTrail = true))
+ onLoadBrush(
+ StockBrushes.emojiHighlighter(
+ "emoji-star",
+ showMiniEmojiTrail = true
+ )
+ )
showEmojiSubMenu = false
expanded = false
}
@@ -217,7 +233,12 @@ private fun BrushLibraryMenu(
DropdownMenuItem(
text = { Text(stringResource(R.string.emoji_poop)) },
onClick = {
- onLoadBrush(StockBrushes.emojiHighlighter("emoji-poop", showMiniEmojiTrail = true))
+ onLoadBrush(
+ StockBrushes.emojiHighlighter(
+ "emoji-poop",
+ showMiniEmojiTrail = true
+ )
+ )
showEmojiSubMenu = false
expanded = false
}
@@ -260,7 +281,7 @@ private fun PaletteMenu(
var expanded by remember { mutableStateOf(false) }
Box {
TextButton(onClick = { expanded = true }) {
- Text(stringResource(R.string.brush_designer_my_palette))
+ Text(stringResource(R.string.brush_designer_my_brushes))
}
DropdownMenu(expanded = expanded, onDismissRequest = { expanded = false }) {
if (savedBrushes.isEmpty()) {
@@ -319,7 +340,7 @@ private fun OverflowMenu(
}
DropdownMenu(expanded = expanded, onDismissRequest = { expanded = false }) {
DropdownMenuItem(
- text = { Text(stringResource(R.string.brush_designer_save_to_palette)) },
+ text = { Text(stringResource(R.string.brush_designer_save)) },
onClick = { onShowSaveDialog(); expanded = false }
)
DropdownMenuItem(
diff --git a/app/src/main/java/com/example/cahier/developer/brushgraph/ui/BrushGraphDialogs.kt b/app/src/main/java/com/example/cahier/developer/brushgraph/ui/BrushGraphDialogs.kt
index cd9e009..673d99e 100644
--- a/app/src/main/java/com/example/cahier/developer/brushgraph/ui/BrushGraphDialogs.kt
+++ b/app/src/main/java/com/example/cahier/developer/brushgraph/ui/BrushGraphDialogs.kt
@@ -92,7 +92,7 @@ fun SaveToPaletteDialog(
AlertDialog(
modifier = modifier,
onDismissRequest = onDismiss,
- title = { Text(stringResource(R.string.bg_save_to_palette)) },
+ title = { Text(stringResource(R.string.bg_save_to_cahier)) },
text = {
OutlinedTextField(
value = paletteBrushNameInput,
diff --git a/app/src/main/java/com/example/cahier/developer/brushgraph/ui/BrushGraphMenus.kt b/app/src/main/java/com/example/cahier/developer/brushgraph/ui/BrushGraphMenus.kt
index 4703974..61d782b 100644
--- a/app/src/main/java/com/example/cahier/developer/brushgraph/ui/BrushGraphMenus.kt
+++ b/app/src/main/java/com/example/cahier/developer/brushgraph/ui/BrushGraphMenus.kt
@@ -485,7 +485,7 @@ fun GraphActionMenu(
Box {
TextButton(onClick = { showPaletteMenu = true }) {
- Text(stringResource(R.string.bg_my_palette))
+ Text(stringResource(R.string.bg_my_brushes))
}
PaletteMenu(
@@ -509,7 +509,7 @@ fun GraphActionMenu(
shape = RoundedCornerShape(16.dp),
modifier = Modifier.height(40.dp),
) {
- Text(stringResource(R.string.bg_save_to_palette))
+ Text(stringResource(R.string.bg_save))
}
}
}
diff --git a/app/src/main/java/com/example/cahier/developer/brushgraph/viewmodel/BrushGraphViewModel.kt b/app/src/main/java/com/example/cahier/developer/brushgraph/viewmodel/BrushGraphViewModel.kt
index 563c32f..feaee2f 100644
--- a/app/src/main/java/com/example/cahier/developer/brushgraph/viewmodel/BrushGraphViewModel.kt
+++ b/app/src/main/java/com/example/cahier/developer/brushgraph/viewmodel/BrushGraphViewModel.kt
@@ -573,7 +573,7 @@ class BrushGraphViewModel @Inject constructor(
} catch (e: Exception) {
postDebug(
DisplayText.Resource(
- com.example.cahier.R.string.bg_err_save_palette,
+ com.example.cahier.R.string.bg_err_save,
listOf(e.message ?: e.javaClass.simpleName)
)
)
@@ -611,7 +611,7 @@ class BrushGraphViewModel @Inject constructor(
} catch (e: Exception) {
postDebug(
DisplayText.Resource(
- com.example.cahier.R.string.bg_err_load_palette,
+ com.example.cahier.R.string.bg_err_load,
listOf(e.message ?: e.javaClass.simpleName)
)
)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7c82ac8..bf1abfc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -105,13 +105,13 @@
Editing controls coming in the next update. Use the preview canvas to draw test strokes.
Close
Stock Brushes
- My Palette
+ My Brushes
No saved brushes yet
- Save to Cahier Palette
+ Save
Import
Export
More options
- Save to Palette
+ Save to Cahier
• This brush will appear in the main Cahier toolbox.\n• Large textures are stored in RAM. Avoid saving many texture-heavy brushes to prevent performance lag or memory issues.
Brush Name
Tip Shape
@@ -278,7 +278,8 @@
Name Texture
Texture ID
- Save to Palette
+ Save
+ Save to Cahier
Brush Name
Clear Graph
Are you sure you want to clear the entire brush graph? This action cannot be undone.
@@ -307,7 +308,7 @@
Behavior
Color Function
Texture Layer
- My Palette
+ My Brushes
Delete Edge
Are you sure you want to delete this edge?
Add Node Between
@@ -467,8 +468,8 @@
Reorganization failed
Failed to load brush
Cannot delete Family node
- Failed to save brush to palette: %1$s
- Failed to load brush from palette: %1$s
+ Failed to save brush to Cahier: %1$s
+ Failed to load brush from Cahier: %1$s
Behavior node %1$s cannot accept input from %2$s
Behavior node %1$s cannot accept input from structural node %2$s
Coat can only accept input from Tip at the tip port