Nollning 26 quest screen

lib/main.dart

@@ -4,17 +4,14 @@ import 'package:fsek_mobile/app.dart';
 import 'package:bloc/bloc.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:fsek_mobile/screens/home/nollningHome26.dart';
 import 'package:fsek_mobile/screens/moose_game/moose_game.dart';
 import 'package:fsek_mobile/screens/news/news.dart';
 import 'package:fsek_mobile/screens/calendar/calendar.dart';
-import 'package:fsek_mobile/screens/nollning/nolleguide/manners.dart';
-import 'package:fsek_mobile/screens/nollning/nolleguide/people.dart';
-import 'package:fsek_mobile/screens/nollning/nolleguide-24/wordlist.dart';
 import 'package:fsek_mobile/screens/other/other.dart';
 import 'package:fsek_mobile/models/destination.dart';
 import 'package:fsek_mobile/screens/nollning/adventure_missions.dart';
 import 'package:fsek_mobile/screens/nollning/emergency_contacts.dart';
-import 'package:fsek_mobile/screens/nollning/nolleguide/nolleguide.dart';
 import 'package:fsek_mobile/screens/songbook/songbook.dart';
 import 'package:fsek_mobile/screens/home/home.dart';
 import 'package:fsek_mobile/services/navigation.service.dart';
@@ -42,8 +39,8 @@ void main() async {
     Destination(0, Icons.feed_outlined, NewsPage()),
     Destination(1, Icons.calendar_today, Calendar()),
     // During introduction, modify NollningHomePage() and comment the normal HomePage()
-    // Destination(2, Icons.home, NollningHomePage()),
-    Destination(2, Icons.home, HomePage()),
+    Destination(2, Icons.home, NollningHomePage()),
+    // Destination(2, Icons.home, HomePage()),
     Destination(3, CustomIcons.moose, MooseGamePage()),
     Destination(4, Icons.list, OtherContent()),
   ];
@@ -53,11 +50,7 @@ void main() async {
     '/adventure_missions': (context) => AdventureMissionsPage(),
     '/emergency_contacts': (context) => EmergencyContactsPage(),
     '/song_book': (context) => SongbookPage(),
-    '/homepage': (context) => HomePage(),
-    '/nolleguide': (context) => GuidePage(),
-    '/manners': (context) => MannersPage(),
-    '/people': (context) => PeoplePage(),
-    '/wordlist': (context) => WordListOldPage(),
+    '/homepage': (context) => HomePage()
   };
   // This captures errors reported by the Flutter framework.
   FlutterError.onError = (FlutterErrorDetails details) {

lib/screens/calendar/calendar.dart

@@ -46,19 +46,28 @@ class _CalendarState extends State<Calendar> {
             }));
   }
 
