Skip to content

Commit

Permalink
Simplified toolbar.
Browse files Browse the repository at this point in the history
UIButton as custom view inside UIBarButtonItem are gone. You can still access UIBarButtonItem directly.
  • Loading branch information
Nicolò Tosi committed Oct 7, 2015
1 parent 6030604 commit 11d6e91
Show file tree
Hide file tree
Showing 224 changed files with 305 additions and 775 deletions.
Binary file modified Bundle/FPKKioskBundle.bundle/Info.plist
Binary file not shown.
Binary file modified Bundle/FPKKioskBundle.bundle/Kiosk_ipad.nib
Binary file not shown.
Binary file modified Bundle/FPKKioskBundle.bundle/Kiosk_phone.nib
Binary file not shown.
Binary file modified Bundle/FPKKioskBundle.bundle/Kiosk_phone5.nib
Binary file not shown.
Binary file modified Bundle/FPKKioskBundle.bundle/backThumb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bundle/FPKKioskBundle.bundle/backThumb@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bundle/FPKKioskBundle.bundle/backThumb_iphone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bundle/FPKKioskBundle.bundle/backThumb_iphone@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bundle/FPKKioskBundle.bundle/border.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bundle/FPKKioskBundle.bundle/download.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bundle/FPKKioskBundle.bundle/download@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bundle/FPKKioskBundle.bundle/header.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bundle/FPKKioskBundle.bundle/header@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bundle/FPKKioskBundle.bundle/header_iphone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bundle/FPKKioskBundle.bundle/header_iphone@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bundle/FPKKioskBundle.bundle/pause.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bundle/FPKKioskBundle.bundle/pause@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bundle/FPKKioskBundle.bundle/remove.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bundle/FPKKioskBundle.bundle/remove@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bundle/FPKKioskBundle.bundle/resume.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bundle/FPKKioskBundle.bundle/resume@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bundle/FPKKioskBundle.bundle/title.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bundle/FPKKioskBundle.bundle/version.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bundle/FPKKioskBundle.bundle/view.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bundle/FPKKioskBundle.bundle/view@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bundle/FPKReaderBundle.bundle/Assets.car
Binary file not shown.
Binary file modified Bundle/FPKReaderBundle.bundle/AudioViewController.nib
Binary file not shown.
Binary file modified Bundle/FPKReaderBundle.bundle/BookmarkView.nib
Binary file not shown.
Binary file modified Bundle/FPKReaderBundle.bundle/Info.plist
Binary file not shown.
Binary file modified Bundle/FPKReaderBundle.bundle/OutlineView.nib
Binary file not shown.
Binary file modified Bundle/FPKReaderBundle.bundle/SearchView2_pad.nib
Binary file not shown.
Binary file modified Bundle/FPKReaderBundle.bundle/SearchView2_phone.nib
Binary file not shown.
Binary file modified Bundle/FPKReaderBundle.bundle/TextDisplayView.nib
Binary file not shown.
Binary file modified Bundle/FPKReaderBundle.bundle/WebBrowser.nib
Binary file not shown.
Binary file modified Bundle/FPKReaderBundle.bundle/X@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bundle/FPKReaderBundle.bundle/X@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bundle/FPKReaderBundle.bundle/bookmark_add.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bundle/FPKReaderBundle.bundle/bookmark_add@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Bundle/FPKReaderBundle.bundle/bookmark_add@3x.png
Binary file modified Bundle/FPKReaderBundle.bundle/changeModeDouble.png
Binary file modified Bundle/FPKReaderBundle.bundle/changeModeDouble@2x.png
Binary file modified Bundle/FPKReaderBundle.bundle/changeModeOverflow.png
Binary file modified Bundle/FPKReaderBundle.bundle/changeModeOverflow@2x.png
Binary file modified Bundle/FPKReaderBundle.bundle/changeModeSingle.png
Binary file modified Bundle/FPKReaderBundle.bundle/changeModeSingle@2x.png
Binary file modified Bundle/FPKReaderBundle.bundle/close@2x.png
Binary file modified Bundle/FPKReaderBundle.bundle/close@3x.png
Binary file modified Bundle/FPKReaderBundle.bundle/close_player@2x.png
Binary file modified Bundle/FPKReaderBundle.bundle/close_player@3x.png
Binary file modified Bundle/FPKReaderBundle.bundle/direction_l2r.png
Binary file modified Bundle/FPKReaderBundle.bundle/direction_l2r@2x.png
Binary file modified Bundle/FPKReaderBundle.bundle/direction_r2l.png
Binary file modified Bundle/FPKReaderBundle.bundle/direction_r2l@2x.png
Binary file modified Bundle/FPKReaderBundle.bundle/img_outline_triangledown.png
Binary file modified Bundle/FPKReaderBundle.bundle/img_outline_triangledown@2x.png
Binary file modified Bundle/FPKReaderBundle.bundle/img_outline_triangledown@3x.png
Binary file modified Bundle/FPKReaderBundle.bundle/img_outline_triangleright@2x.png
Binary file modified Bundle/FPKReaderBundle.bundle/img_outline_triangleright@3x.png
Binary file modified Bundle/FPKReaderBundle.bundle/indice.png
Binary file modified Bundle/FPKReaderBundle.bundle/next@2x.png
Binary file modified Bundle/FPKReaderBundle.bundle/next@3x.png
Binary file modified Bundle/FPKReaderBundle.bundle/pagelead.png
Binary file modified Bundle/FPKReaderBundle.bundle/pagelead@2x.png
Binary file modified Bundle/FPKReaderBundle.bundle/play_player.png
Binary file modified Bundle/FPKReaderBundle.bundle/play_player@2x.png
Binary file modified Bundle/FPKReaderBundle.bundle/play_player@3x.png
Binary file modified Bundle/FPKReaderBundle.bundle/prew.png
Binary file modified Bundle/FPKReaderBundle.bundle/prew@2x.png
Binary file modified Bundle/FPKReaderBundle.bundle/prew@3x.png
Binary file modified Bundle/FPKReaderBundle.bundle/reload@2x.png
Binary file modified Bundle/FPKReaderBundle.bundle/reload@3x.png
Binary file modified Bundle/FPKReaderBundle.bundle/search.png
Binary file modified Bundle/FPKReaderBundle.bundle/search@2x.png
Binary file modified Bundle/FPKReaderBundle.bundle/search@3x.png
Binary file modified Bundle/FPKReaderBundle.bundle/text.png
Binary file modified Bundle/FPKReaderBundle.bundle/text@2x.png
Binary file modified Bundle/FPKReaderBundle.bundle/zoomLock.png
Binary file modified Bundle/FPKReaderBundle.bundle/zoomLock@2x.png
Binary file modified Bundle/FPKReaderBundle.bundle/zoomUnlock.png
Binary file modified Bundle/FPKReaderBundle.bundle/zoomUnlock@2x.png
5 changes: 0 additions & 5 deletions Classes/Reader/ReaderViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@
*/
@property (nonatomic, copy) void (^dismissBlock) ();

