Skip to content

Commit

Permalink
Updated Kalender, Termine and About
Browse files Browse the repository at this point in the history
  • Loading branch information
z1tr0t3c committed Nov 22, 2020
1 parent 4208327 commit ea19040
Show file tree
Hide file tree
Showing 6 changed files with 112 additions and 107 deletions.
167 changes: 77 additions & 90 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,89 +1,82 @@
PODS:
- Firebase/Core (6.24.0):
- Firebase/Core (6.34.0):
- Firebase/CoreOnly
- FirebaseAnalytics (= 6.5.0)
- Firebase/CoreOnly (6.24.0):
- FirebaseCore (= 6.7.0)
- Firebase/Messaging (6.24.0):
- FirebaseAnalytics (= 6.9.0)
- Firebase/CoreOnly (6.34.0):
- FirebaseCore (= 6.10.4)
- Firebase/Messaging (6.34.0):
- Firebase/CoreOnly
- FirebaseMessaging (~> 4.4.0)
- FirebaseAnalytics (6.5.0):
- FirebaseCore (~> 6.7)
- FirebaseInstallations (~> 1.2)
- GoogleAppMeasurement (= 6.5.0)
- GoogleUtilities/AppDelegateSwizzler (~> 6.0)
- GoogleUtilities/MethodSwizzler (~> 6.0)
- GoogleUtilities/Network (~> 6.0)
- "GoogleUtilities/NSData+zlib (~> 6.0)"
- nanopb (~> 1.30905.0)
- FirebaseAnalyticsInterop (1.5.0)
- FirebaseCore (6.7.0):
- FirebaseCoreDiagnostics (~> 1.3)
- FirebaseCoreDiagnosticsInterop (~> 1.2)
- GoogleUtilities/Environment (~> 6.5)
- GoogleUtilities/Logger (~> 6.5)
- FirebaseCoreDiagnostics (1.3.0):
- FirebaseCoreDiagnosticsInterop (~> 1.2)
- GoogleDataTransportCCTSupport (~> 3.1)
- GoogleUtilities/Environment (~> 6.5)
- GoogleUtilities/Logger (~> 6.5)
- nanopb (~> 1.30905.0)
- FirebaseCoreDiagnosticsInterop (1.2.0)
- FirebaseInstallations (1.2.0):
- FirebaseCore (~> 6.6)
- GoogleUtilities/Environment (~> 6.6)
- GoogleUtilities/UserDefaults (~> 6.6)
- FirebaseMessaging (~> 4.7.1)
- FirebaseAnalytics (6.9.0):
- FirebaseCore (~> 6.10)
- FirebaseInstallations (~> 1.7)
- GoogleAppMeasurement (= 6.9.0)
- GoogleUtilities/AppDelegateSwizzler (~> 6.7)
- GoogleUtilities/MethodSwizzler (~> 6.7)
- GoogleUtilities/Network (~> 6.7)
- "GoogleUtilities/NSData+zlib (~> 6.7)"
- nanopb (~> 1.30906.0)
- FirebaseCore (6.10.4):
- FirebaseCoreDiagnostics (~> 1.6)
- GoogleUtilities/Environment (~> 6.7)
- GoogleUtilities/Logger (~> 6.7)
- FirebaseCoreDiagnostics (1.7.0):
- GoogleDataTransport (~> 7.4)
- GoogleUtilities/Environment (~> 6.7)
- GoogleUtilities/Logger (~> 6.7)
- nanopb (~> 1.30906.0)
- FirebaseInstallations (1.7.0):
- FirebaseCore (~> 6.10)
- GoogleUtilities/Environment (~> 6.7)
- GoogleUtilities/UserDefaults (~> 6.7)
- PromisesObjC (~> 1.2)
- FirebaseInstanceID (4.3.4):
- FirebaseCore (~> 6.6)
- FirebaseInstallations (~> 1.0)
- GoogleUtilities/Environment (~> 6.5)
- GoogleUtilities/UserDefaults (~> 6.5)
- FirebaseMessaging (4.4.0):
- FirebaseAnalyticsInterop (~> 1.5)
- FirebaseCore (~> 6.6)
- FirebaseInstanceID (~> 4.3)
- GoogleUtilities/AppDelegateSwizzler (~> 6.5)
- GoogleUtilities/Environment (~> 6.5)
- GoogleUtilities/Reachability (~> 6.5)
- GoogleUtilities/UserDefaults (~> 6.5)
- FirebaseInstanceID (4.8.0):
- FirebaseCore (~> 6.10)
- FirebaseInstallations (~> 1.6)
- GoogleUtilities/Environment (~> 6.7)
- GoogleUtilities/UserDefaults (~> 6.7)
- FirebaseMessaging (4.7.1):
- FirebaseCore (~> 6.10)
- FirebaseInstanceID (~> 4.7)
- GoogleUtilities/AppDelegateSwizzler (~> 6.7)
- GoogleUtilities/Environment (~> 6.7)
- GoogleUtilities/Reachability (~> 6.7)
- GoogleUtilities/UserDefaults (~> 6.7)
- Protobuf (>= 3.9.2, ~> 3.9)
- GoogleAppMeasurement (6.5.0):
- GoogleUtilities/AppDelegateSwizzler (~> 6.0)
- GoogleUtilities/MethodSwizzler (~> 6.0)
- GoogleUtilities/Network (~> 6.0)
- "GoogleUtilities/NSData+zlib (~> 6.0)"
- nanopb (~> 1.30905.0)
- GoogleDataTransport (6.1.0)
- GoogleDataTransportCCTSupport (3.1.0):
- GoogleDataTransport (~> 6.1)
- nanopb (~> 1.30905.0)
- GoogleUtilities/AppDelegateSwizzler (6.6.0):
- GoogleAppMeasurement (6.9.0):
- GoogleUtilities/AppDelegateSwizzler (~> 6.7)
- GoogleUtilities/MethodSwizzler (~> 6.7)
- GoogleUtilities/Network (~> 6.7)
- "GoogleUtilities/NSData+zlib (~> 6.7)"
- nanopb (~> 1.30906.0)
- GoogleDataTransport (7.5.1):
- nanopb (~> 1.30906.0)
- GoogleUtilities/AppDelegateSwizzler (6.7.2):
- GoogleUtilities/Environment
- GoogleUtilities/Logger
- GoogleUtilities/Network
- GoogleUtilities/Environment (6.6.0):
- GoogleUtilities/Environment (6.7.2):
- PromisesObjC (~> 1.2)
- GoogleUtilities/Logger (6.6.0):
- GoogleUtilities/Logger (6.7.2):
- GoogleUtilities/Environment
- GoogleUtilities/MethodSwizzler (6.6.0):
- GoogleUtilities/MethodSwizzler (6.7.2):
- GoogleUtilities/Logger
- GoogleUtilities/Network (6.6.0):
- GoogleUtilities/Network (6.7.2):
- GoogleUtilities/Logger
- "GoogleUtilities/NSData+zlib"
- GoogleUtilities/Reachability
- "GoogleUtilities/NSData+zlib (6.6.0)"
- GoogleUtilities/Reachability (6.6.0):
- "GoogleUtilities/NSData+zlib (6.7.2)"
- GoogleUtilities/Reachability (6.7.2):
- GoogleUtilities/Logger
- GoogleUtilities/UserDefaults (6.6.0):
- GoogleUtilities/UserDefaults (6.7.2):
- GoogleUtilities/Logger
- nanopb (1.30905.0):
- nanopb/decode (= 1.30905.0)
- nanopb/encode (= 1.30905.0)
- nanopb/decode (1.30905.0)
- nanopb/encode (1.30905.0)
- PromisesObjC (1.2.8)
- Protobuf (3.11.4)
- nanopb (1.30906.0):
- nanopb/decode (= 1.30906.0)
- nanopb/encode (= 1.30906.0)
- nanopb/decode (1.30906.0)
- nanopb/encode (1.30906.0)
- PromisesObjC (1.2.10)
- Protobuf (3.13.0)
- QRCodeReader.swift (10.1.0)

