Browse Source

Added titles to tabbaritem

Bastian van de Wetering 7 years ago
parent
commit
9bc7ec05fe

+ 4 - 0
deltachat-ios.xcodeproj/project.pbxproj

@@ -61,6 +61,7 @@
 		7A9FB5561FB08557001FEA36 /* mrtools.c in Sources */ = {isa = PBXBuildFile; fileRef = 7A9FB5331FB08557001FEA36 /* mrtools.c */; };
 		7A9FB5561FB08557001FEA36 /* mrtools.c in Sources */ = {isa = PBXBuildFile; fileRef = 7A9FB5331FB08557001FEA36 /* mrtools.c */; };
 		7A9FB5571FB08557001FEA36 /* stress.c in Sources */ = {isa = PBXBuildFile; fileRef = 7A9FB5351FB08557001FEA36 /* stress.c */; };
 		7A9FB5571FB08557001FEA36 /* stress.c in Sources */ = {isa = PBXBuildFile; fileRef = 7A9FB5351FB08557001FEA36 /* stress.c */; };
 		8B6D425BC604F7C43B65D436 /* Pods_deltachat_ios.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6241BE1534A653E79AD5D01D /* Pods_deltachat_ios.framework */; };
 		8B6D425BC604F7C43B65D436 /* Pods_deltachat_ios.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6241BE1534A653E79AD5D01D /* Pods_deltachat_ios.framework */; };
+		AE0D26FD1FB1FE88002FAFCE /* ChatViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE0D26FC1FB1FE88002FAFCE /* ChatViewController.swift */; };
 /* End PBXBuildFile section */
 /* End PBXBuildFile section */
 
 
 /* Begin PBXContainerItemProxy section */
 /* Begin PBXContainerItemProxy section */
@@ -198,6 +199,7 @@
 		7A9FB5361FB08557001FEA36 /* stress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stress.h; sourceTree = "<group>"; };
 		7A9FB5361FB08557001FEA36 /* stress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stress.h; sourceTree = "<group>"; };
 		8DE110C607A0E4485C43B5FA /* Pods-deltachat-ios.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-deltachat-ios.debug.xcconfig"; path = "Pods/Target Support Files/Pods-deltachat-ios/Pods-deltachat-ios.debug.xcconfig"; sourceTree = "<group>"; };
 		8DE110C607A0E4485C43B5FA /* Pods-deltachat-ios.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-deltachat-ios.debug.xcconfig"; path = "Pods/Target Support Files/Pods-deltachat-ios/Pods-deltachat-ios.debug.xcconfig"; sourceTree = "<group>"; };
 		A8615D4600859851E53CAA9C /* Pods-deltachat-ios.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-deltachat-ios.release.xcconfig"; path = "Pods/Target Support Files/Pods-deltachat-ios/Pods-deltachat-ios.release.xcconfig"; sourceTree = "<group>"; };
 		A8615D4600859851E53CAA9C /* Pods-deltachat-ios.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-deltachat-ios.release.xcconfig"; path = "Pods/Target Support Files/Pods-deltachat-ios/Pods-deltachat-ios.release.xcconfig"; sourceTree = "<group>"; };
+		AE0D26FC1FB1FE88002FAFCE /* ChatViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatViewController.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* End PBXFileReference section */
 
 
 /* Begin PBXFrameworksBuildPhase section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -332,6 +334,7 @@
 				7A451D921FB1B1DB00177250 /* wrapper.c */,
 				7A451D921FB1B1DB00177250 /* wrapper.c */,
 				7A451D931FB1B1DB00177250 /* wrapper.h */,
 				7A451D931FB1B1DB00177250 /* wrapper.h */,
 				7A451DAF1FB1F84900177250 /* AppCoordinator.swift */,
 				7A451DAF1FB1F84900177250 /* AppCoordinator.swift */,
+				AE0D26FC1FB1FE88002FAFCE /* ChatViewController.swift */,
 			);
 			);
 			path = "deltachat-ios";
 			path = "deltachat-ios";
 			sourceTree = "<group>";
 			sourceTree = "<group>";
@@ -604,6 +607,7 @@
 				7A7923751FB0A2C800BC2DE5 /* validate.c in Sources */,
 				7A7923751FB0A2C800BC2DE5 /* validate.c in Sources */,
 				7A9FB5551FB08557001FEA36 /* mrstock.c in Sources */,
 				7A9FB5551FB08557001FEA36 /* mrstock.c in Sources */,
 				7A9FB53B1FB08557001FEA36 /* mrchatlist.c in Sources */,
 				7A9FB53B1FB08557001FEA36 /* mrchatlist.c in Sources */,
+				AE0D26FD1FB1FE88002FAFCE /* ChatViewController.swift in Sources */,
 				7A9FB1461FB061E2001FEA36 /* ViewController.swift in Sources */,
 				7A9FB1461FB061E2001FEA36 /* ViewController.swift in Sources */,
 				7A9FB54E1FB08557001FEA36 /* mrparam.c in Sources */,
 				7A9FB54E1FB08557001FEA36 /* mrparam.c in Sources */,
 				7A7923741FB0A2C800BC2DE5 /* symmetric.c in Sources */,
 				7A7923741FB0A2C800BC2DE5 /* symmetric.c in Sources */,

+ 2 - 4
deltachat-ios/AppCoordinator.swift

@@ -19,15 +19,13 @@ class AppCoordinator {
         settingsViewController.view.backgroundColor = UIColor.blue
         settingsViewController.view.backgroundColor = UIColor.blue
         
         
         let contactTabbarItem = UITabBarItem(tabBarSystemItem: .contacts, tag: 0)
         let contactTabbarItem = UITabBarItem(tabBarSystemItem: .contacts, tag: 0)
-        let chatTabbarItem = UITabBarItem(tabBarSystemItem: .bookmarks, tag: 1)
-        let settingsTabbarItem = UITabBarItem(tabBarSystemItem: .more, tag: 2)
+        let chatTabbarItem = UITabBarItem(title: "Chat", image: nil, tag: 1)
+        let settingsTabbarItem = UITabBarItem(title: "Settings", image: nil, tag: 2)
         
         
         contactViewController.tabBarItem = contactTabbarItem
         contactViewController.tabBarItem = contactTabbarItem
         chatViewController.tabBarItem = chatTabbarItem
         chatViewController.tabBarItem = chatTabbarItem
         settingsViewController.tabBarItem = settingsTabbarItem
         settingsViewController.tabBarItem = settingsTabbarItem
         
         
-        
-        
         let tabBarController = UITabBarController()
         let tabBarController = UITabBarController()
         
         
         tabBarController.viewControllers = [
         tabBarController.viewControllers = [

+ 35 - 0
deltachat-ios/ChatViewController.swift

@@ -0,0 +1,35 @@
+//
+//  ChatViewController.swift
+//  deltachat-ios
+//
+//  Created by Bastian van de Wetering on 07.11.17.
+//  Copyright © 2017 Jonas Reinsch. All rights reserved.
+//
+
+import UIKit
+
+class ChatViewController: UIViewController {
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        // Do any additional setup after loading the view.
+    }
+
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+        // Dispose of any resources that can be recreated.
+    }
+    
+
+    /*
+    // 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.destinationViewController.
+        // Pass the selected object to the new view controller.
+    }
+    */
+
+}