fix: multiple UI fixes
- Leave message UI
- Better support for dark mode
Change-Id: I8ee94aa1a973fcb030be695573d6d1461e730e22
diff --git a/data/dark/ic_camera.png b/data/dark/ic_camera.png
index 1f564c4..215df01 100644
--- a/data/dark/ic_camera.png
+++ b/data/dark/ic_camera.png
Binary files differ
diff --git a/src/LeaveMessageVC.mm b/src/LeaveMessageVC.mm
index 858a8d0..6b35b67 100644
--- a/src/LeaveMessageVC.mm
+++ b/src/LeaveMessageVC.mm
@@ -39,9 +39,9 @@
__unsafe_unretained IBOutlet NSTextField* infoLabel;
__unsafe_unretained IBOutlet NSBox* timerBox;
__unsafe_unretained IBOutlet NSTextField* timerLabel;
- __unsafe_unretained IBOutlet NSBox* sendBox;
- __unsafe_unretained IBOutlet NSTextField* sendFilename;
+ __unsafe_unretained IBOutlet NSButton* sendButton;
__unsafe_unretained IBOutlet NSButton* recordButton;
+ __unsafe_unretained IBOutlet NSButton* exitButton;
}
@end
@@ -62,6 +62,19 @@
personPhoto.layer.masksToBounds =true;
personPhoto.layer.cornerRadius = personPhoto.frame.size.width * 0.5;
filesToSend = [[NSMutableDictionary alloc] init];
+ [self setButtonShadow:sendButton];
+ [self setButtonShadow:exitButton];
+ [self setButtonShadow:recordButton];
+}
+
+-(void) setButtonShadow:(NSButton*) button {
+ button.wantsLayer = YES;
+ button.layer.masksToBounds = NO;
+ button.shadow = [[NSShadow alloc] init];
+ button.layer.shadowOpacity = 0.8;
+ button.layer.shadowColor = [[NSColor grayColor] CGColor];
+ button.layer.shadowOffset = NSMakeSize(-0.5, 1);
+ button.layer.shadowRadius = 1;
}
-(void) setAVModel: (lrc::api::AVModel*) avmodel {
@@ -88,6 +101,7 @@
filesToSend[@(conversationUid.c_str())] = @(file_name.c_str());
isRecording = true;
recordButton.image = [NSImage imageNamed:@"ic_stoprecord.png"];
+ recordButton.title = NSLocalizedString(@"Stop recording", @"Record message title");
[timerBox setHidden:NO];
if (refreshDurationTimer == nil)
refreshDurationTimer = [NSTimer scheduledTimerWithTimeInterval:1.0
@@ -99,11 +113,11 @@
avModel->stopLocalRecorder([filesToSend[@(conversationUid.c_str())] UTF8String]);
isRecording = false;
recordButton.image = [NSImage imageNamed:@"ic_action_audio.png"];
+ recordButton.title = NSLocalizedString(@"Record a message", @"Record message title");
[refreshDurationTimer invalidate];
refreshDurationTimer = nil;
[timerBox setHidden:YES];
- [sendBox setHidden: NO];
- [sendFilename setStringValue:[NSString formattedStringTimeFromSeconds: recordingTime]];
+ [sendButton setHidden: NO];
}
}
@@ -126,25 +140,24 @@
- (void)clearData {
recordButton.image = [NSImage imageNamed:@"ic_action_audio.png"];
+ recordButton.title = NSLocalizedString(@"Record a message", @"Record message title");
recordingTime = 0;
[timerLabel setStringValue: [NSString formattedStringTimeFromSeconds: recordingTime]];
isRecording = false;
[timerBox setHidden:YES];
- [sendBox setHidden: YES];
+ [sendButton setHidden: YES];
[refreshDurationTimer invalidate];
refreshDurationTimer = nil;
- [sendFilename setStringValue:@""];
[filesToSend removeObjectForKey: @(conversationUid.c_str())];
}
- (void)viewWillHide {
recordButton.image = [NSImage imageNamed:@"ic_action_audio.png"];
+ recordButton.title = NSLocalizedString(@"Record a message", @"Record message title");
if(filesToSend[@(conversationUid.c_str())]) {
- [sendFilename setStringValue:[NSString formattedStringTimeFromSeconds: recordingTime]];
- [sendBox setHidden: NO];
+ [sendButton setHidden: NO];
} else {
- [sendFilename setStringValue:@""];
- [sendBox setHidden: YES];
+ [sendButton setHidden: YES];
}
recordingTime = 0;
[timerLabel setStringValue: [NSString formattedStringTimeFromSeconds: recordingTime]];
@@ -182,7 +195,35 @@
QVariant photo = imgManip.conversationPhoto(*it, conversationModel->owner, QSize(120, 120), NO);
[personPhoto setImage:QtMac::toNSImage(qvariant_cast<QPixmap>(photo))];
NSString *name = bestNameForConversation(*it, *conversationModel);
- [infoLabel setStringValue:name];
+
+ NSFont *fontName = [NSFont systemFontOfSize: 20.0 weight: NSFontWeightSemibold];
+ NSFont *otherFont = [NSFont systemFontOfSize: 20.0 weight: NSFontWeightThin];
+ NSColor *color = [NSColor textColor];
+ NSMutableParagraphStyle *style = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
+ [style setLineBreakMode:NSLineBreakByWordWrapping];
+ [style setAlignment:NSCenterTextAlignment];
+ NSDictionary *nameAttrs = [NSDictionary dictionaryWithObjectsAndKeys:
+ fontName, NSFontAttributeName,
+ style, NSParagraphStyleAttributeName,
+ color, NSForegroundColorAttributeName,
+ nil];
+ NSDictionary *otherAttrs = [NSDictionary dictionaryWithObjectsAndKeys:
+ otherFont, NSFontAttributeName,
+ style, NSParagraphStyleAttributeName,
+ color, NSForegroundColorAttributeName,
+ nil];
+ NSAttributedString* attributedName = [[NSAttributedString alloc] initWithString:name attributes:nameAttrs];
+ NSString *str = [NSString stringWithFormat: @"%@%@\n%@",
+ @" ",
+ NSLocalizedString(@"appears to be busy.", @"Peer busy message"),
+ NSLocalizedString(@"Would you like to leave a message?", @"Peer busy message")];
+ NSAttributedString* attributedOther= [[NSAttributedString alloc] initWithString: str attributes: otherAttrs];
+ NSMutableAttributedString *result = [[NSMutableAttributedString alloc] init];
+ [result appendAttributedString:attributedName];
+ [result appendAttributedString:attributedOther];
+ NSRange range = NSMakeRange(0, [result length]);
+ [result addAttribute:NSParagraphStyleAttributeName value:style range: range];
+ [infoLabel setAttributedStringValue: result];
}
[self show];
}
diff --git a/src/RecordFileVC.mm b/src/RecordFileVC.mm
index 7e876bb..0e10c54 100644
--- a/src/RecordFileVC.mm
+++ b/src/RecordFileVC.mm
@@ -38,7 +38,6 @@
@property (unsafe_unretained) IBOutlet NSTextField* infoLabel;
@property (unsafe_unretained) IBOutlet HoverButton* recordOnOffButton;
-@property (unsafe_unretained) IBOutlet NSButton *cancelButton;
@property (unsafe_unretained) IBOutlet NSButton *sendButton;
@property (unsafe_unretained) IBOutlet HoverButton *fileImage;
diff --git a/src/RingWindowController.mm b/src/RingWindowController.mm
index 5d3f4dc..816e8fc 100644
--- a/src/RingWindowController.mm
+++ b/src/RingWindowController.mm
@@ -430,7 +430,7 @@
CGContextAddRect(ctx, rectDraw);
CGContextFillPath(ctx);
} else {
- CGContextSetFillColorWithColor(ctx, [NSColor windowBackgroundColor].CGColor);
+ CGContextSetFillColorWithColor(ctx, [NSColor clearColor].CGColor);
rectDraw.origin = CGPointMake((j + qr_margin) * zoom,(i + qr_margin) * zoom);
CGContextAddRect(ctx, rectDraw);
CGContextFillPath(ctx);
diff --git a/src/views/HoverButton.h b/src/views/HoverButton.h
index 3d248cc..571e6e0 100644
--- a/src/views/HoverButton.h
+++ b/src/views/HoverButton.h
@@ -25,7 +25,7 @@
}
/*
* Background color of the button when mouse inside
- * default value : [NSColor ringBlue]
+ * default value : [NSColor clearColor]
*/
@property (nonatomic, strong) NSColor* hoverColor;
@@ -46,15 +46,59 @@
@property (nonatomic, strong) NSColor* mouseOutsideColor;
/*
- * Image coler when button pressed
- */
-
-@property (nonatomic, strong) NSColor* imagePressedColor;
-
-/*
* Value to increase image size when mouse entered
*/
@property CGFloat imageIncreaseOnHover;
+/*
+ * Value to increase text size when mouse entered
+ */
+
+@property CGFloat textIncreaseOnHover;
+
+/*
+ * Background color of the button when mouse inside in light mode
+ * default value : [NSColor clearColor]
+ */
+@property (nonatomic, strong) NSColor* hoverLightColor;
+
+/*
+ * image color of the button when mouse inside in light mode
+ */
+@property (nonatomic, strong) NSColor* imageHoverLightColor;
+
+/*
+ * Image color of the button when mouse inside in light mode
+ */
+@property (nonatomic, strong) NSColor* moiuseOutsideImageLightColor;
+
+/*
+ * Background color of the button when mouse outside in light mode
+ * default value : [NSColor clearColor];
+ */
+@property (nonatomic, strong) NSColor* mouseOutsideLightColor;
+
+/*
+ * Background color of the button when mouse inside in dark mode
+ * default value : [NSColor clearColor]
+ */
+@property (nonatomic, strong) NSColor* hoverDarkColor;
+
+/*
+ * image color of the button when mouse inside in dark mode
+ */
+@property (nonatomic, strong) NSColor* imageHoverDarkColor;
+
+/*
+ * Image color of the button when mouse inside in dark mode
+ */
+@property (nonatomic, strong) NSColor* moiuseOutsideImageDarkColor;
+
+/*
+ * Background color of the button when mouse outside in dark mode
+ * default value : [NSColor clearColor];
+ */
+@property (nonatomic, strong) NSColor* mouseOutsideDarkColor;
+
@end
diff --git a/src/views/HoverButton.mm b/src/views/HoverButton.mm
index c0e8dd5..91856df 100644
--- a/src/views/HoverButton.mm
+++ b/src/views/HoverButton.mm
@@ -23,33 +23,47 @@
@implementation HoverButton
-(void) awakeFromNib {
[super awakeFromNib];
- if(!self.hoverColor) {
- self.hoverColor = [NSColor ringBlue];
- }
- if(!self.mouseOutsideColor) {
- self.mouseOutsideColor = [NSColor clearColor];
- }
- self.bgColor = self.mouseOutsideColor;
- if(self.moiuseOutsideImageColor) {
- self.imageColor = self.moiuseOutsideImageColor;
- }
+ [self updateParameters];
}
-(instancetype)initWithFrame:(NSRect)frameRect {
self = [super initWithFrame: frameRect];
- if(!self.hoverColor) {
- self.hoverColor = [NSColor ringBlue];
- }
- if(!self.mouseOutsideColor) {
- self.mouseOutsideColor = [NSColor clearColor];
- }
- self.bgColor = self.mouseOutsideColor;
- if(self.moiuseOutsideImageColor) {
- self.imageColor = self.moiuseOutsideImageColor;
- }
+ [self updateParameters];
return self;
}
+-(void)updateParameters {
+ if(!self.imageHoverLightColor) {
+ self.imageHoverLightColor = self.imageHoverColor ? self.imageHoverColor : self.imageLightColor;
+ }
+ if(!self.imageHoverDarkColor) {
+ self.imageHoverDarkColor = self.imageHoverColor ? self.imageHoverColor : self.imageDarkColor;
+ }
+ self.imageHoverColor = self.isDarkMode ? self.imageHoverDarkColor : self.imageHoverLightColor;
+
+ if(!self.hoverLightColor) {
+ self.hoverLightColor = self.hoverColor ? self.hoverColor : self.bgColor;
+ }
+ if(!self.hoverDarkColor) {
+ self.hoverDarkColor = self.bgColor;
+ }
+ self.hoverColor = self.isDarkMode ? self.hoverDarkColor : self.hoverLightColor;
+ if(!self.mouseOutsideLightColor) {
+ self.mouseOutsideLightColor = self.mouseOutsideColor ? self.mouseOutsideColor : self.bgColor;
+ }
+ if(!self.mouseOutsideDarkColor) {
+ self.mouseOutsideDarkColor = self.bgColor;
+ }
+ self.mouseOutsideColor = self.isDarkMode ? self.mouseOutsideDarkColor : self.mouseOutsideLightColor;
+ if(self.moiuseOutsideImageLightColor) {
+ self.moiuseOutsideImageLightColor = self.moiuseOutsideImageColor ? self.moiuseOutsideImageColor : self.imageLightColor;
+ }
+ if(!self.moiuseOutsideImageDarkColor) {
+ self.moiuseOutsideImageDarkColor = self.moiuseOutsideImageColor ? self.moiuseOutsideImageColor : self.imageDarkColor;
+ }
+ self.moiuseOutsideImageColor = self.isDarkMode ? self.moiuseOutsideImageDarkColor : self.moiuseOutsideImageLightColor;
+}
+
-(void)mouseEntered:(NSEvent *)theEvent {
if (self.animating) {
[self stopBlinkAnimation];
@@ -61,9 +75,12 @@
if(self.imageHoverColor) {
self.imageColor = self.imageHoverColor;
}
- if (self.imageIncreaseOnHover) {
+ if (self.imageIncreaseOnHover && self.enabled) {
self.imageInsets -= self.imageIncreaseOnHover;
}
+ if (self.textIncreaseOnHover && self.enabled && self.fontSize) {
+ self.fontSize += self.textIncreaseOnHover;
+ }
[super setNeedsDisplay:YES];
[super mouseEntered:theEvent];
}
@@ -78,23 +95,16 @@
} else if ( self.moiuseOutsideImageColor) {
self.imageColor = self.moiuseOutsideImageColor;
}
- if (self.imageIncreaseOnHover) {
+ if (self.imageIncreaseOnHover && self.enabled) {
self.imageInsets += self.imageIncreaseOnHover;
}
+ if (self.textIncreaseOnHover && self.enabled && self.fontSize) {
+ self.fontSize -= self.textIncreaseOnHover;
+ }
[super setNeedsDisplay:YES];
[super mouseExited:theEvent];
}
--(void) setPressed:(BOOL)newVal
-{
- if(self.imagePressedColor && newVal) {
- self.imageColor = self.imagePressedColor;
- } else if ( self.moiuseOutsideImageColor) {
- self.imageColor = self.moiuseOutsideImageColor;
- }
- [super setPressed:newVal];
-}
-
- (void)ensureTrackingArea {
if (trackingArea == nil) {
trackingArea = [[NSTrackingArea alloc] initWithRect:NSZeroRect
@@ -112,10 +122,12 @@
}
}
-- (void)drawRect:(NSRect)dirtyRect
-{
- [super drawRect:dirtyRect];
+-(void) onAppearanceChanged {
+ [super onAppearanceChanged];
+ self.imageHoverColor = self.isDarkMode ? self.imageHoverDarkColor : self.imageHoverLightColor;
+ self.hoverColor = self.isDarkMode ? self.hoverDarkColor : self.hoverLightColor;
+ self.mouseOutsideColor = self.isDarkMode ? self.mouseOutsideDarkColor : self.mouseOutsideLightColor;
+ self.moiuseOutsideImageColor = self.isDarkMode ? self.moiuseOutsideImageDarkColor : self.moiuseOutsideImageLightColor;
}
-
@end
diff --git a/src/views/IconButton.h b/src/views/IconButton.h
index 56884d1..8a287f6 100644
--- a/src/views/IconButton.h
+++ b/src/views/IconButton.h
@@ -29,13 +29,13 @@
/*
* Background color of the button
- * default value : [NSColor ringBlue]
+ * default value : [NSColor clearColor]
*/
@property (nonatomic, strong) NSColor* bgColor;
/*
* Background color of the button when highlighted
- * default value : view frame width / 2 (circle)
+ * default value bgColor
*/
@property (nonatomic, strong) NSColor* highlightColor;
@@ -63,14 +63,8 @@
@property CGFloat imageIncreaseOnClick;
/*
- * Add bluer effect behind button
- */
-
-@property NSVisualEffectView* vibrantView;
-
-/*
* Button image color
- * default value : [NSColor white];
+ * default value : [NSColor ringDarkBlue];
*/
@property (nonatomic, strong) NSColor* imageColor;
@@ -87,7 +81,6 @@
* and fill corner with cornerColor
*/
@property (nonatomic, strong) NSColor* cornerColor;
-
/*
* Font size of the button title.
*/
@@ -101,4 +94,63 @@
-(void)stopBlinkAnimation;
@property BOOL animating;
+@property BOOL isDarkMode;
+
+/*
+ * Button image color when in dark mode
+ * default value : [NSColor whiteColor];
+ */
+
+@property (nonatomic, strong) NSColor* imageDarkColor;
+
+/*
+ * Button image color
+ * default value : [NSColor ringDarkBlue];
+ */
+
+@property (nonatomic, strong) NSColor* imageLightColor;
+
+/*
+ * Button highlight color when in dark mode
+ * default value : highlightColor;
+ */
+
+@property (nonatomic, strong) NSColor* highlightDarkColor;
+
+/*
+ * Button highlight color when in light mode
+ * default value : highlightColor;
+ */
+
+@property (nonatomic, strong) NSColor* highlightLightColor;
+
+/*
+ * Define if should draw boreder
+ * default value false;
+ */
+@property (atomic) BOOL shouldDrawBorder;
+
+/*
+ * Image coler when button pressed
+ * default value : imageColor;
+ */
+
+@property (nonatomic, strong) NSColor* imagePressedColor;
+
+/*
+ * Image coler when button pressed in dark mode
+ * default value : imagePressedColor;
+ */
+
+@property (nonatomic, strong) NSColor* imagePressedDarkColor;
+
+/*
+ * Image coler when button pressed in light mode
+ * default value : imagePressedColor;
+ */
+
+@property (nonatomic, strong) NSColor* imagePressedLightColor;
+
+-(void) onAppearanceChanged;
+
@end
diff --git a/src/views/IconButton.mm b/src/views/IconButton.mm
index 2b076bb..8c515ce 100644
--- a/src/views/IconButton.mm
+++ b/src/views/IconButton.mm
@@ -28,37 +28,63 @@
@implementation IconButton
NSString* BLINK_ANIMATION_IDENTIFIER = @"blinkAnimation";
-@synthesize trackingArea;
+@synthesize trackingArea, isDarkMode;
-(void) awakeFromNib {
- if (!self.bgColor) {
- self.bgColor = [NSColor ringBlue];
- }
-
- if (!self.cornerRadius) {
- self.cornerRadius = @(NSWidth(self.frame) / 2);
- }
-
- if (self.imageInsets == 0)
- self.imageInsets = 8.0f;
- if (!self.imageIncreaseOnClick) {
- self.imageIncreaseOnClick = 0;
- }
-
- self.pressed = NO;
-
+ [self setParameters];
}
-(instancetype)initWithFrame:(NSRect)frameRect {
self = [super initWithFrame: frameRect];
+ [self setParameters];
+ return self;
+}
+
+-(void) setParameters {
+ isDarkMode = self.checkIsDarkMode;
if (!self.bgColor) {
- self.bgColor = [NSColor ringBlue];
+ self.bgColor = [NSColor clearColor];
}
+ if (!self.imageLightColor) {
+ self.imageLightColor = self.imageColor ? self.imageColor : [NSColor ringDarkBlue];
+ }
+ if (!self.imageDarkColor) {
+ self.imageDarkColor = [NSColor whiteColor];
+ }
+ self.imageColor = isDarkMode ? self.imageDarkColor : self.imageLightColor;
if (!self.cornerRadius) {
self.cornerRadius = @(NSWidth(self.frame) / 2);
}
+ if(!self.shouldDrawBorder) {
+ self.shouldDrawBorder = NO;
+ }
+
+ if (!self.buttonDisableColor) {
+ self.buttonDisableColor = [[NSColor grayColor] colorWithAlphaComponent:0.3];
+ }
+
+ if (!self.highlightLightColor) {
+ self.highlightLightColor = self.highlightColor ? self.highlightColor : self.bgColor;
+ }
+
+ if (!self.highlightDarkColor) {
+ self.highlightDarkColor = self.bgColor;
+ }
+
+ if(!self.imagePressedLightColor) {
+ self.imagePressedLightColor = self.imagePressedColor ? self.imagePressedColor : self.imageLightColor;
+ }
+
+ if(!self.imagePressedDarkColor) {
+ self.imagePressedDarkColor = self.imageDarkColor;
+ }
+
+ self.imagePressedColor = isDarkMode ? self.imagePressedDarkColor : self.imagePressedLightColor;
+
+ self.highlightColor = isDarkMode ? self.highlightDarkColor : self.highlightLightColor;
+
if (self.imageInsets == 0)
self.imageInsets = 8.0f;
if (!self.imageIncreaseOnClick) {
@@ -66,7 +92,6 @@
}
self.pressed = NO;
- return self;
}
-(void) setPressed:(BOOL)newVal
@@ -79,45 +104,18 @@
{
[super drawRect:dirtyRect];
- NSColor* backgroundColor;
- NSColor* backgroundStrokeColor;
- NSColor* tintColor = self.imageColor ? self.imageColor : [NSColor whiteColor];
+ NSColor* backgroundColor = self.bgColor;
+ NSColor* tintColor = self.imageColor;
- if (self.bgColor == [NSColor clearColor]) {
- backgroundColor = self.bgColor ;
- backgroundStrokeColor = self.bgColor;
- if(!self.isEnabled) {
- if (self.buttonDisableColor) {
- tintColor = self.buttonDisableColor;
- } else {
- tintColor = [[NSColor grayColor] colorWithAlphaComponent:0.3];
- }
- }
- }
- else if (!self.isEnabled) {
- backgroundColor = [self.bgColor colorWithAlphaComponent:0.7];
- backgroundStrokeColor = [self.bgColor colorWithAlphaComponent:0.7];
- if (self.buttonDisableColor) {
- tintColor = self.buttonDisableColor;
- } else {
- tintColor = [[NSColor grayColor] colorWithAlphaComponent:0.3];
- }
+ if (!self.isEnabled) {
+ backgroundColor = (self.bgColor == [NSColor clearColor]) ? self.bgColor : [self.bgColor colorWithAlphaComponent:0.7];
+ tintColor = self.buttonDisableColor;
} else if (self.mouseDown || self.isPressed) {
- if (self.highlightColor) {
- backgroundColor = self.highlightColor;
- backgroundStrokeColor = [self.highlightColor darkenColorByValue:0.1];
- } else {
- backgroundColor = [self.bgColor darkenColorByValue:0.3];
- backgroundStrokeColor = [self.bgColor darkenColorByValue:0.4];
- }
+ backgroundColor = self.highlightColor;
+ tintColor = self.imagePressedColor;
}
- else {
- backgroundColor = self.bgColor;
- backgroundStrokeColor = [self.bgColor darkenColorByValue:0.1];
- }
-
- backgroundStrokeColor = NSColor.clearColor;
+ NSColor* backgroundStrokeColor = self.shouldDrawBorder ? tintColor : backgroundColor;
//// Subframes
NSRect group = NSMakeRect(NSMinX(dirtyRect) + floor(NSWidth(dirtyRect) * 0.03333) + 0.5,
@@ -189,7 +187,7 @@
[backgroundColor setFill];
[ovalPath fill];
[backgroundStrokeColor setStroke];
- [ovalPath setLineWidth: 0.5];
+ [ovalPath setLineWidth: 0.1];
[ovalPath stroke];
[NSGraphicsContext saveGraphicsState];
@@ -197,43 +195,59 @@
NSBezierPath* path = [NSBezierPath bezierPathWithRect:dirtyRect];
[path addClip];
- [self setImagePosition:NSImageOverlaps];
- auto insets = self.mouseDown ? (self.imageInsets - self.imageIncreaseOnClick) : self.imageInsets;
+ auto insets = (self.mouseDown && self.enabled) ? (self.imageInsets - self.imageIncreaseOnClick) : self.imageInsets;
auto rect = NSInsetRect(dirtyRect, insets, insets);
+ if ([self title].length == 0) {
+ [self setImagePosition:NSImageOverlaps];
+ [[NSColor image:self.image tintedWithColor:tintColor] drawInRect:rect
+ fromRect:NSZeroRect
+ operation:NSCompositeSourceOver
+ fraction:1.0
+ respectFlipped:YES
+ hints:nil];
- [[NSColor image:self.image tintedWithColor:tintColor] drawInRect:rect
- fromRect:NSZeroRect
- operation:NSCompositeSourceOver
- fraction:1.0
- respectFlipped:YES
- hints:nil];
+ [NSGraphicsContext restoreGraphicsState];
+ return;
+ }
- [NSGraphicsContext restoreGraphicsState];
-
- NSRect rect2;
+ NSRect rectText = rect;
+ NSRect rectImage = rect;
NSDictionary *att = nil;
- NSMutableParagraphStyle *style =
- [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
+ NSMutableParagraphStyle *style = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
[style setLineBreakMode:NSLineBreakByWordWrapping];
[style setAlignment:NSCenterTextAlignment];
att = [[NSDictionary alloc] initWithObjectsAndKeys:
style, NSParagraphStyleAttributeName,
- [NSColor whiteColor],
+ tintColor,
NSForegroundColorAttributeName, nil];
if(self.fontSize) {
NSFont *font = [NSFont fontWithName:@"Helvetica Neue Light" size: self.fontSize];
att = [[NSDictionary alloc] initWithObjectsAndKeys:
font,NSFontAttributeName,
style, NSParagraphStyleAttributeName,
- [NSColor whiteColor], NSForegroundColorAttributeName, nil];
+ tintColor, NSForegroundColorAttributeName, nil];
}
+ rectText.size = [[self title] sizeWithAttributes:att];
+ rectImage.size.width = rectImage.size.height;
+ if (self.image) {
+ rectText.origin.x = floor( NSMidX(rect) - (rectText.size.width / 2 - rectImage.size.width / 2));
+ } else {
+ [self setImagePosition:NSImageOverlaps];
+ rectText.origin.x = floor( NSMidX(rect) - rectText.size.width / 2);
+ }
+ rectText.origin.y = floor( NSMidY([self bounds]) - rectText.size.height / 2 );
+ rectImage.origin.x = rectText.origin.x - rectImage.size.width - insets;
+ [[self title] drawInRect:rectText withAttributes:att];
- rect.size = [[self title] sizeWithAttributes:att];
- rect.origin.x = floor( NSMidX([self bounds]) - rect.size.width / 2 );
- rect.origin.y = floor( NSMidY([self bounds]) - rect.size.height / 2 );
- [[self title] drawInRect:rect withAttributes:att];
+ [[NSColor image:self.image tintedWithColor:tintColor] drawInRect:rectImage
+ fromRect:NSZeroRect
+ operation:NSCompositeSourceOver
+ fraction:1.0
+ respectFlipped:YES
+ hints:nil];
+ [NSGraphicsContext restoreGraphicsState];
}
}
@@ -289,4 +303,28 @@
[self.layer removeAnimationForKey:BLINK_ANIMATION_IDENTIFIER];
}
+-(void) viewDidChangeEffectiveAppearance {
+ BOOL mode = self.checkIsDarkMode;
+ if (isDarkMode != mode) {
+ isDarkMode = mode;
+ [self onAppearanceChanged];
+ }
+ [super viewDidChangeEffectiveAppearance];
+}
+
+-(void) onAppearanceChanged {
+ self.imageColor = isDarkMode ? self.imageDarkColor : self.imageLightColor;
+ self.highlightColor = isDarkMode ? self.highlightDarkColor : self.highlightLightColor;
+ self.imagePressedColor = isDarkMode ? self.imagePressedDarkColor : self.imagePressedLightColor;
+}
+
+-(BOOL)checkIsDarkMode {
+ NSAppearance *appearance = NSAppearance.currentAppearance;
+ if (@available(*, macOS 10.14)) {
+ NSString *interfaceStyle = [NSUserDefaults.standardUserDefaults valueForKey:@"AppleInterfaceStyle"];
+ return [interfaceStyle isEqualToString:@"Dark"];
+ }
+ return NO;
+}
+
@end
diff --git a/ui/Base.lproj/AccRingGeneral.xib b/ui/Base.lproj/AccRingGeneral.xib
index 3d579d2..9e3d62a 100644
--- a/ui/Base.lproj/AccRingGeneral.xib
+++ b/ui/Base.lproj/AccRingGeneral.xib
@@ -318,6 +318,9 @@
<userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
<color key="value" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="hoverDarkColor">
+ <color key="value" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="editPhoto:" target="-2" id="cfC-jn-h6W"/>
@@ -422,7 +425,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750" ambiguous="YES" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="1" viewBased="YES" id="aau-IO-oSs">
- <rect key="frame" x="0.0" y="0.0" width="578" height="1"/>
+ <rect key="frame" x="0.0" y="0.0" width="578" height="52"/>
<autoresizingMask key="autoresizingMask"/>
<size key="intercellSpacing" width="3" height="0.0"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
diff --git a/ui/Base.lproj/AccSipGeneral.xib b/ui/Base.lproj/AccSipGeneral.xib
index 16fc4c9..18c5952 100644
--- a/ui/Base.lproj/AccSipGeneral.xib
+++ b/ui/Base.lproj/AccSipGeneral.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
<capability name="System colors introduced in macOS 10.14" minToolsVersion="10.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@@ -60,6 +60,9 @@
<userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
<color key="value" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="hoverDarkColor">
+ <color key="value" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="editPhoto:" target="-2" id="VT7-hO-fwb"/>
diff --git a/ui/Base.lproj/AccountSettings.xib b/ui/Base.lproj/AccountSettings.xib
index c7e64ae..7d16a1b 100644
--- a/ui/Base.lproj/AccountSettings.xib
+++ b/ui/Base.lproj/AccountSettings.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
<capability name="System colors introduced in macOS 10.14" minToolsVersion="10.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@@ -47,27 +47,33 @@
</scroller>
</scrollView>
<button toolTip="Back" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cyq-zN-98i" customClass="HoverButton">
- <rect key="frame" x="5" y="763" width="35" height="35"/>
+ <rect key="frame" x="5" y="766" width="32" height="32"/>
<constraints>
- <constraint firstAttribute="height" constant="35" id="XcV-yi-oBH"/>
- <constraint firstAttribute="width" constant="35" id="zzo-rZ-gMc"/>
+ <constraint firstAttribute="height" constant="32" id="XcV-yi-oBH"/>
+ <constraint firstAttribute="width" constant="32" id="zzo-rZ-gMc"/>
</constraints>
<buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_arrow_back" imagePosition="overlaps" alignment="center" transparent="YES" imageScaling="proportionallyDown" id="Xsh-Ml-mxa">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" red="0.76470588235294112" green="0.76470588235294112" blue="0.76470588235294112" alpha="1" colorSpace="calibratedRGB"/>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverDarkColor">
+ <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="imageColor">
<color key="value" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="4"/>
+ <integer key="value" value="2"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="highlightColor">
- <color key="value" red="0.55294117647058827" green="0.55294117647058827" blue="0.55294117647058827" alpha="1" colorSpace="calibratedRGB"/>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.93725490196078431" green="0.93725490196078431" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
+ <color key="value" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
diff --git a/ui/Base.lproj/AddSIPAccountVC.xib b/ui/Base.lproj/AddSIPAccountVC.xib
index 5e0b3f0..bd6f971 100644
--- a/ui/Base.lproj/AddSIPAccountVC.xib
+++ b/ui/Base.lproj/AddSIPAccountVC.xib
@@ -53,6 +53,9 @@
<userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
<color key="value" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="hoverDarkColor">
+ <color key="value" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="editPhoto:" target="-2" id="ZqF-dw-9gc"/>
diff --git a/ui/Base.lproj/Conversation.strings b/ui/Base.lproj/Conversation.strings
index 18f0e7d..d86886f 100644
--- a/ui/Base.lproj/Conversation.strings
+++ b/ui/Base.lproj/Conversation.strings
@@ -1,24 +1,53 @@
+/* Class = "NSButtonCell"; title = "🙂"; ObjectID = "8sX-aI-9OG"; */
+"8sX-aI-9OG.title" = "🙂";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Record a video message"; ObjectID = "B6d-Sc-UTp"; */
+"B6d-Sc-UTp.ibShadowedToolTip" = "Record a video message";
/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "FgV-iF-gGQ"; */
"FgV-iF-gGQ.title" = "Text Cell";
-/* Class = "NSTextFieldCell"; placeholderString = "Title"; ObjectID = "HnC-1N-RmR"; */
-"HnC-1N-RmR.placeholderString" = "Title";
-
/* Class = "NSTextFieldCell"; placeholderString = "Send a message"; ObjectID = "Ilz-7v-2fr"; */
"Ilz-7v-2fr.placeholderString" = "Send a message";
-/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
-"ZEx-5Y-rtp.ibShadowedIsNilPlaceholder" = "Send a message";
+/* Class = "NSButton"; ibShadowedToolTip = "Start audio call"; ObjectID = "RuH-fO-poy"; */
+"RuH-fO-poy.ibShadowedToolTip" = "Start audio call";
-/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
-"ZEx-5Y-rtp.ibShadowedMultipleValuesPlaceholder" = "Send a message";
+/* Class = "NSButton"; ibShadowedToolTip = "Send"; ObjectID = "UJf-cF-RAo"; */
+"UJf-cF-RAo.ibShadowedToolTip" = "Send";
-/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Send a message"; ObjectID = "ZEx-5Y-rtp"; */
-"ZEx-5Y-rtp.ibShadowedNoSelectionPlaceholder" = "Send a message";
+/* Class = "NSButton"; ibShadowedToolTip = "Start video call"; ObjectID = "cFH-d7-Erh"; */
+"cFH-d7-Erh.ibShadowedToolTip" = "Start video call";
-/* Class = "NSTextFieldCell"; title = "Start the conversation!"; ObjectID = "bsl-nv-Wqq"; */
-"bsl-nv-Wqq.title" = "Start the conversation!";
+/* Class = "NSBox"; title = "Box"; ObjectID = "ciI-CA-tly"; */
+"ciI-CA-tly.title" = "Box";
-/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "ooq-vs-Xt1"; */
-"ooq-vs-Xt1.ibShadowedToolTip" = "Record";
+/* Class = "NSBox"; title = "Box"; ObjectID = "fh9-Uo-8R1"; */
+"fh9-Uo-8R1.title" = "Box";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Send a file"; ObjectID = "gwx-eT-PcN"; */
+"gwx-eT-PcN.ibShadowedToolTip" = "Send a file";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "hrX-ac-Quk"; */
+"hrX-ac-Quk.title" = "Box";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Back"; ObjectID = "ooq-vs-Xt1"; */
+"ooq-vs-Xt1.ibShadowedToolTip" = "Back";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Add contact"; ObjectID = "pGK-hO-X1Y"; */
+"pGK-hO-X1Y.ibShadowedToolTip" = "Add contact";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "pRL-vb-me9"; */
+"pRL-vb-me9.title" = "Box";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Record an audio message"; ObjectID = "wYE-S3-AzD"; */
+"wYE-S3-AzD.ibShadowedToolTip" = "Record an audio message";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Send a message"; ObjectID = "zK1-Ee-EWS"; */
+"zK1-Ee-EWS.ibShadowedIsNilPlaceholder" = "Send a message";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Send a message"; ObjectID = "zK1-Ee-EWS"; */
+"zK1-Ee-EWS.ibShadowedMultipleValuesPlaceholder" = "Send a message";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Send a message"; ObjectID = "zK1-Ee-EWS"; */
+"zK1-Ee-EWS.ibShadowedNoSelectionPlaceholder" = "Send a message";
diff --git a/ui/Base.lproj/Conversation.xib b/ui/Base.lproj/Conversation.xib
index e9e25b2..00f20a0 100644
--- a/ui/Base.lproj/Conversation.xib
+++ b/ui/Base.lproj/Conversation.xib
@@ -299,7 +299,7 @@
<box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="Sn1-dJ-QCw">
<rect key="frame" x="0.0" y="770" width="798" height="5"/>
</box>
- <button toolTip="Record" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ooq-vs-Xt1" customClass="HoverButton">
+ <button toolTip="Back" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ooq-vs-Xt1" customClass="HoverButton">
<rect key="frame" x="10" y="783" width="35" height="35"/>
<constraints>
<constraint firstAttribute="height" constant="35" id="69o-49-0QB"/>
@@ -310,14 +310,23 @@
<font key="font" metaFont="system"/>
</buttonCell>
<userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" red="0.76470588235294112" green="0.76470588235294112" blue="0.76470588235294112" alpha="1" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="imageColor">
<color key="value" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="4"/>
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverDarkColor">
+ <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
+ <color key="value" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.93725490196078431" green="0.93725490196078431" blue="0.93725490196078431" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
@@ -327,28 +336,96 @@
<customView verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="Rth-di-Tls" customClass="SendMessagePanel">
<rect key="frame" x="49" y="0.0" width="700" height="60"/>
<subviews>
- <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="3" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vd8-6U-eqB">
+ <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="2" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vd8-6U-eqB">
<rect key="frame" x="0.0" y="0.0" width="700" height="60"/>
<subviews>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gwx-eT-PcN" customClass="HoverButton">
- <rect key="frame" x="0.0" y="13" width="35" height="35"/>
+ <button toolTip="Record an audio message" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wYE-S3-AzD" customClass="HoverButton">
+ <rect key="frame" x="0.0" y="14" width="32" height="32"/>
<constraints>
- <constraint firstAttribute="height" constant="35" id="C2W-wV-YvF"/>
- <constraint firstAttribute="width" constant="35" id="zZF-4P-pW9"/>
+ <constraint firstAttribute="height" constant="32" id="2As-E1-3wN"/>
+ <constraint firstAttribute="width" constant="32" id="ThY-e2-Xwc"/>
+ </constraints>
+ <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_audio" imagePosition="overlaps" alignment="center" transparent="YES" imageScaling="proportionallyDown" inset="2" id="1zm-4M-OeR">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
+ <color key="value" red="0.0" green="0.19215686274509802" blue="0.26666666666666666" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverDarkColor">
+ <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.93725490196078431" green="0.93725490196078431" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ </userDefinedRuntimeAttributes>
+ <connections>
+ <action selector="startAudioMessage:" target="iH6-17-JsM" id="L0n-5l-pav"/>
+ </connections>
+ </button>
+ <button toolTip="Record a video message" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="B6d-Sc-UTp" customClass="HoverButton">
+ <rect key="frame" x="34" y="14" width="32" height="32"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="32" id="GRp-fA-Pkp"/>
+ <constraint firstAttribute="width" constant="32" id="f5f-YQ-2i3"/>
+ </constraints>
+ <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_camera" imagePosition="overlaps" alignment="center" transparent="YES" imageScaling="proportionallyDown" inset="2" id="sjp-jf-vw1">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
+ <color key="value" red="0.0" green="0.19215686269999999" blue="0.2666666667" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverDarkColor">
+ <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.93725490196078431" green="0.93607044219970703" blue="0.93608629703521729" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ </userDefinedRuntimeAttributes>
+ <connections>
+ <action selector="startVideoMessage:" target="iH6-17-JsM" id="fde-s8-jSr"/>
+ </connections>
+ </button>
+ <button toolTip="Send a file" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gwx-eT-PcN" customClass="HoverButton">
+ <rect key="frame" x="68" y="14" width="32" height="32"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="32" id="C2W-wV-YvF"/>
+ <constraint firstAttribute="width" constant="32" id="zZF-4P-pW9"/>
</constraints>
<buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_file_upload" imagePosition="overlaps" alignment="center" enabled="NO" transparent="YES" imageScaling="proportionallyDown" inset="2" id="gfQ-c5-YPu">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
- <color key="value" red="0.0" green="0.23137254901960785" blue="0.30588235294117649" alpha="1" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" red="0.23137254901960785" green="0.75686274509803919" blue="0.82745098039215681" alpha="0.23000000000000001" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="4"/>
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
+ <color key="value" red="0.0" green="0.19215686274509802" blue="0.26666666666666666" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverDarkColor">
+ <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.93609845638275146" green="0.93607044219970703" blue="0.93608629703521729" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
@@ -356,7 +433,7 @@
</connections>
</button>
<textField verticalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bsk-Gj-qQ2">
- <rect key="frame" x="36" y="22" width="514" height="17"/>
+ <rect key="frame" x="100" y="22" width="526" height="17"/>
<textFieldCell key="cell" lineBreakMode="charWrapping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" placeholderString="Send a message" id="Ilz-7v-2fr">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -374,103 +451,70 @@
<outlet property="delegate" destination="iH6-17-JsM" id="2eZ-3e-XvP"/>
</connections>
</textField>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Gww-7y-sXo" customClass="HoverButton">
- <rect key="frame" x="551" y="13" width="35" height="35"/>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="ZFq-T5-VFc">
+ <rect key="frame" x="626" y="29" width="2" height="2"/>
<constraints>
- <constraint firstAttribute="width" constant="35" id="Zra-qu-Wv9"/>
- <constraint firstAttribute="height" constant="35" id="xVA-RF-ov9"/>
+ <constraint firstAttribute="height" constant="2" id="7Tq-Jm-qUj"/>
+ <constraint firstAttribute="width" constant="2" id="xq3-ac-NhL"/>
</constraints>
- <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_camera" imagePosition="overlaps" alignment="center" transparent="YES" imageScaling="proportionallyDown" inset="2" id="crE-WV-7wv">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
- <color key="value" red="0.0" green="0.23137254900000001" blue="0.30588235289999999" alpha="1" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" red="0.23137254900000001" green="0.75686274509999996" blue="0.82745098039999998" alpha="0.23000000000000001" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="4"/>
- </userDefinedRuntimeAttribute>
- </userDefinedRuntimeAttributes>
- <connections>
- <action selector="startVideoMessage:" target="iH6-17-JsM" id="2B7-ha-lQk"/>
- </connections>
- </button>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wYE-S3-AzD" customClass="HoverButton">
- <rect key="frame" x="589" y="13" width="35" height="35"/>
- <constraints>
- <constraint firstAttribute="height" constant="35" id="2As-E1-3wN"/>
- <constraint firstAttribute="width" constant="35" id="ThY-e2-Xwc"/>
- </constraints>
- <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_audio" imagePosition="overlaps" alignment="center" transparent="YES" imageScaling="proportionallyDown" inset="2" id="1zm-4M-OeR">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
- <color key="value" red="0.0" green="0.23137254900000001" blue="0.30588235289999999" alpha="1" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" red="0.23137254900000001" green="0.75686274509999996" blue="0.82745098039999998" alpha="0.23000000000000001" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="4"/>
- </userDefinedRuntimeAttribute>
- </userDefinedRuntimeAttributes>
- <connections>
- <action selector="startAudioMessage:" target="iH6-17-JsM" id="L0n-5l-pav"/>
- </connections>
- </button>
+ </customView>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DwY-gP-tsk" userLabel="Emojy button" customClass="HoverButton">
- <rect key="frame" x="627" y="13" width="35" height="35"/>
+ <rect key="frame" x="630" y="14" width="32" height="32"/>
<constraints>
- <constraint firstAttribute="height" constant="35" id="gfw-9e-hi8"/>
- <constraint firstAttribute="width" constant="35" id="pyh-h3-bCb"/>
+ <constraint firstAttribute="height" constant="32" id="gfw-9e-hi8"/>
+ <constraint firstAttribute="width" constant="32" id="pyh-h3-bCb"/>
</constraints>
<buttonCell key="cell" type="square" title="🙂" bezelStyle="shadowlessSquare" imagePosition="overlaps" alignment="center" transparent="YES" imageScaling="proportionallyDown" inset="2" id="8sX-aI-9OG">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system" size="35"/>
</buttonCell>
<userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
- <color key="value" red="0.0" green="0.23137254900000001" blue="0.30588235289999999" alpha="0.0" colorSpace="custom" customColorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" red="0.23137254900000001" green="0.75686274509999996" blue="0.82745098039999998" alpha="0.23000000000000001" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
<integer key="value" value="0"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="fontSize">
<integer key="value" value="25"/>
</userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="textIncreaseOnHover">
+ <integer key="value" value="4"/>
+ </userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</button>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UJf-cF-RAo" customClass="HoverButton">
- <rect key="frame" x="665" y="13" width="35" height="35"/>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="nEk-L2-09b">
+ <rect key="frame" x="664" y="29" width="2" height="2"/>
<constraints>
- <constraint firstAttribute="width" constant="35" id="TmF-ip-m4C"/>
- <constraint firstAttribute="height" constant="35" id="rbQ-lE-sAq"/>
+ <constraint firstAttribute="width" constant="2" id="WrB-F9-XcK"/>
+ <constraint firstAttribute="height" constant="2" id="yH4-L4-7ou"/>
+ </constraints>
+ </customView>
+ <button toolTip="Send" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UJf-cF-RAo" customClass="HoverButton">
+ <rect key="frame" x="668" y="14" width="32" height="32"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="32" id="TmF-ip-m4C"/>
+ <constraint firstAttribute="height" constant="32" id="rbQ-lE-sAq"/>
</constraints>
<buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_send" imagePosition="overlaps" alignment="center" enabled="NO" transparent="YES" imageScaling="proportionallyDown" inset="2" id="s6a-eK-t3T">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
- <color key="value" red="0.0" green="0.23137254901960785" blue="0.30588235294117649" alpha="1" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" red="0.23137254901960785" green="0.75686274509803919" blue="0.82745098039215681" alpha="0.23000000000000001" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="buttonDisableColor">
<color key="value" red="0.78955939797794117" green="0.75686274509803919" blue="0.82745098039215681" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="4"/>
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
+ <color key="value" red="0.0" green="0.19215686274509802" blue="0.26666666666666666" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverDarkColor">
+ <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.93609845638275146" green="0.93607044219970703" blue="0.93608629703521729" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
@@ -486,6 +530,8 @@
<integer value="1000"/>
<integer value="1000"/>
<integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
</visibilityPriorities>
<customSpacing>
<real value="3.4028234663852886e+38"/>
@@ -494,6 +540,8 @@
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
</customSpacing>
</stackView>
</subviews>
@@ -513,31 +561,117 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <button verticalHuggingPriority="750" tag="400" translatesAutoresizingMaskIntoConstraints="NO" id="cFH-d7-Erh" userLabel="Call Button" customClass="HoverButton">
- <rect key="frame" x="753" y="783" width="35" height="35"/>
+ <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="6" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="s8t-r2-zdA">
+ <rect key="frame" x="675" y="773" width="108" height="55"/>
+ <subviews>
+ <button toolTip="Add contact" verticalHuggingPriority="750" tag="400" translatesAutoresizingMaskIntoConstraints="NO" id="pGK-hO-X1Y" userLabel="Add Contact Button" customClass="HoverButton">
+ <rect key="frame" x="0.0" y="12" width="32" height="32"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="32" id="Cxh-SD-Ozq"/>
+ <constraint firstAttribute="height" constant="32" id="UUq-am-hL7"/>
+ </constraints>
+ <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_person_add" imagePosition="overlaps" alignment="center" allowsMixedState="YES" transparent="YES" imageScaling="proportionallyDown" inset="2" id="1oc-i4-1bh">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
+ <color key="value" red="0.0" green="0.19215686274509802" blue="0.26666666666666666" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverDarkColor">
+ <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.93609845638275146" green="0.93607044219970703" blue="0.93608629703521729" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ </userDefinedRuntimeAttributes>
+ <connections>
+ <action selector="addContact:" target="-2" id="9DI-Pm-X0I"/>
+ </connections>
+ </button>
+ <button toolTip="Start audio call" verticalHuggingPriority="750" tag="400" translatesAutoresizingMaskIntoConstraints="NO" id="RuH-fO-poy" userLabel="Audio Call Button" customClass="HoverButton">
+ <rect key="frame" x="38" y="12" width="32" height="32"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="32" id="HyC-Bf-F7P"/>
+ <constraint firstAttribute="height" constant="32" id="opT-rp-VwQ"/>
+ </constraints>
+ <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_call" imagePosition="overlaps" alignment="center" allowsMixedState="YES" transparent="YES" imageScaling="proportionallyDown" inset="2" id="f0E-8f-ly5">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverDarkColor">
+ <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
+ <color key="value" red="0.0" green="0.19215686274509802" blue="0.26666666666666666" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.93609845638275146" green="0.93607044219970703" blue="0.93608629703521729" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ </userDefinedRuntimeAttributes>
+ <connections>
+ <action selector="placeAudioCall:" target="-2" id="ycm-jI-2M5"/>
+ </connections>
+ </button>
+ <button toolTip="Start video call" verticalHuggingPriority="750" tag="400" translatesAutoresizingMaskIntoConstraints="NO" id="cFH-d7-Erh" userLabel="Call Button" customClass="HoverButton">
+ <rect key="frame" x="76" y="12" width="32" height="32"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="32" id="4jd-jn-RY1"/>
+ <constraint firstAttribute="height" constant="32" id="DMa-Lq-2Tk"/>
+ </constraints>
+ <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_video" imagePosition="overlaps" alignment="center" allowsMixedState="YES" transparent="YES" imageScaling="proportionallyDown" inset="2" id="XOS-rh-WfH">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverDarkColor">
+ <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
+ <color key="value" red="0.0" green="0.19215686274509802" blue="0.26666666666666666" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.93609845638275146" green="0.93607044219970703" blue="0.93608629703521729" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ </userDefinedRuntimeAttributes>
+ <connections>
+ <action selector="placeCall:" target="-2" id="2h9-fM-gof"/>
+ </connections>
+ </button>
+ </subviews>
<constraints>
- <constraint firstAttribute="width" constant="35" id="4jd-jn-RY1"/>
- <constraint firstAttribute="height" constant="35" id="DMa-Lq-2Tk"/>
+ <constraint firstAttribute="height" constant="55" id="mTY-MS-F9z"/>
</constraints>
- <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_video" imagePosition="overlaps" alignment="center" allowsMixedState="YES" transparent="YES" imageScaling="proportionallyDown" inset="2" id="XOS-rh-WfH">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
- <color key="value" red="0.0" green="0.23137254901960785" blue="0.30588235294117649" alpha="1" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" red="0.23137254901960785" green="0.75686274509803919" blue="0.82745098039215681" alpha="0.23410744863013699" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="4"/>
- </userDefinedRuntimeAttribute>
- </userDefinedRuntimeAttributes>
- <connections>
- <action selector="placeCall:" target="-2" id="2h9-fM-gof"/>
- </connections>
- </button>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SQT-Vf-Lhr" userLabel="IdLabel">
<rect key="frame" x="53" y="783" width="4" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="rW7-RD-TBM">
@@ -546,84 +680,30 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <button verticalHuggingPriority="750" tag="400" translatesAutoresizingMaskIntoConstraints="NO" id="RuH-fO-poy" userLabel="Audio Call Button" customClass="HoverButton">
- <rect key="frame" x="708" y="783" width="35" height="35"/>
- <constraints>
- <constraint firstAttribute="width" constant="35" id="HyC-Bf-F7P"/>
- <constraint firstAttribute="height" constant="35" id="opT-rp-VwQ"/>
- </constraints>
- <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_call" imagePosition="overlaps" alignment="center" allowsMixedState="YES" transparent="YES" imageScaling="proportionallyDown" inset="2" id="f0E-8f-ly5">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
- <color key="value" red="0.0" green="0.23137254900000001" blue="0.30588235289999999" alpha="1" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" red="0.23137254900000001" green="0.75686274509999996" blue="0.82745098039999998" alpha="0.23410744859999999" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="4"/>
- </userDefinedRuntimeAttribute>
- </userDefinedRuntimeAttributes>
- <connections>
- <action selector="placeAudioCall:" target="-2" id="ycm-jI-2M5"/>
- </connections>
- </button>
- <button verticalHuggingPriority="750" tag="400" translatesAutoresizingMaskIntoConstraints="NO" id="pGK-hO-X1Y" userLabel="Add Contact Button" customClass="HoverButton">
- <rect key="frame" x="663" y="783" width="35" height="35"/>
- <constraints>
- <constraint firstAttribute="width" constant="35" id="Cxh-SD-Ozq"/>
- <constraint firstAttribute="height" constant="35" id="UUq-am-hL7"/>
- </constraints>
- <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_person_add" imagePosition="overlaps" alignment="center" allowsMixedState="YES" transparent="YES" imageScaling="proportionallyDown" inset="2" id="1oc-i4-1bh">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
- <color key="value" red="0.0" green="0.23137254900000001" blue="0.30588235289999999" alpha="1" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" red="0.23137254900000001" green="0.75686274509999996" blue="0.82745098039999998" alpha="0.23410744859999999" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="4"/>
- </userDefinedRuntimeAttribute>
- </userDefinedRuntimeAttributes>
- <connections>
- <action selector="addContact:" target="-2" id="9DI-Pm-X0I"/>
- </connections>
- </button>
</subviews>
<constraints>
<constraint firstItem="ooq-vs-Xt1" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="10" id="1xM-Rt-OXn"/>
<constraint firstItem="ucx-6g-eJw" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="5" id="32s-Wp-DE1"/>
- <constraint firstItem="cFH-d7-Erh" firstAttribute="centerY" secondItem="ooq-vs-Xt1" secondAttribute="centerY" id="5PE-Sd-Vwg"/>
<constraint firstItem="ucx-6g-eJw" firstAttribute="leading" secondItem="ooq-vs-Xt1" secondAttribute="trailing" constant="10" id="60g-Mw-Wax"/>
- <constraint firstItem="cFH-d7-Erh" firstAttribute="leading" secondItem="RuH-fO-poy" secondAttribute="trailing" constant="10" id="7Hq-Yy-WfO"/>
+ <constraint firstItem="s8t-r2-zdA" firstAttribute="top" secondItem="fh9-Uo-8R1" secondAttribute="top" id="8pz-TS-qws"/>
<constraint firstAttribute="bottom" secondItem="Rth-di-Tls" secondAttribute="bottom" id="9nL-Hs-Oak"/>
+ <constraint firstItem="s8t-r2-zdA" firstAttribute="trailing" secondItem="fh9-Uo-8R1" secondAttribute="trailing" constant="-15" id="ATN-4X-HqG"/>
+ <constraint firstItem="s8t-r2-zdA" firstAttribute="centerY" secondItem="ooq-vs-Xt1" secondAttribute="centerY" id="EYN-Be-aBV"/>
<constraint firstAttribute="trailing" secondItem="fh9-Uo-8R1" secondAttribute="trailing" id="EoD-2E-bhi"/>
<constraint firstAttribute="bottom" secondItem="EJD-f8-Xqd" secondAttribute="bottom" constant="60" id="EoS-be-aF2"/>
<constraint firstItem="ucx-6g-eJw" firstAttribute="leading" secondItem="SQT-Vf-Lhr" secondAttribute="leading" id="IQc-hc-YRD"/>
<constraint firstItem="EJD-f8-Xqd" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="L79-xO-12P"/>
- <constraint firstItem="RuH-fO-poy" firstAttribute="centerY" secondItem="ooq-vs-Xt1" secondAttribute="centerY" id="MS8-kk-8g8"/>
- <constraint firstItem="cFH-d7-Erh" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="10" id="Tok-wc-chb"/>
<constraint firstItem="EJD-f8-Xqd" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="55" id="XkO-FA-l3J"/>
<constraint firstItem="Sn1-dJ-QCw" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="55" id="aZT-2B-gv9"/>
<constraint firstItem="Rth-di-Tls" firstAttribute="trailing" secondItem="Ez2-Rf-DZN" secondAttribute="trailing" id="b6d-Ue-Zl5"/>
- <constraint firstAttribute="trailing" secondItem="cFH-d7-Erh" secondAttribute="trailing" constant="10" id="bWY-wj-6dr"/>
<constraint firstItem="EJD-f8-Xqd" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="bvr-Gv-Sgb"/>
<constraint firstItem="Sn1-dJ-QCw" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="dtD-1T-QlG"/>
<constraint firstItem="SQT-Vf-Lhr" firstAttribute="bottom" secondItem="ooq-vs-Xt1" secondAttribute="bottom" id="e8m-qq-0SV"/>
- <constraint firstItem="RuH-fO-poy" firstAttribute="leading" secondItem="pGK-hO-X1Y" secondAttribute="trailing" constant="10" id="fCS-uv-8E2"/>
<constraint firstItem="fh9-Uo-8R1" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="giR-tF-lUI"/>
<constraint firstAttribute="trailing" secondItem="EJD-f8-Xqd" secondAttribute="trailing" id="hSZ-8v-sis"/>
<constraint firstAttribute="bottom" secondItem="fh9-Uo-8R1" secondAttribute="bottom" id="hvC-OR-Ct0"/>
<constraint firstItem="Rth-di-Tls" firstAttribute="leading" secondItem="Ez2-Rf-DZN" secondAttribute="leading" id="jyz-o7-MMh"/>
<constraint firstAttribute="trailing" secondItem="Sn1-dJ-QCw" secondAttribute="trailing" id="m05-gh-crH"/>
- <constraint firstItem="pGK-hO-X1Y" firstAttribute="centerY" secondItem="ooq-vs-Xt1" secondAttribute="centerY" id="nQE-VA-2DY"/>
<constraint firstItem="ucx-6g-eJw" firstAttribute="centerY" secondItem="ooq-vs-Xt1" secondAttribute="centerY" id="uTp-kU-NmC" userLabel="centeredTitle"/>
<constraint firstItem="fh9-Uo-8R1" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" id="wBu-2R-lEu"/>
</constraints>
@@ -637,7 +717,7 @@
<outlet property="messageField" destination="bsk-Gj-qQ2" id="RD0-B6-fPN"/>
<outlet property="messagesBottomMargin" destination="EoS-be-aF2" id="pqG-cP-d8d"/>
<outlet property="recordAudioButton" destination="wYE-S3-AzD" id="nFg-ZY-Hss"/>
- <outlet property="recordVideoButton" destination="Gww-7y-sXo" id="ebw-OA-zmv"/>
+ <outlet property="recordVideoButton" destination="B6d-Sc-UTp" id="QN0-e5-FU7"/>
<outlet property="sendFileButton" destination="gwx-eT-PcN" id="09R-wC-t0r"/>
<outlet property="sendPanelHeight" destination="jJO-v2-Wuj" id="lYG-sU-eIr"/>
</connections>
@@ -650,7 +730,7 @@
<image name="ic_action_send" width="72" height="72"/>
<image name="ic_action_video" width="72" height="72"/>
<image name="ic_arrow_back" width="72" height="72"/>
- <image name="ic_camera" width="100" height="100"/>
+ <image name="ic_camera" width="96" height="96"/>
<image name="ic_file_upload" width="72" height="72"/>
<image name="ic_person_add" width="48" height="48"/>
</resources>
diff --git a/ui/Base.lproj/CurrentCall.strings b/ui/Base.lproj/CurrentCall.strings
index 45d58f1..222a03f 100644
--- a/ui/Base.lproj/CurrentCall.strings
+++ b/ui/Base.lproj/CurrentCall.strings
@@ -2,26 +2,17 @@
/* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "2cB-dz-KYg"; */
"2cB-dz-KYg.ibShadowedToolTip" = "Hang up";
-/* Class = "NSButton"; ibShadowedToolTip = "Join call"; ObjectID = "9e8-ji-QId"; */
-"9e8-ji-QId.ibShadowedToolTip" = "Join call";
+/* Class = "NSBox"; title = "Box"; ObjectID = "4xt-xs-LVn"; */
+"4xt-xs-LVn.title" = "Box";
-/* Class = "NSButton"; ibShadowedToolTip = "Transfer"; ObjectID = "ChW-kg-Sja"; */
-"ChW-kg-Sja.ibShadowedToolTip" = "Transfer";
+/* Class = "NSBox"; title = "Box"; ObjectID = "DSf-SJ-l6k"; */
+"DSf-SJ-l6k.title" = "Box";
-/* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "D0G-XT-lhI"; */
-"D0G-XT-lhI.ibShadowedToolTip" = "Hang up";
+/* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "GBy-HF-JeP"; */
+"GBy-HF-JeP.title" = "Label";
-/* Class = "NSTextFieldCell"; title = "URI"; ObjectID = "Dqv-um-UUk"; */
-"Dqv-um-UUk.title" = "URI";
-
-/* Class = "NSTextFieldCell"; placeholderString = "Incoming Display Name"; ObjectID = "EA3-Q5-Dyj"; */
-"EA3-Q5-Dyj.placeholderString" = "Incoming Display Name";
-
-/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "G0w-c3-9pJ"; */
-"G0w-c3-9pJ.ibShadowedToolTip" = "Record";
-
-/* Class = "NSButtonCell"; title = "Answer"; ObjectID = "KPG-pB-gPm"; */
-"KPG-pB-gPm.title" = "Answer";
+/* Class = "NSBox"; title = "Box"; ObjectID = "KCp-bZ-69S"; */
+"KCp-bZ-69S.title" = "Box";
/* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "Kjq-iM-NBL"; */
"Kjq-iM-NBL.ibShadowedToolTip" = "Hang up";
@@ -29,53 +20,53 @@
/* Class = "NSButton"; ibShadowedToolTip = "Mute Video"; ObjectID = "LVS-yZ-98V"; */
"LVS-yZ-98V.ibShadowedToolTip" = "Mute Video";
-/* Class = "NSTextFieldCell"; title = "Cancel"; ObjectID = "TlL-HO-5Ey"; */
-"TlL-HO-5Ey.title" = "Cancel";
+/* Class = "CocoaBindingsConnection"; ibShadowedMultipleValuesPlaceholder = "Send a message"; ObjectID = "NRc-5f-Ujc"; */
+"NRc-5f-Ujc.ibShadowedMultipleValuesPlaceholder" = "Send a message";
-/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "VVL-A4-r7n"; */
-"VVL-A4-r7n.ibShadowedToolTip" = "Record";
+/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "Send a message"; ObjectID = "NRc-5f-Ujc"; */
+"NRc-5f-Ujc.ibShadowedNoSelectionPlaceholder" = "Send a message";
-/* Class = "NSTextFieldCell"; title = "wants to talk to you!"; ObjectID = "X0W-vv-xua"; */
-"X0W-vv-xua.title" = "wants to talk to you!";
+/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "Send a message"; ObjectID = "NRc-5f-Ujc"; */
+"NRc-5f-Ujc.ibShadowedNotApplicablePlaceholder" = "Send a message";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "QYT-0n-4sw"; */
+"QYT-0n-4sw.ibShadowedToolTip" = "Record";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Toggle chat"; ObjectID = "Vhk-fx-6RW"; */
+"Vhk-fx-6RW.ibShadowedToolTip" = "Toggle chat";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "YGj-SP-ikj"; */
+"YGj-SP-ikj.title" = "Text Cell";
/* Class = "NSButton"; ibShadowedToolTip = "Hold"; ObjectID = "anb-Y8-JQi"; */
"anb-Y8-JQi.ibShadowedToolTip" = "Hold";
+/* Class = "NSTextFieldCell"; placeholderString = "Send a message"; ObjectID = "d4g-hS-EMn"; */
+"d4g-hS-EMn.placeholderString" = "Send a message";
+
+/* Class = "NSTextFieldCell"; placeholderString = "State"; ObjectID = "dPt-JY-yxV"; */
+"dPt-JY-yxV.placeholderString" = "State";
+
/* Class = "NSButton"; ibShadowedToolTip = "Toggle chat"; ObjectID = "fmp-x4-Pef"; */
"fmp-x4-Pef.ibShadowedToolTip" = "Toggle chat";
-/* Class = "NSButton"; ibShadowedToolTip = "Add participant"; ObjectID = "kIZ-mf-moM"; */
-"kIZ-mf-moM.ibShadowedToolTip" = "Add participant";
+/* Class = "NSTextFieldCell"; title = "person Id"; ObjectID = "hKi-Ay-ex5"; */
+"hKi-Ay-ex5.title" = "person Id";
-/* Class = "NSButtonCell"; title = "Button"; ObjectID = "kxH-yM-TLd"; */
-"kxH-yM-TLd.title" = "Button";
+/* Class = "NSBox"; title = "Box"; ObjectID = "hfc-s5-yWK"; */
+"hfc-s5-yWK.title" = "Box";
-/* Class = "NSButton"; ibShadowedToolTip = "Hang up"; ObjectID = "mc3-HV-hek"; */
-"mc3-HV-hek.ibShadowedToolTip" = "Hang up";
-
-/* Class = "NSButton"; ibShadowedToolTip = "Record"; ObjectID = "oRa-pS-HN2"; */
-"oRa-pS-HN2.ibShadowedToolTip" = "Record";
-
-/* Class = "NSTextFieldCell"; placeholderString = "Person name"; ObjectID = "osk-LS-0Qg"; */
-"osk-LS-0Qg.placeholderString" = "Person name";
+/* Class = "NSButton"; ibShadowedToolTip = "Send a file"; ObjectID = "ngO-WV-cXD"; */
+"ngO-WV-cXD.ibShadowedToolTip" = "Send a file";
/* Class = "NSButton"; ibShadowedToolTip = "Pick up"; ObjectID = "qgD-3D-nD5"; */
"qgD-3D-nD5.ibShadowedToolTip" = "Pick up";
+/* Class = "NSButton"; ibShadowedToolTip = "Send"; ObjectID = "rqa-be-VIB"; */
+"rqa-be-VIB.ibShadowedToolTip" = "Send";
+
/* Class = "NSButton"; ibShadowedToolTip = "Mute Audio"; ObjectID = "tQl-cT-0Lb"; */
"tQl-cT-0Lb.ibShadowedToolTip" = "Mute Audio";
-/* Class = "NSTextFieldCell"; title = "Ignore"; ObjectID = "tjM-py-p4V"; */
-"tjM-py-p4V.title" = "Ignore";
-
-/* Class = "NSTextFieldCell"; placeholderString = "State"; ObjectID = "ugy-uK-901"; */
-"ugy-uK-901.placeholderString" = "State";
-
-/* Class = "NSTextFieldCell"; title = "Answer"; ObjectID = "wRO-X4-7IU"; */
-"wRO-X4-7IU.title" = "Answer";
-
-/* Class = "NSTextFieldCell"; title = "wants to talk with you!"; ObjectID = "yZ6-1A-ZLT"; */
-"yZ6-1A-ZLT.title" = "wants to talk with you!";
-
-/* Class = "NSTextFieldCell"; placeholderString = "Time"; ObjectID = "zsO-T7-9yi"; */
-"zsO-T7-9yi.placeholderString" = "Time";
+/* Class = "NSTextFieldCell"; placeholderString = "Person name"; ObjectID = "ues-20-34k"; */
+"ues-20-34k.placeholderString" = "Person name";
diff --git a/ui/Base.lproj/CurrentCall.xib b/ui/Base.lproj/CurrentCall.xib
index 6e85dc7..c3e3ddf 100644
--- a/ui/Base.lproj/CurrentCall.xib
+++ b/ui/Base.lproj/CurrentCall.xib
@@ -159,6 +159,9 @@
<userDefinedRuntimeAttribute type="color" keyPath="bgColor">
<color key="value" red="0.23529411764705882" green="0.6470588235294118" blue="0.16078431372549018" alpha="0.80000000000000004" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
+ <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="accept:" target="-2" id="INY-Fs-j5F"/>
@@ -181,6 +184,9 @@
<userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
<integer key="value" value="16"/>
</userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
+ <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="hangUp:" target="-2" id="14i-n4-cD6"/>
@@ -365,22 +371,19 @@
</buttonCell>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="6"/>
+ <integer key="value" value="4"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="moiuseOutsideImageColor">
+ <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
<color key="value" name="systemRedColor" catalog="System" colorSpace="catalog"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="0.0" colorSpace="custom" customColorSpace="displayP3"/>
- </userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
<color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
<integer key="value" value="2"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnClick">
- <integer key="value" value="2"/>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="1" green="0.14913141730000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
@@ -399,22 +402,19 @@
</buttonCell>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="6"/>
+ <integer key="value" value="4"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="moiuseOutsideImageColor">
+ <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
<color key="value" red="0.84313725490196079" green="0.84313725490196079" blue="0.84313725490196079" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="0.0" colorSpace="custom" customColorSpace="displayP3"/>
- </userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
<color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
<integer key="value" value="2"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnClick">
- <integer key="value" value="2"/>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.84313725490196079" green="0.84313725490196079" blue="0.84313725490196079" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
@@ -433,12 +433,9 @@
</buttonCell>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="6"/>
+ <integer key="value" value="4"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" red="0.12894672927461137" green="0.12894672927461137" blue="0.12894672927461137" alpha="0.0" colorSpace="custom" customColorSpace="displayP3"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="moiuseOutsideImageColor">
+ <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
<color key="value" red="0.84313725490196079" green="0.84313725490196079" blue="0.84313725490196079" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
@@ -447,8 +444,8 @@
<userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
<integer key="value" value="2"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnClick">
- <integer key="value" value="2"/>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.84313725490196079" green="0.84313725490196079" blue="0.84313725490196079" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
@@ -467,22 +464,19 @@
</buttonCell>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="6"/>
+ <integer key="value" value="4"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="moiuseOutsideImageColor">
+ <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
<color key="value" red="0.84313725490196079" green="0.84313725490196079" blue="0.84313725490196079" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="0.0" colorSpace="custom" customColorSpace="displayP3"/>
- </userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
<color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
<integer key="value" value="2"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnClick">
- <integer key="value" value="2"/>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.84313725490196079" green="0.84313725490196079" blue="0.84313725490196079" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
@@ -501,25 +495,19 @@
</buttonCell>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="6"/>
+ <integer key="value" value="4"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="moiuseOutsideImageColor">
+ <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
<color key="value" red="0.84313725490196079" green="0.84313725490196079" blue="0.84313725490196079" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="0.0" colorSpace="custom" customColorSpace="displayP3"/>
- </userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
<color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="imagePressedColor">
- <color key="value" red="0.98594832420349121" green="0.0" blue="0.026950567960739136" alpha="1" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
<integer key="value" value="2"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnClick">
- <integer key="value" value="2"/>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.84313725490196079" green="0.84313725490196079" blue="0.84313725490196079" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
@@ -538,22 +526,19 @@
</buttonCell>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="6"/>
+ <integer key="value" value="4"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="moiuseOutsideImageColor">
+ <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
<color key="value" red="0.84313725490000002" green="0.84313725490000002" blue="0.84313725490000002" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" red="0.12941176469999999" green="0.12941176469999999" blue="0.12941176469999999" alpha="0.0" colorSpace="custom" customColorSpace="displayP3"/>
- </userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
<color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
<integer key="value" value="2"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnClick">
- <integer key="value" value="2"/>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.84313725490196079" green="0.84313725490196079" blue="0.84313725490196079" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
@@ -572,22 +557,19 @@
</buttonCell>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="6"/>
+ <integer key="value" value="4"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="moiuseOutsideImageColor">
+ <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
<color key="value" red="0.84313725490196079" green="0.84313725490196079" blue="0.84313725490196079" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="0.0" colorSpace="custom" customColorSpace="displayP3"/>
- </userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
<color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
<integer key="value" value="2"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnClick">
- <integer key="value" value="2"/>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.84313725490196079" green="0.84313725490196079" blue="0.84313725490196079" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
@@ -876,7 +858,7 @@
<rect key="frame" x="20" y="0.0" width="331" height="60"/>
<subviews>
<textField verticalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Jei-Xj-lgm">
- <rect key="frame" x="53" y="21" width="233" height="18"/>
+ <rect key="frame" x="50" y="21" width="239" height="18"/>
<textFieldCell key="cell" lineBreakMode="charWrapping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" placeholderString="Send a message" id="d4g-hS-EMn">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -894,28 +876,34 @@
<outlet property="delegate" destination="loh-bZ-dDU" id="xu2-mX-kjl"/>
</connections>
</textField>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rqa-be-VIB" customClass="HoverButton">
- <rect key="frame" x="286" y="15" width="35" height="35"/>
+ <button toolTip="Send" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rqa-be-VIB" customClass="HoverButton">
+ <rect key="frame" x="289" y="15" width="32" height="32"/>
<constraints>
- <constraint firstAttribute="height" constant="35" id="dSX-e7-1Vh"/>
- <constraint firstAttribute="width" constant="35" id="kGU-D9-INQ"/>
+ <constraint firstAttribute="height" constant="32" id="dSX-e7-1Vh"/>
+ <constraint firstAttribute="width" constant="32" id="kGU-D9-INQ"/>
</constraints>
<buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_send" imagePosition="overlaps" alignment="center" enabled="NO" transparent="YES" imageScaling="proportionallyDown" inset="2" id="doF-7O-ikF">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
- <color key="value" red="0.0" green="0.23137254900000001" blue="0.30588235289999999" alpha="1" colorSpace="calibratedRGB"/>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
+ <color key="value" red="0.0" green="0.19215686274509802" blue="0.26666666666666666" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" red="0.23137254900000001" green="0.75686274509999996" blue="0.82745098039999998" alpha="0.23000000000000001" colorSpace="calibratedRGB"/>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.93609845638275146" green="0.93607044219970703" blue="0.93608629703521729" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="buttonDisableColor">
<color key="value" red="0.78955939799999997" green="0.75686274509999996" blue="0.82745098039999998" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="4"/>
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverDarkColor">
+ <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
@@ -923,25 +911,31 @@
<binding destination="loh-bZ-dDU" name="enabled" keyPath="self.message.length" id="kt1-TU-lMw"/>
</connections>
</button>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ngO-WV-cXD" customClass="HoverButton">
- <rect key="frame" x="10" y="15" width="35" height="35"/>
+ <button toolTip="Send a file" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ngO-WV-cXD" customClass="HoverButton">
+ <rect key="frame" x="10" y="15" width="32" height="32"/>
<constraints>
- <constraint firstAttribute="width" constant="35" id="jcX-bd-eeT"/>
- <constraint firstAttribute="height" constant="35" id="ypC-5c-Ved"/>
+ <constraint firstAttribute="width" constant="32" id="jcX-bd-eeT"/>
+ <constraint firstAttribute="height" constant="32" id="ypC-5c-Ved"/>
</constraints>
<buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_file_upload" imagePosition="overlaps" alignment="center" enabled="NO" transparent="YES" imageScaling="proportionallyDown" inset="2" id="Lhu-KV-kCT">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
- <color key="value" red="0.0" green="0.23137254900000001" blue="0.30588235289999999" alpha="1" colorSpace="calibratedRGB"/>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
+ <color key="value" red="0.0" green="0.19215686274509802" blue="0.26666666666666666" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" red="0.23137254900000001" green="0.75686274509999996" blue="0.82745098039999998" alpha="0.23000000000000001" colorSpace="calibratedRGB"/>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.93609845638275146" green="0.93607044219970703" blue="0.93608629703521729" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="4"/>
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverDarkColor">
+ <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
diff --git a/ui/Base.lproj/LeaveMessageVC.strings b/ui/Base.lproj/LeaveMessageVC.strings
index 7a85a56..074018e 100644
--- a/ui/Base.lproj/LeaveMessageVC.strings
+++ b/ui/Base.lproj/LeaveMessageVC.strings
@@ -2,20 +2,26 @@
/* Class = "NSTextFieldCell"; title = "00:00"; ObjectID = "78U-cA-2f2"; */
"78U-cA-2f2.title" = "00:00";
-/* Class = "NSBox"; title = "Box"; ObjectID = "MxH-aj-EXO"; */
-"MxH-aj-EXO.title" = "Box";
+/* Class = "NSButtonCell"; title = "Send message"; ObjectID = "Bjm-hd-lQU"; */
+"Bjm-hd-lQU.title" = "Send message";
+
+/* Class = "NSButtonCell"; title = "Go back to conversations"; ObjectID = "M07-cf-bjZ"; */
+"M07-cf-bjZ.title" = "Go back to conversations";
/* Class = "NSBox"; title = "Box"; ObjectID = "TwL-yO-BXI"; */
"TwL-yO-BXI.title" = "Box";
-/* Class = "NSBox"; title = "Box"; ObjectID = "Zlv-nH-Y9y"; */
-"Zlv-nH-Y9y.title" = "Box";
-
-/* Class = "NSTextFieldCell"; title = "Contact appears to be busy. Leave a message?"; ObjectID = "hnr-x5-xnb"; */
-"hnr-x5-xnb.title" = "Contact appears to be busy. Leave a message?";
+/* Class = "NSButton"; ibShadowedToolTip = "Record message"; ObjectID = "dEq-nq-Ae8"; */
+"dEq-nq-Ae8.ibShadowedToolTip" = "Record message";
/* Class = "NSTextFieldCell"; title = "Recording"; ObjectID = "kIq-PG-Ymw"; */
"kIq-PG-Ymw.title" = "Recording";
-/* Class = "NSTextFieldCell"; title = "Name"; ObjectID = "uol-7p-Y2J"; */
-"uol-7p-Y2J.title" = "Name";
+/* Class = "NSButton"; ibShadowedToolTip = "Record message"; ObjectID = "oFb-RQ-trc"; */
+"oFb-RQ-trc.ibShadowedToolTip" = "Record message";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Go to conversations"; ObjectID = "tf8-hV-8xd"; */
+"tf8-hV-8xd.ibShadowedToolTip" = "Go to conversations";
+
+/* Class = "NSButtonCell"; title = "Record a message"; ObjectID = "zTC-Gf-lAV"; */
+"zTC-Gf-lAV.title" = "Record a message";
diff --git a/ui/Base.lproj/LeaveMessageVC.xib b/ui/Base.lproj/LeaveMessageVC.xib
index 8216a93..fdc2124 100644
--- a/ui/Base.lproj/LeaveMessageVC.xib
+++ b/ui/Base.lproj/LeaveMessageVC.xib
@@ -1,18 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
- <capability name="System colors introduced in macOS 10.14" minToolsVersion="10.0"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="LeaveMessageVC">
<connections>
- <outlet property="infoLabel" destination="oeJ-VI-uhE" id="9bG-8v-9PT"/>
+ <outlet property="exitButton" destination="tf8-hV-8xd" id="HIj-gX-zMq"/>
+ <outlet property="infoLabel" destination="BFQ-Q6-8D6" id="rLR-Qd-Yfu"/>
<outlet property="personPhoto" destination="gFu-2j-j1g" id="NOO-yO-d5d"/>
- <outlet property="recordButton" destination="cOl-pS-cP5" id="YsL-fB-biO"/>
- <outlet property="sendBox" destination="MxH-aj-EXO" id="715-t9-z7D"/>
- <outlet property="sendFilename" destination="Zj8-Dk-VI5" id="y15-gg-zgb"/>
+ <outlet property="recordButton" destination="dEq-nq-Ae8" id="tB1-Pb-lle"/>
+ <outlet property="sendButton" destination="oFb-RQ-trc" id="TGB-TV-Af5"/>
<outlet property="timerBox" destination="WtB-WH-CJz" id="WyV-9R-KT0"/>
<outlet property="timerLabel" destination="1k9-gR-Qgh" id="Rch-wt-Q7U"/>
<outlet property="view" destination="Hz6-mo-xeY" id="0ae-8W-gNO"/>
@@ -21,237 +20,301 @@
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView id="Hz6-mo-xeY">
- <rect key="frame" x="0.0" y="0.0" width="798" height="658"/>
+ <rect key="frame" x="0.0" y="0.0" width="888" height="544"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<box boxType="custom" borderType="none" cornerRadius="4" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="TwL-yO-BXI">
- <rect key="frame" x="0.0" y="0.0" width="798" height="658"/>
+ <rect key="frame" x="0.0" y="0.0" width="888" height="544"/>
<view key="contentView" id="RNM-sD-Phj">
- <rect key="frame" x="0.0" y="0.0" width="798" height="658"/>
+ <rect key="frame" x="0.0" y="0.0" width="888" height="544"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</view>
<color key="borderColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="fillColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/>
</box>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cOl-pS-cP5" customClass="HoverButton">
- <rect key="frame" x="350" y="222" width="40" height="40"/>
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="HyU-cT-Xbw">
+ <rect key="frame" x="0.0" y="444" width="888" height="100"/>
<constraints>
- <constraint firstAttribute="width" constant="40" id="hiL-Mx-vuA"/>
- <constraint firstAttribute="height" constant="40" id="qPN-3f-Ko7"/>
+ <constraint firstAttribute="height" constant="100" id="dpp-YY-Aai"/>
</constraints>
- <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_audio" imagePosition="only" alignment="center" transparent="YES" imageScaling="proportionallyUpOrDown" inset="2" id="hiW-Yq-71M">
+ <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" imagePosition="only" alignment="center" transparent="YES" imageScaling="proportionallyUpOrDown" inset="2" id="9Jg-9m-Xk4">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
- <userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="6"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" name="unemphasizedSelectedContentBackgroundColor" catalog="System" colorSpace="catalog"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
- <color key="value" name="labelColor" catalog="System" colorSpace="catalog"/>
- </userDefinedRuntimeAttribute>
- </userDefinedRuntimeAttributes>
- <connections>
- <action selector="recordMessage:" target="-2" id="AcE-mM-mr5"/>
- </connections>
</button>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0v7-mC-auu" customClass="HoverButton">
- <rect key="frame" x="400" y="222" width="40" height="40"/>
- <constraints>
- <constraint firstAttribute="height" constant="40" id="Ubr-IA-SO6"/>
- <constraint firstAttribute="width" constant="40" id="hhA-GJ-SQo"/>
- </constraints>
- <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_exit" imagePosition="only" alignment="center" transparent="YES" imageScaling="proportionallyUpOrDown" inset="2" id="121-P0-aCH">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="6"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" name="unemphasizedSelectedContentBackgroundColor" catalog="System" colorSpace="catalog"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
- <color key="value" name="labelColor" catalog="System" colorSpace="catalog"/>
- </userDefinedRuntimeAttribute>
- </userDefinedRuntimeAttributes>
- <connections>
- <action selector="cancel:" target="-2" id="dVf-0K-pdq"/>
- </connections>
- </button>
- <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="gFu-2j-j1g">
- <rect key="frame" x="339" y="398" width="120" height="120"/>
- <constraints>
- <constraint firstAttribute="height" constant="120" id="KMx-gW-5Jr"/>
- <constraint firstAttribute="width" constant="120" id="kGL-D8-QE0"/>
- </constraints>
- <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSUser" id="boQ-fa-nNO"/>
- </imageView>
- <box titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="WtB-WH-CJz">
- <rect key="frame" x="305" y="118" width="188" height="86"/>
- <view key="contentView" id="tbn-BB-CbR">
- <rect key="frame" x="3" y="3" width="182" height="80"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <subviews>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CvL-tU-YNA">
- <rect key="frame" x="58" y="53" width="66" height="17"/>
- <textFieldCell key="cell" lineBreakMode="clipping" title="Recording" id="kIq-PG-Ymw">
- <font key="font" usesAppearanceFont="YES"/>
- <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1k9-gR-Qgh">
- <rect key="frame" x="49" y="8" width="84" height="35"/>
- <textFieldCell key="cell" lineBreakMode="clipping" title="00:00" id="78U-cA-2f2">
- <font key="font" metaFont="system" size="29"/>
- <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- </subviews>
- <constraints>
- <constraint firstItem="1k9-gR-Qgh" firstAttribute="centerX" secondItem="tbn-BB-CbR" secondAttribute="centerX" id="ALD-VB-KGO"/>
- <constraint firstItem="CvL-tU-YNA" firstAttribute="top" secondItem="tbn-BB-CbR" secondAttribute="top" constant="10" id="Xxf-0h-14a"/>
- <constraint firstItem="CvL-tU-YNA" firstAttribute="centerX" secondItem="tbn-BB-CbR" secondAttribute="centerX" id="Ylf-xL-G77"/>
- <constraint firstItem="1k9-gR-Qgh" firstAttribute="top" secondItem="CvL-tU-YNA" secondAttribute="bottom" constant="10" id="gnT-ir-ivn"/>
- </constraints>
- </view>
- <constraints>
- <constraint firstAttribute="width" constant="182" id="Wgv-cO-Eg5"/>
- <constraint firstAttribute="height" constant="80" id="dEB-5M-hAm"/>
- </constraints>
- <font key="titleFont" metaFont="cellTitle"/>
- </box>
- <box title="Box" titlePosition="noTitle" transparent="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MxH-aj-EXO">
- <rect key="frame" x="305" y="118" width="188" height="86"/>
- <view key="contentView" id="U9z-Rg-Zs3">
- <rect key="frame" x="3" y="3" width="182" height="80"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <subviews>
- <box boxType="custom" borderType="bezel" cornerRadius="20" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="Zlv-nH-Y9y">
- <rect key="frame" x="20" y="40" width="100" height="40"/>
- <view key="contentView" id="bxd-ht-hMm">
- <rect key="frame" x="1" y="1" width="98" height="38"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <stackView distribution="fill" orientation="vertical" alignment="centerX" spacing="15" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" translatesAutoresizingMaskIntoConstraints="NO" id="cgF-IG-blz">
+ <rect key="frame" x="230" y="66" width="428" height="412"/>
+ <subviews>
+ <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="15" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="RrM-q3-ief">
+ <rect key="frame" x="0.0" y="292" width="428" height="120"/>
+ <subviews>
+ <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="gFu-2j-j1g">
+ <rect key="frame" x="0.0" y="0.0" width="120" height="120"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="120" id="KMx-gW-5Jr"/>
+ <constraint firstAttribute="width" constant="120" id="kGL-D8-QE0"/>
+ </constraints>
+ <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSUser" id="boQ-fa-nNO"/>
+ </imageView>
+ <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="BFQ-Q6-8D6">
+ <rect key="frame" x="135" y="48" width="293" height="24"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" drawsBackground="YES" id="z57-wd-7By">
+ <font key="font" metaFont="systemLight" size="20"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" red="0.37055522200000002" green="0.37056469920000001" blue="0.37055957319999999" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+ </textFieldCell>
+ </textField>
+ </subviews>
+ <constraints>
+ <constraint firstAttribute="width" constant="428" id="exh-8y-yGe"/>
+ </constraints>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="gnL-jx-bda">
+ <rect key="frame" x="199" y="247" width="30" height="30"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="30" id="4OT-ej-OZJ"/>
+ <constraint firstAttribute="width" constant="30" id="IKD-QR-lCr"/>
+ </constraints>
+ </customView>
+ <stackView distribution="equalCentering" orientation="vertical" alignment="leading" spacing="15" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3UK-ut-Pdi">
+ <rect key="frame" x="118" y="137" width="193" height="95"/>
+ <subviews>
+ <button toolTip="Record message" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dEq-nq-Ae8" userLabel="record" customClass="HoverButton">
+ <rect key="frame" x="0.0" y="55" width="193" height="40"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="40" id="yzl-pB-H0C"/>
+ </constraints>
+ <buttonCell key="cell" type="square" title="Record a message" bezelStyle="shadowlessSquare" image="ic_action_audio" imagePosition="left" alignment="center" transparent="YES" imageScaling="proportionallyDown" id="zTC-Gf-lAV">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
+ <integer key="value" value="4"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="hoverLightColor">
+ <color key="value" red="0.98039215690000003" green="0.98039215690000003" blue="0.98039215690000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+ <integer key="value" value="10"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="highlightColor">
+ <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="hoverDarkColor">
+ <color key="value" red="0.0" green="0.23137254900000001" blue="0.30588235289999999" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="bgColor">
+ <color key="value" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="highlightDarkColor">
+ <color key="value" red="0.0" green="0.19215686274509802" blue="0.26666666666666666" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ </userDefinedRuntimeAttributes>
+ <connections>
+ <action selector="recordMessage:" target="-2" id="YrD-jQ-AL6"/>
+ </connections>
+ </button>
+ <button toolTip="Go to conversations" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tf8-hV-8xd" userLabel="exit" customClass="HoverButton">
+ <rect key="frame" x="0.0" y="0.0" width="193" height="40"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="40" id="1NL-P8-f6U"/>
+ </constraints>
+ <buttonCell key="cell" type="square" title="Go back to conversations" bezelStyle="shadowlessSquare" image="ic_exit" imagePosition="left" alignment="center" transparent="YES" imageScaling="proportionallyDown" id="M07-cf-bjZ">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
+ <integer key="value" value="4"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="hoverLightColor">
+ <color key="value" red="0.98039215690000003" green="0.98039215690000003" blue="0.98039215690000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+ <integer key="value" value="10"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="highlightColor">
+ <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="hoverDarkColor">
+ <color key="value" red="0.0" green="0.23137254900000001" blue="0.30588235289999999" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="bgColor">
+ <color key="value" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="highlightDarkColor">
+ <color key="value" red="0.0" green="0.19215686274509802" blue="0.26666666666666666" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ </userDefinedRuntimeAttributes>
+ <connections>
+ <action selector="cancel:" target="-2" id="i6g-Ta-oJn"/>
+ </connections>
+ </button>
+ </subviews>
+ <constraints>
+ <constraint firstItem="tf8-hV-8xd" firstAttribute="leading" secondItem="dEq-nq-Ae8" secondAttribute="leading" id="Md5-1F-H6Y"/>
+ <constraint firstItem="tf8-hV-8xd" firstAttribute="trailing" secondItem="dEq-nq-Ae8" secondAttribute="trailing" id="tsq-z7-a3g"/>
+ </constraints>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" translatesAutoresizingMaskIntoConstraints="NO" id="E7i-f2-vTg">
+ <rect key="frame" x="121" y="0.0" width="186" height="122"/>
+ <subviews>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="JXb-8p-BnV">
+ <rect key="frame" x="0.0" y="92" width="186" height="30"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="30" id="QrO-iY-Lzp"/>
+ </constraints>
+ </customView>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="yqC-dx-gC5">
+ <rect key="frame" x="0.0" y="0.0" width="186" height="84"/>
<subviews>
- <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="kSA-Cr-Pp3">
- <rect key="frame" x="10" y="10" width="20" height="18"/>
+ <button toolTip="Record message" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oFb-RQ-trc" userLabel="sendMsg" customClass="HoverButton">
+ <rect key="frame" x="-3" y="44" width="193" height="40"/>
<constraints>
- <constraint firstAttribute="width" constant="20" id="YUW-eF-aaS"/>
+ <constraint firstAttribute="height" constant="40" id="fZ6-ef-vs8"/>
</constraints>
- <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="ic_audio_file" id="8ee-Km-Vp6"/>
- </imageView>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Zj8-Dk-VI5">
- <rect key="frame" x="38" y="11" width="62" height="17"/>
- <textFieldCell key="cell" lineBreakMode="clipping" id="Lml-tH-Au6">
+ <buttonCell key="cell" type="square" title="Send message" bezelStyle="shadowlessSquare" image="ic_audio_file" imagePosition="left" alignment="center" transparent="YES" imageScaling="proportionallyDown" id="Bjm-hd-lQU">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
- <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
+ </buttonCell>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
+ <integer key="value" value="4"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="hoverLightColor">
+ <color key="value" red="0.98039215690000003" green="0.98039215690000003" blue="0.98039215690000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+ <integer key="value" value="10"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="highlightColor">
+ <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="hoverDarkColor">
+ <color key="value" red="0.0" green="0.23137254900000001" blue="0.30588235289999999" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="bgColor">
+ <color key="value" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="highlightDarkColor">
+ <color key="value" red="0.0" green="0.19215686274509802" blue="0.26666666666666666" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ </userDefinedRuntimeAttributes>
+ <connections>
+ <action selector="sendMessage:" target="-2" id="RsE-ok-f5r"/>
+ </connections>
+ </button>
+ <box boxType="custom" borderType="none" cornerRadius="18" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="WtB-WH-CJz">
+ <rect key="frame" x="0.0" y="0.0" width="186" height="84"/>
+ <view key="contentView" id="tbn-BB-CbR">
+ <rect key="frame" x="0.0" y="0.0" width="186" height="84"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CvL-tU-YNA">
+ <rect key="frame" x="60" y="57" width="66" height="17"/>
+ <textFieldCell key="cell" lineBreakMode="clipping" title="Recording" id="kIq-PG-Ymw">
+ <font key="font" usesAppearanceFont="YES"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1k9-gR-Qgh">
+ <rect key="frame" x="52" y="12" width="82" height="35"/>
+ <textFieldCell key="cell" lineBreakMode="clipping" title="00:00" id="78U-cA-2f2">
+ <font key="font" metaFont="system" size="29"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ </subviews>
+ <constraints>
+ <constraint firstItem="1k9-gR-Qgh" firstAttribute="centerX" secondItem="tbn-BB-CbR" secondAttribute="centerX" id="ALD-VB-KGO"/>
+ <constraint firstItem="CvL-tU-YNA" firstAttribute="top" secondItem="tbn-BB-CbR" secondAttribute="top" constant="10" id="Xxf-0h-14a"/>
+ <constraint firstItem="CvL-tU-YNA" firstAttribute="centerX" secondItem="tbn-BB-CbR" secondAttribute="centerX" id="Ylf-xL-G77"/>
+ <constraint firstItem="1k9-gR-Qgh" firstAttribute="top" secondItem="CvL-tU-YNA" secondAttribute="bottom" constant="10" id="gnT-ir-ivn"/>
+ </constraints>
+ </view>
+ <constraints>
+ <constraint firstAttribute="width" constant="186" id="Wgv-cO-Eg5"/>
+ <constraint firstAttribute="height" constant="84" id="dEB-5M-hAm"/>
+ </constraints>
+ <font key="titleFont" metaFont="cellTitle"/>
+ </box>
</subviews>
<constraints>
- <constraint firstItem="Zj8-Dk-VI5" firstAttribute="centerY" secondItem="bxd-ht-hMm" secondAttribute="centerY" id="Hpd-t9-NNA"/>
- <constraint firstItem="kSA-Cr-Pp3" firstAttribute="centerY" secondItem="bxd-ht-hMm" secondAttribute="centerY" id="c4e-NF-hy4"/>
- <constraint firstAttribute="trailing" secondItem="Zj8-Dk-VI5" secondAttribute="trailing" id="iWD-1w-N3k"/>
- <constraint firstItem="kSA-Cr-Pp3" firstAttribute="leading" secondItem="bxd-ht-hMm" secondAttribute="leading" constant="10" id="ofV-eC-JpI"/>
- <constraint firstItem="kSA-Cr-Pp3" firstAttribute="top" secondItem="bxd-ht-hMm" secondAttribute="top" constant="10" id="x9O-tw-81d"/>
- <constraint firstItem="Zj8-Dk-VI5" firstAttribute="leading" secondItem="kSA-Cr-Pp3" secondAttribute="trailing" constant="10" id="zu8-7j-OP5"/>
+ <constraint firstItem="oFb-RQ-trc" firstAttribute="top" secondItem="yqC-dx-gC5" secondAttribute="top" id="UZ2-XA-TQJ"/>
+ <constraint firstItem="WtB-WH-CJz" firstAttribute="centerX" secondItem="yqC-dx-gC5" secondAttribute="centerX" id="mMQ-yk-NmM"/>
+ <constraint firstAttribute="height" constant="84" id="wgY-Vu-VI8"/>
+ <constraint firstItem="WtB-WH-CJz" firstAttribute="centerY" secondItem="yqC-dx-gC5" secondAttribute="centerY" id="yux-9K-XLW"/>
</constraints>
- </view>
- <constraints>
- <constraint firstAttribute="height" constant="40" id="Iyu-Nl-TpG"/>
- <constraint firstAttribute="width" constant="100" id="cw3-NU-2Lj"/>
- </constraints>
- <color key="borderColor" name="unemphasizedSelectedContentBackgroundColor" catalog="System" colorSpace="catalog"/>
- <color key="fillColor" name="unemphasizedSelectedContentBackgroundColor" catalog="System" colorSpace="catalog"/>
- </box>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XN4-Vb-UWd" customClass="HoverButton">
- <rect key="frame" x="131" y="40" width="40" height="40"/>
- <constraints>
- <constraint firstAttribute="height" constant="40" id="LNf-7D-co7"/>
- <constraint firstAttribute="width" constant="40" id="ouZ-f5-Vfs"/>
- </constraints>
- <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_send" imagePosition="only" alignment="center" transparent="YES" imageScaling="proportionallyDown" inset="2" id="9LO-UF-tss">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="6"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
- <color key="value" name="labelColor" catalog="System" colorSpace="catalog"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" name="unemphasizedSelectedContentBackgroundColor" catalog="System" colorSpace="catalog"/>
- </userDefinedRuntimeAttribute>
- </userDefinedRuntimeAttributes>
- <connections>
- <action selector="sendMessage:" target="-2" id="4WL-7f-xpJ"/>
- </connections>
- </button>
- </subviews>
- <constraints>
- <constraint firstItem="XN4-Vb-UWd" firstAttribute="top" secondItem="U9z-Rg-Zs3" secondAttribute="top" id="073-sZ-trD"/>
- <constraint firstItem="Zlv-nH-Y9y" firstAttribute="leading" secondItem="U9z-Rg-Zs3" secondAttribute="leading" constant="20" id="Xh6-x6-TnF"/>
- <constraint firstItem="Zlv-nH-Y9y" firstAttribute="top" secondItem="U9z-Rg-Zs3" secondAttribute="top" id="aot-Tv-9mi"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="XN4-Vb-UWd" secondAttribute="trailing" constant="10" id="hUi-OE-cZU"/>
- <constraint firstItem="XN4-Vb-UWd" firstAttribute="leading" secondItem="Zlv-nH-Y9y" secondAttribute="trailing" constant="11" id="j7u-cW-AWB"/>
- </constraints>
- </view>
- </box>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oeJ-VI-uhE">
- <rect key="frame" x="378" y="320" width="42" height="18"/>
- <textFieldCell key="cell" lineBreakMode="clipping" title="Name" id="uol-7p-Y2J">
- <font key="font" metaFont="system" size="14"/>
- <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dbY-HE-70Z">
- <rect key="frame" x="247" y="282" width="304" height="18"/>
- <textFieldCell key="cell" lineBreakMode="clipping" title="Contact appears to be busy. Leave a message?" id="hnr-x5-xnb">
- <font key="font" metaFont="systemLight" size="14"/>
- <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
+ </customView>
+ </subviews>
+ <constraints>
+ <constraint firstItem="yqC-dx-gC5" firstAttribute="centerX" secondItem="E7i-f2-vTg" secondAttribute="centerX" id="b0c-3K-lCy"/>
+ </constraints>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <constraints>
+ <constraint firstItem="oFb-RQ-trc" firstAttribute="trailing" secondItem="dEq-nq-Ae8" secondAttribute="trailing" id="3ui-mV-Pk7"/>
+ <constraint firstItem="oFb-RQ-trc" firstAttribute="leading" secondItem="dEq-nq-Ae8" secondAttribute="leading" id="Swo-nq-KXr"/>
+ <constraint firstItem="RrM-q3-ief" firstAttribute="top" secondItem="cgF-IG-blz" secondAttribute="top" id="pLE-qi-NdM"/>
+ </constraints>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
</subviews>
<constraints>
- <constraint firstItem="cOl-pS-cP5" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" constant="-29" id="3kZ-xx-zfF"/>
- <constraint firstItem="WtB-WH-CJz" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="4ia-YI-y5O"/>
- <constraint firstItem="dbY-HE-70Z" firstAttribute="top" secondItem="oeJ-VI-uhE" secondAttribute="bottom" constant="20" id="725-UY-bsG"/>
- <constraint firstItem="WtB-WH-CJz" firstAttribute="leading" secondItem="MxH-aj-EXO" secondAttribute="leading" id="DbY-VH-imQ"/>
- <constraint firstItem="WtB-WH-CJz" firstAttribute="trailing" secondItem="MxH-aj-EXO" secondAttribute="trailing" id="E7l-KF-ph3"/>
+ <constraint firstItem="cgF-IG-blz" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="0Wv-Pc-Ool"/>
+ <constraint firstAttribute="trailing" secondItem="HyU-cT-Xbw" secondAttribute="trailing" id="FgZ-Iy-ex2"/>
<constraint firstAttribute="trailing" secondItem="TwL-yO-BXI" secondAttribute="trailing" id="Hi0-k1-dx9"/>
<constraint firstItem="TwL-yO-BXI" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="Hle-nR-C5u"/>
- <constraint firstItem="oeJ-VI-uhE" firstAttribute="centerY" secondItem="Hz6-mo-xeY" secondAttribute="centerY" id="IBz-Qp-LpV"/>
<constraint firstItem="TwL-yO-BXI" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" id="LrF-0X-nHd"/>
- <constraint firstItem="gFu-2j-j1g" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="MnV-YG-76G"/>
- <constraint firstItem="WtB-WH-CJz" firstAttribute="bottom" secondItem="MxH-aj-EXO" secondAttribute="bottom" id="XO6-7p-v1a"/>
<constraint firstAttribute="bottom" secondItem="TwL-yO-BXI" secondAttribute="bottom" id="Yhm-GI-18S"/>
- <constraint firstItem="WtB-WH-CJz" firstAttribute="top" secondItem="cOl-pS-cP5" secondAttribute="bottom" constant="20" id="ZlU-DX-nL3"/>
- <constraint firstItem="0v7-mC-auu" firstAttribute="leading" secondItem="cOl-pS-cP5" secondAttribute="trailing" constant="10" id="afB-FF-Op0"/>
- <constraint firstItem="cOl-pS-cP5" firstAttribute="top" secondItem="dbY-HE-70Z" secondAttribute="bottom" constant="20" id="bNl-00-Thl"/>
- <constraint firstItem="0v7-mC-auu" firstAttribute="centerY" secondItem="cOl-pS-cP5" secondAttribute="centerY" id="hGt-wT-rrj"/>
- <constraint firstItem="oeJ-VI-uhE" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="l8d-MQ-RwK"/>
- <constraint firstItem="dbY-HE-70Z" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="orz-1K-VBk"/>
- <constraint firstItem="oeJ-VI-uhE" firstAttribute="top" secondItem="gFu-2j-j1g" secondAttribute="bottom" constant="60" id="rlm-H5-Lp8"/>
- <constraint firstItem="WtB-WH-CJz" firstAttribute="top" secondItem="MxH-aj-EXO" secondAttribute="top" id="vuA-zF-FBa"/>
+ <constraint firstItem="cgF-IG-blz" firstAttribute="centerY" secondItem="Hz6-mo-xeY" secondAttribute="centerY" id="xHS-IO-fP1"/>
+ <constraint firstItem="HyU-cT-Xbw" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="yCi-te-I7S"/>
+ <constraint firstItem="HyU-cT-Xbw" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" id="zdN-wD-wW2"/>
</constraints>
</customView>
</objects>
<resources>
<image name="NSUser" width="32" height="32"/>
<image name="ic_action_audio" width="36" height="36"/>
- <image name="ic_action_send" width="72" height="72"/>
- <image name="ic_audio_file" width="75" height="75"/>
+ <image name="ic_audio_file" width="100" height="100"/>
<image name="ic_exit" width="64" height="64"/>
</resources>
</document>
diff --git a/ui/Base.lproj/Localizable.strings b/ui/Base.lproj/Localizable.strings
index fded4ef..7af0ee4 100644
--- a/ui/Base.lproj/Localizable.strings
+++ b/ui/Base.lproj/Localizable.strings
@@ -222,3 +222,15 @@
/* Backup account */
"Backup your account" = "Backup your account";
+
+/* Peer busy message */
+"appears to be busy." = "appears to be busy";
+
+/* Peer busy message */
+"Would you like to leave a message?" = "Would you like to leave a message?";
+
+/* Record message title */
+"Record a message" = "Record a message";
+
+/* Record message title */
+"Stop recording" = "Stop recording";
diff --git a/ui/Base.lproj/MessageCells.xib b/ui/Base.lproj/MessageCells.xib
index 9c209e1..5920b21 100644
--- a/ui/Base.lproj/MessageCells.xib
+++ b/ui/Base.lproj/MessageCells.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -230,6 +230,12 @@
<userDefinedRuntimeAttribute type="color" keyPath="highlightColor">
<color key="value" white="0.0" alpha="0.29999999999999999" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="hoverDarkColor">
+ <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.20000000000000001" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="highlightDarkColor">
+ <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.34999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</button>
</subviews>
@@ -581,6 +587,12 @@
<userDefinedRuntimeAttribute type="color" keyPath="highlightColor">
<color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.40000000000000002" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="hoverDarkColor">
+ <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.20000000000000001" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="highlightDarkColor">
+ <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.34999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</button>
</subviews>
diff --git a/ui/Base.lproj/RecordFileVC.xib b/ui/Base.lproj/RecordFileVC.xib
index 6820dc2..6616969 100644
--- a/ui/Base.lproj/RecordFileVC.xib
+++ b/ui/Base.lproj/RecordFileVC.xib
@@ -7,7 +7,6 @@
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="RecordFileVC">
<connections>
- <outlet property="cancelButton" destination="Biq-yV-8LR" id="GbB-hm-BxD"/>
<outlet property="fileImage" destination="Zs4-l8-jAQ" id="0FQ-jC-aJq"/>
<outlet property="infoLabel" destination="MXV-85-UvC" id="0cS-e5-MJo"/>
<outlet property="previewView" destination="rRf-Sm-dXA" id="B7s-VU-mfu"/>
@@ -76,17 +75,17 @@
<userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
<integer key="value" value="1"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
+ <userDefinedRuntimeAttribute type="color" keyPath="bgColor">
<color key="value" red="0.82471948862075806" green="0.37392586469650269" blue="0.32938593626022339" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
</userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
+ <color key="value" red="0.32584697008132935" green="0.32583719491958618" blue="0.32584273815155029" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
- <color key="value" red="0.26051741839999998" green="0.2605243921" blue="0.260520637" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <color key="value" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="moiuseOutsideImageColor">
- <color key="value" red="0.25882352941176467" green="0.25882352941176467" blue="0.25882352941176467" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="mouseOutsideColor">
- <color key="value" red="0.82352941176470584" green="0.33333333333333331" blue="0.32941176470588235" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.32584697008132935" green="0.32583719491958618" blue="0.32584273815155029" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
diff --git a/ui/Base.lproj/RingWindow.strings b/ui/Base.lproj/RingWindow.strings
index adced88..c7b50b4 100644
--- a/ui/Base.lproj/RingWindow.strings
+++ b/ui/Base.lproj/RingWindow.strings
@@ -2,68 +2,60 @@
/* Class = "NSTabViewItem"; label = "SmartView"; ObjectID = "0MO-4e-8mo"; */
"0MO-4e-8mo.label" = "SmartView";
-/* Class = "NSTextFieldCell"; title = "Text"; ObjectID = "3Bh-xR-4Vn"; */
-"3Bh-xR-4Vn.title" = "Text";
+/* Class = "NSSegmentedCell"; 6T7-ip-Pun.ibShadowedLabels[0] = "Conversations"; ObjectID = "6T7-ip-Pun"; */
+"6T7-ip-Pun.ibShadowedLabels[0]" = "Conversations";
+
+/* Class = "NSSegmentedCell"; 6T7-ip-Pun.ibShadowedLabels[1] = "Requests"; ObjectID = "6T7-ip-Pun"; */
+"6T7-ip-Pun.ibShadowedLabels[1]" = "Requests";
/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "Ap7-26-S6b"; */
"Ap7-26-S6b.title" = "Text Cell";
-/* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "BfK-c5-B1l"; */
-"BfK-c5-B1l.placeholderString" = "details";
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "DPK-hh-Aq5"; */
+"DPK-hh-Aq5.title" = "Item 2";
/* Class = "NSWindow"; title = "Jami"; ObjectID = "F0z-JX-Cv5"; */
"F0z-JX-Cv5.title" = "Jami";
-/* Class = "NSTextFieldCell"; placeholderString = "Contact Method"; ObjectID = "FlQ-Th-nfO"; */
-"FlQ-Th-nfO.placeholderString" = "Contact Method";
+/* Class = "NSButton"; ibShadowedToolTip = "Accept Invitation"; ObjectID = "Fc5-KS-cim"; */
+"Fc5-KS-cim.ibShadowedToolTip" = "Accept Invitation";
-/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "GAa-pQ-t4g"; */
-"GAa-pQ-t4g.title" = "Text Cell";
+/* Class = "NSButton"; ibShadowedToolTip = "Share account info"; ObjectID = "Oac-o7-2Ge"; */
+"Oac-o7-2Ge.ibShadowedToolTip" = "Share account info";
-/* Class = "NSBox"; title = "Title"; ObjectID = "Pav-Bw-GgK"; */
-"Pav-Bw-GgK.title" = "Title";
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "Oe5-Nj-cP3"; */
+"Oe5-Nj-cP3.title" = "Item 3";
-/* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "Q1F-xo-N3e"; */
-"Q1F-xo-N3e.placeholderString" = "Display Role";
+/* Class = "NSToolbarItem"; label = "Toolbar Item"; ObjectID = "XSp-w5-Fes"; */
+"XSp-w5-Fes.label" = "Toolbar Item";
-/* Class = "NSTextFieldCell"; placeholderString = "date"; ObjectID = "UKP-Et-CT0"; */
-"UKP-Et-CT0.placeholderString" = "date";
+/* Class = "NSToolbarItem"; paletteLabel = "Toolbar Item"; ObjectID = "XSp-w5-Fes"; */
+"XSp-w5-Fes.paletteLabel" = "Toolbar Item";
-/* Class = "NSTabViewItem"; label = "History"; ObjectID = "Wi9-Zd-O1N"; */
-"Wi9-Zd-O1N.label" = "History";
+/* Class = "NSTextFieldCell"; title = "This is your ID.\nCopy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
+"Xb9-UT-M2F.title" = "This is your ID.\nCopy and share it with your friends!";
-/* Class = "NSTextFieldCell"; title = "This is your ID. Copy and share it with your friends!"; ObjectID = "Xb9-UT-M2F"; */
-"Xb9-UT-M2F.title" = "This is your ID. \n Copy and share it with your friends!";
+/* Class = "NSBox"; title = "Box"; ObjectID = "eVv-lu-T1Y"; */
+"eVv-lu-T1Y.title" = "Box";
-/* Class = "NSTabViewItem"; label = "Contacts"; ObjectID = "Zbi-X6-DLT"; */
-"Zbi-X6-DLT.label" = "Contacts";
+/* Class = "NSButton"; ibShadowedToolTip = "Show QRcode"; ObjectID = "eXV-BT-B6J"; */
+"eXV-BT-B6J.ibShadowedToolTip" = "Show QRcode";
-/* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "bgk-oz-u7n"; */
-"bgk-oz-u7n.placeholderString" = "Name";
-
-/* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
-"d5o-nL-fRP.placeholderString" = "Category";
+/* Class = "NSButton"; ibShadowedToolTip = "Ignore invitation"; ObjectID = "ejM-H2-aJX"; */
+"ejM-H2-aJX.ibShadowedToolTip" = "Ignore invitation";
/* Class = "NSTextFieldCell"; title = "Jami is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
"eln-Vm-t0d.title" = "Jami is free software for universal communication which respects the freedoms and privacy of its users.";
-/* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
-"gaf-Za-tuc.placeholderString" = "Category";
-
-/* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "isD-c6-X5Q"; */
-"isD-c6-X5Q.placeholderString" = "details";
-
/* Class = "NSTextFieldCell"; placeholderString = "Call name"; ObjectID = "j0J-Xd-uth"; */
"j0J-Xd-uth.placeholderString" = "Call name";
/* Class = "NSTextFieldCell"; placeholderString = "details"; ObjectID = "mK5-kV-YOO"; */
"mK5-kV-YOO.placeholderString" = "details";
-/* Class = "NSTextFieldCell"; placeholderString = "n"; ObjectID = "sGB-x7-gig"; */
-"sGB-x7-gig.placeholderString" = "n";
-
-/* Class = "NSTextFieldCell"; placeholderString = "Display Role"; ObjectID = "uSw-g5-kte"; */
-"uSw-g5-kte.placeholderString" = "Display Role";
-
/* Class = "NSSearchFieldCell"; placeholderString = "Search for new or existing contact"; ObjectID = "vvE-nM-kSl"; */
"vvE-nM-kSl.placeholderString" = "Search for new or existing contact";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Block contact"; ObjectID = "xP1-ZW-WZ8"; */
+"xP1-ZW-WZ8.ibShadowedToolTip" = "Block contact";
+
diff --git a/ui/Base.lproj/RingWindow.xib b/ui/Base.lproj/RingWindow.xib
index 54655b9..5bc84d7 100644
--- a/ui/Base.lproj/RingWindow.xib
+++ b/ui/Base.lproj/RingWindow.xib
@@ -2,7 +2,6 @@
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
- <capability name="System colors introduced in macOS 10.14" minToolsVersion="10.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -252,11 +251,20 @@
<userDefinedRuntimeAttribute type="color" keyPath="imageColor">
<color key="value" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="4"/>
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
+ <color key="value" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverDarkColor">
+ <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.93725490196078431" green="0.93725490196078431" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</button>
@@ -274,11 +282,20 @@
<userDefinedRuntimeAttribute type="color" keyPath="imageColor">
<color key="value" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="4"/>
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
+ <color key="value" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverDarkColor">
+ <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.93725490196078431" green="0.93725490196078431" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</button>
@@ -296,11 +313,20 @@
<userDefinedRuntimeAttribute type="color" keyPath="imageColor">
<color key="value" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="4"/>
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
+ <color key="value" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverDarkColor">
+ <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.93725490196078431" green="0.93725490196078431" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</button>
@@ -479,6 +505,9 @@
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<integer key="value" value="0"/>
</userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="hoverDarkColor">
+ <color key="value" red="0.93609845638275146" green="0.93607044219970703" blue="0.93608629703521729" alpha="0.20000000000000001" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="openMenu:" target="TbU-3l-q8n" id="xNN-IL-M24"/>
@@ -616,25 +645,34 @@
</constraints>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="symbol_name" id="9ti-Q4-TAv"/>
</imageView>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="Oac-o7-2Ge">
- <rect key="frame" x="262" y="25" width="25" height="25"/>
+ <button toolTip="Share account info" translatesAutoresizingMaskIntoConstraints="NO" id="Oac-o7-2Ge" customClass="HoverButton">
+ <rect key="frame" x="264" y="15" width="30" height="38"/>
<constraints>
- <constraint firstAttribute="width" constant="25" id="fnM-Dp-xQa"/>
- <constraint firstAttribute="height" constant="25" id="jXA-ZW-tFp"/>
+ <constraint firstAttribute="width" constant="30" id="fnM-Dp-xQa"/>
+ <constraint firstAttribute="height" constant="38" id="jXA-ZW-tFp"/>
</constraints>
- <buttonCell key="cell" type="inline" bezelStyle="inline" image="NSShareTemplate" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="Z08-dU-5EN">
+ <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSShareTemplate" imagePosition="only" alignment="center" transparent="YES" imageScaling="proportionallyUpOrDown" inset="2" id="Z08-dU-5EN">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="smallSystemBold"/>
+ <font key="font" metaFont="system"/>
</buttonCell>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
<integer key="value" value="4"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="imageColor">
- <color key="value" name="systemGrayColor" catalog="System" colorSpace="catalog"/>
+ <color key="value" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" name="unemphasizedSelectedContentBackgroundColor" catalog="System" colorSpace="catalog"/>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverDarkColor">
+ <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
+ <color key="value" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.93725490196078431" green="0.93725490196078431" blue="0.93725490196078431" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
@@ -642,28 +680,34 @@
<binding destination="-2" name="hidden" keyPath="self.notRingAccount" id="CUd-nb-MzH"/>
</connections>
</button>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="eXV-BT-B6J">
- <rect key="frame" x="227" y="25" width="25" height="25"/>
+ <button toolTip="Show QRcode" translatesAutoresizingMaskIntoConstraints="NO" id="eXV-BT-B6J" customClass="HoverButton">
+ <rect key="frame" x="224" y="18" width="32" height="32"/>
<constraints>
- <constraint firstAttribute="width" constant="25" id="FrZ-2C-m7y"/>
- <constraint firstAttribute="height" constant="25" id="tSo-l1-mnZ"/>
+ <constraint firstAttribute="width" constant="32" id="FrZ-2C-m7y"/>
+ <constraint firstAttribute="height" constant="32" id="tSo-l1-mnZ"/>
</constraints>
- <buttonCell key="cell" type="inline" bezelStyle="inline" image="qrcode" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="vvm-Gy-Tbh">
+ <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="qrcode" imagePosition="only" alignment="center" transparent="YES" imageScaling="proportionallyUpOrDown" inset="2" id="vvm-Gy-Tbh">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="smallSystemBold"/>
+ <font key="font" metaFont="system"/>
</buttonCell>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="4"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="bgColor">
- <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
- <color key="value" name="unemphasizedSelectedTextBackgroundColor" catalog="System" colorSpace="catalog"/>
+ <integer key="value" value="2"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="imageColor">
- <color key="value" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="value" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverDarkColor">
+ <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
+ <color key="value" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.93725490196078431" green="0.93725490196078431" blue="0.93725490196078431" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
@@ -689,7 +733,7 @@
<constraint firstItem="f62-JV-dgr" firstAttribute="centerX" secondItem="D6e-KX-8gC" secondAttribute="centerX" id="VTp-M2-i33"/>
<constraint firstItem="JN3-vO-zcd" firstAttribute="top" secondItem="kFj-Sh-o5u" secondAttribute="bottom" constant="8" id="WdR-8q-Lkl"/>
<constraint firstItem="kFj-Sh-o5u" firstAttribute="centerX" secondItem="D6e-KX-8gC" secondAttribute="centerX" id="X8P-ae-ug3"/>
- <constraint firstItem="Oac-o7-2Ge" firstAttribute="leading" secondItem="eXV-BT-B6J" secondAttribute="trailing" constant="10" id="eN6-s3-z6X"/>
+ <constraint firstItem="Oac-o7-2Ge" firstAttribute="leading" secondItem="eXV-BT-B6J" secondAttribute="trailing" constant="8" id="eN6-s3-z6X"/>
<constraint firstItem="Oac-o7-2Ge" firstAttribute="centerY" secondItem="eXV-BT-B6J" secondAttribute="centerY" id="luh-LH-oXu"/>
<constraint firstAttribute="width" constant="520" id="nXn-Wh-VAi"/>
<constraint firstItem="kFj-Sh-o5u" firstAttribute="top" secondItem="VJ1-xk-v5e" secondAttribute="bottom" constant="15" id="wQ0-UB-Yo2"/>
diff --git a/ui/Base.lproj/RingWizardNewAccount.xib b/ui/Base.lproj/RingWizardNewAccount.xib
index 2153ebd..4722c93 100644
--- a/ui/Base.lproj/RingWizardNewAccount.xib
+++ b/ui/Base.lproj/RingWizardNewAccount.xib
@@ -67,6 +67,9 @@
<userDefinedRuntimeAttribute type="color" keyPath="hoverColor">
<color key="value" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="hoverDarkColor">
+ <color key="value" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="editPhoto:" target="-2" id="2Ha-fx-TAe"/>