DEPENDENCIES:
Expand All @@ -95,41 +88,35 @@ SPEC REPOS:
trunk:
- Firebase
- FirebaseAnalytics
- FirebaseAnalyticsInterop
- FirebaseCore
- FirebaseCoreDiagnostics
- FirebaseCoreDiagnosticsInterop
- FirebaseInstallations
- FirebaseInstanceID
- FirebaseMessaging
- GoogleAppMeasurement
- GoogleDataTransport
- GoogleDataTransportCCTSupport
- GoogleUtilities
- nanopb
- PromisesObjC
- Protobuf
- QRCodeReader.swift

SPEC CHECKSUMS:
Firebase: b28e55c60efd98963cd9011fe2fac5a10c2ba124
FirebaseAnalytics: 7386fc2176e3f93ad8ef34b5b1f2b33a891e4962
FirebaseAnalyticsInterop: 3f86269c38ae41f47afeb43ebf32a001f58fcdae
FirebaseCore: e610482f64097b0e9f056cd97bc6b33dfabcbb6a
FirebaseCoreDiagnostics: 4a773a47bd83bbd5a9b1ccf1ce7caa8b2d535e67
FirebaseCoreDiagnosticsInterop: 296e2c5f5314500a850ad0b83e9e7c10b011a850
FirebaseInstallations: 2119fb3e46b0a88bfdbf12562f855ee3252462fa
FirebaseInstanceID: cef67c4967c7cecb56ea65d8acbb4834825c587b
FirebaseMessaging: 58cb17277641a0084d98d4951ba1f1fb0588c8c6
GoogleAppMeasurement: 4c644d86835d827bab30ab6aabb9ecaf1f500735
GoogleDataTransport: f6f8eba931df03ebd2232ff4645aa85f8f47b5ab
GoogleDataTransportCCTSupport: d70a561f7d236af529fee598835caad5e25f6d3d
GoogleUtilities: 39530bc0ad980530298e9c4af8549e991fd033b1
nanopb: c43f40fadfe79e8b8db116583945847910cbabc9
PromisesObjC: c119f3cd559f50b7ae681fa59dc1acd19173b7e6
Protobuf: 176220c526ad8bd09ab1fb40a978eac3fef665f7
Firebase: c23a36d9e4cdf7877dfcba8dd0c58add66358999
FirebaseAnalytics: 3bb096873ee0d7fa4b6c70f5e9166b6da413cc7f
FirebaseCore: d3a978a3cfa3240bf7e4ba7d137fdf5b22b628ec
FirebaseCoreDiagnostics: 770ac5958e1372ce67959ae4b4f31d8e127c3ac1
FirebaseInstallations: 466c7b4d1f58fe16707693091da253726a731ed2
FirebaseInstanceID: bd3ffc24367f901a43c063b36c640b345a4a5dd1
FirebaseMessaging: 5eca4ef173de76253352511aafef774caa1cba2a
GoogleAppMeasurement: a6a3a066369828db64eda428cb2856dc1cdc7c4e
GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833
GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3
nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
PromisesObjC: b14b1c6b68e306650688599de8a45e49fae81151
Protobuf: 3dac39b34a08151c6d949560efe3f86134a3f748
QRCodeReader.swift: 373a389fe9a22d513c879a32a6f647c58f4ef572

