Folding scenes to folders by area

CyBear-Jinni · Feb 7, 2024 · d2889e4 · d2889e4
1 parent f4b452e
commit d2889e4
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 41 deletions.
diff --git a/lib/presentation/pages/add_new_area_page.dart b/lib/presentation/pages/add_new_area_page.dart
@@ -93,6 +93,12 @@ class _AddNewAreaFormState extends State<AddNewAreaForm> {
   Widget build(BuildContext context) {
     final Size screenSize = MediaQuery.of(context).size;
 
+    final List<AreaPurposesTypes> purposesList =
+        List.from(AreaPurposesTypes.values);
+
+    purposesList
+        .removeWhere((element) => element == AreaPurposesTypes.undefined);
+
     return MarginedExpandedAtom(
       child: Column(
         children: [
@@ -133,8 +139,8 @@ class _AddNewAreaFormState extends State<AddNewAreaForm> {
                       cancelText: const Text('CANCEL').tr(),
                       confirmText: const Text('OK').tr(),
                       title: const TextAtom('Select'),
-                      items: AreaPurposesTypes.values
-                          .map((AreaPurposesTypes areaPurposeType) {
+                      items:
+                          purposesList.map((AreaPurposesTypes areaPurposeType) {
                         final String tempAreaName = areaPurposeType.name
                             .substring(1, areaPurposeType.name.length);
                         String areaNameEdited =

diff --git a/lib/presentation/pages/home_page/home_page.dart b/lib/presentation/pages/home_page/home_page.dart
@@ -7,7 +7,7 @@ import 'package:cybearjinni/domain/connections_service.dart';
 import 'package:cybearjinni/presentation/atoms/atoms.dart';
 import 'package:cybearjinni/presentation/core/routes/app_router.gr.dart';
 import 'package:cybearjinni/presentation/molecules/molecules.dart';
-import 'package:cybearjinni/presentation/pages/home_page/tabs/scenes_in_folders_tab/scenes_in_folders_tab.dart';
+import 'package:cybearjinni/presentation/pages/home_page/tabs/scenes_in_folders_tab.dart';
 import 'package:cybearjinni/presentation/pages/home_page/tabs/smart_devices_tab/entities_by_area_tab.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
@@ -197,7 +197,7 @@ class _HomePageState extends State<HomePage> {
               },
               controller: _pageController,
               children: [
-                ScenesInFoldersTab(scenes),
+                ScenesInFoldersTab(areas: areas, scenes: scenes),
                 EntitiesByAreaTab(areas: areas!, entities: entities!),
                 // BindingsPage(),
               ],

diff --git a/...in_folders_tab/scenes_in_folders_tab.dart → ...home_page/tabs/scenes_in_folders_tab.dart b/...in_folders_tab/scenes_in_folders_tab.dart → ...home_page/tabs/scenes_in_folders_tab.dart
@@ -9,8 +9,10 @@ import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
 class ScenesInFoldersTab extends StatelessWidget {
-  const ScenesInFoldersTab(this.scenes);
+  const ScenesInFoldersTab({required this.scenes, this.areas});
+
   final HashMap<String, SceneCbjEntity>? scenes;
+  final HashMap<String, AreaEntity>? areas;
 
   Widget scenesFoldersWidget(
     BuildContext context,
@@ -88,6 +90,7 @@ class ScenesInFoldersTab extends StatelessWidget {
         ),
       );
     }
+    areas!.removeWhere((key, value) => value.scenesId.getOrCrash().isEmpty);
 
     return Column(
       children: <Widget>[
@@ -97,25 +100,20 @@ class ScenesInFoldersTab extends StatelessWidget {
           leftIconFunction: (BuildContext context) {},
         ),
         Expanded(
-          child: ScenesGridMolecule(
-            scenes: scenes!.values.toList(),
+          child: ListView.builder(
+            reverse: true,
+            padding: EdgeInsets.zero,
+            itemBuilder: (context, index) {
+              final AreaEntity sceneFolder = areas!.values.elementAt(index);
+
+              return scenesFoldersWidget(
+                context,
+                sceneFolder,
+              );
+            },
+            itemCount: areas!.length,
           ),
         ),
-        // TODO: Code for room folders
-        // Expanded(
-        //   child: ListView.builder(
-        //     reverse: true,
-        //     padding: EdgeInsets.zero,
-        //     itemBuilder: (context, index) {
-        //       final AreaEntity sceneFolder = scenes![index];
-        //       return scenesFoldersWidget(
-        //         context,
-        //         sceneFolder,
-        //       );
-        //     },
-        //     itemCount: allAreasWithScenes!.length,
-        //   ),
-        // ),
       ],
     );
   }

diff --git a/lib/presentation/pages/splash_page.dart b/lib/presentation/pages/splash_page.dart
@@ -12,7 +12,6 @@ import 'package:cybearjinni/presentation/atoms/atoms.dart';
 import 'package:cybearjinni/presentation/core/routes/app_router.gr.dart';
 import 'package:flutter/foundation.dart' show kIsWeb;
 import 'package:flutter/material.dart';
-import 'package:hexcolor/hexcolor.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 
 @RoutePage()
@@ -74,24 +73,11 @@ class _SplashPageState extends State<SplashPage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      body: Container(
-        decoration: BoxDecoration(
-          gradient: LinearGradient(
-            begin: Alignment.centerRight,
-            end: Alignment.centerLeft,
-            stops: const [0.06, 0.9],
-            colors: [
-              HexColor('#ca6ce3'),
-              HexColor('#aa5fe4'),
-            ],
-          ),
-        ),
-        child: const Center(
-          child: ImageAtom(
-            'assets/cbj_logo.png',
-            hero: 'full_logo',
-          ),
+    return const Scaffold(
+      body: Center(
+        child: ImageAtom(
+          'assets/cbj_logo.png',
+          hero: 'full_logo',
         ),
       ),
     );