Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into release-v0.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@giomfo
giomfo committed Sep 15, 2016
2 parents 4b5ef3d + 9d34cf8 commit 4320ce7
Show file tree
Hide file tree
Showing 20 changed files with 453 additions and 97 deletions.
8 changes: 8 additions & 0 deletions Vector.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,8 @@
F07ECA521D2D730D0060C09F /* main_alias_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = F07ECA4F1D2D730D0060C09F /* main_alias_icon.png */; };
F07ECA531D2D730D0060C09F /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = F07ECA501D2D730D0060C09F /* [email protected] */; };
F07ECA541D2D730D0060C09F /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = F07ECA511D2D730D0060C09F /* [email protected] */; };
F08A543F1D894EDC00A484F1 /* edit_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = F08A543D1D894EDC00A484F1 /* edit_icon.png */; };
F08A54401D894EDC00A484F1 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = F08A543E1D894EDC00A484F1 /* [email protected] */; };
F08BE09E1B87025B00C480FB /* EventFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = F08BE09D1B87025B00C480FB /* EventFormatter.m */; };
F08BE0A21B87064000C480FB /* RoomDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = F08BE0A11B87064000C480FB /* RoomDataSource.m */; };
F094A9A81B78D8F000B1FBBF /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = F094A9A71B78D8F000B1FBBF /* main.m */; };
Expand Down Expand Up @@ -515,6 +517,8 @@
F07ECA4F1D2D730D0060C09F /* main_alias_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = main_alias_icon.png; sourceTree = "<group>"; };
F07ECA501D2D730D0060C09F /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
F07ECA511D2D730D0060C09F /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
F08A543D1D894EDC00A484F1 /* edit_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = edit_icon.png; sourceTree = "<group>"; };
F08A543E1D894EDC00A484F1 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
F08BE09C1B87025B00C480FB /* EventFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventFormatter.h; sourceTree = "<group>"; };
F08BE09D1B87025B00C480FB /* EventFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EventFormatter.m; sourceTree = "<group>"; };
F08BE0A01B87064000C480FB /* RoomDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoomDataSource.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1171,6 +1175,8 @@
F0DD7D1B1B7AA8C900C4BE02 /* Images */ = {
isa = PBXGroup;
children = (
F08A543D1D894EDC00A484F1 /* edit_icon.png */,
F08A543E1D894EDC00A484F1 /* [email protected] */,
F0FE6FB21D66115C0004E747 /* back_icon.png */,
F0FE6FB31D66115C0004E747 /* [email protected] */,
F0FE6FB41D66115C0004E747 /* [email protected] */,
Expand Down Expand Up @@ -1434,6 +1440,7 @@
F02528F11C11B6FC00E1FE1B /* [email protected] in Resources */,
F0026B5E1C916E68001D2C04 /* priorityHigh.png in Resources */,
F02528FB1C11B6FC00E1FE1B /* [email protected] in Resources */,
F08A54401D894EDC00A484F1 /* [email protected] in Resources */,
F001D7631B8207C000A162C3 /* RoomInputToolbarView.xib in Resources */,
F02528DE1C11B6FC00E1FE1B /* [email protected] in Resources */,
F02529091C11B6FC00E1FE1B /* upload_icon.png in Resources */,
Expand Down Expand Up @@ -1565,6 +1572,7 @@
F0FE6F8E1D6486960004E747 /* call_audio_mute_icon.png in Resources */,
F02528EF1C11B6FC00E1FE1B /* placeholder.png in Resources */,
F094A9B41B78D8F000B1FBBF /* Main.storyboard in Resources */,
F08A543F1D894EDC00A484F1 /* edit_icon.png in Resources */,
71F7F51E1C23079F00E7ED8F /* ContactTableViewCell.xib in Resources */,
F047DBB51C576F2200952DA2 /* AuthenticationViewController.xib in Resources */,
F067F2BC1CF6F0EA00F35EE8 /* third_party_licenses.html in Resources */,
Expand Down
36 changes: 24 additions & 12 deletions Vector/AppDelegate.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@

#import "CallViewController.h"

// Uncomment the following line to use local contacts to discover matrix users.
//#define MX_USE_CONTACTS_SERVER_SYNC

//#define MX_CALL_STACK_OPENWEBRTC
#ifdef MX_CALL_STACK_OPENWEBRTC
#import <MatrixOpenWebRTCWrapper/MatrixOpenWebRTCWrapper.h>
Expand Down Expand Up @@ -313,6 +316,9 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
// Configure Google Analytics here if the option is enabled
[self startGoogleAnalytics];

// Configure local contacts management
[MXKContactManager sharedManager].enableFullMatrixIdSyncOnLocalContactsDidLoad = NO;

// Add matrix observers, and initialize matrix sessions if the app is not launched in background.
[self initMatrixSessions];

Expand Down Expand Up @@ -469,9 +475,12 @@ - (void)applicationDidBecomeActive:(UIApplication *)application
[account resume];
}

// refresh the contacts list
[MXKContactManager sharedManager].enableFullMatrixIdSyncOnLocalContactsDidLoad = NO;
[[MXKContactManager sharedManager] loadLocalContacts];
// Check if the application is allowed to access the local contacts
if (ABAddressBookGetAuthorizationStatus() == kABAuthorizationStatusAuthorized)
{
// Refresh the local contacts list by reloading it
[[MXKContactManager sharedManager] loadLocalContacts];
}

_isAppForeground = YES;
}
Expand Down Expand Up @@ -1633,9 +1642,6 @@ - (void)addMatrixCallObserver
[strongSelf presentCallViewController];
}