PODFILE CHECKSUM: e793a715911bfaebdd70a4151028aaeb3d9f2e00

COCOAPODS: 1.9.1
COCOAPODS: 1.10.0
16 changes: 8 additions & 8 deletions blista.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@
2CC72DD71FE9CA28007F874E /* license.txt in Resources */ = {isa = PBXBuildFile; fileRef = 2CC72DD61FE9CA27007F874E /* license.txt */; };
2CCE94421FD4DF5C00335149 /* ThirteenthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CCE94411FD4DF5C00335149 /* ThirteenthViewController.swift */; };
2CD575CB1FD3A3AC0060057D /* TenthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD575CA1FD3A3AC0060057D /* TenthViewController.swift */; };
2CD90EBF2316AE8900329895 /* ferienordnung.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 2CD90EBE2316AE8800329895 /* ferienordnung.pdf */; };
2CE3EBC91FD64A2400DCE733 /* assets in Resources */ = {isa = PBXBuildFile; fileRef = 2CE3EBC51FD64A2300DCE733 /* assets */; };
2CE3EBCA1FD64A2400DCE733 /* images in Resources */ = {isa = PBXBuildFile; fileRef = 2CE3EBC61FD64A2300DCE733 /* images */; };
2CE3EBCB1FD64A2400DCE733 /* index.html in Resources */ = {isa = PBXBuildFile; fileRef = 2CE3EBC71FD64A2300DCE733 /* index.html */; };
2CE3F4571FD3E85700265D7E /* EleventhViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE3F4561FD3E85700265D7E /* EleventhViewController.swift */; };
2CE7E59825040DB800FCEA4D /* ferienordnung.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 2CE7E59725040DB700FCEA4D /* ferienordnung.pdf */; };
2CEB825C1FE59B240013940A /* SeventeenthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CEB825B1FE59B240013940A /* SeventeenthViewController.swift */; };
2CF0A4D620F70374002E98A0 /* TwentiethViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CF0A4D520F70374002E98A0 /* TwentiethViewController.swift */; };
2CF4E7921FCFCB3F00B29B8D /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CF4E7911FCFCB3F00B29B8D /* AppDelegate.swift */; };
Expand Down Expand Up @@ -114,11 +114,11 @@
2CC72DD61FE9CA27007F874E /* license.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = license.txt; sourceTree = "<group>"; };
2CCE94411FD4DF5C00335149 /* ThirteenthViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThirteenthViewController.swift; sourceTree = "<group>"; };
2CD575CA1FD3A3AC0060057D /* TenthViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TenthViewController.swift; sourceTree = "<group>"; };
2CD90EBE2316AE8800329895 /* ferienordnung.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = ferienordnung.pdf; sourceTree = "<group>"; };
2CE3EBC51FD64A2300DCE733 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; path = assets; sourceTree = "<group>"; };
2CE3EBC61FD64A2300DCE733 /* images */ = {isa = PBXFileReference; lastKnownFileType = folder; path = images; sourceTree = "<group>"; };
2CE3EBC71FD64A2300DCE733 /* index.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = index.html; sourceTree = "<group>"; };
2CE3F4561FD3E85700265D7E /* EleventhViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EleventhViewController.swift; sourceTree = "<group>"; };
2CE7E59725040DB700FCEA4D /* ferienordnung.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = ferienordnung.pdf; sourceTree = "<group>"; };
2CEB825B1FE59B240013940A /* SeventeenthViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeventeenthViewController.swift; sourceTree = "<group>"; };
2CF0A4D520F70374002E98A0 /* TwentiethViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TwentiethViewController.swift; sourceTree = "<group>"; };
2CF4E78E1FCFCB3F00B29B8D /* blista.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = blista.app; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -176,7 +176,7 @@
2CF4E78F1FCFCB3F00B29B8D /* Products */,
2C819162217FB66C0052E7C0 /* blista.png */,
2C3B6AF820AB2C5D002A3F5A /* opening.html */,
2CD90EBE2316AE8800329895 /* ferienordnung.pdf */,
2CE7E59725040DB700FCEA4D /* ferienordnung.pdf */,
2C68E398231333990059B2CA /* terminplan.pdf */,
2C5FA11E22CE43D8009145AB /* wegbeschreibung.pdf */,
2C5FA12022CE4916009145AB /* intranet.pdf */,
Expand Down Expand Up @@ -333,13 +333,13 @@
2CE3EBC91FD64A2400DCE733 /* assets in Resources */,
2C5FA12122CE4916009145AB /* intranet.pdf in Resources */,
2CF4E79B1FCFCB3F00B29B8D /* Assets.xcassets in Resources */,
2CD90EBF2316AE8900329895 /* ferienordnung.pdf in Resources */,
2C9834831FF333520099A977 /* GoogleService-Info.plist in Resources */,
2C3B6AF920AB2C5D002A3F5A /* opening.html in Resources */,
2CC72DD71FE9CA28007F874E /* license.txt in Resources */,
2C4699BA2055BDC9003FA3FB /* fabric.apikey in Resources */,
2C68E3992313339A0059B2CA /* terminplan.pdf in Resources */,
2C5FA11F22CE43D8009145AB /* wegbeschreibung.pdf in Resources */,
2CE7E59825040DB800FCEA4D /* ferienordnung.pdf in Resources */,
2CF4E7991FCFCB3F00B29B8D /* Main.storyboard in Resources */,
2CE3EBCB1FD64A2400DCE733 /* index.html in Resources */,
);
Expand Down Expand Up @@ -388,15 +388,15 @@
"${PODS_ROOT}/Target Support Files/Pods-blista/Pods-blista-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
"${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework",
"${BUILT_PRODUCTS_DIR}/Protobuf/protobuf.framework",
"${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework",
"${BUILT_PRODUCTS_DIR}/QRCodeReader.swift/QRCodeReader.framework",
"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/protobuf.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QRCodeReader.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
);
Expand Down Expand Up @@ -594,7 +594,7 @@
INFOPLIST_FILE = blista/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.15.0;
MARKETING_VERSION = 1.17.0;
PRODUCT_BUNDLE_IDENTIFIER = de.zitrotec.blista;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -623,7 +623,7 @@
INFOPLIST_FILE = blista/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.15.0;
MARKETING_VERSION = 1.17.0;
PRODUCT_BUNDLE_IDENTIFIER = de.zitrotec.blista;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<key>blista.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>18</integer>
<integer>15</integer>
</dict>
</dict>
</dict>
Expand Down
20 changes: 15 additions & 5 deletions blista/EighthViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import UIKit
import Crashlytics
import SafariServices

