Skip to content

Added 'foregroundColor' for setting generic text color, and replacing NSAttributedString default color. #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dzenbot wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Added 'foregroundColor' for setting generic text color, and replacing NSAttributedString default color. #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9e7e800
Added optional bool for avoiding default black color rendering of att…
Dec 4, 2013
c33c208
Update the git submodules to public urls
Dec 4, 2013
87a34a3
Updated the sample project automatic settings
Dec 4, 2013
7619ba2
Removed 'allowDefaultColor' attribute. Used 'foregroundColor' instead…
Dec 4, 2013
f6eb300
Added multiple MARKDOWNHREF links support. Fixes #14.
Dec 6, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Xcode
.DS_Store
build/*
*.pbxuser
!default.pbxuser
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "fmemopen"]
path = fmemopen
url = git@github.com:jverkoey/fmemopen.git
url = https://github.com/jverkoey/fmemopen.git
[submodule "nimbus"]
path = nimbus
url = git://github.com/jverkoey/nimbus.git
url = https://github.com/jverkoey/nimbus.git
444 changes: 222 additions & 222 deletions MarkdownAttributedString.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion fmemopen
Open in desktop
Submodule fmemopen updated from 1d696d to 44f91d
2 changes: 1 addition & 1 deletion nimbus
Open in desktop
Submodule nimbus updated 25 files
+1 −0 docs/header.html
+2 −0 examples/catalog/NimbusCatalog.xcodeproj/project.pbxproj
+2 −0 src/attributedlabel/src/NIAttributedLabel.h
+91 −60 src/attributedlabel/src/NIAttributedLabel.m
+3 −0 src/attributedlabel/src/NimbusAttributedLabel.h
+11 −0 src/collections/src/NICollectionViewModel.h
+19 −0 src/collections/src/NICollectionViewModel.m
+9 −1 src/core/src/NIDebuggingTools.h
+5 −0 src/core/src/NISDKAvailability.h
+1 −1 src/core/src/NSString+NimbusCore.m
+1 −0 src/css/src/NIUserInterfaceString.h
+1 −1 src/interapp/src/NIInterapp.m
+24 −2 src/models/src/NICellBackgrounds.h
+79 −44 src/models/src/NICellBackgrounds.m
+1 −0 src/models/src/NICellCatalog.h
+4 −0 src/models/src/NICellCatalog.m
+25 −0 src/models/src/NITableViewActions.h
+37 −28 src/models/src/NITableViewActions.m
+10 −0 src/models/src/NITableViewModel.h
+20 −0 src/models/src/NITableViewModel.m
+24 −0 src/models/unittests/NITableViewModelTests.m
+3 −0 src/overview/src/NIOverviewGraphView.m
+3 −0 src/overview/src/NIOverviewMemoryCacheController.m
+12 −0 src/pagingscrollview/src/NIPagingScrollView.h
+13 −0 src/pagingscrollview/src/NIPagingScrollView.m
15 changes: 8 additions & 7 deletions src/NSAttributedStringMarkdownParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
#import <UIKit/UIKit.h>

typedef enum {
NSAttributedStringMarkdownParserHeader1,
NSAttributedStringMarkdownParserHeader2,
NSAttributedStringMarkdownParserHeader3,
NSAttributedStringMarkdownParserHeader4,
NSAttributedStringMarkdownParserHeader5,
NSAttributedStringMarkdownParserHeader6,

NSAttributedStringMarkdownParserHeader1,
NSAttributedStringMarkdownParserHeader2,
NSAttributedStringMarkdownParserHeader3,
NSAttributedStringMarkdownParserHeader4,
NSAttributedStringMarkdownParserHeader5,
NSAttributedStringMarkdownParserHeader6,
} NSAttributedStringMarkdownParserHeader;

@protocol NSAttributedStringMarkdownStylesheet;
Expand All @@ -44,6 +44,7 @@ typedef enum {
@property (nonatomic, copy) NSString* boldFontName; // Default: boldSystemFont
@property (nonatomic, copy) NSString* italicFontName; // Default: Helvetica-Oblique
@property (nonatomic, copy) NSString* boldItalicFontName; // Default: Helvetica-BoldOblique
@property (nonatomic, strong) UIColor* foregroundColor; // Default: blackColor

- (void)setFont:(UIFont *)font forHeader:(NSAttributedStringMarkdownParserHeader)header;
- (UIFont *)fontForHeader:(NSAttributedStringMarkdownParserHeader)header;
Expand Down
Loading