fix: Theme color support across all components

Author: berkaycatak

CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## [0.1.100]
+* **FIX**: Theme color support across all components
+  * All adaptive components now properly use theme colors when no explicit color provided
+  * iOS: Uses `CupertinoTheme.of(context).primaryColor`
+  * Android: Uses `Theme.of(context).colorScheme.primary`
+  * Material button styles now respect `elevatedButtonTheme`, `textButtonTheme`, etc.
+* **FIX**: iOS button width handling in Row/Flex layouts
+  * iOS 26+ native buttons now properly size to content width
+  * Removed forced full-width constraint in Swift implementation
+  * Buttons work correctly with `mainAxisAlignment: MainAxisAlignment.spaceBetween`
+* **FIX**: Dark mode text color issues on iOS
+  * Text now automatically switches to white in dark mode, black in light mode
+  * Applied to all scaffold implementations (iOS 26+ and legacy)
+* **FIX**: Android TextField suffix spacing issue
+  * Suffix widget now uses `suffixIcon` internally to prevent extra vertical space
+  * Added `isDense: true` to reduce padding
+* **FIX**: Android AppBar back button visibility
+  * Back button now shows even when title is not provided
+* **FIX**: Material context issues in AdaptiveScaffold
+  * Scaffold now always used on Android to ensure Material context
+
 ## [0.1.99]
 * **NEW**: Added `AdaptiveBlurView` widget - iOS 26+ Liquid Glass blur effects
   * iOS 26+: Native UIVisualEffectView with system blur styles (systemMaterial, systemThick, systemThin, etc.)

example/pubspec.lock

@@ -7,7 +7,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.1.98"
+    version: "0.1.99"
   async:
     dependency: transitive
     description:

ios/Classes/iOS26ButtonView.swift

