Warning fixes#78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chamira wants to merge 4 commits into
base:master
Choose a base branch
from
Open

Warning fixes #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ded1a6d
Added close button to right side
chamira Feb 22, 2017
aca34c0
increase to height to 50.0f as before
chamira Feb 22, 2017
8bc2eb7
Increase the animation time to 0.7
chamira Feb 23, 2017
b0e14c5
Fixed! all warnings
chamira Sep 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CSNotificationView/CSNativeBlurView.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#import <UIKit/UIKit.h>
#import "CSNotificationView_Private.h"

API_AVAILABLE(ios(8.0))
@interface CSNativeBlurView : UIVisualEffectView <CSNotificationViewBlurViewProtocol>

@end
10 changes: 9 additions & 1 deletion CSNotificationView/CSNativeBlurView.m
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,15 @@ @implementation CSNativeBlurView

- (instancetype)initWithFrame:(CGRect)frame
{
self = [super initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
if (@available(iOS 8.0, *)) {
self = [super initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
} else {
// Fallback on earlier versions
}if (@available(iOS 8.0, *)) {
self = [super initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
} else {
// Fallback on earlier versions
}
if (self) {
self.tintColorView = [[UIView alloc] initWithFrame:self.bounds];
self.tintColorView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
Expand Down
8 changes: 6 additions & 2 deletions CSNotificationView/CSNotificationView.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,14 +10,16 @@

static CGFloat const kCSNotificationViewHeight = 50.0f;
static CGFloat const kCSNotificationViewSymbolViewSidelength = 44.0f;
static CGFloat const kCSNotificationViewCloseButtonWidth = 44.0f;
static CGFloat const kCSNotificationViewCloseButtonHeight = 44.0f;
static NSTimeInterval const kCSNotificationViewDefaultShowDuration = 2.0;

typedef NS_ENUM(NSInteger, CSNotificationViewStyle) {
CSNotificationViewStyleSuccess,
CSNotificationViewStyleError
};

typedef void(^CSVoidBlock)();
typedef void(^CSVoidBlock)(void);

@interface CSNotificationView : UIView

Expand DownExpand Up@@ -73,7 +75,7 @@ typedef void(^CSVoidBlock)();
* @param animated Should a change in `showing` be animated?
* @param completion `nil` or a callback called on the main thread after changes to the interface are completed.
*/
- (void)setVisible:(BOOL)showing animated:(BOOL)animated completion:(void (^)())completion;
- (void)setVisible:(BOOL)showing animated:(BOOL)animated completion:(void (^)(void))completion;

/**
* Convenience method to dismiss with a(nother) predefined style and / or message.
Expand All@@ -100,6 +102,8 @@ typedef void(^CSVoidBlock)();
* The label containing the message displayed to the user.
*/
@property (nonatomic, readonly) UILabel* textLabel;

@property (nonatomic, readonly) UIButton *closeButton;

@property (nonatomic, getter = isShowingActivity) BOOL showingActivity;

Expand Down
57 changes: 47 additions & 10 deletions CSNotificationView/CSNotificationView.m
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,15 @@

@implementation CSNotificationView

-(nullable instancetype)initWithCoder:(NSCoder *)aDecoder {
self = [self initWithCoder:aDecoder];
return self;
}

-(instancetype)initWithFrame:(CGRect)frame {
self = [self initWithFrame:frame];
return self;
}
#pragma mark + quick presentation

+ (void)showInViewController:(UIViewController*)viewController
Expand All@@ -29,7 +38,7 @@ + (void)showInViewController:(UIViewController*)viewController
note.image = image;
note.textLabel.text = message;

void (^completion)() = ^{[note setVisible:NO animated:YES completion:nil];};
void (^completion)(void) = ^{[note setVisible:NO animated:YES completion:nil];};
[note setVisible:YES animated:YES completion:^{
double delayInSeconds = duration;
dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
Expand DownExpand Up@@ -57,7 +66,7 @@ + (void)showInViewController:(UIViewController*)viewController
note.textLabel.textAlignment = textAlignment;
note.textLabel.text = message;

void (^completion)() = ^{[note setVisible:NO animated:YES completion:nil];};
void (^completion)(void) = ^{[note setVisible:NO animated:YES completion:nil];};
[note setVisible:YES animated:YES completion:^{
double delayInSeconds = duration;
dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
Expand DownExpand Up@@ -175,6 +184,14 @@ - (instancetype)initWithParentViewController:(UIViewController*)viewController
{
[self updateSymbolView];
}

//closeButton
{
_closeButton = [[UIButton alloc] init];
_closeButton.translatesAutoresizingMaskIntoConstraints = NO;
_closeButton.backgroundColor = [UIColor clearColor];
[self addSubview:_closeButton];
}
}

//Interaction
Expand DownExpand Up@@ -255,23 +272,28 @@ - (void)updateConstraints
CGFloat symbolViewWidth = self.symbolView.tag != kCSNotificationViewEmptySymbolViewTag ?
kCSNotificationViewSymbolViewSidelength : 0.0f;
CGFloat symbolViewHeight = kCSNotificationViewSymbolViewSidelength;


CGFloat closeButtonWidth = kCSNotificationViewCloseButtonWidth;
CGFloat closeButtonHeight = kCSNotificationViewCloseButtonHeight;

NSDictionary* metrics =
@{@"symbolViewWidth": [NSNumber numberWithFloat:symbolViewWidth],
@"symbolViewHeight":[NSNumber numberWithFloat:symbolViewHeight]};
@"symbolViewHeight":[NSNumber numberWithFloat:symbolViewHeight],
@"closeButtonWidth":@(closeButtonWidth),
@"closeButtonHeight":@(closeButtonHeight)};

[self addConstraints:[NSLayoutConstraint
constraintsWithVisualFormat:@"H:|-(4)-[_symbolView(symbolViewWidth)]-(5)-[_textLabel]-(10)-|"
constraintsWithVisualFormat:@"H:|-(4)-[_symbolView(symbolViewWidth)]-(5)-[_textLabel]-(5)-[_closeButton(closeButtonWidth)]-(10)-|"
options:0
metrics:metrics
views:NSDictionaryOfVariableBindings(_textLabel, _symbolView)]];
views:NSDictionaryOfVariableBindings(_textLabel, _symbolView,_closeButton)]];

[self addConstraints:[NSLayoutConstraint
constraintsWithVisualFormat:@"V:[_symbolView(symbolViewHeight)]"
options:0
metrics:metrics
views:NSDictionaryOfVariableBindings(_symbolView)]];
[self addConstraint:[NSLayoutConstraint
constraintWithItem:_symbolView
attribute:NSLayoutAttributeBottom
Expand All@@ -287,7 +309,22 @@ - (void)updateConstraints
toItem:_symbolView
attribute:NSLayoutAttributeCenterY
multiplier:1.0f constant:0]];


[self addConstraints:[NSLayoutConstraint
constraintsWithVisualFormat:@"V:[_closeButton(closeButtonHeight)]"
options:0
metrics:metrics
views:NSDictionaryOfVariableBindings(_closeButton)]];

[self addConstraint:[NSLayoutConstraint
constraintWithItem:_closeButton
attribute:NSLayoutAttributeBottom
relatedBy:NSLayoutRelationEqual
toItem:self
attribute:NSLayoutAttributeBottom
multiplier:1.0f constant:0]];


[super updateConstraints];
}

Expand All@@ -311,11 +348,11 @@ -(void)handleTapInView:(UITapGestureRecognizer*)tapGestureRecognizer

#pragma mark - presentation

- (void)setVisible:(BOOL)visible animated:(BOOL)animated completion:(void (^)())completion
- (void)setVisible:(BOOL)visible animated:(BOOL)animated completion:(void (^)(void))completion
{
if (_visible != visible) {

NSTimeInterval animationDuration = animated ? 0.4 : 0.0;
NSTimeInterval animationDuration = animated ? 0.7 : 0.0;

CGRect startFrame, endFrame;
[self animationFramesForVisible:visible startFrame:&startFrame endFrame:&endFrame];
Expand Down
1 change: 0 additions & 1 deletion CSNotificationView/CSNotificationView_Private.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ static NSString * kCSNavigationBarBoundsKeyPath = @"parentNavigationController.n
#pragma mark - presentation
@property (nonatomic, weak) UIViewController* parentViewController;
@property (nonatomic, strong) UINavigationController* parentNavigationController; //Has to be strong-referenced because CSNotificationView does KVO on parentNavigationController
@property (nonatomic, getter = isVisible) BOOL visible;

#pragma mark - content views
@property (nonatomic, strong, readonly) UIView* symbolView; // is updated by -(void)updateSymbolView
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Warning fixes#78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

chamira
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Warning fixes
#78
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
ded1a6d

Added close button to right side


chamira Feb 22, 2017
aca34c0

increase to height to 50.0f as before


chamira Feb 22, 2017
8bc2eb7

Increase the animation time to 0.7


chamira Feb 23, 2017
b0e14c5

Fixed! all warnings


chamira Sep 4, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
CSNotificationView/CSNativeBlurView.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#import <UIKit/UIKit.h>
#import "CSNotificationView_Private.h"

API_AVAILABLE(ios(8.0))
@interface CSNativeBlurView : UIVisualEffectView <CSNotificationViewBlurViewProtocol>

@end

10 changes: 9 additions & 1 deletion
CSNotificationView/CSNativeBlurView.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,15 @@ @implementation CSNativeBlurView

- (instancetype)initWithFrame:(CGRect)frame
{
 self = [super initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
 if (@available(iOS 8.0, *)) {
 self = [super initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
 } else {
 // Fallback on earlier versions
 }if (@available(iOS 8.0, *)) {
 self = [super initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
 } else {
 // Fallback on earlier versions
 }
 if (self) {
 self.tintColorView = [[UIView alloc] initWithFrame:self.bounds];
 self.tintColorView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
Expand Down

8 changes: 6 additions & 2 deletions
CSNotificationView/CSNotificationView.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,14 +10,16 @@

static CGFloat const kCSNotificationViewHeight = 50.0f;
static CGFloat const kCSNotificationViewSymbolViewSidelength = 44.0f;
static CGFloat const kCSNotificationViewCloseButtonWidth = 44.0f;
static CGFloat const kCSNotificationViewCloseButtonHeight = 44.0f;
static NSTimeInterval const kCSNotificationViewDefaultShowDuration = 2.0;

typedef NS_ENUM(NSInteger, CSNotificationViewStyle) {
 CSNotificationViewStyleSuccess,
 CSNotificationViewStyleError
};

typedef void(^CSVoidBlock)();
typedef void(^CSVoidBlock)(void);

@interface CSNotificationView : UIView

Expand DownExpand Up@@ -73,7 +75,7 @@ typedef void(^CSVoidBlock)();
 * @param animated Should a change in `showing` be animated?
 * @param completion `nil` or a callback called on the main thread after changes to the interface are completed.
 */
- (void)setVisible:(BOOL)showing animated:(BOOL)animated completion:(void (^)())completion;
- (void)setVisible:(BOOL)showing animated:(BOOL)animated completion:(void (^)(void))completion;

/**
 * Convenience method to dismiss with a(nother) predefined style and / or message.
Expand All@@ -100,6 +102,8 @@ typedef void(^CSVoidBlock)();
 * The label containing the message displayed to the user.
 */
@property (nonatomic, readonly) UILabel* textLabel;

@property (nonatomic, readonly) UIButton *closeButton;

@property (nonatomic, getter = isShowingActivity) BOOL showingActivity;

Expand Down

57 changes: 47 additions & 10 deletions
CSNotificationView/CSNotificationView.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,15 @@

@implementation CSNotificationView

-(nullable instancetype)initWithCoder:(NSCoder *)aDecoder {
 self = [self initWithCoder:aDecoder];
 return self;
}

-(instancetype)initWithFrame:(CGRect)frame {
 self = [self initWithFrame:frame];
 return self;
}
#pragma mark + quick presentation

+ (void)showInViewController:(UIViewController*)viewController
Expand All@@ -29,7 +38,7 @@ + (void)showInViewController:(UIViewController*)viewController
 note.image = image;
 note.textLabel.text = message;

 void (^completion)() = ^{[note setVisible:NO animated:YES completion:nil];};
 void (^completion)(void) = ^{[note setVisible:NO animated:YES completion:nil];};
 [note setVisible:YES animated:YES completion:^{
 double delayInSeconds = duration;
 dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
Expand DownExpand Up@@ -57,7 +66,7 @@ + (void)showInViewController:(UIViewController*)viewController
 note.textLabel.textAlignment = textAlignment;
 note.textLabel.text = message;

 void (^completion)() = ^{[note setVisible:NO animated:YES completion:nil];};
 void (^completion)(void) = ^{[note setVisible:NO animated:YES completion:nil];};
 [note setVisible:YES animated:YES completion:^{
 double delayInSeconds = duration;
 dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
Expand DownExpand Up@@ -175,6 +184,14 @@ - (instancetype)initWithParentViewController:(UIViewController*)viewController
 {
 [self updateSymbolView];
 }

 //closeButton
 {
 _closeButton = [[UIButton alloc] init];
 _closeButton.translatesAutoresizingMaskIntoConstraints = NO;
 _closeButton.backgroundColor = [UIColor clearColor];
 [self addSubview:_closeButton];
 }
 }

 //Interaction
Expand DownExpand Up@@ -255,23 +272,28 @@ - (void)updateConstraints
 CGFloat symbolViewWidth = self.symbolView.tag != kCSNotificationViewEmptySymbolViewTag ?
 kCSNotificationViewSymbolViewSidelength : 0.0f;
 CGFloat symbolViewHeight = kCSNotificationViewSymbolViewSidelength;


	CGFloat closeButtonWidth = kCSNotificationViewCloseButtonWidth;
	CGFloat closeButtonHeight = kCSNotificationViewCloseButtonHeight;

 NSDictionary* metrics =
 @{@"symbolViewWidth": [NSNumber numberWithFloat:symbolViewWidth],
 @"symbolViewHeight":[NSNumber numberWithFloat:symbolViewHeight]};
 @"symbolViewHeight":[NSNumber numberWithFloat:symbolViewHeight],
 @"closeButtonWidth":@(closeButtonWidth),
 @"closeButtonHeight":@(closeButtonHeight)};

 [self addConstraints:[NSLayoutConstraint
 constraintsWithVisualFormat:@"H:|-(4)-[_symbolView(symbolViewWidth)]-(5)-[_textLabel]-(10)-|"
 constraintsWithVisualFormat:@"H:|-(4)-[_symbolView(symbolViewWidth)]-(5)-[_textLabel]-(5)-[_closeButton(closeButtonWidth)]-(10)-|"
 options:0
 metrics:metrics
 views:NSDictionaryOfVariableBindings(_textLabel, _symbolView)]];
 views:NSDictionaryOfVariableBindings(_textLabel, _symbolView,_closeButton)]];

 [self addConstraints:[NSLayoutConstraint
 constraintsWithVisualFormat:@"V:[_symbolView(symbolViewHeight)]"
 options:0
 metrics:metrics
 views:NSDictionaryOfVariableBindings(_symbolView)]];
 [self addConstraint:[NSLayoutConstraint
 constraintWithItem:_symbolView
 attribute:NSLayoutAttributeBottom
Expand All@@ -287,7 +309,22 @@ - (void)updateConstraints
 toItem:_symbolView
 attribute:NSLayoutAttributeCenterY
 multiplier:1.0f constant:0]];


	[self addConstraints:[NSLayoutConstraint
 constraintsWithVisualFormat:@"V:[_closeButton(closeButtonHeight)]"
 options:0
 metrics:metrics
 views:NSDictionaryOfVariableBindings(_closeButton)]];

	[self addConstraint:[NSLayoutConstraint
 constraintWithItem:_closeButton
 attribute:NSLayoutAttributeBottom
 relatedBy:NSLayoutRelationEqual
 toItem:self
 attribute:NSLayoutAttributeBottom
 multiplier:1.0f constant:0]];


 [super updateConstraints];
}

Expand All@@ -311,11 +348,11 @@ -(void)handleTapInView:(UITapGestureRecognizer*)tapGestureRecognizer

#pragma mark - presentation

- (void)setVisible:(BOOL)visible animated:(BOOL)animated completion:(void (^)())completion
- (void)setVisible:(BOOL)visible animated:(BOOL)animated completion:(void (^)(void))completion
{
 if (_visible != visible) {

 NSTimeInterval animationDuration = animated ? 0.4 : 0.0;
 NSTimeInterval animationDuration = animated ? 0.7 : 0.0;

 CGRect startFrame, endFrame;
 [self animationFramesForVisible:visible startFrame:&startFrame endFrame:&endFrame];
Expand Down

1 change: 0 additions & 1 deletion
CSNotificationView/CSNotificationView_Private.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ static NSString * kCSNavigationBarBoundsKeyPath = @"parentNavigationController.n
#pragma mark - presentation
@property (nonatomic, weak) UIViewController* parentViewController;
@property (nonatomic, strong) UINavigationController* parentNavigationController; //Has to be strong-referenced because CSNotificationView does KVO on parentNavigationController
@property (nonatomic, getter = isVisible) BOOL visible;

#pragma mark - content views
@property (nonatomic, strong, readonly) UIView* symbolView; // is updated by -(void)updateSymbolView
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Warning fixes#78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

chamira
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Warning fixes
#78
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
ded1a6d

Added close button to right side


chamira Feb 22, 2017
aca34c0

increase to height to 50.0f as before


chamira Feb 22, 2017
8bc2eb7

Increase the animation time to 0.7


chamira Feb 23, 2017
b0e14c5

Fixed! all warnings


chamira Sep 4, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
CSNotificationView/CSNativeBlurView.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#import <UIKit/UIKit.h>
#import "CSNotificationView_Private.h"

API_AVAILABLE(ios(8.0))
@interface CSNativeBlurView : UIVisualEffectView <CSNotificationViewBlurViewProtocol>

@end

10 changes: 9 additions & 1 deletion
CSNotificationView/CSNativeBlurView.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,15 @@ @implementation CSNativeBlurView

- (instancetype)initWithFrame:(CGRect)frame
{
 self = [super initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
 if (@available(iOS 8.0, *)) {
 self = [super initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
 } else {
 // Fallback on earlier versions
 }if (@available(iOS 8.0, *)) {
 self = [super initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
 } else {
 // Fallback on earlier versions
 }
 if (self) {
 self.tintColorView = [[UIView alloc] initWithFrame:self.bounds];
 self.tintColorView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
Expand Down

8 changes: 6 additions & 2 deletions
CSNotificationView/CSNotificationView.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,14 +10,16 @@

static CGFloat const kCSNotificationViewHeight = 50.0f;
static CGFloat const kCSNotificationViewSymbolViewSidelength = 44.0f;
static CGFloat const kCSNotificationViewCloseButtonWidth = 44.0f;
static CGFloat const kCSNotificationViewCloseButtonHeight = 44.0f;
static NSTimeInterval const kCSNotificationViewDefaultShowDuration = 2.0;

typedef NS_ENUM(NSInteger, CSNotificationViewStyle) {
 CSNotificationViewStyleSuccess,
 CSNotificationViewStyleError
};

typedef void(^CSVoidBlock)();
typedef void(^CSVoidBlock)(void);

@interface CSNotificationView : UIView

Expand DownExpand Up@@ -73,7 +75,7 @@ typedef void(^CSVoidBlock)();
 * @param animated Should a change in `showing` be animated?
 * @param completion `nil` or a callback called on the main thread after changes to the interface are completed.
 */
- (void)setVisible:(BOOL)showing animated:(BOOL)animated completion:(void (^)())completion;
- (void)setVisible:(BOOL)showing animated:(BOOL)animated completion:(void (^)(void))completion;

/**
 * Convenience method to dismiss with a(nother) predefined style and / or message.
Expand All@@ -100,6 +102,8 @@ typedef void(^CSVoidBlock)();
 * The label containing the message displayed to the user.
 */
@property (nonatomic, readonly) UILabel* textLabel;

@property (nonatomic, readonly) UIButton *closeButton;

@property (nonatomic, getter = isShowingActivity) BOOL showingActivity;

Expand Down

57 changes: 47 additions & 10 deletions
CSNotificationView/CSNotificationView.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,15 @@

@implementation CSNotificationView

-(nullable instancetype)initWithCoder:(NSCoder *)aDecoder {
 self = [self initWithCoder:aDecoder];
 return self;
}

-(instancetype)initWithFrame:(CGRect)frame {
 self = [self initWithFrame:frame];
 return self;
}
#pragma mark + quick presentation

+ (void)showInViewController:(UIViewController*)viewController
Expand All@@ -29,7 +38,7 @@ + (void)showInViewController:(UIViewController*)viewController
 note.image = image;
 note.textLabel.text = message;

 void (^completion)() = ^{[note setVisible:NO animated:YES completion:nil];};
 void (^completion)(void) = ^{[note setVisible:NO animated:YES completion:nil];};
 [note setVisible:YES animated:YES completion:^{
 double delayInSeconds = duration;
 dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
Expand DownExpand Up@@ -57,7 +66,7 @@ + (void)showInViewController:(UIViewController*)viewController
 note.textLabel.textAlignment = textAlignment;
 note.textLabel.text = message;

 void (^completion)() = ^{[note setVisible:NO animated:YES completion:nil];};
 void (^completion)(void) = ^{[note setVisible:NO animated:YES completion:nil];};
 [note setVisible:YES animated:YES completion:^{
 double delayInSeconds = duration;
 dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
Expand DownExpand Up@@ -175,6 +184,14 @@ - (instancetype)initWithParentViewController:(UIViewController*)viewController
 {
 [self updateSymbolView];
 }

 //closeButton
 {
 _closeButton = [[UIButton alloc] init];
 _closeButton.translatesAutoresizingMaskIntoConstraints = NO;
 _closeButton.backgroundColor = [UIColor clearColor];
 [self addSubview:_closeButton];
 }
 }

 //Interaction
Expand DownExpand Up@@ -255,23 +272,28 @@ - (void)updateConstraints
 CGFloat symbolViewWidth = self.symbolView.tag != kCSNotificationViewEmptySymbolViewTag ?
 kCSNotificationViewSymbolViewSidelength : 0.0f;
 CGFloat symbolViewHeight = kCSNotificationViewSymbolViewSidelength;


	CGFloat closeButtonWidth = kCSNotificationViewCloseButtonWidth;
	CGFloat closeButtonHeight = kCSNotificationViewCloseButtonHeight;

 NSDictionary* metrics =
 @{@"symbolViewWidth": [NSNumber numberWithFloat:symbolViewWidth],
 @"symbolViewHeight":[NSNumber numberWithFloat:symbolViewHeight]};
 @"symbolViewHeight":[NSNumber numberWithFloat:symbolViewHeight],
 @"closeButtonWidth":@(closeButtonWidth),
 @"closeButtonHeight":@(closeButtonHeight)};

 [self addConstraints:[NSLayoutConstraint
 constraintsWithVisualFormat:@"H:|-(4)-[_symbolView(symbolViewWidth)]-(5)-[_textLabel]-(10)-|"
 constraintsWithVisualFormat:@"H:|-(4)-[_symbolView(symbolViewWidth)]-(5)-[_textLabel]-(5)-[_closeButton(closeButtonWidth)]-(10)-|"
 options:0
 metrics:metrics
 views:NSDictionaryOfVariableBindings(_textLabel, _symbolView)]];
 views:NSDictionaryOfVariableBindings(_textLabel, _symbolView,_closeButton)]];

 [self addConstraints:[NSLayoutConstraint
 constraintsWithVisualFormat:@"V:[_symbolView(symbolViewHeight)]"
 options:0
 metrics:metrics
 views:NSDictionaryOfVariableBindings(_symbolView)]];
 [self addConstraint:[NSLayoutConstraint
 constraintWithItem:_symbolView
 attribute:NSLayoutAttributeBottom
Expand All@@ -287,7 +309,22 @@ - (void)updateConstraints
 toItem:_symbolView
 attribute:NSLayoutAttributeCenterY
 multiplier:1.0f constant:0]];


	[self addConstraints:[NSLayoutConstraint
 constraintsWithVisualFormat:@"V:[_closeButton(closeButtonHeight)]"
 options:0
 metrics:metrics
 views:NSDictionaryOfVariableBindings(_closeButton)]];

	[self addConstraint:[NSLayoutConstraint
 constraintWithItem:_closeButton
 attribute:NSLayoutAttributeBottom
 relatedBy:NSLayoutRelationEqual
 toItem:self
 attribute:NSLayoutAttributeBottom
 multiplier:1.0f constant:0]];


 [super updateConstraints];
}

Expand All@@ -311,11 +348,11 @@ -(void)handleTapInView:(UITapGestureRecognizer*)tapGestureRecognizer

#pragma mark - presentation

- (void)setVisible:(BOOL)visible animated:(BOOL)animated completion:(void (^)())completion
- (void)setVisible:(BOOL)visible animated:(BOOL)animated completion:(void (^)(void))completion
{
 if (_visible != visible) {

 NSTimeInterval animationDuration = animated ? 0.4 : 0.0;
 NSTimeInterval animationDuration = animated ? 0.7 : 0.0;

 CGRect startFrame, endFrame;
 [self animationFramesForVisible:visible startFrame:&startFrame endFrame:&endFrame];
Expand Down

1 change: 0 additions & 1 deletion
CSNotificationView/CSNotificationView_Private.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ static NSString * kCSNavigationBarBoundsKeyPath = @"parentNavigationController.n
#pragma mark - presentation
@property (nonatomic, weak) UIViewController* parentViewController;
@property (nonatomic, strong) UINavigationController* parentNavigationController; //Has to be strong-referenced because CSNotificationView does KVO on parentNavigationController
@property (nonatomic, getter = isVisible) BOOL visible;

#pragma mark - content views
@property (nonatomic, strong, readonly) UIView* symbolView; // is updated by -(void)updateSymbolView
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Warning fixes#78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

chamira
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Warning fixes
#78
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
ded1a6d

Added close button to right side


chamira Feb 22, 2017
aca34c0

increase to height to 50.0f as before


chamira Feb 22, 2017
8bc2eb7

Increase the animation time to 0.7


chamira Feb 23, 2017
b0e14c5

Fixed! all warnings


chamira Sep 4, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
CSNotificationView/CSNativeBlurView.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#import <UIKit/UIKit.h>
#import "CSNotificationView_Private.h"

API_AVAILABLE(ios(8.0))
@interface CSNativeBlurView : UIVisualEffectView <CSNotificationViewBlurViewProtocol>

@end

10 changes: 9 additions & 1 deletion
CSNotificationView/CSNativeBlurView.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,15 @@ @implementation CSNativeBlurView

- (instancetype)initWithFrame:(CGRect)frame
{
 self = [super initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
 if (@available(iOS 8.0, *)) {
 self = [super initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
 } else {
 // Fallback on earlier versions
 }if (@available(iOS 8.0, *)) {
 self = [super initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
 } else {
 // Fallback on earlier versions
 }
 if (self) {
 self.tintColorView = [[UIView alloc] initWithFrame:self.bounds];
 self.tintColorView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
Expand Down

8 changes: 6 additions & 2 deletions
CSNotificationView/CSNotificationView.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,14 +10,16 @@

static CGFloat const kCSNotificationViewHeight = 50.0f;
static CGFloat const kCSNotificationViewSymbolViewSidelength = 44.0f;
static CGFloat const kCSNotificationViewCloseButtonWidth = 44.0f;
static CGFloat const kCSNotificationViewCloseButtonHeight = 44.0f;
static NSTimeInterval const kCSNotificationViewDefaultShowDuration = 2.0;

typedef NS_ENUM(NSInteger, CSNotificationViewStyle) {
 CSNotificationViewStyleSuccess,
 CSNotificationViewStyleError
};

typedef void(^CSVoidBlock)();
typedef void(^CSVoidBlock)(void);

@interface CSNotificationView : UIView

Expand DownExpand Up@@ -73,7 +75,7 @@ typedef void(^CSVoidBlock)();
 * @param animated Should a change in `showing` be animated?
 * @param completion `nil` or a callback called on the main thread after changes to the interface are completed.
 */
- (void)setVisible:(BOOL)showing animated:(BOOL)animated completion:(void (^)())completion;
- (void)setVisible:(BOOL)showing animated:(BOOL)animated completion:(void (^)(void))completion;

/**
 * Convenience method to dismiss with a(nother) predefined style and / or message.
Expand All@@ -100,6 +102,8 @@ typedef void(^CSVoidBlock)();
 * The label containing the message displayed to the user.
 */
@property (nonatomic, readonly) UILabel* textLabel;

@property (nonatomic, readonly) UIButton *closeButton;

@property (nonatomic, getter = isShowingActivity) BOOL showingActivity;

Expand Down

57 changes: 47 additions & 10 deletions
CSNotificationView/CSNotificationView.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,15 @@

@implementation CSNotificationView

-(nullable instancetype)initWithCoder:(NSCoder *)aDecoder {
 self = [self initWithCoder:aDecoder];
 return self;
}

-(instancetype)initWithFrame:(CGRect)frame {
 self = [self initWithFrame:frame];
 return self;
}
#pragma mark + quick presentation

+ (void)showInViewController:(UIViewController*)viewController
Expand All@@ -29,7 +38,7 @@ + (void)showInViewController:(UIViewController*)viewController
 note.image = image;
 note.textLabel.text = message;

 void (^completion)() = ^{[note setVisible:NO animated:YES completion:nil];};
 void (^completion)(void) = ^{[note setVisible:NO animated:YES completion:nil];};
 [note setVisible:YES animated:YES completion:^{
 double delayInSeconds = duration;
 dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
Expand DownExpand Up@@ -57,7 +66,7 @@ + (void)showInViewController:(UIViewController*)viewController
 note.textLabel.textAlignment = textAlignment;
 note.textLabel.text = message;

 void (^completion)() = ^{[note setVisible:NO animated:YES completion:nil];};
 void (^completion)(void) = ^{[note setVisible:NO animated:YES completion:nil];};
 [note setVisible:YES animated:YES completion:^{
 double delayInSeconds = duration;
 dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
Expand DownExpand Up@@ -175,6 +184,14 @@ - (instancetype)initWithParentViewController:(UIViewController*)viewController
 {
 [self updateSymbolView];
 }

 //closeButton
 {
 _closeButton = [[UIButton alloc] init];
 _closeButton.translatesAutoresizingMaskIntoConstraints = NO;
 _closeButton.backgroundColor = [UIColor clearColor];
 [self addSubview:_closeButton];
 }
 }

 //Interaction
Expand DownExpand Up@@ -255,23 +272,28 @@ - (void)updateConstraints
 CGFloat symbolViewWidth = self.symbolView.tag != kCSNotificationViewEmptySymbolViewTag ?
 kCSNotificationViewSymbolViewSidelength : 0.0f;
 CGFloat symbolViewHeight = kCSNotificationViewSymbolViewSidelength;


	CGFloat closeButtonWidth = kCSNotificationViewCloseButtonWidth;
	CGFloat closeButtonHeight = kCSNotificationViewCloseButtonHeight;

 NSDictionary* metrics =
 @{@"symbolViewWidth": [NSNumber numberWithFloat:symbolViewWidth],
 @"symbolViewHeight":[NSNumber numberWithFloat:symbolViewHeight]};
 @"symbolViewHeight":[NSNumber numberWithFloat:symbolViewHeight],
 @"closeButtonWidth":@(closeButtonWidth),
 @"closeButtonHeight":@(closeButtonHeight)};

 [self addConstraints:[NSLayoutConstraint
 constraintsWithVisualFormat:@"H:|-(4)-[_symbolView(symbolViewWidth)]-(5)-[_textLabel]-(10)-|"
 constraintsWithVisualFormat:@"H:|-(4)-[_symbolView(symbolViewWidth)]-(5)-[_textLabel]-(5)-[_closeButton(closeButtonWidth)]-(10)-|"
 options:0
 metrics:metrics
 views:NSDictionaryOfVariableBindings(_textLabel, _symbolView)]];
 views:NSDictionaryOfVariableBindings(_textLabel, _symbolView,_closeButton)]];

 [self addConstraints:[NSLayoutConstraint
 constraintsWithVisualFormat:@"V:[_symbolView(symbolViewHeight)]"
 options:0
 metrics:metrics
 views:NSDictionaryOfVariableBindings(_symbolView)]];
 [self addConstraint:[NSLayoutConstraint
 constraintWithItem:_symbolView
 attribute:NSLayoutAttributeBottom
Expand All@@ -287,7 +309,22 @@ - (void)updateConstraints
 toItem:_symbolView
 attribute:NSLayoutAttributeCenterY
 multiplier:1.0f constant:0]];


	[self addConstraints:[NSLayoutConstraint
 constraintsWithVisualFormat:@"V:[_closeButton(closeButtonHeight)]"
 options:0
 metrics:metrics
 views:NSDictionaryOfVariableBindings(_closeButton)]];

	[self addConstraint:[NSLayoutConstraint
 constraintWithItem:_closeButton
 attribute:NSLayoutAttributeBottom
 relatedBy:NSLayoutRelationEqual
 toItem:self
 attribute:NSLayoutAttributeBottom
 multiplier:1.0f constant:0]];


 [super updateConstraints];
}

Expand All@@ -311,11 +348,11 @@ -(void)handleTapInView:(UITapGestureRecognizer*)tapGestureRecognizer

#pragma mark - presentation

- (void)setVisible:(BOOL)visible animated:(BOOL)animated completion:(void (^)())completion
- (void)setVisible:(BOOL)visible animated:(BOOL)animated completion:(void (^)(void))completion
{
 if (_visible != visible) {

 NSTimeInterval animationDuration = animated ? 0.4 : 0.0;
 NSTimeInterval animationDuration = animated ? 0.7 : 0.0;

 CGRect startFrame, endFrame;
 [self animationFramesForVisible:visible startFrame:&startFrame endFrame:&endFrame];
Expand Down

1 change: 0 additions & 1 deletion
CSNotificationView/CSNotificationView_Private.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ static NSString * kCSNavigationBarBoundsKeyPath = @"parentNavigationController.n
#pragma mark - presentation
@property (nonatomic, weak) UIViewController* parentViewController;
@property (nonatomic, strong) UINavigationController* parentNavigationController; //Has to be strong-referenced because CSNotificationView does KVO on parentNavigationController
@property (nonatomic, getter = isVisible) BOOL visible;

#pragma mark - content views
@property (nonatomic, strong, readonly) UIView* symbolView; // is updated by -(void)updateSymbolView
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Warning fixes#78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

chamira
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Warning fixes
#78
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
ded1a6d

Added close button to right side


chamira Feb 22, 2017
aca34c0

increase to height to 50.0f as before


chamira Feb 22, 2017
8bc2eb7

Increase the animation time to 0.7


chamira Feb 23, 2017
b0e14c5

Fixed! all warnings


chamira Sep 4, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
CSNotificationView/CSNativeBlurView.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#import <UIKit/UIKit.h>
#import "CSNotificationView_Private.h"

API_AVAILABLE(ios(8.0))
@interface CSNativeBlurView : UIVisualEffectView <CSNotificationViewBlurViewProtocol>

@end

10 changes: 9 additions & 1 deletion
CSNotificationView/CSNativeBlurView.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,15 @@ @implementation CSNativeBlurView

- (instancetype)initWithFrame:(CGRect)frame
{
 self = [super initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
 if (@available(iOS 8.0, *)) {
 self = [super initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
 } else {
 // Fallback on earlier versions
 }if (@available(iOS 8.0, *)) {
 self = [super initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
 } else {
 // Fallback on earlier versions
 }
 if (self) {
 self.tintColorView = [[UIView alloc] initWithFrame:self.bounds];
 self.tintColorView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
Expand Down

8 changes: 6 additions & 2 deletions
CSNotificationView/CSNotificationView.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,14 +10,16 @@

static CGFloat const kCSNotificationViewHeight = 50.0f;
static CGFloat const kCSNotificationViewSymbolViewSidelength = 44.0f;
static CGFloat const kCSNotificationViewCloseButtonWidth = 44.0f;
static CGFloat const kCSNotificationViewCloseButtonHeight = 44.0f;
static NSTimeInterval const kCSNotificationViewDefaultShowDuration = 2.0;

typedef NS_ENUM(NSInteger, CSNotificationViewStyle) {
 CSNotificationViewStyleSuccess,
 CSNotificationViewStyleError
};

typedef void(^CSVoidBlock)();
typedef void(^CSVoidBlock)(void);

@interface CSNotificationView : UIView

Expand DownExpand Up@@ -73,7 +75,7 @@ typedef void(^CSVoidBlock)();
 * @param animated Should a change in `showing` be animated?
 * @param completion `nil` or a callback called on the main thread after changes to the interface are completed.
 */
- (void)setVisible:(BOOL)showing animated:(BOOL)animated completion:(void (^)())completion;
- (void)setVisible:(BOOL)showing animated:(BOOL)animated completion:(void (^)(void))completion;

/**
 * Convenience method to dismiss with a(nother) predefined style and / or message.
Expand All@@ -100,6 +102,8 @@ typedef void(^CSVoidBlock)();
 * The label containing the message displayed to the user.
 */
@property (nonatomic, readonly) UILabel* textLabel;

@property (nonatomic, readonly) UIButton *closeButton;

@property (nonatomic, getter = isShowingActivity) BOOL showingActivity;

Expand Down

57 changes: 47 additions & 10 deletions
CSNotificationView/CSNotificationView.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,15 @@

@implementation CSNotificationView

-(nullable instancetype)initWithCoder:(NSCoder *)aDecoder {
 self = [self initWithCoder:aDecoder];
 return self;
}

-(instancetype)initWithFrame:(CGRect)frame {
 self = [self initWithFrame:frame];
 return self;
}
#pragma mark + quick presentation

+ (void)showInViewController:(UIViewController*)viewController
Expand All@@ -29,7 +38,7 @@ + (void)showInViewController:(UIViewController*)viewController
 note.image = image;
 note.textLabel.text = message;

 void (^completion)() = ^{[note setVisible:NO animated:YES completion:nil];};
 void (^completion)(void) = ^{[note setVisible:NO animated:YES completion:nil];};
 [note setVisible:YES animated:YES completion:^{
 double delayInSeconds = duration;
 dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
Expand DownExpand Up@@ -57,7 +66,7 @@ + (void)showInViewController:(UIViewController*)viewController
 note.textLabel.textAlignment = textAlignment;
 note.textLabel.text = message;

 void (^completion)() = ^{[note setVisible:NO animated:YES completion:nil];};
 void (^completion)(void) = ^{[note setVisible:NO animated:YES completion:nil];};
 [note setVisible:YES animated:YES completion:^{
 double delayInSeconds = duration;
 dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
Expand DownExpand Up@@ -175,6 +184,14 @@ - (instancetype)initWithParentViewController:(UIViewController*)viewController
 {
 [self updateSymbolView];
 }

 //closeButton
 {
 _closeButton = [[UIButton alloc] init];
 _closeButton.translatesAutoresizingMaskIntoConstraints = NO;
 _closeButton.backgroundColor = [UIColor clearColor];
 [self addSubview:_closeButton];
 }
 }

 //Interaction
Expand DownExpand Up@@ -255,23 +272,28 @@ - (void)updateConstraints
 CGFloat symbolViewWidth = self.symbolView.tag != kCSNotificationViewEmptySymbolViewTag ?
 kCSNotificationViewSymbolViewSidelength : 0.0f;
 CGFloat symbolViewHeight = kCSNotificationViewSymbolViewSidelength;


	CGFloat closeButtonWidth = kCSNotificationViewCloseButtonWidth;
	CGFloat closeButtonHeight = kCSNotificationViewCloseButtonHeight;

 NSDictionary* metrics =
 @{@"symbolViewWidth": [NSNumber numberWithFloat:symbolViewWidth],
 @"symbolViewHeight":[NSNumber numberWithFloat:symbolViewHeight]};
 @"symbolViewHeight":[NSNumber numberWithFloat:symbolViewHeight],
 @"closeButtonWidth":@(closeButtonWidth),
 @"closeButtonHeight":@(closeButtonHeight)};

 [self addConstraints:[NSLayoutConstraint
 constraintsWithVisualFormat:@"H:|-(4)-[_symbolView(symbolViewWidth)]-(5)-[_textLabel]-(10)-|"
 constraintsWithVisualFormat:@"H:|-(4)-[_symbolView(symbolViewWidth)]-(5)-[_textLabel]-(5)-[_closeButton(closeButtonWidth)]-(10)-|"
 options:0
 metrics:metrics
 views:NSDictionaryOfVariableBindings(_textLabel, _symbolView)]];
 views:NSDictionaryOfVariableBindings(_textLabel, _symbolView,_closeButton)]];

 [self addConstraints:[NSLayoutConstraint
 constraintsWithVisualFormat:@"V:[_symbolView(symbolViewHeight)]"
 options:0
 metrics:metrics
 views:NSDictionaryOfVariableBindings(_symbolView)]];
 [self addConstraint:[NSLayoutConstraint
 constraintWithItem:_symbolView
 attribute:NSLayoutAttributeBottom
Expand All@@ -287,7 +309,22 @@ - (void)updateConstraints
 toItem:_symbolView
 attribute:NSLayoutAttributeCenterY
 multiplier:1.0f constant:0]];


	[self addConstraints:[NSLayoutConstraint
 constraintsWithVisualFormat:@"V:[_closeButton(closeButtonHeight)]"
 options:0
 metrics:metrics
 views:NSDictionaryOfVariableBindings(_closeButton)]];

	[self addConstraint:[NSLayoutConstraint
 constraintWithItem:_closeButton
 attribute:NSLayoutAttributeBottom
 relatedBy:NSLayoutRelationEqual
 toItem:self
 attribute:NSLayoutAttributeBottom
 multiplier:1.0f constant:0]];


 [super updateConstraints];
}

Expand All@@ -311,11 +348,11 @@ -(void)handleTapInView:(UITapGestureRecognizer*)tapGestureRecognizer

#pragma mark - presentation

- (void)setVisible:(BOOL)visible animated:(BOOL)animated completion:(void (^)())completion
- (void)setVisible:(BOOL)visible animated:(BOOL)animated completion:(void (^)(void))completion
{
 if (_visible != visible) {

 NSTimeInterval animationDuration = animated ? 0.4 : 0.0;
 NSTimeInterval animationDuration = animated ? 0.7 : 0.0;

 CGRect startFrame, endFrame;
 [self animationFramesForVisible:visible startFrame:&startFrame endFrame:&endFrame];
Expand Down

1 change: 0 additions & 1 deletion
CSNotificationView/CSNotificationView_Private.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ static NSString * kCSNavigationBarBoundsKeyPath = @"parentNavigationController.n
#pragma mark - presentation
@property (nonatomic, weak) UIViewController* parentViewController;
@property (nonatomic, strong) UINavigationController* parentNavigationController; //Has to be strong-referenced because CSNotificationView does KVO on parentNavigationController
@property (nonatomic, getter = isVisible) BOOL visible;

#pragma mark - content views
@property (nonatomic, strong, readonly) UIView* symbolView; // is updated by -(void)updateSymbolView
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Warning fixes#78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

chamira
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Warning fixes
#78
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
ded1a6d

Added close button to right side


chamira Feb 22, 2017
aca34c0

increase to height to 50.0f as before


chamira Feb 22, 2017
8bc2eb7

Increase the animation time to 0.7


chamira Feb 23, 2017
b0e14c5

Fixed! all warnings


chamira Sep 4, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
CSNotificationView/CSNativeBlurView.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#import <UIKit/UIKit.h>
#import "CSNotificationView_Private.h"

API_AVAILABLE(ios(8.0))
@interface CSNativeBlurView : UIVisualEffectView <CSNotificationViewBlurViewProtocol>

@end

10 changes: 9 additions & 1 deletion
CSNotificationView/CSNativeBlurView.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,15 @@ @implementation CSNativeBlurView

- (instancetype)initWithFrame:(CGRect)frame
{
 self = [super initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
 if (@available(iOS 8.0, *)) {
 self = [super initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
 } else {
 // Fallback on earlier versions
 }if (@available(iOS 8.0, *)) {
 self = [super initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
 } else {
 // Fallback on earlier versions
 }
 if (self) {
 self.tintColorView = [[UIView alloc] initWithFrame:self.bounds];
 self.tintColorView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
Expand Down

8 changes: 6 additions & 2 deletions
CSNotificationView/CSNotificationView.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,14 +10,16 @@

static CGFloat const kCSNotificationViewHeight = 50.0f;
static CGFloat const kCSNotificationViewSymbolViewSidelength = 44.0f;
static CGFloat const kCSNotificationViewCloseButtonWidth = 44.0f;
static CGFloat const kCSNotificationViewCloseButtonHeight = 44.0f;
static NSTimeInterval const kCSNotificationViewDefaultShowDuration = 2.0;

typedef NS_ENUM(NSInteger, CSNotificationViewStyle) {
 CSNotificationViewStyleSuccess,
 CSNotificationViewStyleError
};

typedef void(^CSVoidBlock)();
typedef void(^CSVoidBlock)(void);

@interface CSNotificationView : UIView

Expand DownExpand Up@@ -73,7 +75,7 @@ typedef void(^CSVoidBlock)();
 * @param animated Should a change in `showing` be animated?
 * @param completion `nil` or a callback called on the main thread after changes to the interface are completed.
 */
- (void)setVisible:(BOOL)showing animated:(BOOL)animated completion:(void (^)())completion;
- (void)setVisible:(BOOL)showing animated:(BOOL)animated completion:(void (^)(void))completion;

/**
 * Convenience method to dismiss with a(nother) predefined style and / or message.
Expand All@@ -100,6 +102,8 @@ typedef void(^CSVoidBlock)();
 * The label containing the message displayed to the user.
 */
@property (nonatomic, readonly) UILabel* textLabel;

@property (nonatomic, readonly) UIButton *closeButton;

@property (nonatomic, getter = isShowingActivity) BOOL showingActivity;

Expand Down

57 changes: 47 additions & 10 deletions
CSNotificationView/CSNotificationView.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,15 @@

@implementation CSNotificationView

-(nullable instancetype)initWithCoder:(NSCoder *)aDecoder {
 self = [self initWithCoder:aDecoder];
 return self;
}

-(instancetype)initWithFrame:(CGRect)frame {
 self = [self initWithFrame:frame];
 return self;
}
#pragma mark + quick presentation

+ (void)showInViewController:(UIViewController*)viewController
Expand All@@ -29,7 +38,7 @@ + (void)showInViewController:(UIViewController*)viewController
 note.image = image;
 note.textLabel.text = message;

 void (^completion)() = ^{[note setVisible:NO animated:YES completion:nil];};
 void (^completion)(void) = ^{[note setVisible:NO animated:YES completion:nil];};
 [note setVisible:YES animated:YES completion:^{
 double delayInSeconds = duration;
 dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
Expand DownExpand Up@@ -57,7 +66,7 @@ + (void)showInViewController:(UIViewController*)viewController
 note.textLabel.textAlignment = textAlignment;
 note.textLabel.text = message;

 void (^completion)() = ^{[note setVisible:NO animated:YES completion:nil];};
 void (^completion)(void) = ^{[note setVisible:NO animated:YES completion:nil];};
 [note setVisible:YES animated:YES completion:^{
 double delayInSeconds = duration;
 dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
Expand DownExpand Up@@ -175,6 +184,14 @@ - (instancetype)initWithParentViewController:(UIViewController*)viewController
 {
 [self updateSymbolView];
 }

 //closeButton
 {
 _closeButton = [[UIButton alloc] init];
 _closeButton.translatesAutoresizingMaskIntoConstraints = NO;
 _closeButton.backgroundColor = [UIColor clearColor];
 [self addSubview:_closeButton];
 }
 }

 //Interaction
Expand DownExpand Up@@ -255,23 +272,28 @@ - (void)updateConstraints
 CGFloat symbolViewWidth = self.symbolView.tag != kCSNotificationViewEmptySymbolViewTag ?
 kCSNotificationViewSymbolViewSidelength : 0.0f;
 CGFloat symbolViewHeight = kCSNotificationViewSymbolViewSidelength;


	CGFloat closeButtonWidth = kCSNotificationViewCloseButtonWidth;
	CGFloat closeButtonHeight = kCSNotificationViewCloseButtonHeight;

 NSDictionary* metrics =
 @{@"symbolViewWidth": [NSNumber numberWithFloat:symbolViewWidth],
 @"symbolViewHeight":[NSNumber numberWithFloat:symbolViewHeight]};
 @"symbolViewHeight":[NSNumber numberWithFloat:symbolViewHeight],
 @"closeButtonWidth":@(closeButtonWidth),
 @"closeButtonHeight":@(closeButtonHeight)};

 [self addConstraints:[NSLayoutConstraint
 constraintsWithVisualFormat:@"H:|-(4)-[_symbolView(symbolViewWidth)]-(5)-[_textLabel]-(10)-|"
 constraintsWithVisualFormat:@"H:|-(4)-[_symbolView(symbolViewWidth)]-(5)-[_textLabel]-(5)-[_closeButton(closeButtonWidth)]-(10)-|"
 options:0
 metrics:metrics
 views:NSDictionaryOfVariableBindings(_textLabel, _symbolView)]];
 views:NSDictionaryOfVariableBindings(_textLabel, _symbolView,_closeButton)]];

 [self addConstraints:[NSLayoutConstraint
 constraintsWithVisualFormat:@"V:[_symbolView(symbolViewHeight)]"
 options:0
 metrics:metrics
 views:NSDictionaryOfVariableBindings(_symbolView)]];
 [self addConstraint:[NSLayoutConstraint
 constraintWithItem:_symbolView
 attribute:NSLayoutAttributeBottom
Expand All@@ -287,7 +309,22 @@ - (void)updateConstraints
 toItem:_symbolView
 attribute:NSLayoutAttributeCenterY
 multiplier:1.0f constant:0]];


	[self addConstraints:[NSLayoutConstraint
 constraintsWithVisualFormat:@"V:[_closeButton(closeButtonHeight)]"
 options:0
 metrics:metrics
 views:NSDictionaryOfVariableBindings(_closeButton)]];

	[self addConstraint:[NSLayoutConstraint
 constraintWithItem:_closeButton
 attribute:NSLayoutAttributeBottom
 relatedBy:NSLayoutRelationEqual
 toItem:self
 attribute:NSLayoutAttributeBottom
 multiplier:1.0f constant:0]];


 [super updateConstraints];
}

Expand All@@ -311,11 +348,11 @@ -(void)handleTapInView:(UITapGestureRecognizer*)tapGestureRecognizer

#pragma mark - presentation

- (void)setVisible:(BOOL)visible animated:(BOOL)animated completion:(void (^)())completion
- (void)setVisible:(BOOL)visible animated:(BOOL)animated completion:(void (^)(void))completion
{
 if (_visible != visible) {

 NSTimeInterval animationDuration = animated ? 0.4 : 0.0;
 NSTimeInterval animationDuration = animated ? 0.7 : 0.0;

 CGRect startFrame, endFrame;
 [self animationFramesForVisible:visible startFrame:&startFrame endFrame:&endFrame];
Expand Down

1 change: 0 additions & 1 deletion
CSNotificationView/CSNotificationView_Private.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ static NSString * kCSNavigationBarBoundsKeyPath = @"parentNavigationController.n
#pragma mark - presentation
@property (nonatomic, weak) UIViewController* parentViewController;
@property (nonatomic, strong) UINavigationController* parentNavigationController; //Has to be strong-referenced because CSNotificationView does KVO on parentNavigationController
@property (nonatomic, getter = isVisible) BOOL visible;

#pragma mark - content views
@property (nonatomic, strong, readonly) UIView* symbolView; // is updated by -(void)updateSymbolView
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Warning fixes#78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

chamira
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Warning fixes
#78
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
ded1a6d

Added close button to right side


chamira Feb 22, 2017
aca34c0

increase to height to 50.0f as before


chamira Feb 22, 2017
8bc2eb7

Increase the animation time to 0.7


chamira Feb 23, 2017
b0e14c5

Fixed! all warnings


chamira Sep 4, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
CSNotificationView/CSNativeBlurView.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#import <UIKit/UIKit.h>
#import "CSNotificationView_Private.h"

API_AVAILABLE(ios(8.0))
@interface CSNativeBlurView : UIVisualEffectView <CSNotificationViewBlurViewProtocol>

@end

10 changes: 9 additions & 1 deletion
CSNotificationView/CSNativeBlurView.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,15 @@ @implementation CSNativeBlurView

- (instancetype)initWithFrame:(CGRect)frame
{
 self = [super initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
 if (@available(iOS 8.0, *)) {
 self = [super initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
 } else {
 // Fallback on earlier versions
 }if (@available(iOS 8.0, *)) {
 self = [super initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
 } else {
 // Fallback on earlier versions
 }
 if (self) {
 self.tintColorView = [[UIView alloc] initWithFrame:self.bounds];
 self.tintColorView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
Expand Down

8 changes: 6 additions & 2 deletions
CSNotificationView/CSNotificationView.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,14 +10,16 @@

static CGFloat const kCSNotificationViewHeight = 50.0f;
static CGFloat const kCSNotificationViewSymbolViewSidelength = 44.0f;
static CGFloat const kCSNotificationViewCloseButtonWidth = 44.0f;
static CGFloat const kCSNotificationViewCloseButtonHeight = 44.0f;
static NSTimeInterval const kCSNotificationViewDefaultShowDuration = 2.0;

typedef NS_ENUM(NSInteger, CSNotificationViewStyle) {
 CSNotificationViewStyleSuccess,
 CSNotificationViewStyleError
};

typedef void(^CSVoidBlock)();
typedef void(^CSVoidBlock)(void);

@interface CSNotificationView : UIView

Expand DownExpand Up@@ -73,7 +75,7 @@ typedef void(^CSVoidBlock)();
 * @param animated Should a change in `showing` be animated?
 * @param completion `nil` or a callback called on the main thread after changes to the interface are completed.
 */
- (void)setVisible:(BOOL)showing animated:(BOOL)animated completion:(void (^)())completion;
- (void)setVisible:(BOOL)showing animated:(BOOL)animated completion:(void (^)(void))completion;

/**
 * Convenience method to dismiss with a(nother) predefined style and / or message.
Expand All@@ -100,6 +102,8 @@ typedef void(^CSVoidBlock)();
 * The label containing the message displayed to the user.
 */
@property (nonatomic, readonly) UILabel* textLabel;

@property (nonatomic, readonly) UIButton *closeButton;

@property (nonatomic, getter = isShowingActivity) BOOL showingActivity;

Expand Down

57 changes: 47 additions & 10 deletions
CSNotificationView/CSNotificationView.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,15 @@

@implementation CSNotificationView

-(nullable instancetype)initWithCoder:(NSCoder *)aDecoder {
 self = [self initWithCoder:aDecoder];
 return self;
}

-(instancetype)initWithFrame:(CGRect)frame {
 self = [self initWithFrame:frame];
 return self;
}
#pragma mark + quick presentation

+ (void)showInViewController:(UIViewController*)viewController
Expand All@@ -29,7 +38,7 @@ + (void)showInViewController:(UIViewController*)viewController
 note.image = image;
 note.textLabel.text = message;

 void (^completion)() = ^{[note setVisible:NO animated:YES completion:nil];};
 void (^completion)(void) = ^{[note setVisible:NO animated:YES completion:nil];};
 [note setVisible:YES animated:YES completion:^{
 double delayInSeconds = duration;
 dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
Expand DownExpand Up@@ -57,7 +66,7 @@ + (void)showInViewController:(UIViewController*)viewController
 note.textLabel.textAlignment = textAlignment;
 note.textLabel.text = message;

 void (^completion)() = ^{[note setVisible:NO animated:YES completion:nil];};
 void (^completion)(void) = ^{[note setVisible:NO animated:YES completion:nil];};
 [note setVisible:YES animated:YES completion:^{
 double delayInSeconds = duration;
 dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
Expand DownExpand Up@@ -175,6 +184,14 @@ - (instancetype)initWithParentViewController:(UIViewController*)viewController
 {
 [self updateSymbolView];
 }

 //closeButton
 {
 _closeButton = [[UIButton alloc] init];
 _closeButton.translatesAutoresizingMaskIntoConstraints = NO;
 _closeButton.backgroundColor = [UIColor clearColor];
 [self addSubview:_closeButton];
 }
 }

 //Interaction
Expand DownExpand Up@@ -255,23 +272,28 @@ - (void)updateConstraints
 CGFloat symbolViewWidth = self.symbolView.tag != kCSNotificationViewEmptySymbolViewTag ?
 kCSNotificationViewSymbolViewSidelength : 0.0f;
 CGFloat symbolViewHeight = kCSNotificationViewSymbolViewSidelength;


	CGFloat closeButtonWidth = kCSNotificationViewCloseButtonWidth;
	CGFloat closeButtonHeight = kCSNotificationViewCloseButtonHeight;

 NSDictionary* metrics =
 @{@"symbolViewWidth": [NSNumber numberWithFloat:symbolViewWidth],
 @"symbolViewHeight":[NSNumber numberWithFloat:symbolViewHeight]};
 @"symbolViewHeight":[NSNumber numberWithFloat:symbolViewHeight],
 @"closeButtonWidth":@(closeButtonWidth),
 @"closeButtonHeight":@(closeButtonHeight)};

 [self addConstraints:[NSLayoutConstraint
 constraintsWithVisualFormat:@"H:|-(4)-[_symbolView(symbolViewWidth)]-(5)-[_textLabel]-(10)-|"
 constraintsWithVisualFormat:@"H:|-(4)-[_symbolView(symbolViewWidth)]-(5)-[_textLabel]-(5)-[_closeButton(closeButtonWidth)]-(10)-|"
 options:0
 metrics:metrics
 views:NSDictionaryOfVariableBindings(_textLabel, _symbolView)]];
 views:NSDictionaryOfVariableBindings(_textLabel, _symbolView,_closeButton)]];

 [self addConstraints:[NSLayoutConstraint
 constraintsWithVisualFormat:@"V:[_symbolView(symbolViewHeight)]"
 options:0
 metrics:metrics
 views:NSDictionaryOfVariableBindings(_symbolView)]];
 [self addConstraint:[NSLayoutConstraint
 constraintWithItem:_symbolView
 attribute:NSLayoutAttributeBottom
Expand All@@ -287,7 +309,22 @@ - (void)updateConstraints
 toItem:_symbolView
 attribute:NSLayoutAttributeCenterY
 multiplier:1.0f constant:0]];


	[self addConstraints:[NSLayoutConstraint
 constraintsWithVisualFormat:@"V:[_closeButton(closeButtonHeight)]"
 options:0
 metrics:metrics
 views:NSDictionaryOfVariableBindings(_closeButton)]];

	[self addConstraint:[NSLayoutConstraint
 constraintWithItem:_closeButton
 attribute:NSLayoutAttributeBottom
 relatedBy:NSLayoutRelationEqual
 toItem:self
 attribute:NSLayoutAttributeBottom
 multiplier:1.0f constant:0]];


 [super updateConstraints];
}

Expand All@@ -311,11 +348,11 @@ -(void)handleTapInView:(UITapGestureRecognizer*)tapGestureRecognizer

#pragma mark - presentation

- (void)setVisible:(BOOL)visible animated:(BOOL)animated completion:(void (^)())completion
- (void)setVisible:(BOOL)visible animated:(BOOL)animated completion:(void (^)(void))completion
{
 if (_visible != visible) {

 NSTimeInterval animationDuration = animated ? 0.4 : 0.0;
 NSTimeInterval animationDuration = animated ? 0.7 : 0.0;

 CGRect startFrame, endFrame;
 [self animationFramesForVisible:visible startFrame:&startFrame endFrame:&endFrame];
Expand Down

1 change: 0 additions & 1 deletion
CSNotificationView/CSNotificationView_Private.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ static NSString * kCSNavigationBarBoundsKeyPath = @"parentNavigationController.n
#pragma mark - presentation
@property (nonatomic, weak) UIViewController* parentViewController;
@property (nonatomic, strong) UINavigationController* parentNavigationController; //Has to be strong-referenced because CSNotificationView does KVO on parentNavigationController
@property (nonatomic, getter = isVisible) BOOL visible;

#pragma mark - content views
@property (nonatomic, strong, readonly) UIView* symbolView; // is updated by -(void)updateSymbolView
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Warning fixes#78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

chamira
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Warning fixes
#78
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
ded1a6d

Added close button to right side


chamira Feb 22, 2017
aca34c0

increase to height to 50.0f as before


chamira Feb 22, 2017
8bc2eb7

Increase the animation time to 0.7


chamira Feb 23, 2017
b0e14c5

Fixed! all warnings


chamira Sep 4, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
CSNotificationView/CSNativeBlurView.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
#import <UIKit/UIKit.h>
#import "CSNotificationView_Private.h"

API_AVAILABLE(ios(8.0))
@interface CSNativeBlurView : UIVisualEffectView <CSNotificationViewBlurViewProtocol>

@end

10 changes: 9 additions & 1 deletion
CSNotificationView/CSNativeBlurView.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,15 @@ @implementation CSNativeBlurView

- (instancetype)initWithFrame:(CGRect)frame
{
 self = [super initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
 if (@available(iOS 8.0, *)) {
 self = [super initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
 } else {
 // Fallback on earlier versions
 }if (@available(iOS 8.0, *)) {
 self = [super initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
 } else {
 // Fallback on earlier versions
 }
 if (self) {
 self.tintColorView = [[UIView alloc] initWithFrame:self.bounds];
 self.tintColorView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
Expand Down

8 changes: 6 additions & 2 deletions
CSNotificationView/CSNotificationView.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,14 +10,16 @@

static CGFloat const kCSNotificationViewHeight = 50.0f;
static CGFloat const kCSNotificationViewSymbolViewSidelength = 44.0f;
static CGFloat const kCSNotificationViewCloseButtonWidth = 44.0f;
static CGFloat const kCSNotificationViewCloseButtonHeight = 44.0f;
static NSTimeInterval const kCSNotificationViewDefaultShowDuration = 2.0;

typedef NS_ENUM(NSInteger, CSNotificationViewStyle) {
 CSNotificationViewStyleSuccess,
 CSNotificationViewStyleError
};

typedef void(^CSVoidBlock)();
typedef void(^CSVoidBlock)(void);

@interface CSNotificationView : UIView

Expand DownExpand Up@@ -73,7 +75,7 @@ typedef void(^CSVoidBlock)();
 * @param animated Should a change in `showing` be animated?
 * @param completion `nil` or a callback called on the main thread after changes to the interface are completed.
 */
- (void)setVisible:(BOOL)showing animated:(BOOL)animated completion:(void (^)())completion;
- (void)setVisible:(BOOL)showing animated:(BOOL)animated completion:(void (^)(void))completion;

/**
 * Convenience method to dismiss with a(nother) predefined style and / or message.
Expand All@@ -100,6 +102,8 @@ typedef void(^CSVoidBlock)();
 * The label containing the message displayed to the user.
 */
@property (nonatomic, readonly) UILabel* textLabel;

@property (nonatomic, readonly) UIButton *closeButton;

@property (nonatomic, getter = isShowingActivity) BOOL showingActivity;

Expand Down

57 changes: 47 additions & 10 deletions
CSNotificationView/CSNotificationView.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,15 @@

@implementation CSNotificationView

-(nullable instancetype)initWithCoder:(NSCoder *)aDecoder {
 self = [self initWithCoder:aDecoder];
 return self;
}

-(instancetype)initWithFrame:(CGRect)frame {
 self = [self initWithFrame:frame];
 return self;
}
#pragma mark + quick presentation

+ (void)showInViewController:(UIViewController*)viewController
Expand All@@ -29,7 +38,7 @@ + (void)showInViewController:(UIViewController*)viewController
 note.image = image;
 note.textLabel.text = message;

 void (^completion)() = ^{[note setVisible:NO animated:YES completion:nil];};
 void (^completion)(void) = ^{[note setVisible:NO animated:YES completion:nil];};
 [note setVisible:YES animated:YES completion:^{
 double delayInSeconds = duration;
 dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
Expand DownExpand Up@@ -57,7 +66,7 @@ + (void)showInViewController:(UIViewController*)viewController
 note.textLabel.textAlignment = textAlignment;
 note.textLabel.text = message;

 void (^completion)() = ^{[note setVisible:NO animated:YES completion:nil];};
 void (^completion)(void) = ^{[note setVisible:NO animated:YES completion:nil];};
 [note setVisible:YES animated:YES completion:^{
 double delayInSeconds = duration;
 dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delayInSeconds * NSEC_PER_SEC));
Expand DownExpand Up@@ -175,6 +184,14 @@ - (instancetype)initWithParentViewController:(UIViewController*)viewController
 {
 [self updateSymbolView];
 }

 //closeButton
 {
 _closeButton = [[UIButton alloc] init];
 _closeButton.translatesAutoresizingMaskIntoConstraints = NO;
 _closeButton.backgroundColor = [UIColor clearColor];
 [self addSubview:_closeButton];
 }
 }

 //Interaction
Expand DownExpand Up@@ -255,23 +272,28 @@ - (void)updateConstraints
 CGFloat symbolViewWidth = self.symbolView.tag != kCSNotificationViewEmptySymbolViewTag ?
 kCSNotificationViewSymbolViewSidelength : 0.0f;
 CGFloat symbolViewHeight = kCSNotificationViewSymbolViewSidelength;


	CGFloat closeButtonWidth = kCSNotificationViewCloseButtonWidth;
	CGFloat closeButtonHeight = kCSNotificationViewCloseButtonHeight;

 NSDictionary* metrics =
 @{@"symbolViewWidth": [NSNumber numberWithFloat:symbolViewWidth],
 @"symbolViewHeight":[NSNumber numberWithFloat:symbolViewHeight]};
 @"symbolViewHeight":[NSNumber numberWithFloat:symbolViewHeight],
 @"closeButtonWidth":@(closeButtonWidth),
 @"closeButtonHeight":@(closeButtonHeight)};

 [self addConstraints:[NSLayoutConstraint
 constraintsWithVisualFormat:@"H:|-(4)-[_symbolView(symbolViewWidth)]-(5)-[_textLabel]-(10)-|"
 constraintsWithVisualFormat:@"H:|-(4)-[_symbolView(symbolViewWidth)]-(5)-[_textLabel]-(5)-[_closeButton(closeButtonWidth)]-(10)-|"
 options:0
 metrics:metrics
 views:NSDictionaryOfVariableBindings(_textLabel, _symbolView)]];
 views:NSDictionaryOfVariableBindings(_textLabel, _symbolView,_closeButton)]];

 [self addConstraints:[NSLayoutConstraint
 constraintsWithVisualFormat:@"V:[_symbolView(symbolViewHeight)]"
 options:0
 metrics:metrics
 views:NSDictionaryOfVariableBindings(_symbolView)]];
 [self addConstraint:[NSLayoutConstraint
 constraintWithItem:_symbolView
 attribute:NSLayoutAttributeBottom
Expand All@@ -287,7 +309,22 @@ - (void)updateConstraints
 toItem:_symbolView
 attribute:NSLayoutAttributeCenterY
 multiplier:1.0f constant:0]];


	[self addConstraints:[NSLayoutConstraint
 constraintsWithVisualFormat:@"V:[_closeButton(closeButtonHeight)]"
 options:0
 metrics:metrics
 views:NSDictionaryOfVariableBindings(_closeButton)]];

	[self addConstraint:[NSLayoutConstraint
 constraintWithItem:_closeButton
 attribute:NSLayoutAttributeBottom
 relatedBy:NSLayoutRelationEqual
 toItem:self
 attribute:NSLayoutAttributeBottom
 multiplier:1.0f constant:0]];


 [super updateConstraints];
}

Expand All@@ -311,11 +348,11 @@ -(void)handleTapInView:(UITapGestureRecognizer*)tapGestureRecognizer

#pragma mark - presentation

- (void)setVisible:(BOOL)visible animated:(BOOL)animated completion:(void (^)())completion
- (void)setVisible:(BOOL)visible animated:(BOOL)animated completion:(void (^)(void))completion
{
 if (_visible != visible) {

 NSTimeInterval animationDuration = animated ? 0.4 : 0.0;
 NSTimeInterval animationDuration = animated ? 0.7 : 0.0;

 CGRect startFrame, endFrame;
 [self animationFramesForVisible:visible startFrame:&startFrame endFrame:&endFrame];
Expand Down

1 change: 0 additions & 1 deletion
CSNotificationView/CSNotificationView_Private.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,6 @@ static NSString * kCSNavigationBarBoundsKeyPath = @"parentNavigationController.n
#pragma mark - presentation
@property (nonatomic, weak) UIViewController* parentViewController;
@property (nonatomic, strong) UINavigationController* parentNavigationController; //Has to be strong-referenced because CSNotificationView does KVO on parentNavigationController
@property (nonatomic, getter = isVisible) BOOL visible;

#pragma mark - content views
@property (nonatomic, strong, readonly) UIView* symbolView; // is updated by -(void)updateSymbolView
Expand Down
Loading