Skip to content

Commit

Permalink
Upload file introduced. Debug logs and error handling introduced. Fix…
Browse files Browse the repository at this point in the history 
…ed some minor bugs.
  • Loading branch information
kerrygrover committed Nov 13, 2015
1 parent 4af6a65 commit d7d1a39
Show file tree
Hide file tree
Showing 20 changed files with 386 additions and 57 deletions.
Binary file modified .DS_Store
View file
Binary file not shown.
55 changes: 51 additions & 4 deletions iFlyChatGlobalListView.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@
6ECB81401B68FA0C009E78EA /* iFlyChatGlobalListViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6ECB813F1B68FA0C009E78EA /* iFlyChatGlobalListViewTests.m */; };
6ECB81511B68FF99009E78EA /* UsersTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6ECB81501B68FF99009E78EA /* UsersTableViewController.m */; };
6ECB81531B6902DE009E78EA /* GlobalListTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6ECB81521B6902DE009E78EA /* GlobalListTableViewCell.xib */; };
6ED0C65B1BF5E8B5005336B1 /* Utility.m in Sources */ = {isa = PBXBuildFile; fileRef = 6ED0C65A1BF5E8B5005336B1 /* Utility.m */; };
6ED0C6611BF5ED5F005336B1 /* ChatRoom.png in Resources */ = {isa = PBXBuildFile; fileRef = 6ED0C65C1BF5ED5F005336B1 /* ChatRoom.png */; };
6ED0C6621BF5ED5F005336B1 /* FemaleUser.png in Resources */ = {isa = PBXBuildFile; fileRef = 6ED0C65D1BF5ED5F005336B1 /* FemaleUser.png */; };
6ED0C6631BF5ED5F005336B1 /* MaleUser.png in Resources */ = {isa = PBXBuildFile; fileRef = 6ED0C65E1BF5ED5F005336B1 /* MaleUser.png */; };
6ED0C6641BF5ED5F005336B1 /* GeneralUser.png in Resources */ = {isa = PBXBuildFile; fileRef = 6ED0C65F1BF5ED5F005336B1 /* GeneralUser.png */; };
6ED0C6651BF5ED5F005336B1 /* iflychat_full.png in Resources */ = {isa = PBXBuildFile; fileRef = 6ED0C6601BF5ED5F005336B1 /* iflychat_full.png */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -59,6 +65,13 @@
6ECB814F1B68FF99009E78EA /* UsersTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UsersTableViewController.h; sourceTree = "<group>"; };
6ECB81501B68FF99009E78EA /* UsersTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UsersTableViewController.m; sourceTree = "<group>"; };
6ECB81521B6902DE009E78EA /* GlobalListTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = GlobalListTableViewCell.xib; sourceTree = "<group>"; };
6ED0C6591BF5E8B5005336B1 /* Utility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utility.h; sourceTree = "<group>"; };
6ED0C65A1BF5E8B5005336B1 /* Utility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Utility.m; sourceTree = "<group>"; };
6ED0C65C1BF5ED5F005336B1 /* ChatRoom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ChatRoom.png; sourceTree = "<group>"; };
6ED0C65D1BF5ED5F005336B1 /* FemaleUser.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = FemaleUser.png; sourceTree = "<group>"; };
6ED0C65E1BF5ED5F005336B1 /* MaleUser.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = MaleUser.png; sourceTree = "<group>"; };
6ED0C65F1BF5ED5F005336B1 /* GeneralUser.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = GeneralUser.png; sourceTree = "<group>"; };
6ED0C6601BF5ED5F005336B1 /* iflychat_full.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = iflychat_full.png; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -167,8 +180,11 @@
6EAEA1FE1B69F7790042A11D /* GlobalListTableViewCell */,
6ECB812D1B68FA0C009E78EA /* Main.storyboard */,
6ECB81301B68FA0C009E78EA /* Images.xcassets */,
6ED0C6661BF5ED64005336B1 /* Resources */,
6ECB81321B68FA0C009E78EA /* LaunchScreen.xib */,
6ECB81231B68FA0C009E78EA /* Supporting Files */,
6ED0C6591BF5E8B5005336B1 /* Utility.h */,
6ED0C65A1BF5E8B5005336B1 /* Utility.m */,
);
path = iFlyChatGlobalListView;
sourceTree = "<group>";
Expand Down Expand Up @@ -199,6 +215,18 @@
name = "Supporting Files";
sourceTree = "<group>";
};
6ED0C6661BF5ED64005336B1 /* Resources */ = {
isa = PBXGroup;
children = (
6ED0C65C1BF5ED5F005336B1 /* ChatRoom.png */,
6ED0C65D1BF5ED5F005336B1 /* FemaleUser.png */,
6ED0C65E1BF5ED5F005336B1 /* MaleUser.png */,
6ED0C65F1BF5ED5F005336B1 /* GeneralUser.png */,
6ED0C6601BF5ED5F005336B1 /* iflychat_full.png */,
);
name = Resources;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -248,6 +276,7 @@
TargetAttributes = {
6ECB811F1B68FA0C009E78EA = {
CreatedOnToolsVersion = 6.4;
DevelopmentTeam = ET385UDM96;
};
6ECB81381B68FA0C009E78EA = {
CreatedOnToolsVersion = 6.4;
Expand Down Expand Up @@ -279,10 +308,15 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
6ED0C6621BF5ED5F005336B1 /* FemaleUser.png in Resources */,
6ED0C6631BF5ED5F005336B1 /* MaleUser.png in Resources */,
6ECB81531B6902DE009E78EA /* GlobalListTableViewCell.xib in Resources */,
6ED0C6651BF5ED5F005336B1 /* iflychat_full.png in Resources */,
6ECB812F1B68FA0C009E78EA /* Main.storyboard in Resources */,
6ECB81341B68FA0C009E78EA /* LaunchScreen.xib in Resources */,
6ECB81311B68FA0C009E78EA /* Images.xcassets in Resources */,
6ED0C6611BF5ED5F005336B1 /* ChatRoom.png in Resources */,
6ED0C6641BF5ED5F005336B1 /* GeneralUser.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -304,6 +338,7 @@
6EAEA2011B69F7970042A11D /* GlobalListTableViewCell.m in Sources */,
6E6743101BA9910B00B03D5E /* ApplicationData.m in Sources */,
6EAEA2061B6A1ACF0042A11D /* RoomsTableViewController.m in Sources */,
6ED0C65B1BF5E8B5005336B1 /* Utility.m in Sources */,
6ECB81291B68FA0C009E78EA /* AppDelegate.m in Sources */,
6ECB81511B68FF99009E78EA /* UsersTableViewController.m in Sources */,
6ECB81261B68FA0C009E78EA /* main.m in Sources */,
Expand Down Expand Up @@ -369,6 +404,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
Expand Down Expand Up @@ -414,6 +450,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_BITCODE = NO;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
Expand All @@ -435,30 +472,40 @@
6ECB81441B68FA0C009E78EA /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)";
FRAMEWORK_SEARCH_PATHS = "";
INFOPLIST_FILE = iFlyChatGlobalListView/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "iFlyLabs.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_BUNDLE_IDENTIFIER = iFlyLabs.iFlyChatGlobalListView;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "arm64 armv7 armv7s";
};
name = Debug;
};
6ECB81451B68FA0C009E78EA /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)";
FRAMEWORK_SEARCH_PATHS = "";
INFOPLIST_FILE = iFlyChatGlobalListView/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "iFlyLabs.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_BUNDLE_IDENTIFIER = iFlyLabs.iFlyChatGlobalListView;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "arm64 armv7 armv7s";
};
name = Release;
};
Expand Down
Binary file modified ...odeproj/project.xcworkspace/xcuserdata/prateek.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
16 changes: 16 additions & 0 deletions ...balListView.xcodeproj/xcuserdata/prateek.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,21 @@
stopOnStyle = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "iFlyChatGlobalListView/UsersTableViewController.m"
timestampString = "469102418.875937"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "166"
endingLineNumber = "166"
landmarkName = "-tableView:cellForRowAtIndexPath:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
Binary file modified iFlyChatGlobalListView/.DS_Store
View file
Binary file not shown.
9 changes: 6 additions & 3 deletions iFlyChatGlobalListView/Base.lproj/LaunchScreen.xib
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9059" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
</dependencies>
<objects>
Expand All @@ -11,19 +11,22 @@
<rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Copyright (c) 2015 Prateek Grover. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Copyright (c) 2015 iFlyLabs. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
<rect key="frame" x="20" y="439" width="441" height="21"/>
<animations/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="iFlyChatGlobalListView" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
<rect key="frame" x="20" y="140" width="441" height="43"/>
<animations/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
Expand Down
Binary file added iFlyChatGlobalListView/ChatRoom.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 5 additions & 2 deletions iFlyChatGlobalListView/DataClass.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,16 @@ +(DataClass *)getInstance
//Intialisation of chat
-(void) initiFlyChatLibrary
{
[Utilities setIsDebug:YES];

//iFlyChatUserSession object with username, password and session key (if available)

appData.session = [[iFlyChatUserSession alloc] initIFlyChatUserSessionwithUserName:@"userName" userPassword:@"userPassword" userSessionKey:@""];

appData.session = [[iFlyChatUserSession alloc] initIFlyChatUserSessionwithUserName:@"username" userPassword:@"userPassword" userSessionKey:@""];

//iFlyChatConfig object with server host, auth URL, SSL connection boolean and iFlyChatUserSession object. These are the basic configuration parameters used to connect to iFlyChat's servers

appData.config = [[iFlyChatConfig alloc] initIFlyChatConfigwithServerHost:@"serverhost.com" authUrl:@"http://example.com/auth/url" isHttps:NO userSession:appData.session];
appData.config = [[iFlyChatConfig alloc] initIFlyChatConfigwithServerHost:@"serverhost.com" authUrl:@"http://example.com/auth/url" isHttps:NO];

//If auto reconnection is required, set it to "YES"

Expand Down
Binary file added iFlyChatGlobalListView/FemaleUser.png
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 iFlyChatGlobalListView/GeneralUser.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions iFlyChatGlobalListView/GlobalListTableViewCell.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
@interface GlobalListTableViewCell : UITableViewCell

@property (weak, nonatomic) IBOutlet UIImageView *avatarImage;
@property (weak, nonatomic) IBOutlet UILabel *userLetterLabel;

@property (weak, nonatomic) IBOutlet UILabel *nameLabel;

Expand Down
15 changes: 15 additions & 0 deletions iFlyChatGlobalListView/GlobalListTableViewCell.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,25 @@
@implementation GlobalListTableViewCell

@synthesize avatarImage;
@synthesize userLetterLabel;
@synthesize nameLabel;
@synthesize messageLabel;
@synthesize timeLabel;


- (void)setHighlighted:(BOOL)highlighted animated:(BOOL)animated
{
UIColor *backgroundColor = self.avatarImage.backgroundColor;
[super setHighlighted:highlighted animated:animated];
self.avatarImage.backgroundColor = backgroundColor;
}

- (void)setSelected:(BOOL)selected animated:(BOOL)animated
{
UIColor *backgroundColor = self.avatarImage.backgroundColor;
[super setSelected:selected animated:animated];
self.avatarImage.backgroundColor = backgroundColor;
}

@end

Loading

0 comments on commit d7d1a39

Please sign in to comment.