From 531699a8bbb3ee57074ace87b37cdb1dc7f8b1e5 Mon Sep 17 00:00:00 2001
From: Phani Pavan K <kphanipavan@gmail.com>
Date: Tue, 12 Mar 2024 12:44:18 +0530
Subject: [PATCH] Return to material 2, cleanup patch

---
 lib/main.dart               |  5 +++--
 lib/models/globalModel.dart | 10 +++++-----
 scripts/pwaOffline.patch    | 24 ++++++------------------
 3 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index d28c7cb..f6ac6cf 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -18,9 +18,10 @@ class MainApp extends StatelessWidget {
       lazy: false,
       create: (context) => GlobalModel(),
       builder: (BuildContext context, child) {
-        return const MaterialApp(
+        return MaterialApp(
           title: "IIITB Menu",
-          home: HomePage(),
+          home: const HomePage(),
+          theme: ThemeData(useMaterial3: false),
         );
       },
     );
diff --git a/lib/models/globalModel.dart b/lib/models/globalModel.dart
index d746e99..c41d96b 100644
--- a/lib/models/globalModel.dart
+++ b/lib/models/globalModel.dart
@@ -16,7 +16,7 @@ class GlobalModel extends ChangeNotifier {
   DataStatus menuAvailable = DataStatus.Loading;
 
   GlobalModel() {
-    print("In constructor");
+    // print("In constructor");
     GlobalModel.loadData().then((value) {
       mainData = value;
       if (this.mainData["dates"].keys.contains(this.date)) {
@@ -58,12 +58,12 @@ class GlobalModel extends ChangeNotifier {
     String? rawData;
     String rawHash;
     rawData = prefs.getString(storageKey);
-    print(rawData);
+    // print(rawData);
     if (rawData != null) {
-      print("data found");
+      // print("data found");
       rawHash = md5.convert(utf8.encode(rawData)).toString();
-      print("Hash of Raw Data:");
-      print(rawHash);
+      // print("Hash of Raw Data:");
+      // print(rawHash);
       returnData = jsonDecode(rawData);
     } else {
       print("Data Not Found");
diff --git a/scripts/pwaOffline.patch b/scripts/pwaOffline.patch
index 935c054..b1bddbe 100644
--- a/scripts/pwaOffline.patch
+++ b/scripts/pwaOffline.patch
@@ -1,35 +1,23 @@
---- flutter_service_worker.js.orig	2024-01-27 06:21:03.225353652 +0530
-+++ flutter_service_worker.js	2024-01-27 06:56:23.531689565 +0530
+--- flutter_service_worker.js.bak	2024-01-28 17:40:14.621116939 +0530
++++ flutter_service_worker.js	2024-01-28 17:41:33.479719944 +0530
 @@ -1,4 +1,5 @@
  'use strict';
-+const BaseHREF = 'HREFREPLACE';
++const BASE_HREF = "IIITB_Menu/";
  const MANIFEST = 'flutter-app-manifest';
  const TEMP = 'flutter-temp-cache';
  const CACHE_NAME = 'flutter-app-cache';
-@@ -36,10 +37,7 @@
- "version.json": "d7fbd41faace5a7a02bb5da13e6049ec"};
- // The application shell files that are downloaded before a service worker can
- // start.
--const CORE = ["main.dart.js",
--"index.html",
--"assets/AssetManifest.json",
--"assets/FontManifest.json"];
-+const CORE = Object.keys(RESOURCES);
- 
- // During install, the TEMP cache is populated with the application shell files.
- self.addEventListener("install", (event) => {
-@@ -123,12 +121,13 @@
+@@ -123,12 +124,13 @@
    if (key.indexOf('?v=') != -1) {
      key = key.split('?v=')[0];
    }
 -  if (event.request.url == origin || event.request.url.startsWith(origin + '/#') || key == '') {
-+  if (event.request.url == origin || event.request.url.startsWith(origin + '/#') || key == '' || key == BaseHREF) {
++  if (event.request.url == origin || event.request.url.startsWith(origin + '/#') || key == '' || key == BASE_HREF) {
      key = '/';
    }
    // If the URL is not the RESOURCE list then return to signal that the
    // browser should take over.
 -  if (!RESOURCES[key]) {
-+  var resKey = key.replace(BaseHREF, "");
++  var resKey = key.replace(BASE_HREF, "");
 +  if (!RESOURCES[resKey]) {
      return;
    }