diff --git a/lib/models/globalModel.dart b/lib/models/globalModel.dart index 251ddec..f2d8597 100644 --- a/lib/models/globalModel.dart +++ b/lib/models/globalModel.dart @@ -2,15 +2,12 @@ import "dart:convert"; import "package:iiitb_menu/constants.dart"; -// import "package:path_provider/path_provider.dart"; import 'dart:io'; import "package:flutter/material.dart"; import "package:crypto/crypto.dart"; import "package:http/http.dart"; import "package:intl/intl.dart"; import "package:shared_preferences/shared_preferences.dart"; -// import "package:dio/dio.dart"; -// import "package:iiitb_menu/data.dart" as menuData; class GlobalModel extends ChangeNotifier { late Map mainData; @@ -25,7 +22,6 @@ class GlobalModel extends ChangeNotifier { if (this.mainData["dates"].keys.contains(this.date)) { this.menuAvailable = DataStatus.Loaded; } - // print(mainData); notifyListeners(); }); } @@ -33,14 +29,6 @@ class GlobalModel extends ChangeNotifier { static Future getLatestHash() async { try { Response hashRequest = await get(Uri.parse(hashLink)); - // Response ret = await Dio().request(hashLink, - // options: Options(method: 'GET', headers: { - // HttpHeaders.acceptHeader: "text/plain", - // "Access-Control-Allow-Origin": "*", - // "Access-Control-Allow-Methods": "GET", - // "Access-Control-Allow-Headers": "*", - // "Access-Control-Max-Age": "1000" - // })); if (hashRequest.statusCode == 200) { return hashRequest.body.replaceAll("\n", ""); } else { @@ -55,11 +43,6 @@ class GlobalModel extends ChangeNotifier { static Future getLatestData() async { try { - // Response ret = await Dio().request(dataLink, - // options: Options(method: "GET", headers: { - // HttpHeaders.acceptHeader: "text/plain", - // "Access-Control-Allow-Origin": "*" - // })); Response dataRequest = await get(Uri.parse(dataLink)); return dataRequest.body; } on SocketException catch (exce) { @@ -71,32 +54,23 @@ class GlobalModel extends ChangeNotifier { static Future loadData() async { late Map returnData; - // Directory appDir = await getApplicationDocumentsDirectory(); final SharedPreferences prefs = await SharedPreferences.getInstance(); String? rawData; String rawHash; - // String fileName = "${appDir.path}/menu.json"; - // print(fileName); - // File fileLink = File(fileName); rawData = prefs.getString(storageKey); print(rawData); if (rawData != null) { print("data found"); - // rawData = localStor.getItem("fullMenu"); rawHash = md5.convert(utf8.encode(rawData)).toString(); print("Hash of Raw Data:"); print(rawHash); - // print("RawData: "); - // print(rawData); returnData = jsonDecode(rawData); - // menuAvailable = true; } else { print("Data Not Found"); returnData = {}; rawHash = ""; } String remoteHash = await GlobalModel.getLatestHash(); - // String remoteHash = "asd"; print("Remote Hash: $remoteHash"); if (remoteHash == "") { } else if (remoteHash == rawHash) { @@ -108,12 +82,9 @@ class GlobalModel extends ChangeNotifier { if (rawData == "") { return {}; } - // print(rawData); returnData = jsonDecode(rawData); - // fileLink.writeAsStringSync(rawData, mode: FileMode.write); prefs.setString(storageKey, rawData); } - // returnData = jsonDecode(menuData.data); return returnData; } diff --git a/lib/views/homePage.dart b/lib/views/homePage.dart index 0690806..6d170b1 100644 --- a/lib/views/homePage.dart +++ b/lib/views/homePage.dart @@ -4,8 +4,6 @@ import "package:flutter/material.dart"; import "package:iiitb_menu/constants.dart"; import "package:iiitb_menu/models/globalModel.dart"; import "package:iiitb_menu/views/menuListView.dart"; -// import "package:iiitb_menu/widgets/itemCard.dart"; -// import "package:intl/intl.dart"; import "package:provider/provider.dart"; class HomePage extends StatelessWidget { @@ -18,11 +16,7 @@ class HomePage extends StatelessWidget { length: 4, child: Builder(builder: (context) { TabController cont = DefaultTabController.of(context); - // print("Rebuilt"); - // if (!cont.hasListeners) { - // print("Adding callback"); cont.addListener(() { - // print("Called Callback"); Provider.of(context, listen: false) .setMenuTime(cont.index); }); diff --git a/lib/widgets/itemCard.dart b/lib/widgets/itemCard.dart index 6feb19e..b19a526 100644 --- a/lib/widgets/itemCard.dart +++ b/lib/widgets/itemCard.dart @@ -42,7 +42,6 @@ class ItemCard extends StatelessWidget { margin: const EdgeInsets.symmetric(horizontal: 5, vertical: 5), padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5), decoration: BoxDecoration( - // gradient: LinearGradient(colors: []), borderRadius: BorderRadius.circular(2), border: Border.all(width: 0.5, color: borderColor), ),