Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

fix(mobile): show a real settings cog in the Android sidebar header (#6520)

Paul van Dykbad1143b02f7
diff --git a/apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3HeaderButtonView.kt b/apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3HeaderButtonView.kt
deleted file mode 100644
index 47db92d92..000000000
--- a/apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3HeaderButtonView.kt
+++ /dev/null
@@ -1,97 +0,0 @@
-package expo.modules.t3nativecontrols
-
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Color
-import android.graphics.Paint
-import android.view.View
-import expo.modules.kotlin.AppContext
-import expo.modules.kotlin.viewevent.EventDispatcher
-import expo.modules.kotlin.views.ExpoView
-
-class T3HeaderButtonView(context: Context, appContext: AppContext) : ExpoView(context, appContext) {
- private val iconView = HeaderIconView(context)
- private val onTriggered by EventDispatcher()
-
- init {
- isClickable = true
- isFocusable = true
- setOnClickListener {
- onTriggered(emptyMap<String, Any>())
- }
- addView(iconView, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT))
- }
-
- fun setLabel(label: String) {
- contentDescription = label
- }
-
- fun setSystemImage(systemImage: String) {
- iconView.systemImage = systemImage
- }
-}
-
-private class HeaderIconView(context: Context) : View(context) {
- private val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
- color = Color.parseColor("#6B7280")
- strokeCap = Paint.Cap.ROUND
- strokeJoin = Paint.Join.ROUND
- strokeWidth = 3f * resources.displayMetrics.density
- style = Paint.Style.STROKE
- }
-
- var systemImage: String = "gearshape"
- set(value) {
- field = value
- invalidate()
- }
-
- override fun onDraw(canvas: Canvas) {
- super.onDraw(canvas)
- val cx = width / 2f
- val cy = height / 2f
- val size = minOf(width, height).toFloat()
- if (systemImage == "square.and.pencil") {
- drawNewTask(canvas, cx, cy, size)
- } else {
- drawSettings(canvas, cx, cy, size)
- }
- }
-
- private fun drawSettings(canvas: Canvas, cx: Float, cy: Float, size: Float) {
- val radius = size * 0.12f
- canvas.drawCircle(cx, cy, radius, paint)
- for (index in 0 until 8) {
- val angle = Math.PI * index / 4.0
- val inner = size * 0.19f
- val outer = size * 0.27f
- val sx = cx + kotlin.math.cos(angle).toFloat() * inner
- val sy = cy + kotlin.math.sin(angle).toFloat() * inner
- val ex = cx + kotlin.math.cos(angle).toFloat() * outer
- val ey = cy + kotlin.math.sin(angle).toFloat() * outer
- canvas.drawLine(sx, sy, ex, ey, paint)
- }
- }
-
- private fun drawNewTask(canvas: Canvas, cx: Float, cy: Float, size: Float) {
- val left = cx - size * 0.2f
- val top = cy - size * 0.16f
- val right = cx + size * 0.14f
- val bottom = cy + size * 0.2f
- canvas.drawRoundRect(left, top, right, bottom, size * 0.04f, size * 0.04f, paint)
- canvas.drawLine(
- cx - size * 0.02f,
- cy + size * 0.13f,
- cx + size * 0.24f,
- cy - size * 0.13f,
- paint
- )
- canvas.drawLine(
- cx + size * 0.17f,
- cy - size * 0.2f,
- cx + size * 0.24f,
- cy - size * 0.13f,
- paint
- )
- }
-}
diff --git a/apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3NativeControlsModule.kt b/apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3NativeControlsModule.kt
index b15a1cd44..f08ca9afb 100644
--- a/apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3NativeControlsModule.kt
+++ b/apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3NativeControlsModule.kt
@@ -32,16 +32,5 @@ class T3NativeControlsModule : Module() {
?.resolve("t3-showcase-ready")
?.writeText(scene)
}
-
- View(T3HeaderButtonView::class) {
- Prop("label") { view: T3HeaderButtonView, label: String ->
- view.setLabel(label)
- }
- Prop("systemImage") { view: T3HeaderButtonView, systemImage: String ->
- view.setSystemImage(systemImage)
- }
-
- Events("onTriggered")
- }
}
}
diff --git a/apps/mobile/modules/t3-native-controls/ios/T3HeaderButtonView.swift b/apps/mobile/modules/t3-native-controls/ios/T3HeaderButtonView.swift
deleted file mode 100644
index 7b7f9db67..000000000
--- a/apps/mobile/modules/t3-native-controls/ios/T3HeaderButtonView.swift
+++ /dev/null
@@ -1,62 +0,0 @@
-import ExpoModulesCore
-import UIKit
-
-public final class T3HeaderButtonView: ExpoView {
- private static let size: CGFloat = 44
- private static let symbolSize: CGFloat = 18
-
- private let button = UIButton(type: .system)
- private var systemImage = "circle"
-
- let onTriggered = EventDispatcher()
-
- public required init(appContext: AppContext? = nil) {
- super.init(appContext: appContext)
-
- isAccessibilityElement = false
- button.frame = bounds
- button.autoresizingMask = [.flexibleWidth, .flexibleHeight]
- button.addTarget(self, action: #selector(handlePress), for: .primaryActionTriggered)
- addSubview(button)
- applyConfiguration()
- }
-
- public override var intrinsicContentSize: CGSize {
- CGSize(width: Self.size, height: Self.size)
- }
-
- public func setLabel(_ label: String) {
- button.accessibilityLabel = label
- }
-
- public func setSystemImage(_ systemImage: String) {
- guard self.systemImage != systemImage else {
- return
- }
- self.systemImage = systemImage
- applyConfiguration()
- }
-
- private func applyConfiguration() {
- var configuration: UIButton.Configuration
- if #available(iOS 26.0, *) {
- configuration = .glass()
- configuration.cornerStyle = .capsule
- } else {
- configuration = .plain()
- }
-
- configuration.baseForegroundColor = .label
- configuration.contentInsets = .zero
- configuration.image = UIImage(systemName: systemImage)
- configuration.preferredSymbolConfigurationForImage = UIImage.SymbolConfiguration(
- pointSize: Self.symbolSize,
- weight: .regular
- )
- button.configuration = configuration
- }
-
- @objc private func handlePress() {
- onTriggered()
- }
-}
diff --git a/apps/mobile/modules/t3-native-controls/ios/T3NativeControlsModule.swift b/apps/mobile/modules/t3-native-controls/ios/T3NativeControlsModule.swift
index 23cf4720d..f3125c3ce 100644
--- a/apps/mobile/modules/t3-native-controls/ios/T3NativeControlsModule.swift
+++ b/apps/mobile/modules/t3-native-controls/ios/T3NativeControlsModule.swift
@@ -87,16 +87,5 @@ public final class T3NativeControlsModule: Module {
let readyPath = NSHomeDirectory() + "/Library/Caches/T3ShowcaseReadyScene"
try? scene.write(toFile: readyPath, atomically: true, encoding: .utf8)
}
-
- View(T3HeaderButtonView.self) {
- Prop("label") { (view: T3HeaderButtonView, label: String) in
- view.setLabel(label)
- }
- Prop("systemImage") { (view: T3HeaderButtonView, systemImage: String) in
- view.setSystemImage(systemImage)
- }
-
- Events("onTriggered")
- }
}
}
diff --git a/apps/mobile/src/features/threads/sidebar-header-actions.android.tsx b/apps/mobile/src/features/threads/sidebar-header-actions.android.tsx
deleted file mode 100644
index 1321c82c0..000000000
--- a/apps/mobile/src/features/threads/sidebar-header-actions.android.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { View } from "react-native";
-
-import { T3HeaderButton } from "../../native/T3HeaderButton.android";
-import type { SidebarHeaderActionsProps } from "./sidebar-header-actions";
-
-export function SidebarHeaderActions(props: SidebarHeaderActionsProps) {
- return (
- <View className="h-11 flex-row gap-1">
- <T3HeaderButton
- accessibilityLabel="Open settings"
- icon="gearshape"
- onPress={props.onOpenSettings}
- />
- </View>
- );
-}
diff --git a/apps/mobile/src/native/T3HeaderButton.android.tsx b/apps/mobile/src/native/T3HeaderButton.android.tsx
deleted file mode 100644
index 74908abd1..000000000
--- a/apps/mobile/src/native/T3HeaderButton.android.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { requireNativeView } from "expo";
-import type { NativeSyntheticEvent, StyleProp, ViewProps, ViewStyle } from "react-native";
-
-interface NativeHeaderButtonProps extends ViewProps {
- readonly label: string;
- readonly systemImage: "gearshape" | "square.and.pencil";
- readonly onTriggered: (event: NativeSyntheticEvent<Record<string, never>>) => void;
-}
-
-const NativeHeaderButton = requireNativeView<NativeHeaderButtonProps>("T3NativeControls");
-
-export function T3HeaderButton(props: {
- readonly accessibilityLabel: string;
- readonly icon: NativeHeaderButtonProps["systemImage"];
- readonly onPress: () => void;
- readonly style?: StyleProp<ViewStyle>;
-}) {
- return (
- <NativeHeaderButton
- label={props.accessibilityLabel}
- onTriggered={props.onPress}
- style={[{ width: 44, height: 44 }, props.style]}
- systemImage={props.icon}
- />
- );
-}