From ce328ac85ce6fb4ba97292359242ce73c9322c30 Mon Sep 17 00:00:00 2001 From: Chris Li Date: Fri, 19 Aug 2016 14:43:43 -0400 Subject: [PATCH] Base for new library --- .../Cross.imageset/Contents.json | 2 +- .../Cross.imageset/close copy.png | Bin 0 -> 15376 bytes .../Cross.imageset/multiply.png | Bin 419 -> 0 bytes .../Library/CloudBooksController.swift | 11 +--- .../Library/LibrarySplitViewController.swift | 13 ++++ .../Controller/LibraryTabBarController.swift | 2 + Kiwix-iOS/Info.plist | 2 +- Kiwix-iOS/Storyboard/LibraryNew.storyboard | 59 +++++++++++++----- Kiwix-iOSWidgets/Bookmarks/Info.plist | 2 +- .../xcdebugger/Breakpoints_v2.xcbkptlist | 34 ++++++++++ 10 files changed, 99 insertions(+), 26 deletions(-) create mode 100644 Kiwix-iOS/Assets.xcassets/Cross.imageset/close copy.png delete mode 100644 Kiwix-iOS/Assets.xcassets/Cross.imageset/multiply.png diff --git a/Kiwix-iOS/Assets.xcassets/Cross.imageset/Contents.json b/Kiwix-iOS/Assets.xcassets/Cross.imageset/Contents.json index 2cfaad3e..dbb51abf 100644 --- a/Kiwix-iOS/Assets.xcassets/Cross.imageset/Contents.json +++ b/Kiwix-iOS/Assets.xcassets/Cross.imageset/Contents.json @@ -10,7 +10,7 @@ }, { "idiom" : "universal", - "filename" : "multiply.png", + "filename" : "close copy.png", "scale" : "3x" } ], diff --git a/Kiwix-iOS/Assets.xcassets/Cross.imageset/close copy.png b/Kiwix-iOS/Assets.xcassets/Cross.imageset/close copy.png new file mode 100644 index 0000000000000000000000000000000000000000..2791e3b224c20c865c1a22f40166719c66b8e19e GIT binary patch literal 15376 zcmeI3Yitx%6vt;#C^kW{5#`OYfTA!vGdug}j@!l3EpEZZTB;VGoxL;Lj@{i^ccyfU zexQPp8W9jwK;st^1vNa>YK-!*Eb50wlmvN5@IfSEc*Gb~#MhmDPH(r@CSv?@H)(gy z{oixW+}}Ot?tGc<`h~ZSDj#1?QPilqV4wkhJB+`PBjEqZb5`zvUsoi8i#3X>=rH~) z+E@ND6y-guG&bo?q1yzY#_Xb`hGlyymVmP<$~PyK5J8))Tf=gT60fqIdw;jhsz_C~ zyImnRl&FzgmEh8(ylCmdMzFLEcqQ8$f4MIuzyL8>7pVQ>flrqb6mm%kHKD>-JbZUOVUVc$}WuRtL+u7?x*vmUi%hlNFo}Ywlz7 zm%}SxQi=!-fqA)f(5kYv>Uu(8n2wGPdk1eQ zNIp(L)<9B8=!zP*8ga$2+OAjGY(}EOC%3LxqL3)A<=8=rOiD~JoSkJ#IZ2@4lW0#y zGq)xIMvlrcIj(Eak1OeyXjOGpYgGqHS&#=!4EH1yD&#JCzp+@!)S6zq1R}^GE$OK> zb|z$|LDtmvB#>*Dz@X^ycLDYF)DIP3&YI_%_S+R1S|UCDVQ znsa$Qz*Q+lB2qY?qC}Vhse+0Ii?!2K#ITez2iqd~;r^p}A*y5!sDzl*WTXA6Z2A5x zoM?pu%kasxu^3pprj**wp&-b{H@OdK0fYL+ko%-2RSe0v}`i5=52%U>`Jb$-mu&p)}RM+l77y)c?5=#WDu1 zV!TC`{7k-r^8-WMyX=nkZ>@a04s1oA@#7@GHilItX4;4IF$2bmnX~hojCPE+XXiUu z*6n5)j)k9`uUSWZ7ypB=Sx0?~u6M>2-S5byLxxRW#&2l$gkJ<7_hi4@<>FmF1|3E{ z>XnonZ3-yxDAtT4#RV6Z@j-=>j*AC#GzmG!>}HuB%rbqL9fgm5@QITtJaP_b(ZWG? zDKCmEx|C6oSR@Go1aA^tcs__qa3MhOCc%a0gQx@-0t9aoTzEc+N^l`S@Fu~9=YyyO z7Xk!t5?pvbh)QrFK=3BPh3A8)1Q!AXZxUR1K8Q+iAwcjZ!G-68s00@R1aA^tcs__q za3MhOCc%a0gQx@-0t9aoTzEc+N^l`S@Fu~9=YyyO7Xk!t5?pvbh)QrFK=3BPh3A8) z1Q!AXZxUR1K8Q+iAwcjZ!G-68s00@R1aA^tcs__qa3MhOCc%a0gQx@-0t9aoTzEc+ zN^l`S@Fo^ldGRGqIS$|4?0~Omc75n=hOc*8L9ii2QA=k~)UxFib>T1geTt&mS&I4r z>cR$!x=wxO!F}^6%JO1ept>=2^w_2a4ZXKqQ@elJdn<$Gqi40P=&1}>H%uLW$O;b6 zo%pL`&HPQTUg-Jd&hwks{qV>|?WyL5ELf51j^^_8r-mtgviSw5yl<#MEP22v|vh;!N&Tl@TPG2@<{hnFugth5D zb_ILZGI`j7yLzr_b`9%(cGaZbyT+DLXS?>UnsU6%&u>{Zu2*MI&pAEr6ZQ8EmY*!a zzStY1pF74LI=T+L@Lkmc?b{8X^==<==5ubs@a?C%(jReaH;Vd^-s+Ph-?(}Dj$KoC zjOng@{>sg5%Fn^*tgI?a1*ndQ;u$`L=`4&h!V@FP~nnSIk({ zZF?u(^H{oeb^727X?b(s`M3L)TQ=S>(Xsj==_PO1p1p5vvry&Uir+@hzke9qQ>w0Z LVPNar=Ewd9hX>=s literal 0 HcmV?d00001 diff --git a/Kiwix-iOS/Assets.xcassets/Cross.imageset/multiply.png b/Kiwix-iOS/Assets.xcassets/Cross.imageset/multiply.png deleted file mode 100644 index 5aa72bd1d0076a71f8b63d44c48748f2de89a070..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 419 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e=3*z$5DpHG+YkL80J)q69+AZi z3^J7<%-H)~We-qLvcxr_Bsf2(yEr+qAXP8FD1G)j8!4b7(Ey(i z*Z=?j1DR;Rw(U(JP>8K0$S;_IF>~s)f0Om(On@TqJY5_^JUUyao#bsc5O9^%dN6@W z$u(1f{avOayHtnMf7J$Gnf%Ys6&sK6{I8tdT2RUMeAoGhzxHPS-?Hz}roCU;``;Gd zkuqG{Ze^>Y&}I5)`PB}c(2o5Z zHhg_8W$o^5Gp)m=-|p29E37)Y=A8ZQRF>5CzJr$^yL^24>65~*JtiI;{1XJ^6cl3| zTy`-0V`yLC`N$}9alz`B8$RsNOfYz&kzx2ov(VtHMy283l?@4;i Bool { diff --git a/Kiwix-iOS/Controller/LibraryTabBarController.swift b/Kiwix-iOS/Controller/LibraryTabBarController.swift index 2e667bfb..a9150282 100644 --- a/Kiwix-iOS/Controller/LibraryTabBarController.swift +++ b/Kiwix-iOS/Controller/LibraryTabBarController.swift @@ -9,6 +9,8 @@ import UIKit class LibraryTabBarController: UITabBarController { + @IBAction func dismissSelf(sender: UIBarButtonItem) { + } override func viewWillLayoutSubviews() { super.viewWillLayoutSubviews() diff --git a/Kiwix-iOS/Info.plist b/Kiwix-iOS/Info.plist index 496fb220..d6ad36eb 100644 --- a/Kiwix-iOS/Info.plist +++ b/Kiwix-iOS/Info.plist @@ -49,7 +49,7 @@ CFBundleVersion - 1.7.921 + 1.7.955 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/Kiwix-iOS/Storyboard/LibraryNew.storyboard b/Kiwix-iOS/Storyboard/LibraryNew.storyboard index 63be8be3..c7593802 100644 --- a/Kiwix-iOS/Storyboard/LibraryNew.storyboard +++ b/Kiwix-iOS/Storyboard/LibraryNew.storyboard @@ -7,7 +7,26 @@ - + + + + + + + + + + + + + + + + + + + + @@ -132,16 +151,30 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -301,11 +334,12 @@ + - + @@ -350,8 +384,8 @@ - + @@ -359,10 +393,7 @@ - - - - + diff --git a/Kiwix-iOSWidgets/Bookmarks/Info.plist b/Kiwix-iOSWidgets/Bookmarks/Info.plist index 0653646e..7ef57ae2 100644 --- a/Kiwix-iOSWidgets/Bookmarks/Info.plist +++ b/Kiwix-iOSWidgets/Bookmarks/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 1.7.992 + 1.7.1032 NSExtension NSExtensionMainStoryboard diff --git a/Kiwix.xcworkspace/xcuserdata/chrisli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Kiwix.xcworkspace/xcuserdata/chrisli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index ed9a9b4d..366022fc 100644 --- a/Kiwix.xcworkspace/xcuserdata/chrisli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Kiwix.xcworkspace/xcuserdata/chrisli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -2,4 +2,38 @@ + + + + + + + + + +