Merge branch 'master' into master

Author: akanksharma

Assets/Chatscreen.pdf

@@ -8,6 +8,9 @@
 
 /* Begin PBXBuildFile section */
 		38D7849B234E61F400D09DC8 /* Alamofire in Frameworks */ = {isa = PBXBuildFile; productRef = 38D7849A234E61F400D09DC8 /* Alamofire */; };
+		945F6FE9234EFB08002D2D1D /* StarterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 945F6FE8234EFB08002D2D1D /* StarterView.swift */; };
+		945F701D234F937C002D2D1D /* Rubik-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 945F7013234F937C002D2D1D /* Rubik-Regular.ttf */; };
+		945F701F234F937C002D2D1D /* Rubik-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 945F7015234F937C002D2D1D /* Rubik-Medium.ttf */; };
 		94E63C7C23389703003BDA62 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94E63C7B23389703003BDA62 /* AppDelegate.swift */; };
 		94E63C7E23389703003BDA62 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94E63C7D23389703003BDA62 /* SceneDelegate.swift */; };
 		94E63C8123389703003BDA62 /* Chatkit.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 94E63C7F23389703003BDA62 /* Chatkit.xcdatamodeld */; };
@@ -18,6 +21,9 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		945F6FE8234EFB08002D2D1D /* StarterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarterView.swift; sourceTree = "<group>"; };
+		945F7013234F937C002D2D1D /* Rubik-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Rubik-Regular.ttf"; sourceTree = "<group>"; };
+		945F7015234F937C002D2D1D /* Rubik-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Rubik-Medium.ttf"; sourceTree = "<group>"; };
 		94E63C7823389703003BDA62 /* Chatkit.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Chatkit.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		94E63C7B23389703003BDA62 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		94E63C7D23389703003BDA62 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
@@ -41,6 +47,15 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		945F6FEF234F90C2002D2D1D /* Font */ = {
+			isa = PBXGroup;
+			children = (
+				945F7015234F937C002D2D1D /* Rubik-Medium.ttf */,
+				945F7013234F937C002D2D1D /* Rubik-Regular.ttf */,
+			);
+			path = Font;
+			sourceTree = "<group>";
+		};
 		94E63C6F23389703003BDA62 = {
 			isa = PBXGroup;
 			children = (
@@ -60,9 +75,11 @@
 		94E63C7A23389703003BDA62 /* Chatkit */ = {
 			isa = PBXGroup;
 			children = (
+				945F6FEF234F90C2002D2D1D /* Font */,
 				94E63C7B23389703003BDA62 /* AppDelegate.swift */,
 				94E63C7D23389703003BDA62 /* SceneDelegate.swift */,
 				94E63C8223389703003BDA62 /* ContentView.swift */,
+				945F6FE8234EFB08002D2D1D /* StarterView.swift */,
 				94E63C8423389704003BDA62 /* Assets.xcassets */,
 				94E63C8923389704003BDA62 /* LaunchScreen.storyboard */,
 				94E63C8C23389704003BDA62 /* Info.plist */,
@@ -144,7 +161,9 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				945F701D234F937C002D2D1D /* Rubik-Regular.ttf in Resources */,
 				94E63C8B23389704003BDA62 /* LaunchScreen.storyboard in Resources */,
+				945F701F234F937C002D2D1D /* Rubik-Medium.ttf in Resources */,
 				94E63C8823389704003BDA62 /* Preview Assets.xcassets in Resources */,
 				94E63C8523389704003BDA62 /* Assets.xcassets in Resources */,
 			);
@@ -158,6 +177,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				94E63C7C23389703003BDA62 /* AppDelegate.swift in Sources */,
+				945F6FE9234EFB08002D2D1D /* StarterView.swift in Sources */,
 				94E63C7E23389703003BDA62 /* SceneDelegate.swift in Sources */,
 				94E63C8323389703003BDA62 /* ContentView.swift in Sources */,
 				94E63C8123389703003BDA62 /* Chatkit.xcdatamodeld in Sources */,

Assets/Home Screen.pdf

@@ -27,6 +27,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
+        
         return true
     }
 

Assets/Login.pdf

@@ -0,0 +1,20 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0.145",
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "0.404"
+        }
+      }
+    }
+  ]
+}

