refactor(theme): rename colors for generic branding

fadi-george · fadi-george · commit e0e45c2e8461 · 2026-02-23T13:01:37.000-08:00
diff --git a/examples/demo/README.md b/examples/demo/README.md
@@ -26,7 +26,13 @@ cd ios && pod install && cd ..
 flutter run
 ```
 
-If multiple devices are connected, select one when prompted or specify it:
+For Android with multiple emulators, use the helper script to pick by AVD name:
+
+```bash
+../run-android.sh
+```
+
+Or specify a device directly:
 
 ```bash
 flutter run -d <device_id>
diff --git a/examples/demo/lib/screens/home_screen.dart b/examples/demo/lib/screens/home_screen.dart
@@ -159,7 +159,7 @@ class _HomeScreenState extends State<HomeScreen> {
                         );
                       },
                       style: ElevatedButton.styleFrom(
-                        backgroundColor: AppColors.oneSignalRed,
+                        backgroundColor: AppColors.osPrimary,
                         foregroundColor: Colors.white,
                       ),
                       child: const Text('NEXT ACTIVITY'),
diff --git a/examples/demo/lib/theme.dart b/examples/demo/lib/theme.dart
@@ -9,15 +9,22 @@ class AppSpacing {
 }
 
 class AppColors {
-  static const oneSignalRed = Color(0xFFE54B4D);
-  static const oneSignalGreen = Color(0xFF34A853);
-  static const lightBackground = Color(0xFFF8F9FA);
-  static const cardBackground = Colors.white;
-  static const dividerColor = Color(0xFFE8EAED);
-  static const warningBackground = Color(0xFFFFF8E1);
-  static const sectionHeaderText = Color(0xFF616161);
-  static const subtleText = Color(0xFF757575);
-
+  static const osPrimary = Color(0xFFE54B4D);
+  static const osSuccess = Color(0xFF34A853);
+  static const osGrey700 = Color(0xFF616161);
+  static const osGrey600 = Color(0xFF757575);
+  static const osGrey500 = Color(0xFF9E9E9E);
+  static const osLightBackground = Color(0xFFF8F9FA);
+  static const osCardBackground = Colors.white;
+  static const osDivider = Color(0xFFE8EAED);
+  static const osWarningBackground = Color(0xFFFFF8E1);
+  static const osOverlayScrim = Color(0x42000000);
+  static const osLogBackground = Color(0xFF1A1B1E);
+  static const osLogDebug = Color(0xFF82AAFF);
+  static const osLogInfo = Color(0xFFC3E88D);
+  static const osLogWarn = Color(0xFFFFCB6B);
+  static const osLogError = Color(0xFFFF5370);
+  static const osLogTimestamp = Color(0xFF676E7B);
   AppColors._();
 }
 
