summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Juick.xcodeproj/project.pbxproj6
-rw-r--r--Juick/AppDelegate.m3
-rw-r--r--Juick/Main.storyboard4
-rw-r--r--Juick/Supporting Files/Juick-Info.plist2
-rw-r--r--Juick/ViewControllers/DiscoverViewController.m6
-rw-r--r--Juick/ViewControllers/ThreadViewController.m6
-rw-r--r--Juick/Views/MessageCell.xib18
-rw-r--r--Podfile2
-rw-r--r--Podfile.lock11
9 files changed, 27 insertions, 31 deletions
diff --git a/Juick.xcodeproj/project.pbxproj b/Juick.xcodeproj/project.pbxproj
index 2708a64..a1cc004 100644
--- a/Juick.xcodeproj/project.pbxproj
+++ b/Juick.xcodeproj/project.pbxproj
@@ -487,11 +487,8 @@
"${BUILT_PRODUCTS_DIR}/DateTools/DateTools.framework",
"${BUILT_PRODUCTS_DIR}/MWFeedParser/MWFeedParser.framework",
"${BUILT_PRODUCTS_DIR}/PDKeychainBindingsController/PDKeychainBindingsController.framework",
- "${BUILT_PRODUCTS_DIR}/PHFComposeBarView/PHFComposeBarView.framework",
- "${BUILT_PRODUCTS_DIR}/PHFDelegateChain/PHFDelegateChain.framework",
"${BUILT_PRODUCTS_DIR}/TTTAttributedLabel/TTTAttributedLabel.framework",
"${BUILT_PRODUCTS_DIR}/TagListView-ObjC/TagListView_ObjC.framework",
- "${BUILT_PRODUCTS_DIR}/XLForm/XLForm.framework",
"${BUILT_PRODUCTS_DIR}/YYCache/YYCache.framework",
"${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework",
"${BUILT_PRODUCTS_DIR}/YYModel/YYModel.framework",
@@ -503,11 +500,8 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DateTools.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MWFeedParser.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PDKeychainBindingsController.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PHFComposeBarView.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PHFDelegateChain.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TTTAttributedLabel.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TagListView_ObjC.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/XLForm.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCache.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYModel.framework",
diff --git a/Juick/AppDelegate.m b/Juick/AppDelegate.m
index 26b10a8..e4056e6 100644
--- a/Juick/AppDelegate.m
+++ b/Juick/AppDelegate.m
@@ -26,8 +26,9 @@
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
{
[[UINavigationBar appearance] setTintColor:[ColorScheme linkColor]];
- [[UINavigationBar appearance] setBarTintColor:[ColorScheme headerBackground]];
+ //[[UINavigationBar appearance] setBarTintColor:[ColorScheme headerBackground]];
[[UINavigationBar appearance] setTitleTextAttributes:@{NSForegroundColorAttributeName: [ColorScheme linkColor]}];
+ [[UINavigationBar appearance] setLargeTitleTextAttributes:@{NSForegroundColorAttributeName: [ColorScheme linkColor]}];
[[UIToolbar appearance] setTintColor:[ColorScheme linkColor]];
[UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleDefault;
diff --git a/Juick/Main.storyboard b/Juick/Main.storyboard
index 71391a9..7936373 100644
--- a/Juick/Main.storyboard
+++ b/Juick/Main.storyboard
@@ -102,8 +102,8 @@
</connections>
</barButtonItem>
</toolbarItems>
- <navigationItem key="navigationItem" title="Discover" id="M2f-nV-K0C">
- <barButtonItem key="leftBarButtonItem" image="profile_icon" id="Sd1-hN-fdS">
+ <navigationItem key="navigationItem" id="M2f-nV-K0C">
+ <barButtonItem key="rightBarButtonItem" image="profile_icon" style="plain" id="Sd1-hN-fdS">
<connections>
<segue destination="4g9-hM-bzq" kind="push" id="6ha-6h-L0E"/>
</connections>
diff --git a/Juick/Supporting Files/Juick-Info.plist b/Juick/Supporting Files/Juick-Info.plist
index b3cfda5..2eb1c21 100644
--- a/Juick/Supporting Files/Juick-Info.plist
+++ b/Juick/Supporting Files/Juick-Info.plist
@@ -21,7 +21,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.0.32</string>
+ <string>1.0.33</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationCategoryType</key>
diff --git a/Juick/ViewControllers/DiscoverViewController.m b/Juick/ViewControllers/DiscoverViewController.m
index 4a36cfe..9d7c43b 100644
--- a/Juick/ViewControllers/DiscoverViewController.m
+++ b/Juick/ViewControllers/DiscoverViewController.m
@@ -22,6 +22,12 @@ AppDelegate *appDelegate;
-(void) viewDidLoad {
[super viewDidLoad];
+ [self.navigationController.navigationBar setPrefersLargeTitles:YES];
+ if ([self.path isEqualToString:[APIClient feedUrl]]) {
+ [self setTitle:@"My feed"];
+ } else {
+ [self setTitle:@"Discover"];
+ }
appDelegate = (AppDelegate *) [UIApplication sharedApplication].delegate;
if (appDelegate.pushedThread != nil) {
[self performSegueWithIdentifier:@"threadViewSegue" sender:self];
diff --git a/Juick/ViewControllers/ThreadViewController.m b/Juick/ViewControllers/ThreadViewController.m
index 8cb2cb5..3b6854c 100644
--- a/Juick/ViewControllers/ThreadViewController.m
+++ b/Juick/ViewControllers/ThreadViewController.m
@@ -16,6 +16,12 @@
@implementation ThreadViewController
+
+-(void) viewDidLoad {
+ [super viewDidLoad];
+ [self setTitle:@"Thread"];
+}
+
-(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
NSString * cellIdentifier = @"messageCell";
MessageCell *cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifier forIndexPath:indexPath];
diff --git a/Juick/Views/MessageCell.xib b/Juick/Views/MessageCell.xib
index 2216ef4..e54c8f9 100644
--- a/Juick/Views/MessageCell.xib
+++ b/Juick/Views/MessageCell.xib
@@ -20,10 +20,10 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="12" translatesAutoresizingMaskIntoConstraints="NO" id="Azj-pa-GEC">
- <rect key="frame" x="6" y="6" width="562" height="425.5"/>
+ <rect key="frame" x="6" y="6" width="574" height="425.5"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="12" translatesAutoresizingMaskIntoConstraints="NO" id="7FT-kJ-84d">
- <rect key="frame" x="0.0" y="0.0" width="562" height="48"/>
+ <rect key="frame" x="0.0" y="0.0" width="574" height="48"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="CZk-Q8-JqS">
<rect key="frame" x="0.0" y="0.0" width="48" height="48"/>
@@ -33,16 +33,16 @@
</constraints>
</imageView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="12" translatesAutoresizingMaskIntoConstraints="NO" id="o3h-ci-LWF">
- <rect key="frame" x="60" y="0.0" width="502" height="48"/>
+ <rect key="frame" x="60" y="0.0" width="574" height="48"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CHd-h0-hPk">
- <rect key="frame" x="0.0" y="0.0" width="502" height="20"/>
+ <rect key="frame" x="0.0" y="0.0" width="574" height="20"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AVu-qV-q84">
- <rect key="frame" x="0.0" y="32" width="502" height="16"/>
+ <rect key="frame" x="0.0" y="32" width="574" height="16"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@@ -52,7 +52,7 @@
</subviews>
</stackView>
<view contentMode="scaleToFill" verticalCompressionResistancePriority="749" translatesAutoresizingMaskIntoConstraints="NO" id="N08-my-2Lr" customClass="TagListView">
- <rect key="frame" x="0.0" y="60" width="562" height="36.5"/>
+ <rect key="frame" x="0.0" y="60" width="574" height="37"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
@@ -79,20 +79,20 @@
</userDefinedRuntimeAttributes>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="752" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zZm-hh-bDO" customClass="TTTAttributedLabel">
- <rect key="frame" x="0.0" y="108.5" width="562" height="21"/>
+ <rect key="frame" x="0.0" y="109" width="574" height="20.5"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Uha-ow-kFJ">
- <rect key="frame" x="0.0" y="141.5" width="562" height="256"/>
+ <rect key="frame" x="0.0" y="141.5" width="574" height="256"/>
<constraints>
<constraint firstAttribute="height" priority="999" constant="256" identifier="attachHeight" id="Cuq-dQ-VYU"/>
<constraint firstAttribute="width" priority="999" constant="256" id="oJg-1R-jp3"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aJE-mZ-MCS">
- <rect key="frame" x="0.0" y="409.5" width="562" height="16"/>
+ <rect key="frame" x="0.0" y="409.5" width="574" height="16"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
diff --git a/Podfile b/Podfile
index bd9cbd4..b3c1309 100644
--- a/Podfile
+++ b/Podfile
@@ -10,8 +10,6 @@ target "Juick" do
pod 'YYModel'
pod 'YYWebImage'
pod 'DateTools'
- pod 'XLForm'
- pod 'PHFComposeBarView'
pod 'TagListView-ObjC'
end
diff --git a/Podfile.lock b/Podfile.lock
index 78f1121..9329da8 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -25,12 +25,8 @@ PODS:
- MWFeedParser/NSDate+InternetDateTime (1.0.1)
- MWFeedParser/NSString+HTML (1.0.1)
- PDKeychainBindingsController (0.0.1)
- - PHFComposeBarView (2.1.0):
- - PHFDelegateChain (~> 1.0)
- - PHFDelegateChain (1.0.1)
- TagListView-ObjC (0.1.1)
- TTTAttributedLabel (2.0.0)
- - XLForm (4.0.0)
- YYCache (1.0.4)
- YYImage (1.0.4):
- YYImage/Core (= 1.0.4)
@@ -45,10 +41,8 @@ DEPENDENCIES:
- DateTools
- MWFeedParser
- PDKeychainBindingsController
- - PHFComposeBarView
- TagListView-ObjC
- TTTAttributedLabel
- - XLForm
- YYModel
- YYWebImage
@@ -57,16 +51,13 @@ SPEC CHECKSUMS:
DateTools: 933ac9c490f21f92127cf690ccd8c397e0126caf
MWFeedParser: 2cf646014c1baf6ad1b08c480b40a08180079247
PDKeychainBindingsController: fa8cb3cf99f2ea9240d61066ed0549f34e2cec3c
- PHFComposeBarView: 6382ab846e2f4d8634273c4a78d074bc5deed07f
- PHFDelegateChain: 491f9cd8a3fb8761f390ff05f74a0e168d48d285
TagListView-ObjC: 432991e24c5177eb4fa7d721de7084f09f39a0b8
TTTAttributedLabel: 8cffe8e127e4e82ff3af1e5386d4cd0ad000b656
- XLForm: 04110197c12187dd28a6c7295d3d8b95f4fdb4de
YYCache: 8105b6638f5e849296c71f331ff83891a4942952
YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30
YYWebImage: 5f7f36aee2ae293f016d418c7d6ba05c4863e928
-PODFILE CHECKSUM: 27971316ca68c20145743643eaa5f96ed95b9c4f
+PODFILE CHECKSUM: b2b57aadac65d2dcd8ce5561ec85dab3d8479d0b
COCOAPODS: 1.4.0.beta.2
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 07:23:11 +0000