kasy-cli 1.12.1 → 1.13.0

package/templates/firebase/lib/features/settings/settings_page.dart

@@ -426,35 +426,175 @@ class HapticFeedbackSwitcher extends ConsumerWidget {
   }
 }
 
-class ThemeSwitcher extends StatefulWidget {
+class ThemeSwitcher extends StatelessWidget {
   const ThemeSwitcher({super.key});
 
+  IconData _iconFor(ThemeMode mode) {
+    switch (mode) {
+      case ThemeMode.system:
+        return KasyIcons.phoneAndroid;
+      case ThemeMode.dark:
+        return KasyIcons.darkMode;
+      case ThemeMode.light:
+        return KasyIcons.lightMode;
+    }
+  }
+
   @override
-  State<ThemeSwitcher> createState() => _ThemeSwitcherState();
+  Widget build(BuildContext context) {
+    final tr = context.t.settings;
+    final theme = ThemeProvider.of(context);
+    final options = <({ThemeMode mode, IconData icon, String label})>[
+      (
+        mode: ThemeMode.system,
+        icon: KasyIcons.phoneAndroid,
+        label: tr.theme_option_system,
+      ),
+      (
+        mode: ThemeMode.light,
+        icon: KasyIcons.lightMode,
+        label: tr.theme_option_light,
+      ),
+      (
+        mode: ThemeMode.dark,
+        icon: KasyIcons.darkMode,
+        label: tr.theme_option_dark,
+      ),
+    ];
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: KasySpacing.sm),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          Row(
+            children: [
+              Icon(
+                _iconFor(theme.mode),
+                size: 21,
+                color: context.colors.onSurface,
+              ),
+              const SizedBox(width: KasySpacing.sm),
+              Expanded(
+                child: Text(
+                  tr.theme_title,
+                  style: context.textTheme.titleMedium?.copyWith(
+                    color: context.colors.onSurface,
+                  ),
+                ),
+              ),
+            ],
+          ),
+          const SizedBox(height: KasySpacing.sm),
+          _ThemeModeSegmented(
+            current: theme.mode,
+            options: options,
+            onChanged: theme.setMode,
+          ),
+        ],
+      ),
+    );
+  }
 }
 
-class _ThemeSwitcherState extends State<ThemeSwitcher> {
-  bool darkMode = false;
+class _ThemeModeSegmented extends StatelessWidget {
+  const _ThemeModeSegmented({
+    required this.current,
+    required this.options,
+    required this.onChanged,
+  });
+
+  final ThemeMode current;
+  final List<({ThemeMode mode, IconData icon, String label})> options;
+  final ValueChanged<ThemeMode> onChanged;
 
   @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      darkMode = ThemeProvider.of(context).mode == ThemeMode.dark;
-      setState(() {});
-    });
+  Widget build(BuildContext context) {
+    final trackColor = context.colors.onSurface.withValues(alpha: 0.06);
+    return Container(
+      padding: const EdgeInsets.all(3),
+      decoration: BoxDecoration(
+        color: trackColor,
+        borderRadius: BorderRadius.circular(10),
+      ),
+      child: Row(
+        children: [
+          for (final opt in options)
+            Expanded(
+              child: _ThemeModeSegment(
+                icon: opt.icon,
+                label: opt.label,
+                selected: current == opt.mode,
+                onTap: () => onChanged(opt.mode),
+              ),
+            ),
+        ],
+      ),
+    );
   }