-  Widget checkAlcoholEventType(String alcType){
+  Widget checkAlcoholEventType(String alcType, {bool isIcon = false}){
     final String alcServed = "assets/data/nollning_25/calendar/alkfullImg.png";
     final String noAlc = "assets/data/nollning_25/calendar/alkfriImg.png";
     final String byob = "assets/data/nollning_25/calendar/byobImg.png";
+    final String alcServedIcon = "assets/data/nollning_25/calendar/alkfullIcon.png";
+    final String noAlcIcon = "assets/data/nollning_25/calendar/alkfriIcon.png";
+    final String byobIcon = "assets/data/nollning_25/calendar/byobIcon.png";
 
     switch (alcType) {
       case "Alcohol-Served":
+        if (isIcon) return Image.asset(alcServedIcon, fit: BoxFit.fill);
+
         return Image.asset(alcServed, fit: BoxFit.fill);
 
       case "Alcohol":
+        if (isIcon) return Image.asset(byobIcon, fit: BoxFit.fill);
+
         return Image.asset(byob, fit: BoxFit.fill);
 
       default:
+        if (isIcon) return Image.asset(noAlcIcon, fit: BoxFit.fill);
+
         return Image.asset(noAlc, fit: BoxFit.fill);
     }
   }
@@ -284,6 +293,37 @@ class _CalendarState extends State<Calendar> {
                   eventLoader: (day) {
                     return _getEventsForDay(day);
                   },
+                  calendarBuilders: CalendarBuilders<EventRead>(
+                    markerBuilder: (context, day, events) {
+                      if (events.isEmpty) return null;
+
+                      final defaultMarkerAnon = (Color color) => Container(
+                        width: 8,
+                        height: 8,
+                        margin: const EdgeInsets.all(1),
+                        decoration: BoxDecoration(
+                          color: color,
+                          shape: BoxShape.circle,
+                        ),
+                      );
+
+                      return Row(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: events.map((event) {
+                          if (!event.isNollningEvent) {
+                            return defaultMarkerAnon(Theme.of(context).colorScheme.inverseSurface);
+                          }
+
+                          return Container(
+                            width: 13,
+                            height: 13,
+                            margin: EdgeInsets.all(1),
+                            child: checkAlcoholEventType(event.alcoholEventType, isIcon: true),
+                          );
+                        }).toList(),
+                      );
+                    },
+                  ),
                 ),
                 Container(
                   alignment: Alignment.centerLeft,

lib/screens/home/nollningHome26.dart

@@ -0,0 +1,134 @@
+import 'package:flutter/material.dart';
+import 'package:fsek_mobile/l10n/app_localizations.dart';
+import 'package:fsek_mobile/screens/nollning/emergency_contacts.dart';
+import 'package:fsek_mobile/screens/nollning/map_page.dart';
+import 'package:fsek_mobile/screens/nollning/nolleguide_26/nolleguide_home.dart';
+import 'package:fsek_mobile/screens/nollning/questscreen_26/quest_home.dart';
+import 'package:fsek_mobile/screens/nollning/schedule.dart';
+import 'package:fsek_mobile/screens/songbook/songbook.dart';
+
+class NollningHomePage extends StatefulWidget {
+  static const routeName = '/homepage';
+
+  @override
+  _NollningHomePageState createState() => _NollningHomePageState();
+}
+
+class _NollningHomePageState extends State<NollningHomePage> {
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  Widget build(BuildContext context) {
+    var t = AppLocalizations.of(context)!;
+
+    double screenWidth = MediaQuery.of(context).size.width;
+    double screenHeight = MediaQuery.of(context).size.height;
+
+    const int buttonSize = 5; // The higher the number the smaller the button
+    const double buttonSpace = 30; // The space between the buttons
+    const double bottomMargin = 30; // The margin from the navbar
+
+    const String backgroundImage = "assets/data/nollning_26/homescreen/background.png";
+    const String buttonImage = "assets/data/nollning_26/homescreen/button.png";
+
+    return Container(
+      child: Stack(children: [
+        Positioned.fill(child: Image.asset(backgroundImage, fit: BoxFit.fill)),
+        Align(alignment: Alignment.topCenter, child: Text("En nollning på ny nivå!", style: TextStyle(color: Colors.white),),),
+        Align(alignment: Alignment.bottomCenter, child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+          crossAxisAlignment: CrossAxisAlignment.end,
+          children: [
+            Padding(padding: EdgeInsets.only(bottom: bottomMargin),
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.end,
+                children: [
+                  Container(
+                    width: screenWidth / buttonSize,
+                    child: InkWell(
+                      onTap: () => (Navigator.push(context, MaterialPageRoute(builder: (context) => NolleGuideHomePage()))),
+                      child: generateButton(buttonImage, "Nolle-\nguiden"),
+                    ),
+                  ),
+                  SizedBox(
+                    height: buttonSpace,
+                  ),
+                  Container(
+                    width: screenWidth / buttonSize,
+                    child: InkWell(
+                      onTap: () => (Navigator.push(context, MaterialPageRoute(builder: (context) => ScheduleScreenPage()))),
+                      child: generateButton(buttonImage, "Schema"),
+                    ),
+                  )
+                ],
+              ),
+            ),
+            Padding(padding: EdgeInsets.only(bottom: bottomMargin),
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.end,
+                children: [
+                  Container(
+                    width: screenWidth / buttonSize,
+                    child: InkWell(
+                      onTap: () => (Navigator.push(context, MaterialPageRoute(builder: (context) => EmergencyContactsPage()))),
+                      child: generateButton(buttonImage, "Kontakt"),
+                    ),
+                  ),
+                  SizedBox(
+                    height: buttonSpace,
+                  ),
+                  Container(
+                    width: screenWidth / buttonSize,
+                    child: InkWell(
+                      onTap: () => (Navigator.push(context, MaterialPageRoute(builder: (context) => QuestHomeScreen()))),
+                      child: generateButton(buttonImage, "Side\nQuest"),
+                    ),
+                  )
+                ],
+              ),
+            ),
+            Padding(padding: EdgeInsets.only(bottom: bottomMargin),
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.end,
+                children: [
+                  Container(
+                    width: screenWidth / buttonSize,
+                    child: InkWell(
+                      onTap: () => (Navigator.push(context, MaterialPageRoute(builder: (context) => SongbookPage()))),
+                      child: generateButton(buttonImage, "Sångbok"),
+                    ),
+                  ),
+                  SizedBox(
+                    height: buttonSpace,
+                  ),
+                  Container(
+                    width: screenWidth / buttonSize,
+                    child: InkWell(
+                      onTap: () => (Navigator.push(context, MaterialPageRoute(builder: (context) => MapView()))),
+                      child: generateButton(buttonImage, "Karta"),
+                    ),
+                  )
+                ],
+              ),
+            ),
+          ],
+        ),)
+      ],),
+    );
+  }
+
+  Widget generateButton(String imagePath, String text) {
+    return Stack(
+      alignment: Alignment.center,
+      children: [
+        Image.asset(imagePath),
+        Text(
+          text,
+          style: TextStyle(color: Colors.black),
+        )
+      ],
+    );
+  }
+}

