Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import android.view.Gravity
import android.view.ViewGroup
import android.view.inputmethod.InputMethodManager
import android.widget.EditText
import androidx.core.graphics.PathParser
import expo.modules.kotlin.AppContext
import expo.modules.kotlin.viewevent.EventDispatcher
import expo.modules.kotlin.views.ExpoView
Expand Down Expand Up @@ -379,6 +380,23 @@ private class ComposerChipSpan(
private val verticalPadding = 2f * density
private val cornerRadius = 6f * density
private val borderWidth = density
private val iconPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
style = Paint.Style.STROKE
strokeWidth = 1.85f
strokeCap = Paint.Cap.ROUND
strokeJoin = Paint.Join.ROUND
}

private fun iconWidth(paint: Paint): Float =
if (skill) paint.textSize * (1.17f + 0.33f) else 0f

companion object {
// Same 24-unit cube path as the desktop composer skill chip.
private val skillIcon = requireNotNull(PathParser.createPathFromPathData(
"M21 8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73l7 4a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16Z " +
"M3.3 7l8.7 5 8.7-5 M12 22V12"
))
}

override fun getSize(
paint: Paint,
Expand All @@ -395,7 +413,7 @@ private class ComposerChipSpan(
it.descent = base.descent + extra
it.bottom = base.bottom + extra
}
return (paint.measureText(label) + horizontalPadding * 2).toInt()
return (paint.measureText(label) + iconWidth(paint) + horizontalPadding * 2).toInt()
}

override fun draw(
Expand All @@ -409,7 +427,8 @@ private class ComposerChipSpan(
bottom: Int,
paint: Paint
) {
val width = paint.measureText(label) + horizontalPadding * 2
val iconWidth = iconWidth(paint)
val width = paint.measureText(label) + iconWidth + horizontalPadding * 2
val metrics = paint.fontMetrics
val rect = RectF(
x,
Expand All @@ -430,7 +449,17 @@ private class ComposerChipSpan(
canvas.drawRoundRect(rect, cornerRadius, cornerRadius, paint)
paint.color = if (skill) theme.skillText else theme.chipText
paint.style = Paint.Style.FILL
canvas.drawText(label, x + horizontalPadding, y.toFloat(), paint)
if (skill) {
val iconSize = paint.textSize * 1.17f
iconPaint.color = theme.skillText
iconPaint.alpha = (Color.alpha(theme.skillText) * 0.85f).toInt()
val saveCount = canvas.save()
canvas.translate(x + horizontalPadding, rect.centerY() - iconSize / 2)
canvas.scale(iconSize / 24f, iconSize / 24f)
canvas.drawPath(skillIcon, iconPaint)
canvas.restoreToCount(saveCount)
}
canvas.drawText(label, x + horizontalPadding + iconWidth, y.toFloat(), paint)

paint.color = originalColor
paint.style = originalStyle
Expand Down
31 changes: 20 additions & 11 deletions apps/mobile/src/native/T3ComposerEditor.native.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import {
useState,
type Ref,
} from "react";
import type { NativeSyntheticEvent, ViewProps } from "react-native";
import { Image, StyleSheet } from "react-native";
import type { ColorValue, NativeSyntheticEvent, ViewProps } from "react-native";
import { Image, Platform, processColor, StyleSheet } from "react-native";

import { markdownFileIconSource } from "@t3tools/mobile-markdown-text/file-icons";
import { resolveMarkdownFileIcon } from "@t3tools/mobile-markdown-text/links";
Expand Down Expand Up @@ -78,6 +78,15 @@ interface NativeComposerEditorProps extends ViewProps {

const NativeView = requireNativeView<NativeComposerEditorProps>(NATIVE_MODULE_NAME);

// The Android editor parses hex as AARRGGBB; theme colors use CSS formats.
function composerThemeColor(color: ColorValue): string {
if (Platform.OS !== "android") return String(color);
const processed = processColor(color);
return typeof processed === "number"
? `#${(processed >>> 0).toString(16).padStart(8, "0")}`
: String(color);
}

function basename(path: string): string {
const separator = Math.max(path.lastIndexOf("/"), path.lastIndexOf("\\"));
return separator >= 0 ? path.slice(separator + 1) : path;
Expand Down Expand Up @@ -212,15 +221,15 @@ export function ComposerEditor({
[],
);
const themeJson = JSON.stringify({
text: theme["--color-foreground"],
placeholder: theme["--color-placeholder"],
chipBackground: theme["--color-subtle"],
chipBorder: theme["--color-border"],
chipText: theme["--color-foreground"],
skillBackground: theme["--color-inline-skill-background"],
skillBorder: theme["--color-inline-skill-border"],
skillText: theme["--color-inline-skill-foreground"],
fileTint: theme["--color-icon-muted"],
text: composerThemeColor(theme["--color-foreground"]),
placeholder: composerThemeColor(theme["--color-placeholder"]),
chipBackground: composerThemeColor(theme["--color-subtle"]),
chipBorder: composerThemeColor(theme["--color-border"]),
chipText: composerThemeColor(theme["--color-foreground"]),
skillBackground: composerThemeColor(theme["--color-inline-skill-background"]),
skillBorder: composerThemeColor(theme["--color-inline-skill-border"]),
skillText: composerThemeColor(theme["--color-inline-skill-foreground"]),
fileTint: composerThemeColor(theme["--color-icon-muted"]),
});
const resolvedTextStyle = StyleSheet.flatten(textStyle) ?? {};
const regularFontFamily = useFontFamily("regular");
Expand Down
Loading