keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

WIP

Browse Source
pull/68/head
Niels Andriesse 5 years ago
parent 88b85ffbf4
commit 713c5fa15e
7 changed files with 46 additions and 58 deletions
Show Stats Download Patch File Download Diff File

2
Signal/src/Loki/Redesign/Style Guide/Colors.swift
Unescape Escape View File

@ -31,4 +31,6 @@ final class Colors : NSObject {
@objc static let modalBorder = UIColor(hex: 0x212121) @objc static let modalBorder = UIColor(hex: 0x212121)
@objc static let fakeChatBubbleBackground = UIColor(hex: 0x3F4146) @objc static let fakeChatBubbleBackground = UIColor(hex: 0x3F4146)
@objc static let fakeChatBubbleText = UIColor(hex: 0x000000) @objc static let fakeChatBubbleText = UIColor(hex: 0x000000)
@objc static let composeViewBackground = UIColor(hex: 0x1B1B1B)
@objc static let composeViewTextFieldBackground = UIColor(hex: 0x141414)
} }

3
Signal/src/Loki/Redesign/Style Guide/Values.swift
Unescape Escape View File

@ -7,6 +7,8 @@ final class Values : NSObject {
@objc static let conversationCellTimestampOpacity = CGFloat(0.4) @objc static let conversationCellTimestampOpacity = CGFloat(0.4)
@objc static let textFieldBorderOpacity = CGFloat(0.4) @objc static let textFieldBorderOpacity = CGFloat(0.4)
@objc static let modalBackgroundOpacity = CGFloat(0.75) @objc static let modalBackgroundOpacity = CGFloat(0.75)
@objc static let composeViewTextFieldBorderOpacity = CGFloat(0.12)
@objc static let composeViewTextFieldPlaceholderOpacity = CGFloat(0.4)
// MARK: - Font Sizes // MARK: - Font Sizes
@objc static let verySmallFontSize = CGFloat(10) @objc static let verySmallFontSize = CGFloat(10)
@ -39,6 +41,7 @@ final class Values : NSObject {
@objc static let fakeChatBubbleWidth = CGFloat(224) @objc static let fakeChatBubbleWidth = CGFloat(224)
@objc static let fakeChatBubbleCornerRadius = CGFloat(10) @objc static let fakeChatBubbleCornerRadius = CGFloat(10)
@objc static let fakeChatViewHeight = CGFloat(234) @objc static let fakeChatViewHeight = CGFloat(234)
@objc static var composeViewTextFieldBorderThickness: CGFloat { return 1 / UIScreen.main.scale }
// MARK: - Distances // MARK: - Distances
@objc static let verySmallSpacing = CGFloat(4) @objc static let verySmallSpacing = CGFloat(4)

6
Signal/src/Loki/Redesign/View Controllers/HomeVC.swift
Unescape Escape View File

@ -211,11 +211,11 @@ final class HomeVC : UIViewController, UITableViewDataSource, UITableViewDelegat
let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(openSettings)) let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(openSettings))
profilePictureView.addGestureRecognizer(tapGestureRecognizer) profilePictureView.addGestureRecognizer(tapGestureRecognizer)
navigationItem.leftBarButtonItem = UIBarButtonItem(customView: profilePictureView) navigationItem.leftBarButtonItem = UIBarButtonItem(customView: profilePictureView)
let createPrivateGroupChatButton = UIBarButtonItem(image: #imageLiteral(resourceName: "People"), style: .plain, target: self, action: #selector(createPrivateGroupChat)) // let createPrivateGroupChatButton = UIBarButtonItem(image: #imageLiteral(resourceName: "People"), style: .plain, target: self, action: #selector(createPrivateGroupChat))
createPrivateGroupChatButton.tintColor = Colors.text // createPrivateGroupChatButton.tintColor = Colors.text
let joinPublicChatButton = UIBarButtonItem(image: #imageLiteral(resourceName: "Globe"), style: .plain, target: self, action: #selector(joinPublicChat)) let joinPublicChatButton = UIBarButtonItem(image: #imageLiteral(resourceName: "Globe"), style: .plain, target: self, action: #selector(joinPublicChat))
joinPublicChatButton.tintColor = Colors.text joinPublicChatButton.tintColor = Colors.text
navigationItem.rightBarButtonItems = [ createPrivateGroupChatButton, joinPublicChatButton ] navigationItem.rightBarButtonItems = [ /*createPrivateGroupChatButton,*/ joinPublicChatButton ]
} }
// MARK: Interaction // MARK: Interaction