@property (nonatomic,retain) UIButton *changeModeButton;
@property (nonatomic,retain) UIButton *zoomLockButton;
@property (nonatomic,retain) UIButton *changeDirectionButton;
@property (nonatomic,retain) UIButton *changeLeadButton;

@property (nonatomic,retain) UIImage * imgModeSingle;
@property (nonatomic,retain) UIImage * imgModeDouble;
@property (nonatomic,retain) UIImage * imgZoomLock;
Expand Down
286 changes: 63 additions & 223 deletions Classes/Reader/ReaderViewController.m

Large diffs are not rendered by default.

8 changes: 0 additions & 8 deletions FPKCore/Stuff.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,9 @@ free((x)),(x)=NULL; \
#define MF_BUNDLED_BUNDLE(x) [NSBundle bundleWithPath:[[NSBundle mainBundle]pathForResource:(x) ofType:@"bundle"]]
#define MF_BUNDLED_RESOURCE(x,k,z) [(MF_BUNDLED_BUNDLE(x))pathForResource:(k) ofType:(z)]

#ifndef FPK_USE_XCASSETS
#define FPK_USE_XCASSETS 1
#endif
#define FPK_READER_BUNDLE @"FPKReaderBundle"
#define FPK_BUNDLED_IMAGE_FORMAT @"png"

#if FPK_USE_XCASSETS
#define FPK_BUNDLED_IMAGE(img_name) [UIImage imageNamed:(img_name)]
#else
#define FPK_BUNDLED_IMAGE(img_name) [UIImage imageWithContentsOfFile:MF_BUNDLED_RESOURCE(FPK_READER_BUNDLE,(img_name),FPK_BUNDLED_IMAGE_FORMAT)]
#endif

