public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-11-01 09:09:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dejal' into catalyst

Browse source
This commit is contained in:
David Sinclair 2022-10-25 21:14:11 -06:00
commit 6ccb2d5def
18 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
clients/ios/Classes/FeedsObjCViewController.m
View file

@ -452,7 +452,7 @@ static NSArray<NSString *> *NewsBlurTopSectionNames;
if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad && !UIInterfaceOrientationIsLandscape(orientation)) {
[self.intelligenceControl setImage:[UIImage imageNamed:@"unread_yellow_icn.png"] forSegmentAtIndex:1];
[self.intelligenceControl setImage:[Utilities imageNamed:@"indicator-focus" sized:14] forSegmentAtIndex:2];
[self.intelligenceControl setImage:[Utilities imageNamed:@"saved-stories" sized:14] forSegmentAtIndex:3];
[self.intelligenceControl setImage:[Utilities imageNamed:@"unread_blue_icn.png" sized:14] forSegmentAtIndex:3];
[self.intelligenceControl setWidth:45 forSegmentAtIndex:0];
[self.intelligenceControl setWidth:40 forSegmentAtIndex:1];
@ -460,8 +460,8 @@ static NSArray<NSString *> *NewsBlurTopSectionNames;
[self.intelligenceControl setWidth:40 forSegmentAtIndex:3];
} else {
[self.intelligenceControl setImage:[UIImage imageNamed:@"unread_yellow.png"] forSegmentAtIndex:1];
[self.intelligenceControl setImage:[Utilities imageNamed:@"indicator-focus" sized:14] forSegmentAtIndex:2];
[self.intelligenceControl setImage:[Utilities imageNamed:@"saved-stories" sized:14] forSegmentAtIndex:3];
[self.intelligenceControl setImage:[UIImage imageNamed:@"unread_green.png"] forSegmentAtIndex:2];
[self.intelligenceControl setImage:[UIImage imageNamed:@"unread_blue.png"] forSegmentAtIndex:3];
[self.intelligenceControl setWidth:40 forSegmentAtIndex:0];
[self.intelligenceControl setWidth:68 forSegmentAtIndex:1];
@ -2765,6 +2765,8 @@ heightForHeaderInSection:(NSInteger)section {
userAvatarButton.pointerInteractionEnabled = YES;
userAvatarButton.accessibilityLabel = @"User info";
userAvatarButton.accessibilityHint = @"Double-tap for information about your account.";
UIEdgeInsets insets = UIEdgeInsetsMake(0, 0, 10, 0);
userAvatarButton.contentEdgeInsets = insets;
NSMutableURLRequest *avatarRequest = [NSMutableURLRequest requestWithURL:imageURL];
[avatarRequest addValue:@"image/*" forHTTPHeaderField:@"Accept"];
@ -2773,7 +2775,7 @@ heightForHeaderInSection:(NSInteger)section {
typeof(self) __weak weakSelf = self;
[avatarImageView setImageWithURLRequest:avatarRequest placeholderImage:nil success:^(NSURLRequest *request, NSHTTPURLResponse *response, UIImage *image) {
typeof(weakSelf) __strong strongSelf = weakSelf;
image = [Utilities roundCorneredImage:image radius:6 convertToSize:CGSizeMake(40, 40)];
image = [Utilities roundCorneredImage:image radius:6 convertToSize:CGSizeMake(38, 38)];
image = [image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
[(UIButton *)strongSelf.userAvatarButton setImage:image forState:UIControlStateNormal];

10
clients/ios/Resources-iPhone/LoginViewController.xib
View file

@ -45,10 +45,10 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</imageView>
<label hidden="YES" opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" fixedFrame="YES" text="Authenticating..." textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="24">
<label hidden="YES" opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" fixedFrame="YES" text=" Authenticating..." textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="24">
<rect key="frame" x="20" y="268" width="280" height="52"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="WhitneySSm-Medium" family="Whitney SSm" pointSize="17"/>
<fontDescription key="fontDescription" name="WhitneySSm-Medium" family="Whitney SSm" pointSize="15"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<color key="shadowColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@ -128,12 +128,12 @@
<color key="shadowColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</label>
<segmentedControl contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bar" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="33">
<rect key="frame" x="-4" y="0.0" width="329" height="30"/>
<rect key="frame" x="-4" y="-1" width="329" height="32"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.89736747741699219" green="0.90138375759124756" blue="0.92627149820327759" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<segments>
<segment title="LOGIN"/>
<segment title="SIGNUP"/>
<segment title="Login"/>
<segment title="Create Account"/>
</segments>
<color key="tintColor" red="0.94625341892242432" green="0.94625341892242432" blue="0.94625341892242432" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<connections>

BIN
clients/ios/Resources/all.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 282 B

After

Width:  |  Height:  |  Size: 323 B

BIN
clients/ios/Resources/all@2x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 408 B

After

Width:  |  Height:  |  Size: 531 B

BIN
clients/ios/Resources/all@3x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 538 B

After

Width:  |  Height:  |  Size: 801 B

BIN
clients/ios/Resources/unread_blue.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 803 B

BIN
clients/ios/Resources/unread_blue@2x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
clients/ios/Resources/unread_blue@3x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
clients/ios/Resources/unread_blue_icn.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 393 B

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
clients/ios/Resources/unread_blue_icn@2x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 539 B

After

Width:  |  Height:  |  Size: 11 KiB

BIN
clients/ios/Resources/unread_blue_icn@3x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 18 KiB

BIN
clients/ios/Resources/unread_green.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 559 B

After

Width:  |  Height:  |  Size: 888 B

BIN
clients/ios/Resources/unread_green@2x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
clients/ios/Resources/unread_green@3x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
clients/ios/Resources/unread_yellow.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 931 B

BIN
clients/ios/Resources/unread_yellow@2x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 2 KiB

BIN
clients/ios/Resources/unread_yellow@3x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
media/img/originals/Nouns.sketch
View file

Binary file not shown.