From 826c4ab2500fb309e72657148f73d3c883065d4f Mon Sep 17 00:00:00 2001 From: IamLRBA Date: Tue, 10 Feb 2026 11:37:15 +0300 Subject: [PATCH 1/9] feat(formulus): use ODE tokens and components (fixes #291) --- formulus/package.json | 2 + formulus/src/components/MenuDrawer.tsx | 29 +--- formulus/src/components/QRScannerModal.tsx | 65 ++++---- .../src/components/SignatureCaptureModal.tsx | 73 +++------ formulus/src/components/common/Button.tsx | 133 +++------------- formulus/src/components/common/FilterBar.tsx | 78 +++------- formulus/src/components/common/Input.tsx | 79 +--------- .../src/components/common/ObservationCard.tsx | 36 ++--- .../components/common/SyncStatusButtons.tsx | 43 +----- formulus/src/screens/FormManagementScreen.tsx | 57 ++----- .../src/screens/ObservationDetailScreen.tsx | 22 +-- formulus/src/screens/ObservationsScreen.tsx | 12 +- formulus/src/screens/SettingsScreen.tsx | 143 ++++++------------ formulus/src/screens/SyncScreen.tsx | 138 ++++------------- formulus/src/screens/WelcomeScreen.tsx | 25 +-- formulus/src/theme/colors.ts | 94 +++++------- .../components/src/react-native/Badge.tsx | 2 +- .../components/src/react-native/Button.tsx | 10 +- packages/components/src/react-native/Card.tsx | 2 +- .../components/src/react-native/Input.tsx | 4 +- packages/components/src/shared/types.ts | 5 + packages/tokens/package.json | 2 +- .../tokens/scripts/create-tokens-resolved.js | 21 +++ 23 files changed, 330 insertions(+), 745 deletions(-) create mode 100644 packages/tokens/scripts/create-tokens-resolved.js diff --git a/formulus/package.json b/formulus/package.json index 06547f140..1d3d1e296 100644 --- a/formulus/package.json +++ b/formulus/package.json @@ -18,6 +18,8 @@ "prebuild": "npm run generate" }, "dependencies": { + "@ode/components": "file:../packages/components", + "@ode/tokens": "file:../packages/tokens", "@notifee/react-native": "^9.1.8", "@nozbe/watermelondb": "^0.28.0", "@react-native-async-storage/async-storage": "^2.2.0", diff --git a/formulus/src/components/MenuDrawer.tsx b/formulus/src/components/MenuDrawer.tsx index 35ae6085b..0c36ac034 100644 --- a/formulus/src/components/MenuDrawer.tsx +++ b/formulus/src/components/MenuDrawer.tsx @@ -14,6 +14,7 @@ import { import Icon from '@react-native-vector-icons/material-design-icons'; import { getUserInfo, UserInfo, UserRole } from '../api/synkronus/Auth'; import { colors } from '../theme/colors'; +import { Button } from './common/Button'; interface MenuItem { icon: React.ComponentProps['name']; @@ -180,16 +181,13 @@ const MenuDrawer: React.FC = ({ {userInfo && ( - - - Logout - +