// Hide system status bar
[UIApplication sharedApplication].statusBarHidden = YES;

}
}];

Expand All @@ -1644,9 +1650,6 @@ - (void)addMatrixCallObserver
else
{
[self presentCallViewController];

// Hide system status bar
[UIApplication sharedApplication].statusBarHidden = YES;
}
}

Expand Down Expand Up @@ -1920,6 +1923,12 @@ - (void)dismissCallViewController:(MXKCallViewController *)callViewController co
BOOL callIsEnded = (callViewController.mxCall.state == MXCallStateEnded);
NSLog(@"Call view controller is dismissed (%d)", callIsEnded);

if (callIsEnded)
{
// Restore system status bar
[UIApplication sharedApplication].statusBarHidden = NO;
}

[callViewController dismissViewControllerAnimated:YES completion:^{
callViewController.isPresented = NO;

Expand All @@ -1939,9 +1948,6 @@ - (void)dismissCallViewController:(MXKCallViewController *)callViewController co
{
[self removeCallStatusBar];

// Restore system status bar
[UIApplication sharedApplication].statusBarHidden = NO;

// Release properly
currentCallViewController.mxCall.delegate = nil;
currentCallViewController.delegate = nil;
Expand Down Expand Up @@ -2052,6 +2058,9 @@ - (void)presentCallViewController

currentCallViewController.isPresented = YES;

// Hide system status bar
[UIApplication sharedApplication].statusBarHidden = YES;

}];
}
else
Expand All @@ -2060,6 +2069,9 @@ - (void)presentCallViewController

currentCallViewController.isPresented = YES;

// Hide system status bar
[UIApplication sharedApplication].statusBarHidden = YES;

}];
}
}
Expand Down
Binary file added Vector/Assets/Images/edit_icon.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 modified Vector/Assets/Images/[email protected]
100644 → 100755
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 Vector/Assets/Images/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Vector/Assets/en.lproj/Vector.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"room_recents_conversations" = "ROOMS";
"room_recents_low_priority" = "LOW PRIORITY";
"room_recents_invites" = "INVITES";
"room_recents_start_chat_with" = "Invite people";
"room_recents_start_chat_with" = "Start chat";
"room_recents_create_empty_room" = "Create room";

// Search
Expand Down
1 change: 1 addition & 0 deletions Vector/ViewController/ContactDetailsViewController.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ typedef enum : NSUInteger
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *contactAvatarHeaderBackgroundHeightConstraint;

@property (weak, nonatomic) IBOutlet UIView *headerView;
@property (weak, nonatomic) IBOutlet UIView *contactAvatarMask;
@property (weak, nonatomic) IBOutlet UILabel *contactNameLabel;
@property (weak, nonatomic) IBOutlet UIView *contactNameLabelMask;

Expand Down
Loading

0 comments on commit 4320ce7

Please sign in to comment.