23
Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m
Unescape Escape View File

@ -28,16 +28,17 @@ NS_ASSUME_NONNULL_BEGIN
self.delegate = self; self.delegate = self;
self.backgroundColor = nil; self.backgroundColor = nil;
self.scrollIndicatorInsets = UIEdgeInsetsMake(4, 4, 4, 4); self.showsHorizontalScrollIndicator = NO;
self.showsVerticalScrollIndicator = NO;
self.scrollEnabled = YES; self.scrollEnabled = YES;
self.scrollsToTop = NO; self.scrollsToTop = NO;
self.userInteractionEnabled = YES; self.userInteractionEnabled = YES;
self.font = [UIFont ows_dynamicTypeBodyFont]; self.font = [UIFont systemFontOfSize:LKValues.mediumFontSize];
self.textColor = Theme.primaryColor; self.textColor = LKColors.text;
self.textAlignment = NSTextAlignmentNatural; self.textAlignment = NSTextAlignmentNatural;
self.tintColor = UIColor.lokiGreen; self.tintColor = LKColors.accent;
self.contentMode = UIViewContentModeRedraw; self.contentMode = UIViewContentModeRedraw;
self.dataDetectorTypes = UIDataDetectorTypeNone; self.dataDetectorTypes = UIDataDetectorTypeNone;
@ -45,18 +46,18 @@ NS_ASSUME_NONNULL_BEGIN
self.text = nil; self.text = nil;
self.placeholderView = [UILabel new]; self.placeholderView = [UILabel new];
self.placeholderView.text = NSLocalizedString(@"New Message", @""); self.placeholderView.text = NSLocalizedString(@"Message", @"");
self.placeholderView.textColor = Theme.placeholderColor; self.placeholderView.textColor = [LKColors.text colorWithAlphaComponent:LKValues.composeViewTextFieldPlaceholderOpacity];
self.placeholderView.userInteractionEnabled = NO; self.placeholderView.userInteractionEnabled = NO;
[self addSubview:self.placeholderView]; [self addSubview:self.placeholderView];
// We need to do these steps _after_ placeholderView is configured. // We need to do these steps _after_ placeholderView is configured.
self.font = [UIFont ows_dynamicTypeBodyFont]; self.font = [UIFont systemFontOfSize:LKValues.mediumFontSize];
CGFloat hMarginLeading = 12.f; CGFloat hMarginLeading = 16.f;
CGFloat hMarginTrailing = 24.f; CGFloat hMarginTrailing = 16.f;
self.textContainerInset = UIEdgeInsetsMake(7.f, self.textContainerInset = UIEdgeInsetsMake(11.f,
CurrentAppContext().isRTL ? hMarginTrailing : hMarginLeading, CurrentAppContext().isRTL ? hMarginTrailing : hMarginLeading,
7.f, 11.f,
CurrentAppContext().isRTL ? hMarginLeading : hMarginTrailing); CurrentAppContext().isRTL ? hMarginLeading : hMarginTrailing);
self.textContainer.lineFragmentPadding = 0; self.textContainer.lineFragmentPadding = 0;
self.contentInset = UIEdgeInsetsZero; self.contentInset = UIEdgeInsetsZero;

67
Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
Unescape Escape View File

