Merge pull request #181 from guyluz11/new_flow

Created a home page when entering to the app

assets/translations/en-US.json

@@ -52,5 +52,6 @@
   "break": "Take a break",
   "new_session": "Press to start a new session",
   "work_ended": "You have completed the Work session, take a break",
-  "break_ended": "Break ended, enter the app to continue to the next session"
+  "break_ended": "Break ended, enter the app to continue to the next session",
+  "home_page": "Home Page"
 }

ios/Runner/AppDelegate.swift

@@ -1,7 +1,7 @@
 import UIKit
 import Flutter
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

lib/main.dart

@@ -47,7 +47,7 @@ class MyApp extends StatelessWidget {
       localizationsDelegates: context.localizationDelegates,
       supportedLocales: context.supportedLocales,
       locale: context.locale,
-      home: IntroPage(),
+      home: HomePage(),
     );
   }
 }

lib/presentation/atoms/card_atom.dart

@@ -1,32 +1,39 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:infinite_horizons/presentation/core/theme_data.dart';
 
 class CardAtom extends StatelessWidget {
-  const CardAtom({required this.child, this.image, this.imageColor});
+  const CardAtom({required this.child, this.onClick, this.image});
 
   final Widget child;
-  final Image? image;
-  final Color? imageColor;
+  final SvgPicture? image;
+  final VoidCallback? onClick;
 
   @override
   Widget build(BuildContext context) {
-    return Card.filled(
-      margin: EdgeInsets.zero,
-      clipBehavior: Clip.hardEdge,
-      child: Column(
-        children: [
-          if (image != null)
-            Container(
-              height: 250,
-              width: double.infinity,
-              color: imageColor,
-              child: image,
+    return GestureDetector(
+      onTap: onClick,
+      child: Card.filled(
+        margin: EdgeInsets.zero,
+        clipBehavior: Clip.hardEdge,
+        child: Column(
+          children: [
+            if (image != null)
+              ClipRRect(
+                borderRadius:
+                    const BorderRadius.vertical(bottom: Radius.circular(15)),
+                child: SizedBox(
+                  height: 170,
+                  width: double.infinity,
+                  child: image,
+                ),
+              ),
+            Padding(
+              padding: const EdgeInsets.all(AppThemeData.generalSpacing),
+              child: child,
             ),
-          Padding(
-            padding: const EdgeInsets.all(AppThemeData.generalSpacing),
-            child: child,
-          ),
-        ],
+          ],
+        ),
       ),
     );
   }

lib/presentation/molecules/molecules.dart

@@ -8,5 +8,4 @@ export 'package:infinite_horizons/presentation/molecules/timer_molecule.dart';
 export 'package:infinite_horizons/presentation/molecules/toggle_switch_tile_molecule.dart';
 export 'package:infinite_horizons/presentation/molecules/top_bar_molecule.dart';
 export 'package:infinite_horizons/presentation/molecules/web_view_molecule.dart';
-export 'package:infinite_horizons/presentation/molecules/work_type_selection_molecule.dart';
 export 'package:infinite_horizons/presentation/molecules/youtube_player_molecule.dart';

lib/presentation/molecules/page_enclosure_molecule.dart

@@ -32,6 +32,7 @@ class PageEnclosureMolecule extends StatelessWidget {
 
   Widget topBarHelper() {
     return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         TopBarMolecule(
           topBarType: topBarType,
@@ -46,7 +47,7 @@ class PageEnclosureMolecule extends StatelessWidget {
             subTitle!,
             variant: TextVariant.smallTitle,
           ),
-        if (topMargin) const SeparatorAtom(variant: SeparatorVariant.farApart),
+        if (topMargin) const SeparatorAtom(),
         Expanded(
           child: child,
         ),

lib/presentation/molecules/top_bar_molecule.dart

@@ -44,9 +44,6 @@ class TopBarMolecule extends StatelessWidget {
             const SizedBox(height: 15),
             Row(
               children: [
-                const Expanded(
-                  child: SizedBox(),
-                ),
                 TextAtom(
                   title ?? '',
                   variant: TextVariant.title,

lib/presentation/organisms/organisms.dart

@@ -1,6 +1,5 @@
-export 'package:infinite_horizons/presentation/organisms/intro/tips_organism.dart';
-export 'package:infinite_horizons/presentation/organisms/intro/welcome_organism.dart';
 export 'package:infinite_horizons/presentation/organisms/permissions_organism.dart';
 export 'package:infinite_horizons/presentation/organisms/ready_for_session_organism.dart';
 export 'package:infinite_horizons/presentation/organisms/text_area_organism.dart';
 export 'package:infinite_horizons/presentation/organisms/timer_organism.dart';
+export 'package:infinite_horizons/presentation/organisms/tips_organism.dart';

lib/presentation/organisms/intro/tips_organism.dart → lib/presentation/organisms/tips_organism.dart

@@ -14,7 +14,7 @@ import 'package:universal_io/io.dart';
 class TipsOrganism extends StatefulWidget {
   const TipsOrganism(this.workType);
 
-  final String workType;
+  final TipType workType;
 
   @override
   State<TipsOrganism> createState() => _TipsOrganismState();
@@ -90,7 +90,7 @@ class _TipsOrganismState extends State<TipsOrganism> {
 
     return PageEnclosureMolecule(
       scaffold: false,
-      title: 'efficient_tips'.tr(args: [widget.workType.tr()]),
+      title: 'efficient_tips'.tr(args: [widget.workType.name.tr()]),
       subTitle: 'Select each element when complete',
       topBarTranslate: false,
       child: isDnd == null || !didPulledWakeTime