Skip to content

Commit

Permalink
1.20.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@z1tr0t3c
z1tr0t3c committed Apr 18, 2021
1 parent b44d11d commit 26eeda3
Show file tree
Hide file tree
Showing 12 changed files with 106 additions and 317 deletions.
10 changes: 0 additions & 10 deletions Settings.bundle/Root.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,6 @@
<key>DefaultValue</key>
<false/>
</dict>
<dict>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
<key>Title</key>
<string>Mensa QR-Code-Scanner (Nur für Mitarbeiter)</string>
<key>Key</key>
<string>mensa</string>
<key>DefaultValue</key>
<false/>
</dict>
<dict>
<key>Type</key>
<string>PSGroupSpecifier</string>
Expand Down
10 changes: 4 additions & 6 deletions blista.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
2C280887211BC2FE0062E975 /* TwentysecondViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C280886211BC2FE0062E975 /* TwentysecondViewController.swift */; };
2C2B2FC8213DA67600973A86 /* TwentythirdViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C2B2FC6213DA67500973A86 /* TwentythirdViewController.swift */; };
2C2EC08D1FD3F6CF0094CC16 /* TwelfthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C2EC08C1FD3F6CF0094CC16 /* TwelfthViewController.swift */; };
2C31F3A024035ADE00FB2CDB /* mensa.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 2C31F39F24035ADD00FB2CDB /* mensa.pdf */; };
2C3AC44922C56D5500BCE8AB /* TwentyfourthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C3AC44822C56D5500BCE8AB /* TwentyfourthViewController.swift */; };
2C3B6AF120AAFF93002A3F5A /* EighteenthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C3B6AF020AAFF93002A3F5A /* EighteenthViewController.swift */; };
2C3B6AF520AB0DF9002A3F5A /* links.html in Resources */ = {isa = PBXBuildFile; fileRef = 2C3B6AF420AB0DF9002A3F5A /* links.html */; };
Expand Down Expand Up @@ -82,7 +81,6 @@
2C280886211BC2FE0062E975 /* TwentysecondViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TwentysecondViewController.swift; sourceTree = "<group>"; };
2C2B2FC6213DA67500973A86 /* TwentythirdViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = TwentythirdViewController.swift; path = /Users/falk/Documents/Xcode/blista/blista/TwentythirdViewController.swift; sourceTree = "<absolute>"; };
2C2EC08C1FD3F6CF0094CC16 /* TwelfthViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TwelfthViewController.swift; sourceTree = "<group>"; };
2C31F39F24035ADD00FB2CDB /* mensa.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = mensa.pdf; sourceTree = "<group>"; };
2C3AC44822C56D5500BCE8AB /* TwentyfourthViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TwentyfourthViewController.swift; sourceTree = "<group>"; };
2C3B6AF020AAFF93002A3F5A /* EighteenthViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EighteenthViewController.swift; sourceTree = "<group>"; };
2C3B6AF420AB0DF9002A3F5A /* links.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = links.html; sourceTree = "<group>"; };
Expand Down Expand Up @@ -180,7 +178,6 @@
2C68E398231333990059B2CA /* terminplan.pdf */,
2C5FA11E22CE43D8009145AB /* wegbeschreibung.pdf */,
2C5FA12022CE4916009145AB /* intranet.pdf */,
2C31F39F24035ADD00FB2CDB /* mensa.pdf */,
2CE3EBC51FD64A2300DCE733 /* assets */,
2CE3EBC61FD64A2300DCE733 /* images */,
2CE3EBC71FD64A2300DCE733 /* index.html */,
Expand Down Expand Up @@ -324,7 +321,6 @@
2CA914CC1FDC402A00EC3B02 /* imprint.html in Resources */,
2CE3EBCA1FD64A2400DCE733 /* images in Resources */,
2C98347A1FF2E4F00099A977 /* faq.html in Resources */,
2C31F3A024035ADE00FB2CDB /* mensa.pdf in Resources */,
2C3B6AF720AB244C002A3F5A /* privacy.html in Resources */,
2C819163217FB66C0052E7C0 /* blista.png in Resources */,
2C6186321FD680A100C8FCF1 /* Settings.bundle in Resources */,
Expand Down Expand Up @@ -582,6 +578,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = blista/blista.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
Expand All @@ -594,7 +591,7 @@
INFOPLIST_FILE = blista/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.19.0;
MARKETING_VERSION = 1.20.0;
PRODUCT_BUNDLE_IDENTIFIER = de.zitrotec.blista;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -612,6 +609,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = blista/blista.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = CM9ECSAB4Y;
Expand All @@ -623,7 +621,7 @@
INFOPLIST_FILE = blista/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.19.0;
MARKETING_VERSION = 1.20.0;
PRODUCT_BUNDLE_IDENTIFIER = de.zitrotec.blista;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
0 ...ts.xcassets/ticket.imageset/Contents.json → ...sets.xcassets/meet.imageset/Contents.json
View file
File renamed without changes.
Binary file added blista/Assets.xcassets/meet.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added blista/Assets.xcassets/meet.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added blista/Assets.xcassets/meet.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed blista/Assets.xcassets/ticket.imageset/[email protected]
View file
Binary file not shown.
Binary file removed blista/Assets.xcassets/ticket.imageset/[email protected]
View file
Binary file not shown.
Binary file removed blista/Assets.xcassets/ticket.imageset/[email protected]
View file
Binary file not shown.
37 changes: 4 additions & 33 deletions blista/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1121,49 +1121,20 @@
</objects>
<point key="canvasLocation" x="-842.39999999999998" y="-977.36131934032994"/>
</scene>
<!--Essen bestellen-->
<!--blistaMeet-->
<scene sceneID="QYO-PG-ev7">
<objects>
<viewController title="Essen bestellen" automaticallyAdjustsScrollViewInsets="NO" id="5E8-aG-Wgw" customClass="TwentyfifthViewController" customModule="blista" customModuleProvider="target" sceneMemberID="viewController">
<viewController title="blistaMeet" automaticallyAdjustsScrollViewInsets="NO" id="5E8-aG-Wgw" customClass="TwentyfifthViewController" customModule="blista" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="Ns8-4c-Zck"/>
<viewControllerLayoutGuide type="bottom" id="M1a-x2-f0b"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="tdb-ox-30u">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<webView contentMode="scaleToFill" scalesPageToFit="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Wnc-48-2ey">
<rect key="frame" x="0.0" y="0.0" width="375" height="618"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<dataDetectorType key="dataDetectorTypes" phoneNumber="YES" link="YES" address="YES"/>
<connections>
<outlet property="delegate" destination="5E8-aG-Wgw" id="aRM-HC-xJ4"/>
</connections>
</webView>
<activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="Obq-VJ-RqL">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="color" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
</activityIndicatorView>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="Obq-VJ-RqL" secondAttribute="bottom" id="82O-NB-fD8"/>
<constraint firstItem="Obq-VJ-RqL" firstAttribute="top" secondItem="tdb-ox-30u" secondAttribute="top" id="C4c-xM-19W"/>
<constraint firstAttribute="trailing" secondItem="Wnc-48-2ey" secondAttribute="trailing" id="DQc-Jx-Bhm"/>
<constraint firstItem="Wnc-48-2ey" firstAttribute="leading" secondItem="tdb-ox-30u" secondAttribute="leading" id="G5D-yq-QFj"/>
<constraint firstItem="Wnc-48-2ey" firstAttribute="top" secondItem="Ns8-4c-Zck" secondAttribute="bottom" id="J0X-d2-w7R"/>
<constraint firstItem="M1a-x2-f0b" firstAttribute="top" secondItem="Wnc-48-2ey" secondAttribute="bottom" id="Src-P7-Cdf"/>
<constraint firstAttribute="trailing" secondItem="Obq-VJ-RqL" secondAttribute="trailing" id="d2m-nY-fIU"/>
<constraint firstItem="Obq-VJ-RqL" firstAttribute="leading" secondItem="tdb-ox-30u" secondAttribute="leading" id="dbN-xb-vNy"/>
</constraints>
</view>
<tabBarItem key="tabBarItem" title="Essen bestellen" image="ticket" id="dFd-uJ-P6I"/>
<connections>
<outlet property="activity" destination="Obq-VJ-RqL" id="FuM-h4-0rc"/>
<outlet property="webView25" destination="Wnc-48-2ey" id="dyD-TT-0uz"/>
</connections>
<tabBarItem key="tabBarItem" title="blistaMeet" image="meet" id="dFd-uJ-P6I"/>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Hi9-te-4VR" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
Expand Down Expand Up @@ -1227,6 +1198,7 @@
<image name="intranet" width="33.5" height="33.5"/>
<image name="katalog" width="33.5" height="33.5"/>
<image name="kontakt" width="33.5" height="33.5"/>
<image name="meet" width="33.5" height="33.5"/>
<image name="news" width="33.5" height="33.5"/>
<image name="newsletter" width="33.5" height="33.5"/>
<image name="open" width="33.5" height="33.5"/>
Expand All @@ -1236,7 +1208,6 @@
<image name="stundenplan" width="33.5" height="33.5"/>
<image name="termine" width="33.5" height="33.5"/>
<image name="terminplan" width="33.5" height="33.5"/>
<image name="ticket" width="33.5" height="33.5"/>
<image name="twitter" width="30" height="30"/>
<image name="user" width="33.5" height="33.5"/>
<image name="vplan1" width="33.5" height="33.5"/>
Expand Down
Loading

0 comments on commit 26eeda3

Please sign in to comment.