lib/screens/nollning/adventure_missions_new.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:fsek_mobile/screens/nollning/adventure_missions_tab_new.dart';
 import 'package:fsek_mobile/screens/nollning/highscore_tab_new.dart';
-import 'package:fsek_mobile/screens/nollning/questscreen/quests.dart';
+import 'package:fsek_mobile/screens/nollning/questscreen_24/quests.dart';
 import 'package:fsek_mobile/l10n/app_localizations.dart';
 
 class AdventureMissionsPageNew extends StatefulWidget {

lib/screens/nollning/nolleguide-24/nolleguidescreen.dart → lib/screens/nollning/nolleguide_24/nolleguidescreen.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:fsek_mobile/screens/nollning/nolleguide-24/kladguide.dart';
-import 'package:fsek_mobile/screens/nollning/nolleguide-24/stodfunktioner.dart';
-import 'package:fsek_mobile/screens/nollning/nolleguide-24/wordlist.dart';
-import 'package:fsek_mobile/screens/nollning/nolleguide-24/orgscreen/org_screen.dart';
-import 'package:fsek_mobile/screens/nollning/nolleguide-24/studentvett.dart';
+import 'package:fsek_mobile/screens/nollning/nolleguide_24/kladguide.dart';
+import 'package:fsek_mobile/screens/nollning/nolleguide_24/stodfunktioner.dart';
+import 'package:fsek_mobile/screens/nollning/nolleguide_24/wordlist.dart';
+import 'package:fsek_mobile/screens/nollning/nolleguide_24/orgscreen/org_screen.dart';
+import 'package:fsek_mobile/screens/nollning/nolleguide_24/studentvett.dart';
 import 'package:fsek_mobile/l10n/app_localizations.dart';
 import 'package:fsek_mobile/services/preload_asset.service.dart';
 

lib/screens/nollning/nolleguide-24/orgscreen/org_screen.dart → lib/screens/nollning/nolleguide_24/orgscreen/org_screen.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
-import 'package:fsek_mobile/screens/nollning/nolleguide-24/orgscreen/nations.dart';
-import 'package:fsek_mobile/screens/nollning/nolleguide-24/orgscreen/committee_page.dart';
-import 'package:fsek_mobile/screens/nollning/nolleguide-24/orgscreen/spex.dart';
-import 'package:fsek_mobile/screens/nollning/nolleguide-24/orgscreen/others.dart';
+import 'package:fsek_mobile/screens/nollning/nolleguide_24/orgscreen/nations.dart';
+import 'package:fsek_mobile/screens/nollning/nolleguide_24/orgscreen/committee_page.dart';
+import 'package:fsek_mobile/screens/nollning/nolleguide_24/orgscreen/spex.dart';
+import 'package:fsek_mobile/screens/nollning/nolleguide_24/orgscreen/others.dart';
 import 'package:fsek_mobile/services/preload_asset.service.dart';
 import 'package:url_launcher/url_launcher.dart';
-import 'package:fsek_mobile/screens/nollning/nolleguide-24/orgscreen/guilds.dart';
+import 'package:fsek_mobile/screens/nollning/nolleguide_24/orgscreen/guilds.dart';
 import 'package:fsek_mobile/l10n/app_localizations.dart';
 
 class OrganizationScreenPage extends StatefulWidget {

lib/screens/nollning/nolleguide25/nolleguide_home.dart → lib/screens/nollning/nolleguide_25/nolleguide_home.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:fsek_mobile/l10n/app_localizations.dart';
-import 'package:fsek_mobile/screens/nollning/nolleguide25/kladguide.dart';
-import 'package:fsek_mobile/screens/nollning/nolleguide25/stod.dart';
-import 'package:fsek_mobile/screens/nollning/nolleguide25/studentlivet_home.dart';
-import 'package:fsek_mobile/screens/nollning/nolleguide25/vettoetikett.dart';
-import 'package:fsek_mobile/screens/nollning/nolleguide25/wordlist.dart';
+import 'package:fsek_mobile/screens/nollning/nolleguide_25/kladguide.dart';
+import 'package:fsek_mobile/screens/nollning/nolleguide_25/stod.dart';
+import 'package:fsek_mobile/screens/nollning/nolleguide_25/studentlivet_home.dart';
+import 'package:fsek_mobile/screens/nollning/nolleguide_25/vettoetikett.dart';
+import 'package:fsek_mobile/screens/nollning/nolleguide_25/wordlist.dart';
 
 class NolleGuideHomePage extends StatefulWidget {
   @override

lib/screens/nollning/nolleguide25/studentlivet_home.dart → lib/screens/nollning/nolleguide_25/studentlivet_home.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:fsek_mobile/l10n/app_localizations.dart';
-import 'package:fsek_mobile/screens/nollning/nolleguide25/fsek.dart';
-import 'package:fsek_mobile/screens/nollning/nolleguide25/karen.dart';
-import 'package:fsek_mobile/screens/nollning/nolleguide25/lund.dart';
+import 'package:fsek_mobile/screens/nollning/nolleguide_25/fsek.dart';
+import 'package:fsek_mobile/screens/nollning/nolleguide_25/karen.dart';
+import 'package:fsek_mobile/screens/nollning/nolleguide_25/lund.dart';
 
 class StudentlivetHome extends StatefulWidget {
   @override

lib/screens/nollning/nolleguide_26/nolleguide_home.dart

@@ -0,0 +1,37 @@
+import 'package:flutter/material.dart';
+import 'package:fsek_mobile/l10n/app_localizations.dart';
+
+class NolleGuideHomePage extends StatefulWidget {
+  @override
+  _NolleGuideHomeState createState() => _NolleGuideHomeState();
+}
+
+class _NolleGuideHomeState extends State<NolleGuideHomePage> {
+  void initState() {
+    super.initState();
+  }
+
+  Widget build(BuildContext context) {
+    var t = AppLocalizations.of(context)!;
+
+    double screenWidth = MediaQuery.of(context).size.width;
+    double screenHeight = MediaQuery.of(context).size.height;
+
+    return Scaffold(
+      extendBodyBehindAppBar: true,
+      appBar: AppBar(
+        backgroundColor: Colors.transparent,
+        elevation: 0.0,
+        scrolledUnderElevation: 0.0,
+      ),
+      body: InteractiveViewer(
+        panEnabled: true,
+        child: Container(
+          height: screenHeight,
+          width: screenWidth,
+          child: Align(alignment: Alignment.center, child: Text("Nolleguiden!")),
+        ),
+      ),
+    );
+  }
+}

lib/screens/nollning/questscreen/paperWidget.dart → lib/screens/nollning/questscreen_24/paperWidget.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import "package:fsek_mobile/l10n/app_localizations.dart";
-import "package:fsek_mobile/screens/nollning/questscreen/goodbyePaperPage.dart";
+import "package:fsek_mobile/screens/nollning/questscreen_24/goodbyePaperPage.dart";
 
 //behöver vecka, synas eller inte, klarade,total
 

lib/screens/nollning/questscreen/quests.dart → lib/screens/nollning/questscreen_24/quests.dart

@@ -4,8 +4,8 @@ import 'package:fsek_mobile/services/nollning.service.dart';
 import 'package:fsek_mobile/services/service_locator.dart';
 import 'package:fsek_mobile/util/nollning/week_tracker.dart';
 import 'package:fsek_mobile/models/nollning/adventure_mission_week.dart';
-import 'package:fsek_mobile/screens/nollning/questscreen/paperWidget.dart';
-import 'package:fsek_mobile/screens/nollning/questscreen/finishedMissions.dart';
+import 'package:fsek_mobile/screens/nollning/questscreen_24/paperWidget.dart';
+import 'package:fsek_mobile/screens/nollning/questscreen_24/finishedMissions.dart';
 
 class QuestPage extends StatefulWidget {
   @override

lib/screens/nollning/new_questscreen/quest_home.dart → lib/screens/nollning/questscreen_25/quest_home.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:fsek_mobile/screens/nollning/new_questscreen/highscore.dart';
-import 'package:fsek_mobile/screens/nollning/new_questscreen/quests.dart';
+import 'package:fsek_mobile/screens/nollning/questscreen_25/highscore.dart';
+import 'package:fsek_mobile/screens/nollning/questscreen_25/quests.dart';
 import 'package:fsek_mobile/l10n/app_localizations.dart';
 
 class QuestHomeScreen extends StatefulWidget {