Add a workaround for swiftui bug preventing menu button from being pr…

…essed twice before re-rendering; update supported canteens
TheJKM · Jan 14, 2020 · 5b1227f · 5b1227f
1 parent 066e529
commit 5b1227f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/MensaGuthaben.xcodeproj/project.pbxproj b/MensaGuthaben.xcodeproj/project.pbxproj
@@ -502,7 +502,7 @@
 				CODE_SIGN_ENTITLEMENTS = MensaGuthaben/MensaGuthaben.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1.1.113;
+				CURRENT_PROJECT_VERSION = 1.1.132;
 				DEVELOPMENT_ASSET_PATHS = "\"MensaGuthaben/Preview Content\"";
 				DEVELOPMENT_TEAM = EBQF48FD36;
 				ENABLE_PREVIEWS = YES;
@@ -516,7 +516,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.5;
+				MARKETING_VERSION = 1.1.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.johanneskreutz.mensaguthaben;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "MensaGuthaben 20.11.19";
@@ -533,7 +533,7 @@
 				CODE_SIGN_ENTITLEMENTS = MensaGuthaben/MensaGuthaben.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1.1.113;
+				CURRENT_PROJECT_VERSION = 1.1.132;
 				DEVELOPMENT_ASSET_PATHS = "\"MensaGuthaben/Preview Content\"";
 				DEVELOPMENT_TEAM = EBQF48FD36;
 				ENABLE_PREVIEWS = YES;
@@ -547,7 +547,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.5;
+				MARKETING_VERSION = 1.1.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.johanneskreutz.mensaguthaben;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "MensaGuthaben 20.11.19";

diff --git a/MensaGuthaben/Views/Helpers/ChartsContainer.swift b/MensaGuthaben/Views/Helpers/ChartsContainer.swift
@@ -3,7 +3,7 @@
 //  MensaGuthaben
 //
 //  Created by Johannes Kreutz on 24.09.19.
-//  Copyright © 2019 Johannes Kreutz. All rights reserved.
+//  Copyright © 2019 - 2020 Johannes Kreutz. All rights reserved.
 //
 //  This file is part of MensaGuthaben.
 //
@@ -47,7 +47,6 @@ struct ChartsContainer: UIViewRepresentable {
     }
 
     func updateUIView(_ uiView: LineChartView, context: UIViewRepresentableContext<ChartsContainer>) {
-        print("Update")
         setupChartData(chart: uiView)
     }
 

diff --git a/MensaGuthaben/Views/MainView.swift b/MensaGuthaben/Views/MainView.swift
@@ -25,6 +25,7 @@ import SwiftUI
 
 struct MainView: View {
     @State private var showSettingsModal: Bool = false
+    @State private var buttonText: String = ""
     @EnvironmentObject var balance: Balance
     @EnvironmentObject var settings: SettingsStore
     @EnvironmentObject var historyData: HistoryData
@@ -69,15 +70,15 @@ struct MainView: View {
                             )
                         }.padding(.leading, 2).padding(.trailing, 2)
                     }
-
                 }.padding()
             }
             .navigationBarTitle("MensaGuthaben")
             .navigationBarItems(trailing: Button(action: {
                 self.showSettingsModal = true
             }) {
                 Image(systemName: "line.horizontal.3")
-            }).sheet(isPresented: $showSettingsModal, onDismiss: {self.showSettingsModal = false}, content: {
+                Text(self.buttonText)
+            }).sheet(isPresented: $showSettingsModal, onDismiss: {self.showSettingsModal = false; self.buttonText = (self.buttonText == "") ? " " : ""}, content: {
                 SettingsView(sceneDelegate: self.sceneDelegate).environmentObject(self.settings)
             })
         }

diff --git a/MensaGuthaben/Views/SupportedCanteensView.swift b/MensaGuthaben/Views/SupportedCanteensView.swift
@@ -24,8 +24,8 @@
 import SwiftUI
 
 struct SupportedCanteensView: View {
-    let supported: [String] = ["HS Aschaffenburg", "Uni Bamberg", "Uni Bochum", "TU Braunschweig", "TU Darmstadt", "h_da Darmstadt", "TU Dresden Emeal", "Westfälische Hochschule Gelsenkirchen", "Uni Gießen", "TU Ilmenau", "Uni Saarland", "Uni Ulm", "FH Würzburg", "Uni Würzburg"]
-    let untested: [String] = ["Uni Bayreuth (nur Druckguthaben)", "Uni Bielefeld (nur neuere Karten)", "FH Brandenburg", "Uni Bremen", "HS Bremerhaven", "TU Clausthal", "HS Freiburg", "DH Gera Eisenbach", "Uni Greifswald", "MLU Halle", "HAW Hamburg", "HS Hannover", "Uni Heidelberg", "Uni Hohenheim (nur neuere Karten)", "HS Koblenz", "Uni Koblenz", "FH Köln", "Uni Köln", "Uni Leipzig", "Uni Lüneburg", "Uni Magdeburg", "DHBW Mosbach", "HS Offenburg", "Uni Osnabrück", "HS Osnabrück", "HS für Gestaltung Schwäbisch Gmünd", "Uni Stuttgart", "HS Zittau/Görlitz"]
+    let supported: [String] = ["HS Aschaffenburg", "Uni Bamberg", "Uni Bochum", "TU Braunschweig", "TU Darmstadt", "h_da Darmstadt", "TU Dresden Emeal", "Westfälische Hochschule Gelsenkirchen", "Uni Gießen", "Uni Hannover", "HS Hannover", "TU Ilmenau", "Uni Saarland", "Uni Ulm", "FH Würzburg", "Uni Würzburg"]
+    let untested: [String] = ["Uni Bayreuth (nur Druckguthaben)", "Uni Bielefeld (nur neuere Karten)", "FH Brandenburg", "Uni Bremen", "HS Bremerhaven", "TU Clausthal", "HS Freiburg", "DH Gera Eisenbach", "Uni Greifswald", "MLU Halle", "HAW Hamburg", "Uni Heidelberg", "Uni Hohenheim (nur neuere Karten)", "HS Koblenz", "Uni Koblenz", "FH Köln", "Uni Köln", "Uni Leipzig", "Uni Lüneburg", "Uni Magdeburg", "DHBW Mosbach", "HS Offenburg", "Uni Osnabrück", "HS Osnabrück", "HS für Gestaltung Schwäbisch Gmünd", "Uni Stuttgart", "HS Zittau/Görlitz"]
 
     private func getSupported() -> String {
         var supportedString: String = ""

diff --git a/README.md b/README.md
@@ -18,6 +18,8 @@ The app is tested with the following universities:
 - TU Dresden Emeal
 - Westfälische Hochschule Gelsenkirchen
 - Uni Gießen
+- Uni Hannover
+- HS Hannover
 - TU Ilmenau
 - Uni Saarland
 - Uni Ulm
@@ -36,7 +38,6 @@ However, it should also work with the cards of these universities, but they are
 - Uni Greifswald
 - MLU Halle
 - HAW Hamburg
-- HS Hannover
 - Uni Heidelberg
 - Uni Hohenheim (only newer cards)
 - HS Koblenz