@@ -122,6 +122,8 @@ class iOS26ButtonView: NSObject, FlutterPlatformView {
 
         // Setup constraints
         _view.addSubview(button)
+
+        // Button should fill container width
         NSLayoutConstraint.activate([
             button.leadingAnchor.constraint(equalTo: _view.leadingAnchor),
             button.trailingAnchor.constraint(equalTo: _view.trailingAnchor),
@@ -130,6 +132,10 @@ class iOS26ButtonView: NSObject, FlutterPlatformView {
             button.heightAnchor.constraint(equalToConstant: getHeightForSize())
         ])
 
+        // Low content hugging - button can expand if container wants
+        button.setContentHuggingPriority(.defaultLow, for: .horizontal)
+        button.setContentCompressionResistancePriority(.required, for: .horizontal)
+
         // Add tap action
         button.addTarget(self, action: #selector(buttonTapped), for: .touchUpInside)
 

lib/src/widgets/adaptive_app.dart

@@ -253,88 +253,119 @@ class AdaptiveApp extends StatelessWidget {
     final config =
         cupertino?.call(context, platform) ?? const CupertinoAppData();
 
-    // We need to wrap CupertinoApp in a builder to get system brightness
-    // CupertinoApp doesn't have themeMode like MaterialApp, so we manually
-    // detect brightness and apply the appropriate theme
-    return Builder(
-      builder: (context) {
-        // Get system brightness to determine which theme to use
-        final brightness = MediaQuery.platformBrightnessOf(context);
-        final isDark =
-            themeMode == ThemeMode.dark ||
-            (themeMode != ThemeMode.light && brightness == Brightness.dark);
-
-        // Use dark theme if dark mode, otherwise light theme
-        final effectiveLightTheme =
-            cupertinoLightTheme ??
-            const CupertinoThemeData(brightness: Brightness.light);
-        final effectiveDarkTheme =
-            cupertinoDarkTheme ??
-            const CupertinoThemeData(brightness: Brightness.dark);
-
-        final theme = isDark ? effectiveDarkTheme : effectiveLightTheme;
-
-        if (isRouter) {
-          return CupertinoApp.router(
-            key: key,
-            routerConfig: routerConfig,
-            routeInformationProvider: routeInformationProvider,
-            routeInformationParser: routeInformationParser,
-            routerDelegate: routerDelegate,
-            backButtonDispatcher: backButtonDispatcher,
-            builder: builder,
-            title: title,
-            onGenerateTitle: onGenerateTitle,
-            color: config.color,
-            theme: theme,
-            locale: locale,
-            localizationsDelegates: localizationsDelegates,
-            localeListResolutionCallback: localeListResolutionCallback,
-            localeResolutionCallback: localeResolutionCallback,
-            supportedLocales: supportedLocales,
-            showPerformanceOverlay: config.showPerformanceOverlay,
-            checkerboardRasterCacheImages: config.checkerboardRasterCacheImages,
-            checkerboardOffscreenLayers: config.checkerboardOffscreenLayers,
-            showSemanticsDebugger: config.showSemanticsDebugger,
-            debugShowCheckedModeBanner: config.debugShowCheckedModeBanner,
-            shortcuts: config.shortcuts,
-            actions: config.actions,
-            restorationScopeId: config.restorationScopeId,
-            scrollBehavior: config.scrollBehavior,
-          );
-        }
-
-        return CupertinoApp(
-          key: key,
-          navigatorKey: navigatorKey,
-          home: home,
-          routes: routes,
-          initialRoute: initialRoute,
-          onGenerateRoute: onGenerateRoute,
-          onGenerateInitialRoutes: onGenerateInitialRoutes,
-          onUnknownRoute: onUnknownRoute,
-          navigatorObservers: navigatorObservers,
-          builder: builder,
-          title: title,
-          onGenerateTitle: onGenerateTitle,
-          color: config.color,
-          theme: theme,
-          locale: locale,
-          localizationsDelegates: localizationsDelegates,
-          localeListResolutionCallback: localeListResolutionCallback,
-          localeResolutionCallback: localeResolutionCallback,
-          supportedLocales: supportedLocales,
-          showPerformanceOverlay: config.showPerformanceOverlay,
-          checkerboardRasterCacheImages: config.checkerboardRasterCacheImages,
-          checkerboardOffscreenLayers: config.checkerboardOffscreenLayers,
-          showSemanticsDebugger: config.showSemanticsDebugger,
-          debugShowCheckedModeBanner: config.debugShowCheckedModeBanner,
-          shortcuts: config.shortcuts,
-          actions: config.actions,
-          restorationScopeId: config.restorationScopeId,
-          scrollBehavior: config.scrollBehavior,
+    // Prepare light and dark themes
+    // If Cupertino theme is not provided, try to derive primaryColor from Material theme
+    final effectiveLightTheme = cupertinoLightTheme ??
+        CupertinoThemeData(
+          brightness: Brightness.light,
+          primaryColor: materialLightTheme?.colorScheme.primary,
         );
-      },
+    final effectiveDarkTheme = cupertinoDarkTheme ??
+        CupertinoThemeData(
+          brightness: Brightness.dark,
+          primaryColor: materialDarkTheme?.colorScheme.primary,
+        );
+
+    // CupertinoApp doesn't have themeMode like MaterialApp
+    // We need to wrap the app content in a builder to detect brightness and apply the theme
+    Widget wrapWithThemeMode(BuildContext context, Widget? child) {
+      // Determine if we should use dark mode
+      Brightness effectiveBrightness;
+
+      if (themeMode == ThemeMode.dark) {
+        effectiveBrightness = Brightness.dark;
+      } else if (themeMode == ThemeMode.light) {
+        effectiveBrightness = Brightness.light;
+      } else {
+        // ThemeMode.system - get from platform
+        effectiveBrightness = MediaQuery.platformBrightnessOf(context);
+      }
+
+      final isDark = effectiveBrightness == Brightness.dark;
+
+      // Apply the appropriate theme and ensure MediaQuery has correct brightness
+      final theme = isDark ? effectiveDarkTheme : effectiveLightTheme;
+
+      return MediaQuery(
+        data: MediaQuery.of(context).copyWith(
+          platformBrightness: effectiveBrightness,
+        ),
+        child: CupertinoTheme(
+          data: theme,
+          child: child!,
+        ),
+      );
+    }
+
+    // Combine user's builder with our theme builder
+    final effectiveBuilder = builder != null
+        ? (BuildContext context, Widget? child) {
+            // First apply our theme wrapper
+            final themedChild = wrapWithThemeMode(context, child);
+            // Then apply user's builder
+            return builder!(context, themedChild);
+          }
+        : wrapWithThemeMode;
+
+    if (isRouter) {
+      return CupertinoApp.router(
+        key: key,
+        routerConfig: routerConfig,
+        routeInformationProvider: routeInformationProvider,
+        routeInformationParser: routeInformationParser,
+        routerDelegate: routerDelegate,
+        backButtonDispatcher: backButtonDispatcher,
+        builder: effectiveBuilder,
+        title: title,
+        onGenerateTitle: onGenerateTitle,
+        color: config.color,
+        theme: effectiveLightTheme, // Default theme (will be overridden by builder)
+        locale: locale,
+        localizationsDelegates: localizationsDelegates,
+        localeListResolutionCallback: localeListResolutionCallback,
+        localeResolutionCallback: localeResolutionCallback,
+        supportedLocales: supportedLocales,
+        showPerformanceOverlay: config.showPerformanceOverlay,
+        checkerboardRasterCacheImages: config.checkerboardRasterCacheImages,
+        checkerboardOffscreenLayers: config.checkerboardOffscreenLayers,
+        showSemanticsDebugger: config.showSemanticsDebugger,
+        debugShowCheckedModeBanner: config.debugShowCheckedModeBanner,
+        shortcuts: config.shortcuts,
+        actions: config.actions,
+        restorationScopeId: config.restorationScopeId,
+        scrollBehavior: config.scrollBehavior,
+      );
+    }
+
+    return CupertinoApp(
+      key: key,
+      navigatorKey: navigatorKey,
+      home: home,
+      routes: routes,
+      initialRoute: initialRoute,
+      onGenerateRoute: onGenerateRoute,
+      onGenerateInitialRoutes: onGenerateInitialRoutes,
+      onUnknownRoute: onUnknownRoute,
+      navigatorObservers: navigatorObservers,
+      builder: effectiveBuilder,
+      title: title,
+      onGenerateTitle: onGenerateTitle,
+      color: config.color,
+      theme: effectiveLightTheme, // Default theme (will be overridden by builder)
+      locale: locale,
+      localizationsDelegates: localizationsDelegates,
+      localeListResolutionCallback: localeListResolutionCallback,
+      localeResolutionCallback: localeResolutionCallback,
+      supportedLocales: supportedLocales,
+      showPerformanceOverlay: config.showPerformanceOverlay,
+      checkerboardRasterCacheImages: config.checkerboardRasterCacheImages,
+      checkerboardOffscreenLayers: config.checkerboardOffscreenLayers,
+      showSemanticsDebugger: config.showSemanticsDebugger,
+      debugShowCheckedModeBanner: config.debugShowCheckedModeBanner,
+      shortcuts: config.shortcuts,
+      actions: config.actions,
+      restorationScopeId: config.restorationScopeId,
+      scrollBehavior: config.scrollBehavior,
     );
   }