@ -28,8 +28,8 @@ typedef NS_CLOSED_ENUM(NSUInteger, VoiceMemoRecordingState){
static void *kConversationInputTextViewObservingContext = &kConversationInputTextViewObservingContext; static void *kConversationInputTextViewObservingContext = &kConversationInputTextViewObservingContext;
const CGFloat kMinTextViewHeight = 36; const CGFloat kMinTextViewHeight = 40;
const CGFloat kMaxTextViewHeight = 98; const CGFloat kMaxTextViewHeight = 120;
#pragma mark - #pragma mark -
@ -119,25 +119,15 @@ const CGFloat kMaxTextViewHeight = 98;
- (void)createContents - (void)createContents
{ {
self.layoutMargins = UIEdgeInsetsZero; self.layoutMargins = UIEdgeInsetsZero;
if (UIAccessibilityIsReduceTransparencyEnabled()) {
self.backgroundColor = Theme.toolbarBackgroundColor;
} else {
CGFloat alpha = OWSNavigationBar.backgroundBlurMutingFactor;
self.backgroundColor = [UIColor.lokiDarkerGray colorWithAlphaComponent:alpha];
UIVisualEffectView *blurEffectView = [[UIVisualEffectView alloc] initWithEffect:Theme.barBlurEffect];
blurEffectView.layer.zPosition = -1;
[self addSubview:blurEffectView];
[blurEffectView autoPinEdgesToSuperviewEdges];
}
self.autoresizingMask = UIViewAutoresizingFlexibleHeight; self.autoresizingMask = UIViewAutoresizingFlexibleHeight;
self.backgroundColor = LKColors.composeViewBackground;
_inputTextView = [ConversationInputTextView new]; _inputTextView = [ConversationInputTextView new];
self.inputTextView.textViewToolbarDelegate = self; self.inputTextView.textViewToolbarDelegate = self;
self.inputTextView.font = [UIFont ows_dynamicTypeBodyFont]; self.inputTextView.textColor = LKColors.text;
self.inputTextView.backgroundColor = Theme.toolbarBackgroundColor; self.inputTextView.font = [UIFont systemFontOfSize:LKValues.mediumFontSize];
self.inputTextView.backgroundColor = LKColors.composeViewTextFieldBackground;
[self.inputTextView setContentHuggingLow]; [self.inputTextView setContentHuggingLow];
[self.inputTextView setCompressionResistanceLow]; [self.inputTextView setCompressionResistanceLow];
SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _inputTextView); SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _inputTextView);
@ -145,43 +135,34 @@ const CGFloat kMaxTextViewHeight = 98;
_textViewHeightConstraint = [self.inputTextView autoSetDimension:ALDimensionHeight toSize:kMinTextViewHeight]; _textViewHeightConstraint = [self.inputTextView autoSetDimension:ALDimensionHeight toSize:kMinTextViewHeight];
_attachmentButton = [[UIButton alloc] init]; _attachmentButton = [[UIButton alloc] init];
self.attachmentButton.accessibilityLabel self.attachmentButton.accessibilityLabel = NSLocalizedString(@"ATTACHMENT_LABEL", @"Accessibility label for attaching photos");
= NSLocalizedString(@"ATTACHMENT_LABEL", @"Accessibility label for attaching photos"); self.attachmentButton.accessibilityHint = NSLocalizedString(@"ATTACHMENT_HINT", @"Accessibility hint describing what you can do with the attachment button");
self.attachmentButton.accessibilityHint = NSLocalizedString( [self.attachmentButton addTarget:self action:@selector(attachmentButtonPressed) forControlEvents:UIControlEventTouchUpInside];
@"ATTACHMENT_HINT", @"Accessibility hint describing what you can do with the attachment button"); UIImage *attachmentImage = [UIImage imageNamed:@"CirclePlus"];
[self.attachmentButton addTarget:self [self.attachmentButton setImage:attachmentImage forState:UIControlStateNormal];
action:@selector(attachmentButtonPressed)
forControlEvents:UIControlEventTouchUpInside];
UIImage *attachmentImage = [UIImage imageNamed:@"ic_circled_plus"];
[self.attachmentButton setImage:[attachmentImage imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]
forState:UIControlStateNormal];
self.attachmentButton.tintColor = Theme.navbarIconColor;
[self.attachmentButton autoSetDimensionsToSize:CGSizeMake(40, kMinTextViewHeight)]; [self.attachmentButton autoSetDimensionsToSize:CGSizeMake(40, kMinTextViewHeight)];
SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _attachmentButton); SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _attachmentButton);
_sendButton = [UIButton buttonWithType:UIButtonTypeCustom]; _sendButton = [UIButton buttonWithType:UIButtonTypeCustom];
[self.sendButton setTitle:MessageStrings.sendButton forState:UIControlStateNormal]; [self.sendButton setTitle:MessageStrings.sendButton forState:UIControlStateNormal];
[self.sendButton setTitleColor:UIColor.lokiGreen forState:UIControlStateNormal]; [self.sendButton setTitleColor:LKColors.text forState:UIControlStateNormal];
self.sendButton.titleLabel.textAlignment = NSTextAlignmentCenter; self.sendButton.titleLabel.textAlignment = NSTextAlignmentCenter;
self.sendButton.titleLabel.font = [UIFont ows_mediumFontWithSize:17.f]; self.sendButton.titleLabel.font = [UIFont boldSystemFontOfSize:LKValues.mediumFontSize];
self.sendButton.contentEdgeInsets = UIEdgeInsetsMake(0, 4, 0, 4); self.sendButton.contentEdgeInsets = UIEdgeInsetsMake(0, 4, 0, 4);
[self.sendButton autoSetDimension:ALDimensionHeight toSize:kMinTextViewHeight]; [self.sendButton autoSetDimension:ALDimensionHeight toSize:kMinTextViewHeight];
[self.sendButton addTarget:self action:@selector(sendButtonPressed) forControlEvents:UIControlEventTouchUpInside]; [self.sendButton addTarget:self action:@selector(sendButtonPressed) forControlEvents:UIControlEventTouchUpInside];
SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _sendButton); SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _sendButton);
UIImage *voiceMemoIcon = [UIImage imageNamed:@"voice-memo-button"]; UIImage *voiceMemoIcon = [UIImage imageNamed:@"Microphone"];
OWSAssertDebug(voiceMemoIcon); OWSAssertDebug(voiceMemoIcon);
_voiceMemoButton = [UIButton buttonWithType:UIButtonTypeCustom]; _voiceMemoButton = [UIButton buttonWithType:UIButtonTypeCustom];
[self.voiceMemoButton setImage:[voiceMemoIcon imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate] [self.voiceMemoButton setImage:voiceMemoIcon forState:UIControlStateNormal];
forState:UIControlStateNormal];
self.voiceMemoButton.imageView.tintColor = Theme.navbarIconColor;
[self.voiceMemoButton autoSetDimensionsToSize:CGSizeMake(40, kMinTextViewHeight)]; [self.voiceMemoButton autoSetDimensionsToSize:CGSizeMake(40, kMinTextViewHeight)];
SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _voiceMemoButton); SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _voiceMemoButton);
// We want to be permissive about the voice message gesture, so we hang // We want to be permissive about the voice message gesture, so we hang
// the long press GR on the button's wrapper, not the button itself. // the long press GR on the button's wrapper, not the button itself.
UILongPressGestureRecognizer *longPressGestureRecognizer = UILongPressGestureRecognizer *longPressGestureRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(handleLongPress:)];
[[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(handleLongPress:)];
longPressGestureRecognizer.minimumPressDuration = 0; longPressGestureRecognizer.minimumPressDuration = 0;
self.voiceMemoGestureRecognizer = longPressGestureRecognizer; self.voiceMemoGestureRecognizer = longPressGestureRecognizer;
[self.voiceMemoButton addGestureRecognizer:longPressGestureRecognizer]; [self.voiceMemoButton addGestureRecognizer:longPressGestureRecognizer];
@ -201,8 +182,7 @@ const CGFloat kMaxTextViewHeight = 98;
SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _linkPreviewWrapper); SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _linkPreviewWrapper);
// V Stack // V Stack
UIStackView *vStack = [[UIStackView alloc] UIStackView *vStack = [[UIStackView alloc] initWithArrangedSubviews:@[ self.quotedReplyWrapper, self.linkPreviewWrapper, self.inputTextView ]];
initWithArrangedSubviews:@[ self.quotedReplyWrapper, self.linkPreviewWrapper, self.inputTextView ]];
vStack.axis = UILayoutConstraintAxisVertical; vStack.axis = UILayoutConstraintAxisVertical;
[vStack setContentHuggingHorizontalLow]; [vStack setContentHuggingHorizontalLow];
[vStack setCompressionResistanceHorizontalLow]; [vStack setCompressionResistanceHorizontalLow];
@ -213,7 +193,7 @@ const CGFloat kMaxTextViewHeight = 98;
} }
// V Stack Wrapper // V Stack Wrapper
const CGFloat vStackRounding = 18.f; const CGFloat vStackRounding = kMinTextViewHeight / 2;
UIView *vStackWrapper = [UIView containerView]; UIView *vStackWrapper = [UIView containerView];
vStackWrapper.layer.cornerRadius = vStackRounding; vStackWrapper.layer.cornerRadius = vStackRounding;
vStackWrapper.clipsToBounds = YES; vStackWrapper.clipsToBounds = YES;
@ -235,9 +215,9 @@ const CGFloat kMaxTextViewHeight = 98;
initWithArrangedSubviews:@[ self.attachmentButton, vStackWrapper, self.voiceMemoButton, self.sendButton ]]; initWithArrangedSubviews:@[ self.attachmentButton, vStackWrapper, self.voiceMemoButton, self.sendButton ]];
self.hStack.axis = UILayoutConstraintAxisHorizontal; self.hStack.axis = UILayoutConstraintAxisHorizontal;
self.hStack.layoutMarginsRelativeArrangement = YES; self.hStack.layoutMarginsRelativeArrangement = YES;
self.hStack.layoutMargins = UIEdgeInsetsMake(6, 6, 6, 6); self.hStack.layoutMargins = UIEdgeInsetsMake(LKValues.smallSpacing, LKValues.smallSpacing, LKValues.smallSpacing, LKValues.smallSpacing);
self.hStack.alignment = UIStackViewAlignmentBottom; self.hStack.alignment = UIStackViewAlignmentBottom;
self.hStack.spacing = 8; self.hStack.spacing = LKValues.smallSpacing;
[self addSubview:self.hStack]; [self addSubview:self.hStack];
[self.hStack autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:self.mentionCandidateSelectionView]; [self.hStack autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:self.mentionCandidateSelectionView];
@ -266,8 +246,9 @@ const CGFloat kMaxTextViewHeight = 98;
self.borderView.userInteractionEnabled = NO; self.borderView.userInteractionEnabled = NO;
self.borderView.backgroundColor = UIColor.clearColor; self.borderView.backgroundColor = UIColor.clearColor;
self.borderView.opaque = NO; self.borderView.opaque = NO;
self.borderView.layer.borderColor = Theme.secondaryColor.CGColor; self.borderView.layer.borderColor = LKColors.text.CGColor;
self.borderView.layer.borderWidth = CGHairlineWidth(); self.borderView.layer.opacity = LKValues.composeViewTextFieldBorderOpacity;
self.borderView.layer.borderWidth = LKValues.composeViewTextFieldBorderThickness;
self.borderView.layer.cornerRadius = vStackRounding; self.borderView.layer.cornerRadius = vStackRounding;
[self addSubview:self.borderView]; [self addSubview:self.borderView];
[self.borderView autoPinToEdgesOfView:vStackWrapper]; [self.borderView autoPinToEdgesOfView:vStackWrapper];

