Skip to content

I
ios-test-login
Commit 0ee9592b authored by Giovanni Cariglia's avatar Giovanni Cariglia
Browse files
Options

Bugfix

parent ab081e88
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 8 deletions
Test Login.xcodeproj/project.pbxproj
View file @ 0ee9592b
......@@ -9,9 +9,7 @@
/* Begin PBXBuildFile section */
9A588BEF25A75AF40012990D /* PopUpVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A588BEE25A75AF40012990D /* PopUpVC.swift */; };
9A588BF225A75D910012990D /* OptionsVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A588BF125A75D910012990D /* OptionsVC.swift */; };
9A6395C425A6FD580030AB0D /* MyColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A6395C325A6FD580030AB0D /* MyColor.swift */; };
9A6395C825A6FFDF0030AB0D /* MasterTableVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A6395C725A6FFDF0030AB0D /* MasterTableVC.swift */; };
9A6395CD25A725200030AB0D /* SplitVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A6395CC25A725200030AB0D /* SplitVC.swift */; };
9A6395D525A7295C0030AB0D /* DetailVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A6395D425A7295C0030AB0D /* DetailVC.swift */; };
9A6395DC25A742990030AB0D /* MasterDetailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A6395DB25A742990030AB0D /* MasterDetailViewModel.swift */; };
9A93295125A0FBC90025FC97 /* DashboardController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A93295025A0FBC90025FC97 /* DashboardController.swift */; };
......@@ -27,14 +25,14 @@
9AEA96C725A2168D00EC932D /* EditorController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AEA96C625A2168D00EC932D /* EditorController.swift */; };
9AF326BD25A275740038E5B4 /* NaviTestController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AF326BC25A275740038E5B4 /* NaviTestController.swift */; };
9AF326C025A280600038E5B4 /* TestViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AF326BF25A280600038E5B4 /* TestViewModel.swift */; };
9AF79C3F25AC60500094CDF9 /* MyColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AF79C3E25AC60500094CDF9 /* MyColor.swift */; };
9AF79C4325AC65170094CDF9 /* SplitVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AF79C4225AC65170094CDF9 /* SplitVC.swift */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
9A588BEE25A75AF40012990D /* PopUpVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopUpVC.swift; sourceTree = "<group>"; };
9A588BF125A75D910012990D /* OptionsVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OptionsVC.swift; sourceTree = "<group>"; };
9A6395C325A6FD580030AB0D /* MyColor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MyColor.swift; path = "../../../../../../Library/Mobile Documents/com~apple~CloudDocs/_dev/Swift/__Buch-Dateien/swift5-beispielprogramme-teil1/17/ios-split/ios-split/MyColor.swift"; sourceTree = "<group>"; };
9A6395C725A6FFDF0030AB0D /* MasterTableVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MasterTableVC.swift; sourceTree = "<group>"; };
9A6395CC25A725200030AB0D /* SplitVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SplitVC.swift; path = "../../../../../../../Library/Mobile Documents/com~apple~CloudDocs/_dev/Swift/__Buch-Dateien/swift5-beispielprogramme-teil1/17/ios-split/ios-split/SplitVC.swift"; sourceTree = "<group>"; };
9A6395D425A7295C0030AB0D /* DetailVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailVC.swift; sourceTree = "<group>"; };
9A6395DB25A742990030AB0D /* MasterDetailViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MasterDetailViewModel.swift; sourceTree = "<group>"; };
9A93295025A0FBC90025FC97 /* DashboardController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DashboardController.swift; sourceTree = "<group>"; };
......@@ -52,6 +50,8 @@
9AEA96C625A2168D00EC932D /* EditorController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditorController.swift; sourceTree = "<group>"; };
9AF326BC25A275740038E5B4 /* NaviTestController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NaviTestController.swift; sourceTree = "<group>"; };
9AF326BF25A280600038E5B4 /* TestViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestViewModel.swift; sourceTree = "<group>"; };
9AF79C3E25AC60500094CDF9 /* MyColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyColor.swift; sourceTree = "<group>"; };
9AF79C4225AC65170094CDF9 /* SplitVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplitVC.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
......@@ -79,9 +79,9 @@
isa = PBXGroup;
children = (
9A6395DB25A742990030AB0D /* MasterDetailViewModel.swift */,
9A6395CC25A725200030AB0D /* SplitVC.swift */,
9A6395C725A6FFDF0030AB0D /* MasterTableVC.swift */,
9A6395D425A7295C0030AB0D /* DetailVC.swift */,
9AF79C4225AC65170094CDF9 /* SplitVC.swift */,
);
path = MasterDetailModule;
sourceTree = "<group>";
......@@ -107,7 +107,7 @@
children = (
9A588BEC25A75AC00012990D /* PopOver */,
9A6395C625A6FF490030AB0D /* MasterDetailModule */,
9A6395C325A6FD580030AB0D /* MyColor.swift */,
9AF79C3E25AC60500094CDF9 /* MyColor.swift */,
9AB7E3E5259D06C8008F9DD8 /* AppDelegate.swift */,
9AB7E3E7259D06C8008F9DD8 /* SceneDelegate.swift */,
9AB7E3E9259D06C8008F9DD8 /* ViewController.swift */,
......@@ -196,16 +196,16 @@
buildActionMask = 2147483647;
files = (
9A93295125A0FBC90025FC97 /* DashboardController.swift in Sources */,
9A6395CD25A725200030AB0D /* SplitVC.swift in Sources */,
9A6395D525A7295C0030AB0D /* DetailVC.swift in Sources */,
9AF326BD25A275740038E5B4 /* NaviTestController.swift in Sources */,
9A6395C825A6FFDF0030AB0D /* MasterTableVC.swift in Sources */,
9AF326C025A280600038E5B4 /* TestViewModel.swift in Sources */,
9AB7E3EA259D06C8008F9DD8 /* ViewController.swift in Sources */,
9AF79C4325AC65170094CDF9 /* SplitVC.swift in Sources */,
9AD0FAD025A6067C00E15817 /* TableDemoViewController.swift in Sources */,
9A6395C425A6FD580030AB0D /* MyColor.swift in Sources */,
9A93295425A0FBFF0025FC97 /* DetailsController.swift in Sources */,
9AB7E3E6259D06C8008F9DD8 /* AppDelegate.swift in Sources */,
9AF79C3F25AC60500094CDF9 /* MyColor.swift in Sources */,
9A6395DC25A742990030AB0D /* MasterDetailViewModel.swift in Sources */,
9A588BEF25A75AF40012990D /* PopUpVC.swift in Sources */,
9AEA96C725A2168D00EC932D /* EditorController.swift in Sources */,
......
Test Login/Base.lproj/Main.storyboard
View file @ 0ee9592b
......@@ -648,6 +648,7 @@
</connections>
</button>
</subviews>
<viewLayoutGuide key="safeArea" id="IPt-F7-MN9"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<edgeInsets key="layoutMargins" top="0.0" left="20" bottom="0.0" right="20"/>
</view>
......@@ -676,6 +677,7 @@
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
</textView>
</subviews>
<viewLayoutGuide key="safeArea" id="oAy-WH-6fZ"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="nEr-Va-Alk" firstAttribute="trailing" secondItem="Hu5-f5-sz1" secondAttribute="trailing" id="GE4-JN-TfH"/>
......
Test Login/Info.plist
View file @ 0ee9592b
......@@ -49,6 +49,8 @@
<array>
<string>armv7</string>
</array>
<key>UIStatusBarStyle</key>
<string>UIStatusBarStyleDefault</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
......
Test Login/MasterDetailModule/SplitVC.swift 0 → 100644
View file @ 0ee9592b
//
// SplitVC.swift
// Test Login
//
// Created by Giovanni Cariglia on 11.01.21.
//
import UIKit
class SplitVC: UISplitViewController, UISplitViewControllerDelegate {
override func viewDidLoad() {
super.viewDidLoad()
MasterDetailViewModel.getInstance.splitVC = self
self.delegate = self
}
// beim Programmstart Liste anzeigen (nicht Detail)
// http://stackoverflow.com/questions/25875618
func splitViewController(
_ splitViewController: UISplitViewController,
collapseSecondary secondaryViewController: UIViewController,
onto primaryViewController: UIViewController)
-> Bool
{
return true
}
/*
// MARK: - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
// Get the new view controller using segue.destination.
// Pass the selected object to the new view controller.
}
*/
}
Test Login/MyColor.swift 0 → 100644
View file @ 0ee9592b
//
// MyColor.swift
// Test Login
//
// Created by Giovanni Cariglia on 11.01.21.
//
import UIKit
class MyColor {
var name: String
var color: UIColor
init(_ name: String, color: UIColor) {
self.name = name
self.color = color
}
static func makeDefault() -> [MyColor] {
return [
MyColor("Gelb", color: .yellow),
MyColor("Grau", color: .gray),
MyColor("Rot", color: .red),
MyColor("Schwarz", color: .black),
MyColor("Blau", color: .blue),
MyColor("Grün", color: .green),
]
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment