Clean arch feature

lib/components/Lists/class_list.dart

@@ -1,10 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:neocloud_mobile/components/cards/class_card.dart';
-import 'package:neocloud_mobile/graphql/models/ClassModel.dart';
-import 'package:neocloud_mobile/graphql/services/class_service.dart';
+import 'package:neocloud_mobile/core/domain/entities/class_entity.dart';
 import 'package:neocloud_mobile/components/widgets.dart';
 
-class ClassList extends StatefulWidget {
+class ClassList extends StatelessWidget {
   const ClassList({
     Key? key,
     this.classList,
@@ -13,55 +12,38 @@ class ClassList extends StatefulWidget {
     this.spinnerScreeMaxHeight,
   }) : super(key: key);
 
-  final List<ClassModel>? classList;
+  final List<ClassEntity> ? classList;
   final bool showClassAvatar;
   final double bodySeparationSize;
   final double? spinnerScreeMaxHeight;
 
-  @override
-  State<ClassList> createState() => _ClassListState();
-}
-
-class _ClassListState extends State<ClassList> {
-  var classService = ClassService();
-  List<ClassModel>? dataList;
-
-  @override
-  void initState() {
-    super.initState();
-    loadData();
-  }
-
-  void loadData() {
-    if (!mounted) return;
-
-    if (widget.classList == null) {
-      classService.getClasses().then((classes) {
-        setState(() {
-          dataList = classes;
-        });
-      });
-    } else {
-      dataList = widget.classList;
-    }
-  }
 
   @override
   Widget build(BuildContext context) {
-    return dataList == null
-        ? spinnerScreen()
-        : dataList!.isEmpty
-            ? nothingWasFoundScreen(screenMaxHeight: widget.spinnerScreeMaxHeight)
-            : Column(
-                children: List.generate(
-                  dataList!.length,
-                  (index) => ClassCard(
-                    clas: dataList![index],
-                    showClassAvatar: widget.showClassAvatar,
-                    bodySeparationSize: widget.bodySeparationSize,
-                  ),
-                ),
-              );
+    return Builder(
+      builder: (context) {
+        if (classList == null){
+          return spinnerScreen(context: context);
+        }
+        if (classList!.isEmpty) {
+          return nothingWasFoundScreen(context: context, screenMaxHeight: spinnerScreeMaxHeight);
+        }
+
+        if (classList != null) {
+          return Column(
+            children: List.generate(
+              classList!.length,
+              (index) => ClassCard(
+                clas: classList![index],
+                showClassAvatar: showClassAvatar,
+                bodySeparationSize: bodySeparationSize,
+              ),
+            ),
+          );
+        }
+        return Text('fix', style: Theme.of(context).textTheme.bodyMedium,);
+      },
+    );    
   }
 
 

lib/components/Lists/class_schedule_list.dart

@@ -1,14 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:neocloud_mobile/components/cards/class_schedule_card.dart';
-import 'package:neocloud_mobile/graphql/models/ClassScheduleModel.dart';
-import 'package:neocloud_mobile/graphql/services/class_schedule_service.dart';
+import 'package:neocloud_mobile/core/data/data_sources/remote/class_schedule_service.dart';
+import 'package:neocloud_mobile/core/domain/entities/class_schedule_entity.dart';
 
 import '../widgets.dart';
 
 class ClassSchedulesList extends StatefulWidget {
   const ClassSchedulesList({super.key, this.classScheduleList, this.spinnerScreeMaxHeight});
 
-  final List<ClassScheduleModel>? classScheduleList;
+  final List<ClassScheduleEntity>? classScheduleList;
   final double? spinnerScreeMaxHeight;
 
   @override
@@ -17,7 +17,7 @@ class ClassSchedulesList extends StatefulWidget {
 
 class _ClassSchedulesListState extends State<ClassSchedulesList> {
   var classSchedule = ClassScheduleService();
-  List<ClassScheduleModel>? dataList;
+  List<ClassScheduleEntity>? dataList;
 
   @override
   void initState() {
@@ -40,9 +40,9 @@ class _ClassSchedulesListState extends State<ClassSchedulesList> {
   @override
   Widget build(BuildContext context) {
     return dataList == null
-        ? spinnerScreen(screenMaxHeight: widget.spinnerScreeMaxHeight)
+        ? spinnerScreen(context: context, screenMaxHeight: widget.spinnerScreeMaxHeight)
         : dataList!.isEmpty
-            ? nothingWasFoundScreen(screenMaxHeight: widget.spinnerScreeMaxHeight)
+            ? nothingWasFoundScreen(context: context, screenMaxHeight: widget.spinnerScreeMaxHeight)
             : Column(
                 children: List.generate(
                   dataList!.length,

lib/components/Lists/class_works_list.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:neocloud_mobile/components/cards/class_works_card.dart';
-import 'package:neocloud_mobile/graphql/models/ClassworkModel.dart';
-import 'package:neocloud_mobile/graphql/services/classwork_service.dart';
+import 'package:neocloud_mobile/core/data/data_sources/remote/classwork_service.dart';
+import 'package:neocloud_mobile/core/domain/entities/classwork_entity.dart';
 
 import '../widgets.dart';
 
@@ -13,7 +13,7 @@ class ClassworksList extends StatefulWidget {
     this.spinnerScreeMaxHeight
   }) : super(key: key);
 
-  final List<ClassworkModel>? classworkList;
+  final List<ClassworkEntity>? classworkList;
   final bool showFeedback;
   final double? spinnerScreeMaxHeight;
 
@@ -23,7 +23,7 @@ class ClassworksList extends StatefulWidget {
 
 class _ClassworksListState extends State<ClassworksList> {
   var classworkService = ClassworkService();
-  List<ClassworkModel>? dataList;
+  List<ClassworkEntity>? dataList;
 
   @override
   void initState() {
@@ -48,9 +48,9 @@ class _ClassworksListState extends State<ClassworksList> {
   @override
   Widget build(BuildContext context) {
     return dataList == null
-        ? spinnerScreen(screenMaxHeight: widget.spinnerScreeMaxHeight)
+        ? spinnerScreen(context: context, screenMaxHeight: widget.spinnerScreeMaxHeight)
         : dataList!.isEmpty
-            ? nothingWasFoundScreen(screenMaxHeight: widget.spinnerScreeMaxHeight)
+            ? nothingWasFoundScreen(context: context, screenMaxHeight: widget.spinnerScreeMaxHeight)
             : Column(
                 children: List.generate(
                   dataList!.length,

lib/components/Lists/faculty_list.dart

@@ -1,16 +1,16 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:neocloud_mobile/components/cards/faculty_card.dart';
-import 'package:neocloud_mobile/graphql/models/FacultyModel.dart';
-import 'package:neocloud_mobile/graphql/services/faculty_service.dart';
+import 'package:neocloud_mobile/core/data/data_sources/remote/faculty_service.dart';
+import 'package:neocloud_mobile/core/domain/entities/faculty_entity.dart';
 import 'package:neocloud_mobile/models/Faculty.dart';
 
 import '../widgets.dart';
 
 class FacultyList extends StatefulWidget {
   const FacultyList({Key? key, this.facultyList, this.spinnerScreeMaxHeight}) : super(key: key);
 
-  final List<FacultyModel>? facultyList;
+  final List<FacultyEntity>? facultyList;
   final double? spinnerScreeMaxHeight;
 
   @override
@@ -20,7 +20,7 @@ class FacultyList extends StatefulWidget {
 // (){} "" <> ? _ ! *
 class _FacultyListState extends State<FacultyList> {
   var facultyService = FacultyService();
-  List<FacultyModel>? dataList;
+  List<FacultyEntity>? dataList;
 
   @override
   void initState() {
@@ -49,9 +49,9 @@ class _FacultyListState extends State<FacultyList> {
     //     (index) => FacultyCard(faculty: facultiesList[index])),
     // );
     return dataList == null
-        ? spinnerScreen(screenMaxHeight: widget.spinnerScreeMaxHeight)
+        ? spinnerScreen(context: context, screenMaxHeight: widget.spinnerScreeMaxHeight)
         : dataList!.isEmpty
-            ? nothingWasFoundScreen(screenMaxHeight: widget.spinnerScreeMaxHeight)
+            ? nothingWasFoundScreen(context: context, screenMaxHeight: widget.spinnerScreeMaxHeight)
             : Column(
                 children: List.generate(
                   facultiesList.length,

lib/components/Lists/user_list.dart

@@ -1,66 +1,25 @@
 import 'package:flutter/material.dart';
-import 'package:neocloud_mobile/components/tile/tiles.dart';
-import 'package:neocloud_mobile/graphql/models/UserModel.dart';
-import 'package:neocloud_mobile/graphql/services/user_service.dart';
-import 'package:neocloud_mobile/screens/Profile/profile_sceen.dart';
-
+import 'package:neocloud_mobile/components/tile/user_tile.dart';
+import 'package:neocloud_mobile/core/domain/entities/user_entity.dart';
 import '../widgets.dart';
 
-class UserList extends StatefulWidget {
-  const UserList({
-    super.key,
-    this.usersList,
-    this.spinnerScreeMaxHeight
-  });
+class UserList extends StatelessWidget {
+  const UserList({super.key, this.users, this.spinnerScreeMaxHeight});
 
-  final List<UserModel>? usersList;
+  final List<UserEntity>? users;
   final double? spinnerScreeMaxHeight;
 
-  @override
-  State<UserList> createState() => _UserListState();
-}
-
-class _UserListState extends State<UserList> {
-  var userService = UserService();
-  List<UserModel>? dataList;
-
-  @override
-  void initState() {
-    super.initState();
-    loadData();
-  }
-
-  void loadData() {
-    if (!mounted) return; 
-
-    if (widget.usersList == null) {
-      userService.getUsers().then((users) {
-      setState(() { dataList = users; });
-    });
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
-    if (widget.usersList != null) { dataList = widget.usersList; }
-
-    return dataList == null
-        ? spinnerScreen(screenMaxHeight: widget.spinnerScreeMaxHeight)
-        : dataList!.isEmpty
-            ? nothingWasFoundScreen(screenMaxHeight: widget.spinnerScreeMaxHeight)
-            : Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: List.generate(
-                  dataList!.length,
-                  (index) => GestureDetector(
-                    onTap: () => Navigator.push(context, MaterialPageRoute(builder: (context) => ProfileScreen(user: dataList![index]),)),
-                    child: UserTile(
-                      user: dataList![index]
-                    ),
-                  ),
-                ),
-              );
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: List.generate(
+        users!.length,
+        (index) => GestureDetector(
+          // onTap: () => Navigator.push(context, MaterialPageRoute(builder: (context) => ProfileScreen(user: dataList![index]),)),
+          child: UserTile(user: users![index]),
+        ),
+      ),
+    );
   }
-
-  toList() {}
 }

lib/components/appbar/actions.dart

@@ -8,17 +8,13 @@ class actionUserButton extends StatelessWidget {
     super.key,
     this.icon,
     this.svg,
-    this.isDark = false,
     this.routeWidget,
   });
 
   // either <svg> or <icon> is required for in other for something
   // to be displayed
   final IconData? icon;
   final String? svg;
-  // action button is dark when this <isDark> is true and white when <isDark>
-  // is false
-  final bool isDark;
   // the route to be navigated to when this action button is clicked on
   final String routeName;
   // 
@@ -41,8 +37,8 @@ class actionUserButton extends StatelessWidget {
           color: Colors.transparent,
           padding: EdgeInsets.symmetric(horizontal: defaultSize * 2),
           child: svg != null
-            ? IconOrSvg(svg: svg!, color: isDark ? kBlack80 : kWhite, size: defaultSize * 2.5,)
-            : IconOrSvg(icon: icon!, color: isDark ? kBlack80 : kWhite, size: defaultSize * 2.5),
+            ? IconOrSvg(svg: svg!, size: defaultSize * 2.5,)
+            : IconOrSvg(icon: icon!, size: defaultSize * 2.5),
         )
     );
   }