mirror of
https://github.com/viq/NewsBlur.git
synced 2025-09-18 21:43:31 +00:00
Fixing a crash and fixing notification button.
This commit is contained in:
Samuel Clay
parent
b1d9cc9e92
commit
58b092c46e
4 changed files with 33 additions and 21 deletions
|
|
@ -1804,6 +1804,7 @@
|
|||
for (StoryDetailViewController *page in @[storyPageControl.previousPage,
|
||||
storyPageControl.currentPage,
|
||||
storyPageControl.nextPage]) {
|
||||
if (!page) continue;
|
||||
if ([[page.activeStory objectForKey:@"story_hash"]
|
||||
isEqualToString:[story objectForKey:@"story_hash"]]) {
|
||||
page.isRecentlyUnread = YES;
|
||||
|
|
|
|||
|
|
@ -205,7 +205,7 @@ static UIFont *userLabelFont;
|
|||
appDelegate.inFeedDetail = NO;
|
||||
// reload the data and then set the highlight again
|
||||
// [self.feedTitlesTable reloadData];
|
||||
[self refreshHeaderCounts];
|
||||
// [self refreshHeaderCounts];
|
||||
[self redrawUnreadCounts];
|
||||
// [self.feedTitlesTable selectRowAtIndexPath:self.currentRowAtIndexPath
|
||||
// animated:NO
|
||||
|
|
@ -224,7 +224,9 @@ static UIFont *userLabelFont;
|
|||
[super viewDidAppear:animated];
|
||||
[self performSelector:@selector(fadeSelectedCell) withObject:self afterDelay:0.2];
|
||||
// self.navigationController.navigationBar.backItem.title = @"All Sites";
|
||||
|
||||
[self layoutHeaderCounts:nil];
|
||||
[self refreshHeaderCounts];
|
||||
|
||||
self.interactiveFeedDetailTransition = NO;
|
||||
}
|
||||
|
||||
|
|
@ -1982,7 +1984,8 @@ heightForHeaderInSection:(NSInteger)section {
|
|||
greenIcon.frame.origin.y - 3, 100, 16);
|
||||
[positiveCount sizeToFit];
|
||||
|
||||
[userInfoBarButton.customView sizeToFit];
|
||||
NSLog(@"User info size pre: %@", NSStringFromCGRect(userInfoBarButton.customView.frame));
|
||||
NSLog(@"User info size post: %@", NSStringFromCGRect(userInfoBarButton.customView.frame));
|
||||
}
|
||||
|
||||
- (void)showRefreshNotifier {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
#import <SystemConfiguration/SystemConfiguration.h>
|
||||
#import <MobileCoreServices/MobileCoreServices.h>
|
||||
|
||||
//#define DEBUG 1
|
||||
#define DEBUG 1
|
||||
//#define PROD_DEBUG 1
|
||||
|
||||
#ifdef DEBUG
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6751" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="15A282b" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6736"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AddSiteViewController">
|
||||
|
|
@ -32,6 +32,7 @@
|
|||
<label hidden="YES" opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" text="Adding..." lineBreakMode="tailTruncation" minimumFontSize="10" id="9">
|
||||
<rect key="frame" x="111" y="294" width="189" height="52"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<animations/>
|
||||
<fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="17"/>
|
||||
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -41,6 +42,7 @@
|
|||
<label hidden="YES" opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" text="Error" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="4" minimumFontSize="17" id="8">
|
||||
<rect key="frame" x="20" y="265" width="280" height="110"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
|
||||
<animations/>
|
||||
<fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="17"/>
|
||||
<color key="textColor" red="0.92408370969999998" green="0.35912829639999999" blue="0.23267127570000001" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -50,10 +52,12 @@
|
|||
<activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" hidesWhenStopped="YES" style="gray" id="10">
|
||||
<rect key="frame" x="87" y="310" width="20" height="20"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<animations/>
|
||||
</activityIndicatorView>
|
||||
<navigationBar contentMode="scaleToFill" translucent="NO" id="24">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
|
||||
<animations/>
|
||||
<items>
|
||||
<navigationItem id="25">
|
||||
<barButtonItem key="leftBarButtonItem" title="Cancel" width="50" id="26">
|
||||
|
|
@ -72,19 +76,12 @@
|
|||
<outlet property="delegate" destination="-1" id="45"/>
|
||||
</connections>
|
||||
</navigationBar>
|
||||
<pickerView contentMode="scaleToFill" id="30">
|
||||
<rect key="frame" x="0.0" y="500" width="320" height="216"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
|
||||
<connections>
|
||||
<outlet property="dataSource" destination="-1" id="33"/>
|
||||
<outlet property="delegate" destination="-1" id="34"/>
|
||||
</connections>
|
||||
</pickerView>
|
||||
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Choose a folder" minimumFontSize="17" id="36">
|
||||
<rect key="frame" x="20" y="96" width="250" height="31"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
|
||||
<animations/>
|
||||
<accessibility key="accessibilityConfiguration">
|
||||
<accessibilityTraits key="traits" none="YES" button="YES" image="YES"/>
|
||||
<accessibilityTraits key="traits" button="YES" image="YES"/>
|
||||
</accessibility>
|
||||
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="12"/>
|
||||
|
|
@ -96,6 +93,7 @@
|
|||
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Search by site title or address..." minimumFontSize="18" clearButtonMode="whileEditing" id="47">
|
||||
<rect key="frame" x="20" y="57" width="280" height="31"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
|
||||
<animations/>
|
||||
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="12"/>
|
||||
<textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="emailAddress" returnKeyType="search" enablesReturnKeyAutomatically="YES"/>
|
||||
|
|
@ -108,6 +106,7 @@
|
|||
<textField opaque="NO" clipsSubviews="YES" alpha="0.0" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="New folder title" minimumFontSize="18" clearButtonMode="whileEditing" id="48">
|
||||
<rect key="frame" x="20" y="135" width="280" height="31"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
|
||||
<animations/>
|
||||
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="12"/>
|
||||
<textInputTraits key="textInputTraits" autocapitalizationType="words" autocorrectionType="no" keyboardType="alphabet" returnKeyType="done" enablesReturnKeyAutomatically="YES"/>
|
||||
|
|
@ -118,6 +117,7 @@
|
|||
<activityIndicatorView hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" hidesWhenStopped="YES" style="gray" id="61">
|
||||
<rect key="frame" x="24" y="63" width="20" height="20"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<animations/>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</activityIndicatorView>
|
||||
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" alpha="0.0" contentMode="scaleToFill" id="63">
|
||||
|
|
@ -127,7 +127,8 @@
|
|||
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="49">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="345"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<color key="backgroundColor" cocoaTouchSystemColor="lightTextColor"/>
|
||||
<animations/>
|
||||
<color key="backgroundColor" red="1" green="1" blue="1" alpha="0.59999999999999998" colorSpace="calibratedRGB"/>
|
||||
<inset key="separatorInset" minX="6" minY="0.0" maxX="0.0" maxY="0.0"/>
|
||||
<connections>
|
||||
<outlet property="dataSource" destination="-1" id="52"/>
|
||||
|
|
@ -135,11 +136,13 @@
|
|||
</connections>
|
||||
</tableView>
|
||||
</subviews>
|
||||
<animations/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
</scrollView>
|
||||
<button opaque="NO" contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="67">
|
||||
<rect key="frame" x="270" y="96" width="50" height="32"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
|
||||
<animations/>
|
||||
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
|
||||
<inset key="imageEdgeInsets" minX="8" minY="8" maxX="26" maxY="8"/>
|
||||
<state key="normal" image="g_icn_folder_add.png">
|
||||
|
|
@ -152,7 +155,17 @@
|
|||
<action selector="toggleAddFolder:" destination="-1" eventType="touchUpInside" id="68"/>
|
||||
</connections>
|
||||
</button>
|
||||
<pickerView contentMode="scaleToFill" id="30">
|
||||
<rect key="frame" x="0.0" y="500" width="320" height="216"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
|
||||
<animations/>
|
||||
<connections>
|
||||
<outlet property="dataSource" destination="-1" id="33"/>
|
||||
<outlet property="delegate" destination="-1" id="34"/>
|
||||
</connections>
|
||||
</pickerView>
|
||||
</subviews>
|
||||
<animations/>
|
||||
<color key="backgroundColor" white="0.94625342150000002" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
</view>
|
||||
|
|
@ -160,9 +173,4 @@
|
|||
<resources>
|
||||
<image name="g_icn_folder_add.png" width="16" height="16"/>
|
||||
</resources>
|
||||
<simulatedMetricsContainer key="defaultSimulatedMetrics">
|
||||
<simulatedStatusBarMetrics key="statusBar"/>
|
||||
<simulatedOrientationMetrics key="orientation"/>
|
||||
<simulatedScreenMetrics key="destination" type="retina4"/>
|
||||
</simulatedMetricsContainer>
|
||||
</document>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue