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

#1494 (Add Site dialog UI fixes)

Browse source
This commit is contained in:
David Sinclair 2021-06-03 21:36:04 -07:00
parent 9708c2f567
commit 8760fef8cd
3 changed files with 40 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
clients/ios/Classes/AddSiteViewController.m
View file

@ -36,11 +36,13 @@
self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(doCancelButton)];
self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Add Site" style:UIBarButtonItemStyleDone target:self action:@selector(addSite)];
UIView *folderPadding = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 24, 16)];
UIImageView *folderImage = [[UIImageView alloc]
initWithImage:[UIImage imageNamed:@"g_icn_folder_sm.png"]];
folderImage.frame = CGRectMake(0, 0, 24, 16);
[folderImage setContentMode:UIViewContentModeRight];
[self.inFolderInput setLeftView:folderImage];
[folderPadding addSubview:folderImage];
[self.inFolderInput setLeftView:folderPadding];
[self.inFolderInput setLeftViewMode:UITextFieldViewModeAlways];
// If you want to show a disclosure arrow; don't really need it, though.
@ -51,18 +53,22 @@
// [inFolderInput setRightView:disclosureImage];
// [inFolderInput setRightViewMode:UITextFieldViewModeAlways];
UIView *folderPadding2 = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 24, 16)];
UIImageView *folderImage2 = [[UIImageView alloc]
initWithImage:[UIImage imageNamed:@"g_icn_folder_rss_sm.png"]];
folderImage2.frame = CGRectMake(0, 0, 24, 16);
[folderImage2 setContentMode:UIViewContentModeRight];
[self.addFolderInput setLeftView:folderImage2];
[folderPadding2 addSubview:folderImage2];
[self.addFolderInput setLeftView:folderPadding2];
[self.addFolderInput setLeftViewMode:UITextFieldViewModeAlways];
UIView *urlPadding = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 24, 16)];
UIImageView *urlImage = [[UIImageView alloc]
initWithImage:[UIImage imageNamed:@"world.png"]];
urlImage.frame = CGRectMake(0, 0, 24, 16);
[urlImage setContentMode:UIViewContentModeRight];
[self.siteAddressInput setLeftView:urlImage];
[urlPadding addSubview:urlImage];
[self.siteAddressInput setLeftView:urlPadding];
[self.siteAddressInput setLeftViewMode:UITextFieldViewModeAlways];
self.siteTable.hidden = YES;
@ -210,6 +216,8 @@
if ([phrase isEqualToString:query]) {
self.autocompleteResults = [responseObject objectForKey:@"feeds"];
[self reloadSearchResults];
} else {
[self.siteActivityIndicator stopAnimating];
}
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
[self.siteActivityIndicator stopAnimating];
@ -422,7 +430,7 @@
cell.feedTitle.text = [result objectForKey:@"label"];
cell.feedTitle.textColor = UIColorFromRGB(NEWSBLUR_BLACK_COLOR);
cell.feedUrl.text = [result objectForKey:@"value"];
cell.feedUrl.textColor = UIColorFromFixedRGB(NEWSBLUR_LINK_COLOR);
cell.feedUrl.textColor = UIColorFromLightDarkRGB(NEWSBLUR_LINK_COLOR, 0x3B7CC5);
cell.feedSubs.text = [NSString stringWithFormat:@"%@ subscriber%@",
[NSString stringWithFormat:@"%@", [numberFormatter stringFromNumber:theScore]], subs == 1 ? @"" : @"s"];
cell.feedSubs.textColor = UIColorFromRGB(0x808080);

40
clients/ios/Resources-iPhone/AddSiteAutocompleteCell.xib
View file

@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment defaultVersion="1792" identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="WhitneySSm-Medium-Bas.otf">
@ -16,32 +18,31 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="4" id="4ta-Id-1EG">
<rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Daring Fireball" lineBreakMode="tailTruncation" minimumFontSize="12" id="5">
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" fixedFrame="YES" text="Daring Fireball" lineBreakMode="tailTruncation" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="5">
<rect key="frame" x="26" y="3" width="158" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="WhitneySSm-Medium" family="Whitney SSm" pointSize="15"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<size key="shadowOffset" width="0.0" height="1"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="http://daringfireball.net/feeds/extra/parameters/that/might/be/truncated/rss.xml" lineBreakMode="middleTruncation" minimumFontSize="10" id="6">
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" fixedFrame="YES" text="http://daringfireball.net/feeds/extra/parameters/that/might/be/truncated/rss.xml" lineBreakMode="middleTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="6">
<rect key="frame" x="6" y="20" width="306" height="21"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="WhitneySSm-Medium" family="Whitney SSm" pointSize="11"/>
<color key="textColor" red="0.36056621319999999" green="0.3860340491" blue="0.58659329380000003" alpha="1" colorSpace="deviceRGB"/>
<color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="textColor" systemColor="linkColor"/>
<color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="3,123 subscribers" textAlignment="right" lineBreakMode="tailTruncation" minimumFontSize="9" id="7">
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" fixedFrame="YES" text="3,123 subscribers" textAlignment="right" lineBreakMode="tailTruncation" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="7">
<rect key="frame" x="192" y="3" width="120" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="WhitneySSm-Medium" family="Whitney SSm" pointSize="10"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="textColor" systemColor="secondaryLabelColor"/>
<color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" id="14">
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="14">
<rect key="frame" x="6" y="5" width="16" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
@ -53,6 +54,15 @@
<outlet property="feedTitle" destination="5" id="12"/>
<outlet property="feedUrl" destination="6" id="13"/>
</connections>
<point key="canvasLocation" x="138" y="153"/>
</tableViewCell>
</objects>
<resources>
<systemColor name="linkColor">
<color red="0.0" green="0.47843137254901963" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
<systemColor name="secondaryLabelColor">
<color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
</resources>
</document>

6
clients/ios/Resources-iPhone/AddSiteViewController.xib
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
@ -89,7 +89,7 @@
</connections>
</textField>
<activityIndicatorView hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="61">
<rect key="frame" x="24" y="63" width="20" height="20"/>
<rect key="frame" x="26" y="63" width="20" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</activityIndicatorView>