+}
+
+class _ThemeModeSegment extends StatelessWidget {
+  const _ThemeModeSegment({
+    required this.icon,
+    required this.label,
+    required this.selected,
+    required this.onTap,
+  });
+
+  final IconData icon;
+  final String label;
+  final bool selected;
+  final VoidCallback onTap;
 
   @override
   Widget build(BuildContext context) {
-    return SettingsSwitchTile(
-      icon: darkMode ? KasyIcons.darkMode : KasyIcons.lightMode,
-      title: context.t.settings.theme_title,
-      value: darkMode,
-      onChanged: (value) {
-        setState(() => darkMode = value);
-        ThemeProvider.of(context).toggle();
-      },
+    final selectedBg = context.colors.surface;
+    final selectedFg = context.colors.onSurface;
+    final unselectedFg = context.colors.muted;
+    return Semantics(
+      button: true,
+      selected: selected,
+      label: label,
+      child: GestureDetector(
+        onTap: onTap,
+        behavior: HitTestBehavior.opaque,
+        child: AnimatedContainer(
+          duration: const Duration(milliseconds: 160),
+          curve: Curves.easeOut,
+          padding: const EdgeInsets.symmetric(vertical: 8),
+          decoration: BoxDecoration(
+            color: selected ? selectedBg : Colors.transparent,
+            borderRadius: BorderRadius.circular(8),
+            boxShadow: selected
+                ? [
+                    BoxShadow(
+                      color: Colors.black.withValues(alpha: 0.06),
+                      blurRadius: 4,
+                      offset: const Offset(0, 1),
+                    ),
+                  ]
+                : const [],
+          ),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Icon(
+                icon,
+                size: 18,
+                color: selected ? selectedFg : unselectedFg,
+              ),
+              const SizedBox(height: 2),
+              Text(
+                label,
+                style: context.textTheme.labelSmall?.copyWith(
+                  color: selected ? selectedFg : unselectedFg,
+                  fontWeight: selected ? FontWeight.w600 : FontWeight.w500,
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
     );
   }
 }

package/templates/firebase/lib/i18n/en.i18n.json

@@ -175,7 +175,8 @@
             "title": "Subscriptions module",
             "description": "Manage subscriptions with premade paywalls",
             "action": "Continue",
-            "skip": "Skip"
+            "skip": "Skip",
+            "login": "Already have an account? Log in"
         },
         "feature_2": {
             "title": "Authentication module",
@@ -321,7 +322,10 @@
             "cancel": "Cancel"
         },
         "language_title": "Languages",
-        "theme_title": "Light/Dark mode",
+        "theme_title": "Theme",
+        "theme_option_system": "System",
+        "theme_option_light": "Light",
+        "theme_option_dark": "Dark",
         "haptic_feedback_title": "Haptic feedback",
         "section_preferences_label": "PREFERENCES",
         "section_security_label": "SECURITY",

package/templates/firebase/lib/i18n/es.i18n.json

@@ -175,7 +175,8 @@
             "title": "Módulo de suscripciones",
             "description": "Gestiona suscripciones con paywalls listos para usar",
             "action": "Continuar",
-            "skip": "Omitir"
+            "skip": "Omitir",
+            "login": "¿Ya tienes cuenta? Iniciar sesión"
         },
         "feature_2": {
             "title": "Módulo de autenticación",
@@ -321,7 +322,10 @@
             "cancel": "Cancelar"
         },
         "language_title": "Idiomas",
-        "theme_title": "Modo claro/oscuro",
+        "theme_title": "Tema",
+        "theme_option_system": "Sistema",
+        "theme_option_light": "Claro",
+        "theme_option_dark": "Oscuro",
         "haptic_feedback_title": "Feedback háptico",
         "section_preferences_label": "PREFERENCIAS",
         "section_security_label": "SEGURIDAD",

package/templates/firebase/lib/i18n/pt.i18n.json

@@ -175,7 +175,8 @@
             "title": "Módulo de assinaturas",
             "description": "Gerencie assinaturas com paywalls prontos para usar",
             "action": "Continuar",
-            "skip": "Pular"
+            "skip": "Pular",
+            "login": "Já tem conta? Entrar"
         },
         "feature_2": {
             "title": "Módulo de autenticação",
@@ -321,7 +322,10 @@
             "cancel": "Cancelar"
         },
         "language_title": "Idiomas",
-        "theme_title": "Modo claro/escuro",
+        "theme_title": "Tema",
+        "theme_option_system": "Sistema",
+        "theme_option_light": "Claro",
+        "theme_option_dark": "Escuro",
         "haptic_feedback_title": "Feedback háptico",
         "section_preferences_label": "PREFERÊNCIAS",
         "section_security_label": "SEGURANÇA",

package/templates/firebase/lib/main.dart

@@ -115,28 +115,47 @@ void run(SharedPreferences prefs) => runApp(
 //   mode: ThemeMode.dark,
 // ),
 // See ./docs/theme.md for more details
-class MyApp extends ConsumerWidget {
+class MyApp extends ConsumerStatefulWidget {
   final SharedPreferences sharedPreferences;
 
   const MyApp({super.key, required this.sharedPreferences});
 
+  @override
+  ConsumerState<MyApp> createState() => _MyAppState();
+}
+
+class _MyAppState extends ConsumerState<MyApp> {
+  late final AppTheme _appTheme;
+
+  @override
+  void initState() {
+    super.initState();
+    _appTheme = AppTheme.uniform(
+      sharedPreferences: widget.sharedPreferences,
+      themeFactory: const UniversalThemeFactory(),
+      lightColors: KasyColors.light(),
+      darkColors: KasyColors.dark(),
+      textTheme: KasyTextTheme.build(),
+      defaultMode: ThemeMode.system,
+    );
+  }
+
+  @override
+  void dispose() {
+    _appTheme.dispose();
+    super.dispose();
+  }
+
   // This widget is the root of your application.
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
+  Widget build(BuildContext context) {
     ErrorWidget.builder = (FlutterErrorDetails details) {
       return AppErrorWidget(error: details);
     };
     final goRouter = ref.watch(goRouterProvider);
 
     return ThemeProvider(
-      notifier: AppTheme.uniform(
-        sharedPreferences: sharedPreferences,
-        themeFactory: const UniversalThemeFactory(),
-        lightColors: KasyColors.light(),
-        darkColors: KasyColors.dark(),
-        textTheme: KasyTextTheme.build(),
-        defaultMode: ThemeMode.light,
-      ),
+      notifier: _appTheme,
       child: Builder(
         builder: (context) {
           return WebDevicePreview.wrap(

package/templates/firebase/pubspec.yaml

@@ -134,16 +134,15 @@ flutter_native_splash:
   color: "#FFFFFF"
   color_dark: "#000000"
   fullscreen: true
-  preserve: true
   ios: true
   android: true
-  image: assets/images/splashscreen.png
-  image_dark: assets/images/splashscreen.png
+  image: assets/images/splash_logo_light.png
+  image_dark: assets/images/splash_logo_dark.png
   android_12:
     color: "#FFFFFF"
     color_dark: "#000000"
-    image: assets/images/splashscreen.png
-    image_dark: assets/images/splashscreen.png
+    image: assets/images/splash_logo_light.png
+    image_dark: assets/images/splash_logo_dark.png
 
   # To add assets to your application, add an assets section, like this:
   # assets:

package/templates/firebase/test/core/data/repositories/user_repository_test.dart

@@ -30,7 +30,7 @@ void main() {
     await tester.runAsync(() async {
       final userRepository = await init();
 
-      final file = await rootBundle.load('assets/images/splashscreen.png');
+      final file = await rootBundle.load('assets/images/splash_logo_light.png');
       final bytes = file.buffer.asUint8List();
       // if you want to create an XFile from bytes
       // final xfile = XFile.fromData(bytes);

package/templates/firebase/web/index.html

@@ -29,73 +29,80 @@
 
   <title>kasy</title>
   <link rel="manifest" href="manifest.json">
+  
+  
+  <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport">
   <style id="splash-screen-style">
     html {
-      height: 100%;
+      height: 100%
     }
 
     body {
       margin: 0;
       min-height: 100%;
       background-color: #FFFFFF;
+          background-size: 100% 100%;
     }
 
-    @media (prefers-color-scheme: dark) {
-      body { background-color: #000000; }
+    .center {
+      margin: 0;
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      -ms-transform: translate(-50%, -50%);
+      transform: translate(-50%, -50%);
     }
 
-    #splash {
-      position: fixed;
-      inset: 0;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      background-color: #FFFFFF;
-      transition: opacity 0.35s ease;
-      z-index: 9999;
+    .contain {
+      display:block;
+      width:100%; height:100%;
+      object-fit: contain;
     }
 
-    @media (prefers-color-scheme: dark) {
-      #splash { background-color: #000000; }
+    .stretch {
+      display:block;
+      width:100%; height:100%;
     }
 
-    #splash img {
-      width: 160px;
-      height: 160px;
-      object-fit: contain;
+    .cover {
+      display:block;
+      width:100%; height:100%;
+      object-fit: cover;
     }
 
-    .center {
-      margin: 0;
+    .bottom {
       position: absolute;
-      top: 50%;
+      bottom: 0;
       left: 50%;
-      -ms-transform: translate(-50%, -50%);
-      transform: translate(-50%, -50%);
+      -ms-transform: translate(-50%, 0);
+      transform: translate(-50%, 0);
     }
 
-    .contain { display:block; width:100%; height:100%; object-fit: contain; }
-    .stretch { display:block; width:100%; height:100%; }
-    .cover   { display:block; width:100%; height:100%; object-fit: cover; }
+    .bottomLeft {
+      position: absolute;
+      bottom: 0;
+      left: 0;
+    }
 
-    .bottom      { position: absolute; bottom: 0; left: 50%; transform: translate(-50%, 0); }
-    .bottomLeft  { position: absolute; bottom: 0; left: 0; }
-    .bottomRight { position: absolute; bottom: 0; right: 0; }
+    .bottomRight {
+      position: absolute;
+      bottom: 0;
+      right: 0;
+    }
+
+    @media (prefers-color-scheme: dark) {
+      body {
+        background-color: #000000;
+          }
+    }
   </style>
   <script id="splash-screen-script">
     function removeSplashFromWeb() {
-      var splash = document.getElementById("splash");
-      if (splash) {
-        splash.style.opacity = "0";
-        setTimeout(function() {
-          splash.remove();
-          document.getElementById("splash-branding")?.remove();
-          document.body.style.background = "transparent";
-        }, 380);
-      }
+      document.getElementById("splash")?.remove();
+      document.getElementById("splash-branding")?.remove();
+      document.body.style.background = "transparent";
     }
   </script>
-  <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport">
 </head>
 <body>
   <picture id="splash">
@@ -103,6 +110,7 @@
       <source srcset="splash/img/dark-1x.png 1x, splash/img/dark-2x.png 2x, splash/img/dark-3x.png 3x, splash/img/dark-4x.png 4x" media="(prefers-color-scheme: dark)">
       <img class="center" aria-hidden="true" src="splash/img/light-1x.png" alt="">
   </picture>
+  
   <script src="flutter_bootstrap.js" async=""></script>
   <script src="./local_notifications.js"></script>
 

package/lib/scaffold/features/analytics/lib/core/data/api/analytics_api.dart

@@ -1,124 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:mixpanel_flutter/mixpanel_flutter.dart';
-import 'package:kasy_kit/core/data/models/user.dart';
-import 'package:kasy_kit/core/initializer/onstart_service.dart';
-import 'package:kasy_kit/environnements.dart';
-
-final analyticsApiProvider = Provider<AnalyticsApi>(
-  (ref) => MixpanelAnalyticsApi.instance(),
-  
-);
-
-abstract class AnalyticsApi implements OnStartService {
-  /// Log an event to your analytics platform
-  Future<void> logEvent(String name, Map<String, dynamic> params);
-
-  /// Log a signout event to your analytics platform
-  Future<void> logSignout();
-
-  /// Identify a user to your analytics platform
-  Future<void> identify(User user);
-}
-
-
-class MixpanelAnalyticsApi implements AnalyticsApi {
-  final Environment environment;
-  Mixpanel? mixpanel;
-  MixpanelAnalyticsApi._({
-    required this.environment,
-  });
-
-  static MixpanelAnalyticsApi? _instance;
-
-  factory MixpanelAnalyticsApi.instance() {
-    return _instance ??= MixpanelAnalyticsApi._(
-      environment: Environment.fromEnv(),
-    );
-  }
-
-  @override
-  Future<void> init() async {
-    if (environment.mixpanelToken == null ||
-        environment.mixpanelToken!.isEmpty) {
-      return;
-    }
-    try {
-      mixpanel = await Mixpanel.init(
-        environment.mixpanelToken!,
-        trackAutomaticEvents: true,
-      );
-    } catch (e, s) {
-      debugPrint('Error initializing Mixpanel: $e\n$s');
-    }
-  }
-
-  @override
-  Future<void> logEvent(String name, Map<String, dynamic> params) async {
-    mixpanel?.track(name, properties: params);
-  }
-
-  @override
-  Future<void> logSignout() async {
-    mixpanel?.reset();
-    mixpanel?.track('logout');
-  }
-
-  @override
-  Future<void> identify(User user) async {
-    mixpanel?.track('login');
-    final userId = user.idOrNull;
-    if (userId != null) {
-      mixpanel?.identify(userId);
-    }
-  }
-}
-
-
-
-
-class AnalyticsObserver extends RouteObserver<ModalRoute<dynamic>> {
-  final AnalyticsApi analyticsApi;
-  final String? prefix;
-
-  AnalyticsObserver({
-    required this.analyticsApi,
-    this.prefix,
-  });
-
-  @override
-  void didPush(Route<dynamic> route, Route<dynamic>? previousRoute) {
-    // debugPrint('didPush $prefix${route.settings.name} ');
-    if (route.settings.name != null && prefix != null) {
-      analyticsApi.logEvent('$prefix${route.settings.name}', {});
-    } else if (route.settings.name != null && prefix == null) {
-      analyticsApi.logEvent('${route.settings.name}', {});
-    }
-  }
-
-  @override
-  void didReplace({Route<dynamic>? newRoute, Route<dynamic>? oldRoute}) {
-    // debugPrint('didReplace ${newRoute?.settings.name}');
-    if (newRoute?.settings.name != null && prefix != null) {
-      analyticsApi.logEvent('$prefix${newRoute!.settings.name!}', {});
-    } else if (newRoute?.settings.name != null && prefix == null) {
-      analyticsApi.logEvent(newRoute!.settings.name!, {});
-    }
-  }
-
-  @override
-  void didPop(Route<dynamic> route, Route<dynamic>? previousRoute) {}
-
-  @override
-  void didRemove(Route<dynamic> route, Route<dynamic>? previousRoute) {}
-
-  @override
-  void didStartUserGesture(
-    Route<dynamic> route,
-    Route<dynamic>? previousRoute,
-  ) {}
-
-  @override
-  void didStopUserGesture() {}
-}
-

package/lib/scaffold/features/ci/.github/ISSUE_TEMPLATE/BUG.es.md

@@ -1,35 +0,0 @@
----
-name: Encontré un problema.
-about: El proyecto no compila o hace crash...
-title: ''
-labels: ''
-assignees: ''
-
----
-
-## Pasos para reproducir
-
-*Describe cómo reproducir el error, proporciona un dartpad o código simple para reproducir*
-
-## Resultados esperados
-
-*Qué debería pasar*
-
-## Resultados reales
-
-*Qué ves*
-
-## Sobre tu dispositivo
-
-| Marca   | Modelo       | SO        |
-| ------- | ----------- | --------- |
-| *Apple* | *iPhone X*  | *13.6.1*  |
-
-## Tu versión de Flutter
-
-Ejecuta en la terminal:
-```flutter --version```
-
-*Pega el resultado aquí*
-
-</details>