Merge pull request #2 from deandreamatias/feature/home

Feature/home

LICENSE

@@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+    Website for dog grooming services
+    Mimos Copyright (C) 2023  Matias de Andrea
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    <program>  Copyright (C) <year>  <name of author>
+    Mimos  Copyright (C) 2023  Matias de Andrea
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

analysis_options.yaml

@@ -1,9 +1,13 @@
-include: package:flutter_lints/flutter.yaml
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
 
-analyzer:
-  exclude:
-    - fvm/
-    - lib/**/*.config.dart
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
 
 linter:
   rules:
@@ -20,6 +24,7 @@ linter:
     - literal_only_boolean_expressions
     - prefer_asserts_with_message
     - prefer_null_aware_method_calls
+    - prefer_single_quotes
     - require_trailing_commas
     - secure_pubspec_urls
     - sized_box_shrink_expand
@@ -37,3 +42,11 @@ linter:
     - use_string_buffers
     - use_super_parameters
     - prefer_final_locals
+analyzer:
+  exclude:
+    - fvm/
+    - lib/**/*.config.dart
+    - test/**/*.config.dart
+    - lib/generated_plugin_registrant.dart
+    - test/**/*.mocks.dart
+

assets/translations/en.json

@@ -1,5 +1,19 @@
 {
   "coming_soon": "Coming soon",
+  "menu": { 
+    "home": "home",
+    "about": "about",
+    "services": "services",
+    "gallery": "gallery"
+  },
+  "home": {
+    "slogan": "We take care of your pet. As if it were ours",
+    "appointment": "Make an appointment",
+    "semantic_logo": "Logo of pet grooming salon Mimos",
+    "contact_number": "123456798",
+    "contact_number_tooltip": "Open dialer and call to {}",
+    "whatsapp_tooltip": "Open whatsapp and send a message to {}"
+  },
   "errors": {
     "not_found": "No se ha encontrado el recurso",
     "server": "Error en el servidor",

assets/translations/es.json

@@ -1,5 +1,19 @@
 {
   "coming_soon": "Próximamente",
+  "menu": {
+    "home": "inicio",
+    "about": "sobre",
+    "services": "servicios",
+    "gallery": "galería"
+  },
+  "home": {
+    "slogan": "La peluquería que mima a tus mascotas. Donde cuidamos a tu peludet",
+    "appointment": "Marca tu cita",
+    "semantic_logo": "Logo de la peluquería canina Mimos",
+    "contact_number": "123456798",
+    "contact_number_tooltip": "Abrir marcador y llamar a {}",
+    "whatsapp_tooltip": "Abrir WhatsApp y enviar mensaje a {}"
+  },
   "errors": {
     "not_found": "No se ha encontrado el recurso",
     "server": "Error en el servidor",

assets/translations/pt.json

@@ -1,5 +1,19 @@
 {
   "coming_soon": "Em breve",
+  "menu": {
+    "home": "inicio",
+    "about": "sobre",
+    "services": "serviços",
+    "gallery": "galeria"
+  },
+  "home": {
+    "slogan": "La peluquería que mima a tus mascotas. Donde cuidamos a tu peludet",
+    "appointment": "Marque um horário",
+    "semantic_logo": "Logo da peluquería canina Mimos",
+    "contact_number": "123456798",
+    "contact_number_tooltip": "Abrir discador e ligar a {}",
+    "whatsapp_tooltip": "Abrir WhatsApp e enviar mensagem a {}"
+  },
   "errors": {
     "not_found": "No se ha encontrado el recurso",
     "server": "Error en el servidor",

lib/di/di.dart

@@ -10,8 +10,8 @@ final getIt = GetIt.instance;
 void configureDependencies({required String env}) =>
     getIt.init(environment: env);
 
-const dev = Environment("dev");
-const prod = Environment("prod");
+const dev = Environment('dev');
+const prod = Environment('prod');
 
 @module
 abstract class DiModule {

lib/env/constants.dart

@@ -1,3 +1,4 @@
 class Constants {
   static const String home = 'https://peluqueriacaninamimos.com/';
+  static const String phone = '+34666666666';
 }

lib/env/env.dart

@@ -12,11 +12,11 @@ abstract class Env {
 
 class EnvConfig implements Env {
   @override
-  String get packageName => const String.fromEnvironment("PACKAGE_NAME");
+  String get packageName => const String.fromEnvironment('PACKAGE_NAME');
 
   @override
-  String get urlRestService => const String.fromEnvironment("URL_REST_SERVICE");
+  String get urlRestService => const String.fromEnvironment('URL_REST_SERVICE');
 
   @override
-  String get appName => const String.fromEnvironment("APP_NAME");
+  String get appName => const String.fromEnvironment('APP_NAME');
 }

lib/main.dart

@@ -8,7 +8,7 @@ import 'package:flutter/widgets.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
 
 void main() async {
-  const String env = String.fromEnvironment("ENVIRONMENT");
+  const String env = String.fromEnvironment('ENVIRONMENT');
   configureDependencies(env: env);
 
   final widgetBindings = WidgetsFlutterBinding.ensureInitialized();

lib/ui/navigation/main_navigator.dart

@@ -1,48 +1,28 @@
+import 'package:dog_gromming_website/ui/navigation/menu_navigation.dart';
 import 'package:dog_gromming_website/ui/navigation/routes.dart';
 import 'package:dog_gromming_website/ui/widgets/screens/announcement/announcement_screen.dart';
-import 'package:dog_gromming_website/ui/widgets/screens/home/home_screen.dart';
-import 'package:dog_gromming_website/ui/widgets/screens/splash/splash_screen.dart';
 import 'package:flutter/widgets.dart';
+import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:go_router/go_router.dart';
 
-final GlobalKey<NavigatorState> rootNavigatorKey =
+final GlobalKey<NavigatorState> _rootNavigatorKey =
     GlobalKey<NavigatorState>(debugLabel: 'root');
 
 class MainNavigator {
   final GoRouter router = GoRouter(
-    navigatorKey: rootNavigatorKey,
-    initialLocation: Routes.splash,
+    navigatorKey: _rootNavigatorKey,
+    initialLocation: Routes.home,
+    redirect: (context, state) {
+      FlutterNativeSplash.remove();
+      return null;
+    },
     routes: <RouteBase>[
-      GoRoute(
-        path: Routes.splash,
-        builder: (BuildContext context, GoRouterState state) =>
-            const SplashScreen(),
-      ),
-      GoRoute(
-        path: Routes.home,
-        builder: (BuildContext context, GoRouterState state) => HomeScreen(),
-      ),
       GoRoute(
         path: Routes.announcement,
         builder: (BuildContext context, GoRouterState state) =>
             const AnnouncementScreen(),
       ),
+      menuNavigation,
     ],
   );
-
-  Future<void> navigateToSplash() {
-    return router.push(Routes.splash);
-  }
-
-  Future<void> navigateToHome() {
-    return router.push(Routes.home);
-  }
-
-  Future<void> navigateToAnnouncement() {
-    return router.push(Routes.announcement);
-  }
-
-  void pop() {
-    if (router.canPop()) router.pop();
-  }
 }

lib/ui/navigation/menu_navigation.dart

@@ -0,0 +1,48 @@
+import 'package:dog_gromming_website/ui/navigation/routes.dart';
+import 'package:dog_gromming_website/ui/widgets/screens/home/home_screen.dart';
+import 'package:dog_gromming_website/ui/widgets/screens/scaffold_with_nav_bar.dart';
+import 'package:flutter/widgets.dart';
+import 'package:go_router/go_router.dart';
+
+final GlobalKey<NavigatorState> _menuNavigatorKey =
+    GlobalKey<NavigatorState>(debugLabel: 'menu');
+
+final menuNavigation = ShellRoute(
+  navigatorKey: _menuNavigatorKey,
+  builder: (BuildContext context, GoRouterState state, Widget child) {
+    return ScaffoldWithNavBar(child: child);
+  },
+  routes: <RouteBase>[
+    GoRoute(
+      path: Routes.home,
+      builder: (BuildContext context, GoRouterState state) {
+        return const HomeScreen();
+      },
+    ),
+    GoRoute(
+      path: Routes.services,
+      builder: (BuildContext context, GoRouterState state) {
+        return const Text('Services');
+      },
+    ),
+    GoRoute(
+      path: Routes.gallery,
+      builder: (BuildContext context, GoRouterState state) {
+        return const Text('Gallery');
+      },
+    ),
+    GoRoute(
+      path: Routes.about,
+      builder: (BuildContext context, GoRouterState state) {
+        return const Text('about');
+      },
+    ),
+  ],
+);
+
+enum MenuNavigation {
+  home,
+  services,
+  gallery,
+  about,
+}

lib/ui/navigation/routes.dart

@@ -1,5 +1,24 @@
+import 'package:dog_gromming_website/ui/navigation/menu_navigation.dart';
+
 class Routes {
-  static const String splash = '/';
   static const String home = '/home';
   static const String announcement = '/announcement';
+  static const String services = '/services';
+  static const String about = '/about';
+  static const String gallery = '/gallery';
+}
+
+extension MenuRoutes on MenuNavigation {
+  String get route {
+    switch (this) {
+      case MenuNavigation.home:
+        return Routes.home;
+      case MenuNavigation.services:
+        return Routes.services;
+      case MenuNavigation.gallery:
+        return Routes.gallery;
+      case MenuNavigation.about:
+        return Routes.about;
+    }
+  }
 }

lib/ui/styles/box_shadows.dart

@@ -0,0 +1,12 @@
+import 'package:dog_gromming_website/ui/styles/app_colors.dart';
+import 'package:flutter/cupertino.dart';
+
+class BoxShadows {
+  static final List<BoxShadow> bs1 = [
+    BoxShadow(
+      color: AppColors.black.withOpacity(0.12),
+      blurRadius: 12,
+      offset: const Offset(2, 2),
+    ),
+  ];
+}

lib/ui/styles/sizes.dart

@@ -1,21 +1,24 @@
 enum Sizes {
-  small,
-  medium,
-  large,
-  extraLarge,
+  xs,
+  s,
+  m,
+  l,
+  xl,
 }
 
 extension ResponsiveSizes on Sizes {
   double get width {
     switch (this) {
-      case Sizes.small:
+      case Sizes.xs:
         return 320;
-      case Sizes.medium:
+      case Sizes.s:
         return 768;
-      case Sizes.large:
+      case Sizes.m:
         return 1024;
-      case Sizes.extraLarge:
+      case Sizes.l:
         return 1440;
+      case Sizes.xl:
+        return 1920;
       default:
         return 0;
     }

lib/ui/styles/theme.dart

@@ -5,6 +5,17 @@ import 'package:flutter/material.dart';
 final themeData = ThemeData(
   colorSchemeSeed: AppColors.primary,
   scaffoldBackgroundColor: AppColors.white,
+  elevatedButtonTheme: ElevatedButtonThemeData(
+    style: ButtonStyle(
+      backgroundColor: MaterialStateProperty.all(AppColors.secondary),
+      textStyle: MaterialStateProperty.all(TextStyles.labelLarge),
+      shape: MaterialStateProperty.all(
+        RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(56),
+        ),
+      ),
+    ),
+  ),
   textTheme: const TextTheme(
     labelLarge: TextStyles.labelLarge,
     labelMedium: TextStyles.labelMedium,