Merge pull request #59 from Caeli-technologies/dev

version 8.0.0
Caeli-technologies · Mar 4, 2024 · b29b243 · b29b243
2 parents 20d80c7 + 6b59a24
commit b29b243
Show file tree

Hide file tree

Showing 104 changed files with 774 additions and 1,495 deletions.
diff --git a/assets/image/homepage/Cream_Black.jpg b/assets/image/homepage/Cream_Black.jpg
diff --git a/assets/image/homepage/Digitale_infomarkt_25_mei_2024.jpg b/assets/image/homepage/Digitale_infomarkt_25_mei_2024.jpg
diff --git a/assets/image/homepage/afscheid_bestuur_rotex.jpg b/assets/image/homepage/afscheid_bestuur_rotex.jpg
diff --git a/.../image/homepage/barbara_with_students.jpg → ...omepage/archive/barbara_with_students.jpg b/.../image/homepage/barbara_with_students.jpg → ...omepage/archive/barbara_with_students.jpg
diff --git a/...page/digitale_informatie_ochtend_2024.jpg → ...hive/digitale_informatie_ochtend_2024.jpg b/...page/digitale_informatie_ochtend_2024.jpg → ...hive/digitale_informatie_ochtend_2024.jpg
diff --git a/assets/image/homepage/saying_goodby.jpg → .../image/homepage/archive/saying_goodby.jpg b/assets/image/homepage/saying_goodby.jpg → .../image/homepage/archive/saying_goodby.jpg
diff --git a/assets/image/homepage/saying_goodby_2.jpeg → ...age/homepage/archive/saying_goodby_2.jpeg b/assets/image/homepage/saying_goodby_2.jpeg → ...age/homepage/archive/saying_goodby_2.jpeg
diff --git a/.../image/homepage/selectiedag_8_oktober.png → ...omepage/archive/selectiedag_8_oktober.png b/.../image/homepage/selectiedag_8_oktober.png → ...omepage/archive/selectiedag_8_oktober.png
diff --git a/assets/image/homepage/shelterbox.jpg → assets/image/homepage/archive/shelterbox.jpg b/assets/image/homepage/shelterbox.jpg → assets/image/homepage/archive/shelterbox.jpg
diff --git a/assets/image/homepage/together.jpg → assets/image/homepage/archive/together.jpg b/assets/image/homepage/together.jpg → assets/image/homepage/archive/together.jpg
diff --git a/...ge/homepage/PHOTO-2023-11-16-20-04-48.jpg → assets/image/homepage/class_2024.jpg b/...ge/homepage/PHOTO-2023-11-16-20-04-48.jpg → assets/image/homepage/class_2024.jpg
diff --git a/assets/image/homepage/prebounds_in_action.jpg b/assets/image/homepage/prebounds_in_action.jpg
diff --git a/assets/website files/news.json b/assets/website files/news.json
@@ -1,5 +1,13 @@
 {
     "news": [
+        {
+            "id": 9,
+            "images": "https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/news/nieuwsbrief-najaar-2023.png",
+            "pdf": "https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/news/nieuwsbrief-najaar-2023-def.pdf",
+            "title": "Nieuwsbrief Najaar 2023",
+            "description": "",
+            "isPdf": "yes"
+        },
         {
             "id": 8,
             "images": "https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/images/news/nieuwsbrief-voorjaar-2023.png",

diff --git a/lib/core/presentation/pages/inbounds_students_details_page.dart b/lib/core/presentation/pages/inbounds_students_details_page.dart
@@ -36,7 +36,6 @@ class InboundsDetails extends StatelessWidget {
         leading: UniformBackButton(),
         title: Text(
           'Student Profile',
-          textScaleFactor: 1.2,
           style: TextStyle(color: Palette.indigo, fontWeight: FontWeight.bold),
         ),
       ),

diff --git a/lib/core/presentation/pages/organization_contact_details_page.dart b/lib/core/presentation/pages/organization_contact_details_page.dart
@@ -41,7 +41,7 @@ class OrganizationDetails extends StatelessWidget {
         leading: UniformBackButton(),
         title: Text(
           'Organization',
-          textScaleFactor: 1.4,
+          textScaler: TextScaler.linear(1.4),
           style: TextStyle(color: Palette.indigo, fontWeight: FontWeight.bold),
         ),
       ),

diff --git a/lib/core/presentation/pages/pdf_viewer_share.dart b/lib/core/presentation/pages/pdf_viewer_share.dart
@@ -73,10 +73,9 @@ class _PDFPageWithShareState extends State<PDFPageWithShare> {
   Widget build(BuildContext context) {
     return Scaffold(
         appBar: AppBar(
-          systemOverlayStyle:
-              MediaQuery.of(context).platformBrightness == Brightness.light
-                  ? SystemUiOverlayStyle.dark
-                  : SystemUiOverlayStyle.light,
+          systemOverlayStyle: SystemUiOverlayStyle(
+            statusBarBrightness: MediaQuery.of(context).platformBrightness,
+          ),
           backgroundColor: Colors.transparent,
           elevation: 0.0,
           leading: UniformBackButton(),

diff --git a/lib/core/presentation/pages/rotex_contact_details_page.dart b/lib/core/presentation/pages/rotex_contact_details_page.dart
@@ -33,7 +33,7 @@ class RotexDetails extends StatelessWidget {
         leading: UniformBackButton(),
         title: Text(
           'Rotex',
-          textScaleFactor: 1.4,
+          textScaler: TextScaler.linear(1.4),
           style: TextStyle(color: Palette.indigo, fontWeight: FontWeight.bold),
         ),
       ),

diff --git a/lib/core/presentation/widgets/photo_gallery/gallery_view.dart b/lib/core/presentation/widgets/photo_gallery/gallery_view.dart
@@ -65,16 +65,15 @@ class _GalleryViewPageState extends State<GalleryViewPage> {
   Widget build(BuildContext context) {
     return Scaffold(
         appBar: AppBar(
-          systemOverlayStyle:
-              MediaQuery.of(context).platformBrightness == Brightness.light
-                  ? SystemUiOverlayStyle.dark
-                  : SystemUiOverlayStyle.light,
+          systemOverlayStyle: SystemUiOverlayStyle(
+            statusBarBrightness: MediaQuery.of(context).platformBrightness,
+          ),
           backgroundColor: Colors.transparent,
           elevation: 0.0,
           leading: UniformBackButton(),
           title: Text(
             'Gallery View',
-            textScaleFactor: 1.2,
+            textScaler: TextScaler.linear(1.2),
             style:
                 TextStyle(color: Palette.indigo, fontWeight: FontWeight.bold),
           ),

diff --git a/lib/features/about/presentation/pages/about_page.dart b/lib/features/about/presentation/pages/about_page.dart
@@ -24,7 +24,7 @@ class _AboutPageState extends State<AboutPage> {
         centerTitle: false,
         title: Text(
           'About Us',
-          textScaleFactor: 1.7,
+          textScaler: TextScaler.linear(1.7),
           style: TextStyle(color: Palette.indigo, fontWeight: FontWeight.bold),
         ),
       ),

diff --git a/lib/features/calendar/presentation/pages/events_page.dart b/lib/features/calendar/presentation/pages/events_page.dart
@@ -114,16 +114,15 @@ class _CalendarPageState extends State<CalendarPage> {
     print(kEvents.length);
     return Scaffold(
         appBar: AppBar(
-          systemOverlayStyle:
-              MediaQuery.of(context).platformBrightness == Brightness.light
-                  ? SystemUiOverlayStyle.dark
-                  : SystemUiOverlayStyle.light,
+          systemOverlayStyle: SystemUiOverlayStyle(
+            statusBarBrightness: MediaQuery.of(context).platformBrightness,
+          ),
           backgroundColor: Colors.transparent,
           elevation: 0.0,
           leading: UniformBackButton(),
           title: Text(
             'Calendar',
-            textScaleFactor: 1.4,
+            textScaler: TextScaler.linear(1.4),
             style:
                 TextStyle(color: Palette.indigo, fontWeight: FontWeight.bold),
           ),

diff --git a/lib/features/contact/presentation/pages/contact_page.dart b/lib/features/contact/presentation/pages/contact_page.dart
@@ -30,16 +30,15 @@ class _ContactPageState extends State<ContactPage> {
       length: 4,
       child: Scaffold(
         appBar: AppBar(
-          systemOverlayStyle:
-              MediaQuery.of(context).platformBrightness == Brightness.light
-                  ? SystemUiOverlayStyle.dark
-                  : SystemUiOverlayStyle.light,
+          systemOverlayStyle: SystemUiOverlayStyle(
+            statusBarBrightness: MediaQuery.of(context).platformBrightness,
+          ),
           backgroundColor: Colors.transparent,
           elevation: 0.0,
           centerTitle: false,
           title: Text(
             'Contact List',
-            textScaleFactor: 1.7,
+            textScaler: TextScaler.linear(1.7),
             style:
                 TextStyle(color: Palette.indigo, fontWeight: FontWeight.bold),
           ),

diff --git a/lib/features/emergency/presentation/pages/emergency_page.dart b/lib/features/emergency/presentation/pages/emergency_page.dart
@@ -17,16 +17,15 @@ class _EmergencyPageState extends State<EmergencyPage> {
   Widget build(BuildContext context) {
     return Scaffold(
         appBar: AppBar(
-          systemOverlayStyle:
-              MediaQuery.of(context).platformBrightness == Brightness.light
-                  ? SystemUiOverlayStyle.dark
-                  : SystemUiOverlayStyle.light,
+          systemOverlayStyle: SystemUiOverlayStyle(
+            statusBarBrightness: MediaQuery.of(context).platformBrightness,
+          ),
           backgroundColor: Colors.transparent,
           elevation: 0.0,
           centerTitle: false,
           title: Text(
             'Emergency',
-            textScaleFactor: 1.7,
+            textScaler: TextScaler.linear(1.7),
             style:
                 TextStyle(color: Palette.indigo, fontWeight: FontWeight.bold),
           ),

diff --git a/lib/features/forRotaryClubs/presentation/pages/AlgemeneInformatie/algemeneInfo.dart b/lib/features/forRotaryClubs/presentation/pages/AlgemeneInformatie/algemeneInfo.dart
@@ -25,7 +25,7 @@ class _AlgemeneInfoPageState extends State<AlgemeneInfoPage> {
         leading: UniformBackButton(),
         title: Text(
           'Algemene Informatie',
-          textScaleFactor: 1,
+          textScaler: TextScaler.linear(1),
           style: TextStyle(color: Palette.indigo, fontWeight: FontWeight.bold),
         ),
       ),

diff --git a/lib/features/forRotaryClubs/presentation/pages/InfoCounselor/InfoCounselor.dart b/lib/features/forRotaryClubs/presentation/pages/InfoCounselor/InfoCounselor.dart
@@ -7,7 +7,6 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
 // 🌎 Project imports:
 import 'package:rotary_nl_rye/core/presentation/pages/pdf_viewer_share.dart';
-import 'package:rotary_nl_rye/core/presentation/widgets/show_alert_dialog.dart';
 import 'package:rotary_nl_rye/core/prop.dart';
 import 'package:rotary_nl_rye/features/uniform_widgets/back_button.dart';
 
@@ -17,146 +16,66 @@ class InfoCounselorPage extends StatefulWidget {
 }
 
 class _InfoCounselorPageState extends State<InfoCounselorPage> {
+  final List<Map<String, dynamic>> infoOptions = [
+    {
+      'title': 'Handboek Counselor',
+      'icon': FontAwesomeIcons.handsHoldingChild,
+      'page': PDFPageWithShare(
+          pdfUrl:
+              'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/rotary-club-info/2024/handboek-counselor-versie-2024-2025-def.pdf'),
+    },
+    {
+      'title': 'First Night Questions',
+      'icon': FontAwesomeIcons.question,
+      'page': PDFPageWithShare(
+          pdfUrl:
+              'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/rotary-club-info/questions-first-night-host-family.pdf'),
+    },
+    {
+      'title': 'Travel rules within and outside the Netherlands',
+      'icon': FontAwesomeIcons.personWalkingLuggage,
+      'page': PDFPageWithShare(
+          pdfUrl:
+              'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/rotary-club-info/2024/travel-rules-within-and-outside-the-netherlands-2024-2025.pdf'),
+    },
+    // Add more options as needed
+  ];
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        systemOverlayStyle:
-            MediaQuery.of(context).platformBrightness == Brightness.light
-                ? SystemUiOverlayStyle.dark
-                : SystemUiOverlayStyle.light,
+        systemOverlayStyle: SystemUiOverlayStyle(
+          statusBarBrightness: MediaQuery.of(context).platformBrightness,
+        ),
         backgroundColor: Colors.transparent,
         elevation: 0.0,
         leading: UniformBackButton(),
         title: Text(
           'Info Counselor',
-          textScaleFactor: 1.2,
+          textScaler: TextScaler.linear(1.2),
           style: TextStyle(color: Palette.indigo, fontWeight: FontWeight.bold),
         ),
       ),
-      body: ListView(
-        shrinkWrap: true,
-        scrollDirection: Axis.vertical,
-        children: <Widget>[
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: <Widget>[
-              Divider(
-                height: 15,
-                thickness: 2,
-              ),
-              buildInboundOptionRow(
-                context,
-                'Draaiboek Counselor',
-                FontAwesomeIcons.handsHoldingChild,
-                PDFPageWithShare(
-                  pdfUrl:
-                      'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/rotary-club-info/2023/draaiboek-counselor-versie-2023.pdf',
-                ),
-              ),
-              Divider(
-                height: 15,
-                thickness: 2,
-              ),
-
-              buildInboundOptionRow(
-                context,
-                'First Night Questions',
-                FontAwesomeIcons.question,
-                PDFPageWithShare(
-                  pdfUrl:
-                      'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/rotary-club-info/questions-first-night-host-family.pdf',
-                ),
-              ),
-              Divider(
-                height: 15,
-                thickness: 2,
-              ),
-
-              buildInboundOptionRow(
-                context,
-                'Travel rules within and outside the Netherlands',
-                FontAwesomeIcons.personWalkingLuggage,
-                PDFPageWithShare(
-                  pdfUrl:
-                      'https://www.rotary.nl/yep/yep-app/tu4w6b3-6436ie5-63h0jf-9i639i4-t3mf67-uhdrs/rotary-club-info/2023/travel-rules-within-and-outside-the-netherlands-2023-2024.pdf',
-                ),
-              ),
-              Divider(
-                height: 15,
-                thickness: 2,
-              ),
-
-              // the end
-              SizedBox(
-                height: 20,
+      body: ListView.builder(
+        itemCount: infoOptions.length,
+        itemBuilder: (BuildContext context, int index) {
+          Map<String, dynamic> option = infoOptions[index];
+          return Column(
+            children: [
+              ListTile(
+                leading: FaIcon(option['icon'], color: Palette.lightIndigo),
+                title: Text(option['title'],
+                    style: TextStyle(color: Palette.grey)),
+                onTap: () => Navigator.push(context,
+                    MaterialPageRoute(builder: (context) => option['page'])),
+                trailing: Icon(Icons.arrow_forward_ios, color: Palette.grey),
               ),
+              Divider(height: 20, thickness: 2),
             ],
-          )
-        ],
-      ),
-    );
-  }
-
-  GestureDetector buildInboundOptionRow(
-    BuildContext context,
-    String title,
-    IconData icon,
-    pushTo,
-  ) {
-    return GestureDetector(
-        child: Padding(
-      padding: EdgeInsets.only(top: 8.0, bottom: 8.0, left: 8.0),
-      child: ListTile(
-        leading: Padding(
-          padding: EdgeInsets.zero,
-          child: Container(
-            child: FaIcon(
-              icon,
-              color: Palette.lightIndigo,
-              size: 27,
-            ),
-          ),
-        ),
-        title: Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: <Widget>[
-            SizedBox(
-              width: Device.width - 130,
-              child: Text(title,
-                  maxLines: 2,
-                  overflow: TextOverflow.ellipsis,
-                  softWrap: false,
-                  style: TextStyle(
-                    fontSize: 15,
-                    color: Palette.grey,
-                    fontWeight: FontWeight.w500,
-                  )),
-            ),
-            Icon(
-              Icons.arrow_forward_ios,
-              color: Palette.grey,
-            ),
-          ],
-        ),
-        onTap: () {
-          if (pushTo != null) {
-            Navigator.push(
-              context,
-              MaterialPageRoute(builder: (context) => pushTo),
-            );
-          } else {
-            String title = 'Comming soon';
-            String message = 'This page is not yet ready';
-            showMaterialDialog(
-              context,
-              title,
-              message,
-              null,
-            );
-          }
+          );
         },
       ),
-    ));
+    );
   }
 }