2
Signal/src/ViewControllers/ConversationView/ConversationViewController.m
Unescape Escape View File

@ -1560,7 +1560,7 @@ typedef enum : NSUInteger {
isAttachmentButtonHidden = false; isAttachmentButtonHidden = false;
} }
[self.inputToolbar setUserInteractionEnabled:isEnabled]; [self.inputToolbar setUserInteractionEnabled:isEnabled];
NSString *placeholderText = isEnabled ? NSLocalizedString(@"New Message", "") : NSLocalizedString(@"Pending Friend Request...", ""); NSString *placeholderText = isEnabled ? NSLocalizedString(@"Message", "") : NSLocalizedString(@"Pending Friend Request...", "");
[self.inputToolbar setPlaceholderText:placeholderText]; [self.inputToolbar setPlaceholderText:placeholderText];
[self.inputToolbar setAttachmentButtonHidden:isAttachmentButtonHidden]; [self.inputToolbar setAttachmentButtonHidden:isAttachmentButtonHidden];
} }

1
Signal/translations/en.lproj/Localizable.strings
Unescape Escape View File

@ -2738,3 +2738,4 @@
"Enter a display name" = "Enter a display name"; "Enter a display name" = "Enter a display name";
"Restore your account using your seed" = "Restore your account using your seed"; "Restore your account using your seed" = "Restore your account using your seed";
"Enter your seed" = "Enter your seed"; "Enter your seed" = "Enter your seed";
"Message" = "Message";

Write Preview
Loading…
Cancel
Save