summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2013-12-17 11:49:37 +0400
committerGravatar Vitaly Takmazov2013-12-17 11:49:37 +0400
commita4d2e426a36111a2da3683025ab129ef701d5a3f (patch)
tree6f9a4d1975bd321fc546f1ca4c0b312c2f95ef83
parentab41e0a3dad97f7c0960446bb7a7150b4dec862a (diff)
FontAwesome
-rw-r--r--Juick/Juick-Info.plist6
-rw-r--r--Juick/RevealPanelViewController.h1
-rw-r--r--Juick/RevealPanelViewController.m18
-rw-r--r--Podfile1
-rw-r--r--Podfile.lock5
5 files changed, 23 insertions, 8 deletions
diff --git a/Juick/Juick-Info.plist b/Juick/Juick-Info.plist
index 3776ab8..2f29b33 100644
--- a/Juick/Juick-Info.plist
+++ b/Juick/Juick-Info.plist
@@ -48,6 +48,12 @@
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
+ <key>UIAppFonts</key>
+ <array>
+ <string>FontAwesome.ttf</string>
+ </array>
+ <key>NSHumanReadableCopyright</key>
+ <string></string>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
</dict>
diff --git a/Juick/RevealPanelViewController.h b/Juick/RevealPanelViewController.h
index a8196fe..5a90b99 100644
--- a/Juick/RevealPanelViewController.h
+++ b/Juick/RevealPanelViewController.h
@@ -7,6 +7,7 @@
//
#import <UIKit/UIKit.h>
+#import <FAImageView.h>
@interface RevealPanelViewController : UITableViewController
diff --git a/Juick/RevealPanelViewController.m b/Juick/RevealPanelViewController.m
index ec575a0..ecac5df 100644
--- a/Juick/RevealPanelViewController.m
+++ b/Juick/RevealPanelViewController.m
@@ -59,21 +59,25 @@
UITableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifier];
NSInteger row = indexPath.row;
if (cell == nil) {
- cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellIdentifier];
+ cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue2 reuseIdentifier:cellIdentifier];
[cell setBackgroundColor:[ColorsAndButtons navbarBackground]];
+ cell.textLabel.font = [UIFont fontWithName:kFontAwesomeFamilyName size:20.f];
cell.textLabel.textColor = [ColorsAndButtons navbarFont];
+ cell.detailTextLabel.textColor = [ColorsAndButtons navbarFont];
}
if (row == 0) {
- cell.textLabel.text = @"My feed";
- [cell.imageView setImage:[ColorsAndButtons homeImage]];
+ cell.detailTextLabel.text = @"My feed";
+ cell.textLabel.text = [NSString fontAwesomeIconStringForEnum:FAIconHome];
} else if (row == 1) {
- cell.textLabel.text = @"Popular";
+ cell.detailTextLabel.text = @"Popular";
+ cell.textLabel.text = [NSString fontAwesomeIconStringForEnum:FAIconComments];
} else if (row == 2) {
- cell.textLabel.text = @"Discover";
- [cell.imageView setImage:[ColorsAndButtons discoverImage]];
+ cell.detailTextLabel.text = @"Discover";
+ cell.textLabel.text = [NSString fontAwesomeIconStringForEnum:FAIconSearch];
} else if (row == 3) {
- cell.textLabel.text = @"Images";
+ cell.detailTextLabel.text = @"Images";
+ cell.textLabel.text = [NSString fontAwesomeIconStringForEnum:FAIconPicture];
}
return cell;
}
diff --git a/Podfile b/Podfile
index 41427a5..d364274 100644
--- a/Podfile
+++ b/Podfile
@@ -9,6 +9,7 @@ pod 'SWRevealViewController'
pod 'PDKeychainBindingsController'
pod 'RestKit'
pod 'JMImageCache'
+pod 'FontAwesome+iOS'
end
target "JuickTests" do
diff --git a/Podfile.lock b/Podfile.lock
index 286acea..09f5a70 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -1,5 +1,6 @@
PODS:
- AFNetworking (1.3.3)
+ - FontAwesome+iOS (0.1.1)
- ISO8601DateFormatterValueTransformer (0.5.0):
- RKValueTransformers (~> 1.0.0)
- JMImageCache (0.4.0)
@@ -39,6 +40,7 @@ PODS:
- TTTAttributedLabel (1.7.1)
DEPENDENCIES:
+ - FontAwesome+iOS
- JMImageCache
- Masonry
- MWFeedParser
@@ -48,7 +50,8 @@ DEPENDENCIES:
- TTTAttributedLabel
SPEC CHECKSUMS:
- AFNetworking: 0700ec7a58c36ad217173e167f6e4df7270df66b
+ AFNetworking: 61fdd49e2ffe6380378df37b3b6e70630bb9dd66
+ FontAwesome+iOS: 243c5309e90d5788909b0f859f75ecff4a20f88f
ISO8601DateFormatterValueTransformer: d0af1f50a9df42db72d7418db31938b8473e0af8
JMImageCache: 4d764ca5819ce5b0b3bb1efb85c29977768c54bd
Masonry: 73df2f346bd1a0044dc9de969aa45aea2f8a9bd8