summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Juick.xcodeproj/project.pbxproj4
-rw-r--r--Juick/AppDelegate.h3
-rw-r--r--Juick/AppDelegate.m2
-rw-r--r--Juick/Model/User.h9
-rw-r--r--Juick/Model/User.m14
-rw-r--r--Juick/ViewControllers/LoginViewController.m3
-rw-r--r--Juick/ViewControllers/MessagesViewController.m3
-rw-r--r--Juick/Views/MessageCell.m2
-rw-r--r--Podfile2
-rw-r--r--Podfile.lock8
10 files changed, 20 insertions, 30 deletions
diff --git a/Juick.xcodeproj/project.pbxproj b/Juick.xcodeproj/project.pbxproj
index 5ccbfef..a026387 100644
--- a/Juick.xcodeproj/project.pbxproj
+++ b/Juick.xcodeproj/project.pbxproj
@@ -467,12 +467,10 @@
"${SRCROOT}/Pods/Target Support Files/Pods-Juick/Pods-Juick-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
"${BUILT_PRODUCTS_DIR}/DateTools/DateTools.framework",
- "${BUILT_PRODUCTS_DIR}/FontAwesome+iOS/FontAwesome_iOS.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}/SIAlertView/SIAlertView.framework",
"${BUILT_PRODUCTS_DIR}/TTTAttributedLabel/TTTAttributedLabel.framework",
"${BUILT_PRODUCTS_DIR}/TagListView-ObjC/TagListView_ObjC.framework",
"${BUILT_PRODUCTS_DIR}/XLForm/XLForm.framework",
@@ -485,12 +483,10 @@
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DateTools.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FontAwesome_iOS.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}/SIAlertView.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",
diff --git a/Juick/AppDelegate.h b/Juick/AppDelegate.h
index 64cc01a..092fa20 100644
--- a/Juick/AppDelegate.h
+++ b/Juick/AppDelegate.h
@@ -6,8 +6,7 @@
// Copyright (c) 2013 com.juick. All rights reserved.
//
-#import <UIKit/UIKit.h>
-#import "User.h"
+@import UIKit;
@interface AppDelegate : UIResponder <UIApplicationDelegate, UNUserNotificationCenterDelegate>
diff --git a/Juick/AppDelegate.m b/Juick/AppDelegate.m
index 1989de2..049e42e 100644
--- a/Juick/AppDelegate.m
+++ b/Juick/AppDelegate.m
@@ -11,7 +11,9 @@
#import "LoginViewController.h"
#import "ColorScheme.h"
+#import "APIClient.h"
#import "Message.h"
+#import "User.h"
#import "DeviceRegistration.h"
#import "NewPostViewController.h"
diff --git a/Juick/Model/User.h b/Juick/Model/User.h
index ca84d50..1d4897e 100644
--- a/Juick/Model/User.h
+++ b/Juick/Model/User.h
@@ -6,11 +6,8 @@
// Copyright (c) 2014 com.juick. All rights reserved.
//
-#import <Foundation/Foundation.h>
-@import PDKeychainBindingsController;
-#import "SIAlertView.h"
-#import "APIClient.h"
-#import "YYModel.h"
+@import Foundation;
+@import YYModel;
@interface User : NSObject
@property (nonatomic, strong) NSString *uname;
@@ -22,6 +19,6 @@
+ (void) checkIsValid:(void(^)(BOOL))callback;
-+ (void) throwUnableToLogin;
++ (void) throwUnableToLogin:(UIViewController *)view;
@end
diff --git a/Juick/Model/User.m b/Juick/Model/User.m
index 3f860d7..38e4269 100644
--- a/Juick/Model/User.m
+++ b/Juick/Model/User.m
@@ -8,6 +8,8 @@
#import "User.h"
+@import PDKeychainBindingsController;
+#import "APIClient.h"
@implementation User
@@ -15,12 +17,12 @@
return [[PDKeychainBindings sharedKeychainBindings] stringForKey:@"com.juick.username"] != nil;
}
-+(void) throwUnableToLogin {
- SIAlertView *alert = [[SIAlertView alloc] initWithTitle:@"Error" andMessage:@"Unable to login, check username/password, or network connectivity"];
- [alert addButtonWithTitle:@"OK" type:SIAlertViewButtonTypeCancel handler:^(SIAlertView *alertView) {
- // <#code#>
- }];
- [alert show];
++(void) throwUnableToLogin:(UIViewController *)view {
+ UIAlertController *alert = [UIAlertController new];
+ [alert setTitle:@"Error"];
+ [alert setMessage:@"Unable to login, check username/password, or network connectivity"];
+ [alert addAction:[UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleCancel handler:nil]];
+ [view presentViewController:alert animated:YES completion:nil];
}
+(void) checkIsValid:(void (^)(BOOL))callback {
diff --git a/Juick/ViewControllers/LoginViewController.m b/Juick/ViewControllers/LoginViewController.m
index d3d1edc..640cd10 100644
--- a/Juick/ViewControllers/LoginViewController.m
+++ b/Juick/ViewControllers/LoginViewController.m
@@ -10,6 +10,7 @@
#import "User.h"
#import "ColorScheme.h"
#import "AppDelegate.h"
+#import "APIClient.h"
@implementation LoginViewController
@@ -70,7 +71,7 @@
[self.navigationController.view.layer addAnimation:transition forKey:kCATransition];
[self.navigationController popToRootViewControllerAnimated:NO];
} else {
- [User throwUnableToLogin];
+ [User throwUnableToLogin:self];
}
}];
diff --git a/Juick/ViewControllers/MessagesViewController.m b/Juick/ViewControllers/MessagesViewController.m
index e4d0e1c..b91f056 100644
--- a/Juick/ViewControllers/MessagesViewController.m
+++ b/Juick/ViewControllers/MessagesViewController.m
@@ -9,6 +9,7 @@
#import "MessagesViewController.h"
#import "MessageCell.h"
+#import "APIClient.h"
#import "Message.h"
#import "ColorScheme.h"
@@ -80,7 +81,7 @@
self.path = [APIClient feedUrl];
[self refreshData];
} else {
- [User throwUnableToLogin];
+ [User throwUnableToLogin:self];
}
}];
diff --git a/Juick/Views/MessageCell.m b/Juick/Views/MessageCell.m
index 77d54cd..236b4a3 100644
--- a/Juick/Views/MessageCell.m
+++ b/Juick/Views/MessageCell.m
@@ -31,7 +31,7 @@
}
- (void) configureWithMessage:(Message *)msg {
- [self.avatar setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"https://i.juick.com/a/%d.png", [msg.user.uid intValue]]]];
+ [self.avatar yy_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"https://i.juick.com/a/%d.png", [msg.user.uid intValue]]] options:YYWebImageOptionProgressiveBlur|YYWebImageOptionSetImageWithFadeAnimation];
if ([msg.attach length] > 0) {
CGFloat imageHeight = [msg.attachment.small.height floatValue] / [[UIScreen mainScreen] scale];
self.attachmentHeight.constant = imageHeight;
diff --git a/Podfile b/Podfile
index f6e662e..030b192 100644
--- a/Podfile
+++ b/Podfile
@@ -9,9 +9,7 @@ target "Juick" do
pod 'PDKeychainBindingsController'
pod 'YYModel'
pod 'YYWebImage'
- pod 'FontAwesome+iOS'
pod 'DateTools'
- pod 'SIAlertView'
pod 'XLForm'
pod 'PHFComposeBarView'
pod 'TagListView-ObjC'
diff --git a/Podfile.lock b/Podfile.lock
index ac16073..ea3b523 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -15,7 +15,6 @@ PODS:
- AFNetworking/UIKit (3.1.0):
- AFNetworking/NSURLSession
- DateTools (2.0.0)
- - FontAwesome+iOS (0.1.4)
- MWFeedParser (1.0.1):
- MWFeedParser/FeedParser (= 1.0.1)
- MWFeedParser/NSDate+InternetDateTime (= 1.0.1)
@@ -29,7 +28,6 @@ PODS:
- PHFComposeBarView (2.1.0):
- PHFDelegateChain (~> 1.0)
- PHFDelegateChain (1.0.1)
- - SIAlertView (1.3)
- TagListView-ObjC (0.1.1)
- TTTAttributedLabel (2.0.0)
- XLForm (4.0.0)
@@ -45,11 +43,9 @@ PODS:
DEPENDENCIES:
- AFNetworking
- DateTools
- - FontAwesome+iOS
- MWFeedParser
- PDKeychainBindingsController
- PHFComposeBarView
- - SIAlertView
- TagListView-ObjC
- TTTAttributedLabel
- XLForm
@@ -59,12 +55,10 @@ DEPENDENCIES:
SPEC CHECKSUMS:
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
DateTools: 933ac9c490f21f92127cf690ccd8c397e0126caf
- FontAwesome+iOS: 9070b682a9255ca0fdc34bcfb129ad0ba2b73b87
MWFeedParser: 2cf646014c1baf6ad1b08c480b40a08180079247
PDKeychainBindingsController: fa8cb3cf99f2ea9240d61066ed0549f34e2cec3c
PHFComposeBarView: 6382ab846e2f4d8634273c4a78d074bc5deed07f
PHFDelegateChain: 491f9cd8a3fb8761f390ff05f74a0e168d48d285
- SIAlertView: 20c794b55eaf44d888773ea51647cf8907723919
TagListView-ObjC: 432991e24c5177eb4fa7d721de7084f09f39a0b8
TTTAttributedLabel: 8cffe8e127e4e82ff3af1e5386d4cd0ad000b656
XLForm: 04110197c12187dd28a6c7295d3d8b95f4fdb4de
@@ -73,6 +67,6 @@ SPEC CHECKSUMS:
YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30
YYWebImage: 5f7f36aee2ae293f016d418c7d6ba05c4863e928
-PODFILE CHECKSUM: ee64e1198ecfa623cc7be9773c723981dce299b5
+PODFILE CHECKSUM: 6143f90404e3db465c0eaccbf38e1b3c08c43b59
COCOAPODS: 1.4.0.beta.2
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 07:28:45 +0000