@@ -26,16 +33,16 @@ class AppTheme {
     return ThemeData(
       useMaterial3: true,
       colorScheme: ColorScheme.fromSeed(
-        seedColor: AppColors.oneSignalRed,
-      ).copyWith(primary: AppColors.oneSignalRed),
-      scaffoldBackgroundColor: AppColors.lightBackground,
+        seedColor: AppColors.osPrimary,
+      ).copyWith(primary: AppColors.osPrimary),
+      scaffoldBackgroundColor: AppColors.osLightBackground,
       appBarTheme: const AppBarTheme(
-        backgroundColor: AppColors.oneSignalRed,
+        backgroundColor: AppColors.osPrimary,
         foregroundColor: Colors.white,
         elevation: 0,
       ),
       cardTheme: CardThemeData(
-        color: AppColors.cardBackground,
+        color: AppColors.osCardBackground,
         elevation: 1,
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(12),
diff --git a/examples/demo/lib/widgets/action_button.dart b/examples/demo/lib/widgets/action_button.dart
@@ -21,7 +21,7 @@ class PrimaryButton extends StatelessWidget {
       child: ElevatedButton(
         onPressed: onPressed,
         style: ElevatedButton.styleFrom(
-          backgroundColor: AppColors.oneSignalRed,
+          backgroundColor: AppColors.osPrimary,
           foregroundColor: Colors.white,
         ),
         child: Row(
@@ -56,8 +56,8 @@ class DestructiveButton extends StatelessWidget {
       child: OutlinedButton(
         onPressed: onPressed,
         style: OutlinedButton.styleFrom(
-          foregroundColor: AppColors.oneSignalRed,
-          side: const BorderSide(color: AppColors.oneSignalRed),
+          foregroundColor: AppColors.osPrimary,
+          side: const BorderSide(color: AppColors.osPrimary),
         ),
         child: Text(label),
       ),
diff --git a/examples/demo/lib/widgets/dialogs.dart b/examples/demo/lib/widgets/dialogs.dart
@@ -710,7 +710,7 @@ class TooltipDialog extends StatelessWidget {
                           Text(
                             option.description,
                             style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                  color: AppColors.subtleText,
+                                  color: AppColors.osGrey600,
                                 ),
                           ),
                         ],
diff --git a/examples/demo/lib/widgets/list_widgets.dart b/examples/demo/lib/widgets/list_widgets.dart
@@ -33,7 +33,7 @@ class PairItem extends StatelessWidget {
                 Text(
                   valueText,
                   style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                        color: AppColors.subtleText,
+                        color: AppColors.osGrey600,
                       ),
                 ),
               ],
@@ -42,7 +42,7 @@ class PairItem extends StatelessWidget {
           if (onDelete != null)
             GestureDetector(
               onTap: onDelete,
-              child: Icon(Icons.close, size: 18, color: AppColors.sectionHeaderText),
+              child: Icon(Icons.close, size: 18, color: AppColors.osPrimary),
             ),
         ],
       ),
@@ -70,7 +70,7 @@ class SingleItem extends StatelessWidget {
           if (onDelete != null)
             GestureDetector(
               onTap: onDelete,
-              child: Icon(Icons.close, size: 18, color: AppColors.sectionHeaderText),
+              child: Icon(Icons.close, size: 18, color: AppColors.osPrimary),
             ),
         ],
       ),
@@ -91,7 +91,7 @@ class EmptyState extends StatelessWidget {
         child: Text(
           text,
           style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                color: AppColors.subtleText,
+                color: AppColors.osGrey600,
               ),
         ),
       ),
diff --git a/examples/demo/lib/widgets/log_view.dart b/examples/demo/lib/widgets/log_view.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 
 import '../services/log_manager.dart';
+import '../theme.dart';
 
 class LogView extends StatefulWidget {
   const LogView({super.key});
@@ -42,21 +43,25 @@ class _LogViewState extends State<LogView> {
   Color _levelColor(LogLevel level) {
     switch (level) {
       case LogLevel.debug:
-        return Colors.blue;
+        return AppColors.osLogDebug;
       case LogLevel.info:
-        return Colors.green;
+        return AppColors.osLogInfo;
       case LogLevel.warn:
-        return Colors.amber;
+        return AppColors.osLogWarn;
       case LogLevel.error:
-        return Colors.red;
+        return AppColors.osLogError;
     }
   }
 
   @override
   Widget build(BuildContext context) {
     final logs = LogManager().logs;
+    final textTheme = Theme.of(context).textTheme;
+    final logEntryStyle = textTheme.labelSmall?.copyWith(
+      fontFamily: 'monospace',
+    );
 
-    const logBackground = Color(0xFF1A1B1E);
+    const logBackground = AppColors.osLogBackground;
 
     return Semantics(
       label: 'log_view_container',
@@ -78,9 +83,9 @@ class _LogViewState extends State<LogView> {
                   ),
                   child: Row(
                     children: [
-                      const Text(
+                      Text(
                         'LOGS',
-                        style: TextStyle(
+                        style: textTheme.labelSmall?.copyWith(
                           fontWeight: FontWeight.bold,
                           color: Colors.white,
                         ),
@@ -90,7 +95,9 @@ class _LogViewState extends State<LogView> {
                         label: 'log_view_count',
                         child: Text(
                           '(${logs.length})',
-                          style: TextStyle(color: Colors.grey[400]),
+                          style: textTheme.labelSmall?.copyWith(
+                            color: AppColors.osGrey500,
+                          ),
                         ),
                       ),
                       const Spacer(),
@@ -99,10 +106,10 @@ class _LogViewState extends State<LogView> {
                           label: 'log_view_clear_button',
                           child: GestureDetector(
                             onTap: () => LogManager().clear(),
-                            child: Icon(
+                            child: const Icon(
                               Icons.delete,
                               size: 18,
-                              color: Colors.grey[400],
+                              color: AppColors.osGrey500,
                             ),
                           ),
                         ),
@@ -112,7 +119,7 @@ class _LogViewState extends State<LogView> {
                             ? Icons.expand_less
                             : Icons.expand_more,
                         size: 20,
-                        color: Colors.grey[400],
+                        color: AppColors.osGrey500,
                       ),
                     ],
                   ),
@@ -130,7 +137,9 @@ class _LogViewState extends State<LogView> {
                           child: Center(
                             child: Text(
                               'No logs yet',
-                              style: TextStyle(color: Colors.grey[500]),
+                              style: textTheme.bodyMedium?.copyWith(
+                                color: AppColors.osGrey500,
+                              ),
                             ),
                           ),
                         )
@@ -153,10 +162,8 @@ class _LogViewState extends State<LogView> {
                                       label: 'log_entry_${index}_timestamp',
                                       child: Text(
                                         entry.formattedTime,
-                                        style: TextStyle(
-                                          fontSize: 11,
-                                          color: Colors.grey[500],
-                                          fontFamily: 'monospace',
+                                        style: logEntryStyle?.copyWith(
+                                          color: AppColors.osLogTimestamp,
                                         ),
                                       ),
                                     ),
@@ -165,11 +172,9 @@ class _LogViewState extends State<LogView> {
                                       label: 'log_entry_${index}_level',
                                       child: Text(
                                         entry.levelLabel,
-                                        style: TextStyle(
-                                          fontSize: 11,
+                                        style: logEntryStyle?.copyWith(
                                           fontWeight: FontWeight.bold,
                                           color: _levelColor(entry.level),
-                                          fontFamily: 'monospace',
                                         ),
                                       ),
                                     ),
@@ -179,10 +184,8 @@ class _LogViewState extends State<LogView> {
                                         label: 'log_entry_${index}_message',
                                         child: Text(
                                           '${entry.tag}: ${entry.message}',
-                                          style: const TextStyle(
-                                            fontSize: 11,
-                                            fontFamily: 'monospace',
-                                            color: Colors.white70,
+                                          style: logEntryStyle?.copyWith(
+                                            color: Colors.white,
                                           ),
                                         ),
                                       ),
diff --git a/examples/demo/lib/widgets/section_card.dart b/examples/demo/lib/widgets/section_card.dart
@@ -31,7 +31,7 @@ class SectionCard extends StatelessWidget {
                     title.toUpperCase(),
                     style: Theme.of(context).textTheme.bodySmall?.copyWith(
                           fontWeight: FontWeight.bold,
-                          color: AppColors.sectionHeaderText,
+                          color: AppColors.osGrey700,
                           letterSpacing: 0.5,
                         ),
                   ),
@@ -42,7 +42,7 @@ class SectionCard extends StatelessWidget {
                     child: Icon(
                       Icons.info_outline,
                       size: 18,
-                      color: AppColors.sectionHeaderText,
+                      color: AppColors.osGrey500,
                     ),
                   ),
               ],
diff --git a/examples/demo/lib/widgets/sections/app_section.dart b/examples/demo/lib/widgets/sections/app_section.dart
@@ -50,7 +50,7 @@ class AppSection extends StatelessWidget {
           SizedBox(
             width: double.infinity,
             child: Card(
-              color: AppColors.warningBackground,
+              color: AppColors.osWarningBackground,
               margin: EdgeInsets.zero,
             child: Padding(
               padding: const EdgeInsets.all(12),
@@ -69,7 +69,7 @@ class AppSection extends StatelessWidget {
                     child: Text(
                       'Get your keys at onesignal.com',
                       style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                            color: AppColors.oneSignalRed,
+                            color: AppColors.osPrimary,
                             fontWeight: FontWeight.w600,
                           ),
                     ),
diff --git a/examples/demo/lib/widgets/sections/send_iam_section.dart b/examples/demo/lib/widgets/sections/send_iam_section.dart
@@ -26,7 +26,7 @@ class SendIamSection extends StatelessWidget {
             child: ElevatedButton(
               onPressed: () => vm.sendInAppMessage(type),
               style: ElevatedButton.styleFrom(
-                backgroundColor: AppColors.oneSignalRed,
+                backgroundColor: AppColors.osPrimary,
                 foregroundColor: Colors.white,
                 minimumSize: const Size(double.infinity, 48),
                 shape: RoundedRectangleBorder(
diff --git a/examples/demo/lib/widgets/sections/user_section.dart b/examples/demo/lib/widgets/sections/user_section.dart
@@ -37,8 +37,8 @@ class UserSection extends StatelessWidget {
                         style: Theme.of(context).textTheme.bodyMedium?.copyWith(
                               fontWeight: FontWeight.w500,
                               color: vm.isLoggedIn
-                                  ? AppColors.oneSignalGreen
-                                  : AppColors.subtleText,
+                                  ? AppColors.osSuccess
+                                  : AppColors.osGrey600,
                             ),
                       ),
                     ],
diff --git a/examples/demo/lib/widgets/toggle_row.dart b/examples/demo/lib/widgets/toggle_row.dart
@@ -29,7 +29,7 @@ class ToggleRow extends StatelessWidget {
                 Text(
                   description!,
                   style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                        color: AppColors.subtleText,
+                        color: AppColors.osGrey600,
                       ),
                 ),
             ],
diff --git a/examples/run-android.sh b/examples/run-android.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+cd "$(dirname "$0")/demo"
+
+serials=()
+names=()
+
+while IFS= read -r serial; do
+  name=$(adb -s "$serial" emu avd name 2>/dev/null | head -1 | tr -d '\r')
+  [ -z "$name" ] && name="$serial"
+  serials+=("$serial")
+  names+=("$name")
+done < <(adb devices | awk '/emulator-.*device$/ {print $1}')
+
+if [ ${#serials[@]} -eq 0 ]; then
+  echo "No running Android emulators found."
+  exit 1
+fi
+
+if [ ${#serials[@]} -eq 1 ]; then
+  echo "Using ${names[0]} (${serials[0]})"
+  flutter run -d "${serials[0]}"
+  exit 0
+fi
+
+echo "Running Android emulators:"
+for i in "${!serials[@]}"; do
+  echo "  [$((i + 1))] ${names[$i]} (${serials[$i]})"
+done
+
+printf "Choose [1-%d]: " "${#serials[@]}"
+read -r choice
+
+if ! [[ "$choice" =~ ^[0-9]+$ ]] || [ "$choice" -lt 1 ] || [ "$choice" -gt ${#serials[@]} ]; then
+  echo "Invalid choice."
+  exit 1
+fi
+
+idx=$((choice - 1))
+echo "Using ${names[$idx]} (${serials[$idx]})"
+flutter run -d "${serials[$idx]}"