private var viewHasLoaded = false

Expand Down Expand Up @@ -181,11 +182,20 @@ class EighthViewController: UIViewController, UIWebViewDelegate {
}
}

if #available(iOS 10.0, *) {
UIApplication.shared.open(request.url!, options: [:], completionHandler: nil)
} else {
UIApplication.shared.openURL(request.url!)
}
if #available(iOS 9.0, *) {
UIApplication.shared.isIdleTimerDisabled = true
let vc = SFSafariViewController(url: request.url!)
let blistaColor = UIColor(red: 0, green: 0.651, blue: 0.1137, alpha: 1)
if #available(iOS 10.0, *) {
vc.preferredControlTintColor = blistaColor
} else {
vc.view.tintColor = blistaColor
}
present(vc, animated: true)
} else {
UIApplication.shared.isIdleTimerDisabled = false
UIApplication.shared.openURL(request.url!)
}

return false
}
Expand Down
12 changes: 10 additions & 2 deletions blista/TwentysecondViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import UIKit
import Crashlytics
import SafariServices

class TwentysecondViewController: UIViewController, UIWebViewDelegate {

Expand Down Expand Up @@ -112,8 +113,15 @@ class TwentysecondViewController: UIViewController, UIWebViewDelegate {

if request.url!.absoluteString.range(of: "export_execute.php") != nil {

if #available(iOS 10.0, *) {
UIApplication.shared.open(request.url!, options: [:], completionHandler: nil)
if #available(iOS 9.0, *) {
let vc = SFSafariViewController(url: request.url!)
let blistaColor = UIColor(red: 0, green: 0.651, blue: 0.1137, alpha: 1)
if #available(iOS 10.0, *) {
vc.preferredControlTintColor = blistaColor
} else {
vc.view.tintColor = blistaColor
}
present(vc, animated: true)
} else {
UIApplication.shared.openURL(request.url!)
}
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ <h1>blistar-App</h1>
<h2>Über mich</h2>
</header>
<p>
Mein Name ist Falk und ich bin 18 Jahre alt. Ich entwickele Apps, schreibe einen IT-Blog, mache Musik, und bin selbst Schüler der blista. ;)
Mein Name ist Falk und ich bin 19 Jahre alt. Ich entwickele Apps, schreibe einen IT-Blog, mache Musik, und war selbst Schüler der blista. ;)
<br>
Mehr über mich erfahrt Ihr auf: <a href="https://zitrotec.de" style="color:#00A61D;">zitrotec.de</a>, <a href="https://m.facebook.com/z1tr0t3c" style="color:#00A61D;">Facebook</a> und <a href="https://mobile.twitter.com/z1tr0t3c" style="color:#00A61D;">Twitter</a>.</p>
</article>
Expand Down

0 comments on commit ea19040

Please sign in to comment.