Chat sdk master

ChatSDKCore/Classes/Categories/NSDate+Additions.m

@@ -24,7 +24,7 @@ -(NSString *) threadTimeAgo {
     // We check if the last date was in the last few days
     // Then check if it was exactly yesterday
     if ([self daysAgo] < 3 && today.day == otherDay.day + 1) {
-        time = [NSBundle t: bYesterday];
+        time = [NSBundle t: NSLocalizedString(bYesterday, nil)];
     }
     else if (self.daysAgo > 1 && self.daysAgo < 7) {
         [formatter setDateFormat:@"EEEE"];
@@ -62,10 +62,10 @@ -(NSString *) dateAgo {
     NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
 
     if (self.isToday) {
-        day = [NSBundle t: bToday];
+        day = [NSBundle t: NSLocalizedString(bToday, nil)];
     }
     else if (self.isYesterday) {
-        day = [NSBundle t: bYesterday];
+        day = [NSBundle t: NSLocalizedString(bYesterday, nil)];
     }
     else if (self.daysAgo < 7) {
         [formatter setDateFormat:@"EEE"];

ChatSDKCore/Classes/Entities/PMessage.h

@@ -21,6 +21,10 @@ typedef enum {
     bMessageTypeSticker = 6,
     bMessageTypeFile = 7,
     bMessageTypeCustom = 99,
+    bMessageTypeLeaveConversation = 8,
+    bMessageTypeAddedMember = 9,
+    bMessageTypeGroupRenamed = 10,
+
 } bMessageType;
 
 typedef enum {

ChatSDKCore/Classes/Handlers/Abstract/BAbstractCoreHandler.h

@@ -19,5 +19,5 @@
 -(id<PThread>) createThreadWithUsers: (NSArray *) users name: (NSString *) name type: (bThreadType) type;
 
 -(RXPromise *) prepareSendMessage: (id<PMessage>) messageModel;
-
+-(RXPromise *) updateThread: (id<PThread>) threadModel dataPushed: (void(^)(NSError * error, id<PThread> thread)) dataPushed;
 @end

ChatSDKCore/Classes/Handlers/Abstract/BAbstractCoreHandler.m

@@ -216,11 +216,17 @@ -(RXPromise *) createThreadWithUsers: (NSArray *) users
                          threadCreated:threadCreated];
 }
 
+-(RXPromise *) updateThread: (id<PThread>) threadModel dataPushed: (void(^)(NSError * error, id<PThread> thread)) dataPushed {
+    return [self updateThread:threadModel dataPushed:dataPushed];
+}
+
+
 -(RXPromise *) createThreadWithUsers: (NSArray *) users
                        threadCreated: (void(^)(NSError * error, id<PThread> thread)) threadCreated {
     return [self createThreadWithUsers:users name:nil threadCreated:threadCreated];
 }
 
+
 /**
  * @brief Add users to a thread
  */

ChatSDKCore/Classes/Hooks/BBaseHookHandler.m

@@ -32,7 +32,7 @@ -(BHook *) addHook: (BHook *) hook withName: (NSString *) name {
     if(!existingHooks) {
         existingHooks = [NSMutableArray new];
     }
-    if(![existingHooks containsObject:hook]) {
+    if(![existingHooks containsObject:hook] && hook != nil) {
         [existingHooks addObject:hook];
     }
     _hooks[name] = existingHooks;

ChatSDKCore/Classes/Session/BConfiguration.h

@@ -153,6 +153,11 @@
 @property (nonatomic, readwrite) UIFont * threadTimeFont;
 @property (nonatomic, readwrite) UIFont * threadSubtitleFont;
 
+@property (nonatomic, readwrite) UIFont * unreadThreadTitleFont;
+@property (nonatomic, readwrite) UIFont * unreadThreadTimeFont;
+@property (nonatomic, readwrite) UIFont * unreadThreadSubtitleFont;
+
+@property (nonatomic, readwrite) NSString * threadNameColor;
 @property (nonatomic, readwrite) BOOL locationMessagesEnabled;
 @property (nonatomic, readwrite) BOOL imageMessagesEnabled;
 

ChatSDKCore/Classes/UI/NSBundle+Core.h

@@ -21,13 +21,14 @@
 #define bThreadCreationError @"bThreadCreationError"
 #define bSearchTerm @"bSearchTerm"
 
-#define bPickFriends @"bPickFriends"
+#define bPickFriends @"NewChat"
+#define bInviteFriend @"Invite"
 
-#define bBack @"bBack"
+#define bBack @"Back"
 #define bImageSaved @"bImageSaved"
 #define bOpenInMaps @"bOpenInMaps"
 #define bLocation @"bLocation"
-#define bCompose @"bCompose"
+#define bCompose @"Create"
 #define bCreateGroup @"bCreateGroup"
 
 #define bLoadingFriends @"bLoadingFriends"
@@ -76,11 +77,11 @@
 #define bChooseExistingPhoto @"bChooseExistingPhoto"
 #define bChooseExistingVideo @"bChooseExistingVideo"
 #define bCurrentLocation @"bCurrentLocation"
-#define bSend @"bSend"
+#define bSend @"SEND"
 #define bOpen @"bOpen"
 #define bReply @"bReply"
 #define bRec @"bRec"
-#define bWriteSomething @"bWriteSomething"
+#define bWriteSomething @"type_something"
 #define bSlideToCancel @"bSlideToCancel"
 #define bFlagged @"bFlagged"
 #define bFlag @"bFlag"
@@ -101,7 +102,7 @@
 #define bInviteBySMS @"bInviteBySMS"
 
 #define bTo @"bTo"
-#define bEnterNamesHere @"bEnterNamesHere"
+#define bEnterNamesHere @"SearchMembers" //@"bEnterNamesHere"
 #define bSearchedContacts @"bSearchedContacts"
 #define bNearbyContacts @"bNearbyContacts"
 
@@ -123,8 +124,8 @@
 #define bDeletePicture @"bDeletePicture"
 #define bSetAsDefaultPicture @"bSetAsDefaultPicture"
 #define bDeleteLastPictureWarning @"bDeleteLastPictureWarning"
-#define bDone @"bDone"
-#define bEdit @"bEdit"
+#define bDone @"Done"
+#define bEdit @"Edit"
 #define b_Ago @"b_Ago"
 
 #define bRemoveFriend @"bRemoveFriend"
@@ -137,12 +138,12 @@
 
 #define bTermsAndConditions @"bTermsAndConditions"
 
-#define bNoMessages @"bNoMessages"
+#define bNoMessages @"no_messages"
 #define bNoNewUsersFoundForThisSearch @"bNoNewUsersFoundForThisSearch"
 #define bLastSeen_at_ @"bLastSeen_at_"
 #define b_at_ @"b_at_"
-#define bToday @"Today"
-#define bYesterday @"Yesterday"
+#define bToday @"today"
+#define bYesterday @"yesterday"
 #define bYouLeftTheGroup @"bYouLeftTheGroup"
 #define bYouJoinedTheGroup @"bYouJoinedTheGroup"
 #define bRejoinGroup @"bRejoinGroup"
@@ -184,6 +185,10 @@
 #define bVideoMessage @"bVideoMessage"
 #define bStickerMessage @"bStickerMessage"
 #define bFileMessage @"bFileMessage"
+#define bProfilePictures @"bProfilePictures"
+#define bDeletePicture @"bDeletePicture"
+#define bSetAsDefaultPicture @"bSetAsDefaultPicture"
+#define bDeleteLastPictureWarning @"bDeleteLastPictureWarning"
 
 #define bAvailable @"bAvailable"
 #define bAway @"bAway"

ChatSDKCore/Classes/UI/NSBundle+Core.h.orig

@@ -0,0 +1,210 @@
+//
+//  NSBundle+Core.h
+//  Pods
+//
+//  Created by Benjamin Smiley-andrews on 12/07/2017.
+//
+//
+
+#import <Foundation/Foundation.h>
+
+#define bLogout @"bLogout"
+#define bSettings @"bSettings"
+#define bAuthenticating @"bAuthenticating"
+#define bLogginIn @"bLogginIn"
+#define bErrorTitle @"bErrorTitle"
+#define bContacts @"bContacts"
+#define bConversations @"bConversations"
+#define bBroadcast @"bBroadcast"
+//#define bThread @"bThread"
+#define bChatRooms @"bChatRooms"
+#define bThreadCreationError @"bThreadCreationError"
+#define bSearchTerm @"bSearchTerm"
+
+#define bPickFriends @"NewChat"
+#define bInviteFriend @"Invite"
+
+#define bBack @"Back"
+#define bImageSaved @"bImageSaved"
+#define bOpenInMaps @"bOpenInMaps"
+#define bLocation @"bLocation"
+#define bCompose @"Create"
+#define bCreateGroup @"bCreateGroup"
+
+#define bLoadingFriends @"bLoadingFriends"
+#define bLoading @"bLoading"
+#define bErrorLoadingFriends @"bErrorLoadingFriends"
+
+#define bInvalidSelection @"bInvalidSelection"
+#define bSelectAtLeastOneFriend @"bSelectAtLeastOneFriend"
+
+#define bInviteFriendsFromFacebook @"bInviteFriendsFromFacebook"
+#define bFriendsAdded_i @"bFriendsAdded_i"
+
+#define bSuccess @"bSuccess"
+#define bAdded @"bAdded"
+
+#define bAdd @"bAdd"
+#define bCreatingThread @"bCreatingThread"
+#define bLogoutErrorTitle @"bLogoutErrorTitle"
+
+#define bSearch @"bSearch"
+#define bSearching @"bSearching"
+#define bNoNearbyUsers @"bNoNearbyUsers"
+
+#define bAddUsers @"bAddUsers"
+
+#define bOnline @"online"
+<<<<<<< HEAD
+#define bOffline @"bOffline"
+=======
+#define bOffline @"offline"
+>>>>>>> ba622d8b140a9791dcf57da71313e8792eb58a33
+
+#define bCreatePublicThread @"bCreatePublicThread"
+#define bThreadName @"bThreadName"
+#define bCancel @"bCancel"
+#define bOk @"bOk"
+#define bReset @"bReset"
+#define bLogin @"bLogin"
+#define bRegister @"bRegister"
+#define bPassword @"bPassword"
+#define bForgotPassword @"bForgotPassword"
+#define bEnterCredentialToResetPassword @"bEnterCredentialToResetPassword"
+#define bPasswordResetSuccess @"bPasswordResetSuccess"
+#define bUnableToCreateThread @"bUnableToCreateThread"
+#define bChat @"bChat"
+#define bOptions @"bOptions"
+#define bTakePhoto @"bTakePhoto"
+#define bTakeVideo @"bTakeVideo"
+#define bTakePhotoOrVideo @"bTakePhotoOrVideo"
+#define bChooseExistingPhoto @"bChooseExistingPhoto"
+#define bChooseExistingVideo @"bChooseExistingVideo"
+#define bCurrentLocation @"bCurrentLocation"
+#define bSend @"SEND"
+#define bOpen @"bOpen"
+#define bReply @"bReply"
+#define bRec @"bRec"
+#define bWriteSomething @"type_something"
+#define bSlideToCancel @"bSlideToCancel"
+#define bFlagged @"bFlagged"
+#define bFlag @"bFlag"
+#define bDelete @"bDelete"
+#define bUnflag @"bUnflag"
+#define bHoldToSendAudioMessageError @"bHoldToSendAudioMessageError"
+#define bRecording @"bRecording"
+#define bSecondsRemaining_ @"bSecondsRemaining_"
+#define bAudioLengthLimitReached @"bAudioLengthLimitReached"
+#define bSendOrDiscardRecording @"bSendOrDiscardRecording"
+
+#define bCancelled @"bCancelled"
+#define bSave @"bSave"
+#define bSaving @"bSaving"
+#define bGroupName @"bGroupName"
+#define bInviteByEmail @"bInviteByEmail"
+#define bInviteContact @"bInviteContact"
+#define bInviteBySMS @"bInviteBySMS"
+
+#define bTo @"bTo"
+#define bEnterNamesHere @"SearchMembers" //@"bEnterNamesHere"
+#define bSearchedContacts @"bSearchedContacts"
+#define bNearbyContacts @"bNearbyContacts"
+
+#define bName @"bName"
+#define bPhoneNumber @"bPhoneNumber"
+#define bEmail @"bEmail"
+#define bDetails @"bDetails"
+#define bAddParticipant @"bAddParticipant"
+#define bLeaveConversation @"bLeaveConversation"
+#define bRejoinConversation @"bRejoinConversation"
+#define bParticipants @"bParticipants"
+#define bActiveParticipants @"bActiveParticipants"
+#define bNoActiveParticipants @"bNoActiveParticipants"
+#define bTapHereForContactInfo @"bTapHereForContactInfo"
+
+#define bProfile @"bProfile"
+#define bProfilePictures @"bProfilePictures"
+#define bAddPictures @"bAddPicture"
+#define bDeletePicture @"bDeletePicture"
+#define bSetAsDefaultPicture @"bSetAsDefaultPicture"
+#define bDeleteLastPictureWarning @"bDeleteLastPictureWarning"
+#define bDone @"Done"
+#define bEdit @"Edit"
+#define b_Ago @"b_Ago"
+
+#define bRemoveFriend @"bRemoveFriend"
+#define bAddFriend @"bAddFriend"
+#define bAddContact @"bAddContact"
+#define bUnblock @"bUnblock"
+#define bBlock @"bBlock"
+#define b_LeftTheGroup @"b_LeftTheGroup"
+#define b_JoinedTheGroup @"b_JoinedTheGroup"
+
+#define bTermsAndConditions @"bTermsAndConditions"
+
+#define bNoMessages @"no_messages"
+#define bNoNewUsersFoundForThisSearch @"bNoNewUsersFoundForThisSearch"
+#define bLastSeen_at_ @"bLastSeen_at_"
+#define b_at_ @"b_at_"
+#define bToday @"today"
+#define bYesterday @"yesterday"
+#define bYouLeftTheGroup @"bYouLeftTheGroup"
+#define bYouJoinedTheGroup @"bYouJoinedTheGroup"
+#define bRejoinGroup @"bRejoinGroup"
+
+#define bDefaultThreadName @"bDefaultThreadName"
+
+#define bDeleteContact @"bDeleteContact"
+#define bDeleteContactMessage @"bDeleteContactMessage"
+
+#define bTyping @"bTyping"
+#define bCamera @"bCamera"
+#define bPhoto @"bPhoto"
+#define bChoosePhoto @"bChoosePhoto"
+#define bChooseVideo @"bChooseVideo"
+#define bSticker @"bSticker"
+#define bFile @"bFile"
+#define bRefreshingUsers @"bRefreshingUsers"
+#define bMessageBurst @"bMessageBurst"
+
+#define bSelectYourSearch @"bSelectYourSearch"
+#define bPhonebook @"bPhonebook"
+#define bSearchWithName @"bSearchWithName"
+#define bWarning @"bWarning"
+#define bYouMustEnableContactPermissionsToUseThisFunctionalityEnableInTheSettingsApp @"bYouMustEnableContactPermissionsToUseThisFunctionalityEnableInTheSettingsApp"
+
+#define bImageMessagesNotSupported @"bImageMessagesNotSupported"
+#define bAudioMessagesNotSupported @"bAudioMessagesNotSupported"
+#define bStickerMessagesNotSupported @"bStickerMessagesNotSupported"
+#define bFileMessagesNotSupported @"bFileMessagesNotSupported"
+#define bLocationMessagesNotSupported @"bLocationMessagesNotSupported"
+#define bVideoMessagesNotSupported @"bVideoMessagesNotSupported"
+
+#define bBlock @"bBlock"
+#define bUnblock @"bUnblock"
+
+#define bImageMessage @"bImageMessage"
+#define bLocationMessage @"bLocationMessage"
+#define bAudioMessage @"bAudioMessage"
+#define bVideoMessage @"bVideoMessage"
+#define bStickerMessage @"bStickerMessage"
+#define bFileMessage @"bFileMessage"
+#define bProfilePictures @"bProfilePictures"
+#define bDeletePicture @"bDeletePicture"
+#define bSetAsDefaultPicture @"bSetAsDefaultPicture"
+#define bDeleteLastPictureWarning @"bDeleteLastPictureWarning"
+
+#define bAvailable @"bAvailable"
+#define bAway @"bAway"
+#define bExtendedAway @"bExtendedAway"
+#define bBusy @"bBusy"
+
+@protocol PMessage;
+
+@interface NSBundle(ChatCore)
+
++(NSBundle *) coreBundle;
++(NSString *) t: (NSString *) string;
++(NSString *) textForMessage: (id<PMessage>) message;
+
+@end