From ede4f0cc0a08ed8c3c7f9a7c605c75f9a357d4f0 Mon Sep 17 00:00:00 2001
From: Deniz Duezgoeren <k.duezgoeren@gmail.com>
Date: Sat, 19 Oct 2019 09:29:59 +0200
Subject: [PATCH] Added empty food menu notice, code for checking the app
 version, possible fix for jumpy CollectionView behaviour, TODO: check on real
 device

---
 AvH Plan.xcodeproj/project.pbxproj         |  4 ++--
 AvH Plan/CustomizationViewController.swift |  7 +++++++
 AvH Plan/DataFetcher.swift                 | 10 ++++++++--
 AvH Plan/MenuViewController.swift          |  6 +++++-
 AvH Plan/PlanViewController.swift          |  6 +++++-
 AvH Plan/de.lproj/Localizable.strings      |  1 +
 AvH Plan/en.lproj/Localizable.strings      |  1 +
 7 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/AvH Plan.xcodeproj/project.pbxproj b/AvH Plan.xcodeproj/project.pbxproj
index 5ceda92..0aea41c 100644
--- a/AvH Plan.xcodeproj/project.pbxproj	
+++ b/AvH Plan.xcodeproj/project.pbxproj	
@@ -722,7 +722,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.denizd.substitutionplan;
+				PRODUCT_BUNDLE_IDENTIFIER = "denizd.AvH-Plan";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -742,7 +742,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.denizd.substitutionplan;
+				PRODUCT_BUNDLE_IDENTIFIER = "denizd.AvH-Plan";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
diff --git a/AvH Plan/CustomizationViewController.swift b/AvH Plan/CustomizationViewController.swift
index 32b7138..690ca13 100644
--- a/AvH Plan/CustomizationViewController.swift	
+++ b/AvH Plan/CustomizationViewController.swift	
@@ -119,6 +119,13 @@ class CustomizationViewController: UITableViewController, UITextFieldDelegate, U
                         self.prefs.set(newValue, forKey: "use_test_urls")
                         toastMessage = "Test URLs set to \(newValue)"
                         break
+                    case "_version":
+                        if let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String {
+                            toastMessage = "App version: \(version)"
+                        } else {
+                            toastMessage = "Version couldn't be resolved"
+                        }
+                        break
                     default:
                         toastMessage = NSLocalizedString("invalid_code", comment: "")
                         break
diff --git a/AvH Plan/DataFetcher.swift b/AvH Plan/DataFetcher.swift
index 194fd6b..4a16d8e 100644
--- a/AvH Plan/DataFetcher.swift	
+++ b/AvH Plan/DataFetcher.swift	
@@ -169,6 +169,7 @@ class DataFetcher {
         
         var isPlanEmpty = true
         var isPersonalEmpty = true
+        var isFoodMenuEmpty = true
         var personalPlanCount = 0
         var mWebsitePriority = 0
         
@@ -267,6 +268,7 @@ class DataFetcher {
             indices.append(foodItems.size())
             
             for l in 0..<indices.count - 1 {
+                isFoodMenuEmpty = false
                 var s = ""
                 for i2 in indices[l]..<indices[l + 1] {
                     if (s.isEmpty) {
@@ -290,8 +292,12 @@ class DataFetcher {
             
             prefs.set(infoString.trimmingCharacters(in: .whitespacesAndNewlines), forKey: "information")
             
-            for food in foodmenuList {
-                try db.run(foodmenu.insert(text <- food))
+            if isFoodMenuEmpty {
+                try db.run(foodmenu.insert(text <- NSLocalizedString("food_menu_empty", comment: "")))
+            } else {
+                for food in foodmenuList {
+                    try db.run(foodmenu.insert(text <- food))
+                }
             }
             
         } catch {
diff --git a/AvH Plan/MenuViewController.swift b/AvH Plan/MenuViewController.swift
index 902f21f..f6091eb 100644
--- a/AvH Plan/MenuViewController.swift	
+++ b/AvH Plan/MenuViewController.swift	
@@ -22,6 +22,11 @@ class MenuViewController : UICollectionViewController, UICollectionViewDelegateM
         collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout)
     }
     
+    override func loadView() {
+        super.loadView()
+        self.collectionView.isPrefetchingEnabled = false
+    }
+    
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
@@ -58,7 +63,6 @@ class MenuViewController : UICollectionViewController, UICollectionViewDelegateM
         self.extendedLayoutIncludesOpaqueBars = true
         self.collectionView.contentInsetAdjustmentBehavior = .always
         self.navigationController?.navigationBar.topItem?.title = NSLocalizedString("food_menu", comment: "")
-        self.collectionView.isPrefetchingEnabled = false
     }
     
     @objc private func objDoAsync(_ sender: Any) {
diff --git a/AvH Plan/PlanViewController.swift b/AvH Plan/PlanViewController.swift
index c3f4980..b8d2741 100644
--- a/AvH Plan/PlanViewController.swift	
+++ b/AvH Plan/PlanViewController.swift	
@@ -28,6 +28,11 @@ class PlanViewController : UICollectionViewController, UICollectionViewDelegateM
         collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout)
     }
     
+    override func loadView() {
+        super.loadView()
+        self.collectionView.isPrefetchingEnabled = false
+    }
+    
     override func viewWillAppear(_ animated: Bool) {
         
         if !self.prefs.bool(forKey: "logged_in") {
@@ -96,7 +101,6 @@ class PlanViewController : UICollectionViewController, UICollectionViewDelegateM
         
         self.collectionView.contentInsetAdjustmentBehavior = .always
         self.df.setTabBarBadge(for: self.tabBarController?.tabBar.items)
-        self.collectionView.isPrefetchingEnabled = false
     }
     
     func getViewType() -> String {
diff --git a/AvH Plan/de.lproj/Localizable.strings b/AvH Plan/de.lproj/Localizable.strings
index 5054b3f..dc89d43 100644
--- a/AvH Plan/de.lproj/Localizable.strings	
+++ b/AvH Plan/de.lproj/Localizable.strings	
@@ -67,6 +67,7 @@
 
 "plan_empty" = "Der Vertretungsplan ist leer";
 "personal_plan_empty" = "Dein Plan ist leer :(";
+"food_menu_empty" = "Der Speiseplan ist leer";
 
 // titles
 "avh_plan" = "AvH-Plan";
diff --git a/AvH Plan/en.lproj/Localizable.strings b/AvH Plan/en.lproj/Localizable.strings
index 0fb48c6..35b0d18 100644
--- a/AvH Plan/en.lproj/Localizable.strings	
+++ b/AvH Plan/en.lproj/Localizable.strings	
@@ -68,6 +68,7 @@
 
 "plan_empty" = "The substitution plan is empty";
 "personal_plan_empty" = "Your plan is empty :(";
+"food_menu_empty" = "The food menu is empty";
 
 // titles
 "avh_plan" = "AvH Plan";