#define PRINT_TRANSFORM(c,t) NSLog(@"%@ - [%.3f %.3f %.3f %.3f %.3f %.3f]",(c),(t).a,(t).b,(t).c,(t).d,(t).tx,(t).ty)
#define PRINT_RECT(c,r) NSLog(@"%@ - (%.3f, %.3f)[%.3f x %.3f]",(c),(r).origin.x,(r).origin.y,(r).size.width,(r).size.height)
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@
*/
@property (nonatomic, copy) void (^dismissBlock) ();

@property (nonatomic,retain) UIButton *changeModeButton;
@property (nonatomic,retain) UIButton *zoomLockButton;
@property (nonatomic,retain) UIButton *changeDirectionButton;
@property (nonatomic,retain) UIButton *changeLeadButton;

@property (nonatomic,retain) UIImage * imgModeSingle;
@property (nonatomic,retain) UIImage * imgModeDouble;
@property (nonatomic,retain) UIImage * imgZoomLock;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,9 @@ free((x)),(x)=NULL; \
#define MF_BUNDLED_BUNDLE(x) [NSBundle bundleWithPath:[[NSBundle mainBundle]pathForResource:(x) ofType:@"bundle"]]
#define MF_BUNDLED_RESOURCE(x,k,z) [(MF_BUNDLED_BUNDLE(x))pathForResource:(k) ofType:(z)]

#ifndef FPK_USE_XCASSETS
#define FPK_USE_XCASSETS 1
#endif
#define FPK_READER_BUNDLE @"FPKReaderBundle"
#define FPK_BUNDLED_IMAGE_FORMAT @"png"

#if FPK_USE_XCASSETS
#define FPK_BUNDLED_IMAGE(img_name) [UIImage imageNamed:(img_name)]
#else
#define FPK_BUNDLED_IMAGE(img_name) [UIImage imageWithContentsOfFile:MF_BUNDLED_RESOURCE(FPK_READER_BUNDLE,(img_name),FPK_BUNDLED_IMAGE_FORMAT)]
#endif

#define PRINT_TRANSFORM(c,t) NSLog(@"%@ - [%.3f %.3f %.3f %.3f %.3f %.3f]",(c),(t).a,(t).b,(t).c,(t).d,(t).tx,(t).ty)
#define PRINT_RECT(c,r) NSLog(@"%@ - (%.3f, %.3f)[%.3f x %.3f]",(c),(r).origin.x,(r).origin.y,(r).size.width,(r).size.height)
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
248 changes: 242 additions & 6 deletions FastPdfKit.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
23 changes: 0 additions & 23 deletions img/fpk_reader.xcassets/X.imageset/Contents.json

This file was deleted.

23 changes: 0 additions & 23 deletions img/fpk_reader.xcassets/bookmark_add.imageset/Contents.json

This file was deleted.

22 changes: 0 additions & 22 deletions img/fpk_reader.xcassets/changeModeDouble.imageset/Contents.json

This file was deleted.

22 changes: 0 additions & 22 deletions img/fpk_reader.xcassets/changeModeOverflow.imageset/Contents.json

This file was deleted.

22 changes: 0 additions & 22 deletions img/fpk_reader.xcassets/changeModeSingle.imageset/Contents.json

This file was deleted.

23 changes: 0 additions & 23 deletions img/fpk_reader.xcassets/close.imageset/Contents.json

This file was deleted.

23 changes: 0 additions & 23 deletions img/fpk_reader.xcassets/close_player.imageset/Contents.json

This file was deleted.

22 changes: 0 additions & 22 deletions img/fpk_reader.xcassets/direction_l2r.imageset/Contents.json

This file was deleted.

22 changes: 0 additions & 22 deletions img/fpk_reader.xcassets/direction_r2l.imageset/Contents.json

This file was deleted.

This file was deleted.

This file was deleted.

23 changes: 0 additions & 23 deletions img/fpk_reader.xcassets/indice.imageset/Contents.json

This file was deleted.

23 changes: 0 additions & 23 deletions img/fpk_reader.xcassets/next.imageset/Contents.json

This file was deleted.

Loading

0 comments on commit 11d6e91

Please sign in to comment.