Assets/Sign Up.pdf

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "loginLogoImage.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Assets/Starter Screen.pdf

@@ -56,5 +56,10 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UIAppFonts</key>
+	<array>
+		<string>Rubik-Bold.ttf</string>
+		<string>Rubik-Medium.ttf</string>
+	</array>
 </dict>
 </plist>

Chatkit/Chatkit.xcodeproj/project.pbxproj

@@ -35,12 +35,12 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
         // Create the SwiftUI view and set the context as the value for the managedObjectContext environment keyPath.
         // Add `@Environment(\.managedObjectContext)` in the views that will need the context.
-        let contentView = ContentView().environment(\.managedObjectContext, context)
+        let starterView = StarterView().environment(\.managedObjectContext, context)
 
         // Use a UIHostingController as window root view controller.
         if let windowScene = scene as? UIWindowScene {
             let window = UIWindow(windowScene: windowScene)
-            window.rootViewController = UIHostingController(rootView: contentView)
+            window.rootViewController = UIHostingController(rootView: starterView)
             self.window = window
             window.makeKeyAndVisible()
         }

Chatkit/Chatkit/AppDelegate.swift

@@ -0,0 +1,84 @@
+//
+//  StarterView.swift
+//  Chatkit
+//
+//  Created by Tushar Limaye on 10/10/19.
+//  Copyright [2019] [SwiftMumbai]
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+
+import SwiftUI
+
+struct StarterView: View {
+    let loginLogoImage = UIImage(named: "loginLogoImage")!
+    var body: some View {
+        VStack(alignment: .center, spacing: 20){
+                Image(uiImage:loginLogoImage)
+                    .resizable()
+                    .aspectRatio(contentMode: .fit)
+                Text("ChatKit")
+                    .font(Font.custom("Rubik-Medium", size: 30))
+                    .foregroundColor(Color("blueColor")).padding()
+                LoginButton()
+                    .padding(.leading)
+                    .padding(.trailing)
+                    .padding(.top)
+                SignUpButton()
+                    .padding(.leading)
+                    .padding(.trailing)
+                    .padding(.bottom)
+            }
+    }
+}
+
+struct LoginButton:View{
+    var body:some View{
+        return Button(action: {
+            // Login Button Action
+               }) {
+                Text("Login")
+                    .frame(maxWidth: .infinity)
+                    .font(Font.custom("Rubik-Regular", size: 20))
+                    .padding()
+                    .background(Color.white)
+                    .foregroundColor(Color("blueColor"))
+                    .border(Color("blueColor"),width:2)
+                    .cornerRadius(5)
+        }
+    }
+}
+
+
+struct SignUpButton:View{
+    var body:some View{
+        return Button(action: {
+                // SignUp Button Action
+               }) {
+                Text("Sign Up")
+                    .frame(maxWidth: .infinity)
+                    .font(Font.custom("Rubik-Regular", size: 20))
+                    .padding()
+                    .background(Color("blueColor"))
+                    .foregroundColor(.white)
+                    .cornerRadius(5)
+        }
+    }
+}
+
+
+
+struct StarterView_Previews: PreviewProvider {
+    static var previews: some View {
+        StarterView()
+    }
+}

Chatkit/Chatkit/Assets.xcassets/blueColor.colorset/Contents.json

@@ -1 +1,24 @@
-# chatkit
+# Chatkit
+
+[![codebeat badge](https://codebeat.co/badges/50a7fc27-9c9b-422e-9494-5642946db8ab)](https://codebeat.co/projects/g.yxqyang.asia-swiftmumbai-chatkit-master)
+
+A Community Based Open Software Project
+
+We are in the process of developing a Messaging application for community level communications.
+
+
+Checkout Project status: https://github.com/swiftmumbai/chatkit/projects/1
+
+Messaging App contents:
+- Mainpage 
+- Login page 
+- Signup page 
+- Chat tray
+- Individual chats screen 
+
+Authentication on local side (initially) using the protocols.
+Server side handling,rendering and fetching of data using Firebase(initially), or some MYSQL,SQLite or PostgreSQL
+
+Swift Package Manager to be used.
+
+Development of SDK and then available to all the commmunity members.