From ec59f2a93fda360d58f27679b7d60e1efe67be2a Mon Sep 17 00:00:00 2001 From: Giuseppe Nucifora Date: Tue, 19 Jan 2016 17:42:05 +0100 Subject: [PATCH] - Add iPadPro - Add DeviceInches for Simulator --- .../UIDevice-Utils.xcodeproj/project.pbxproj | 4 +- .../AppIcon.appiconset/Contents.json | 22 +++- .../Images.xcassets/Contents.json | 6 + .../LaunchImage.launchimage/Contents.json | 117 +++++++++++++++++- .../Default-568h@2x.png | Bin 0 -> 14960 bytes .../Default-667h@2x.png | Bin 0 -> 20562 bytes .../Default-Landscape-736h@3x.png | Bin 0 -> 50837 bytes .../Default-Portrait-736h@3x.png | Bin 0 -> 53101 bytes .../LaunchImage.launchimage/Default.png | Bin 0 -> 3630 bytes .../LaunchImage.launchimage/Default@2x.png | Bin 0 -> 12661 bytes .../LaunchImage.launchimage/Default~ipad.png | Bin 0 -> 15495 bytes .../Default~ipad@2x.png | Bin 0 -> 58215 bytes .../Default~ipad~landscape.png | Bin 0 -> 15035 bytes .../Default~ipad~landscape@2x.png | Bin 0 -> 57073 bytes .../Default~ipad~landscape~nostatusbar.png | Bin 0 -> 15434 bytes .../Default~ipad~landscape~nostatusbar@2x.png | Bin 0 -> 58606 bytes .../Default~ipad~nostatusbar.png | Bin 0 -> 15801 bytes .../Default~ipad~nostatusbar@2x.png | Bin 0 -> 59384 bytes .../UIDevice-Utils/UIDevice-Utils-Info.plist | 2 + Pod/Classes/UIDevice-Hardware.h | 7 ++ Pod/Classes/UIDevice-Hardware.m | 50 +++++--- 21 files changed, 187 insertions(+), 21 deletions(-) create mode 100644 Example/UIDevice-Utils/Images.xcassets/Contents.json create mode 100644 Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png create mode 100644 Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-667h@2x.png create mode 100644 Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Landscape-736h@3x.png create mode 100644 Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Portrait-736h@3x.png create mode 100644 Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default.png create mode 100644 Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default@2x.png create mode 100644 Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad.png create mode 100644 Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad@2x.png create mode 100644 Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~landscape.png create mode 100644 Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~landscape@2x.png create mode 100644 Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~landscape~nostatusbar.png create mode 100644 Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~landscape~nostatusbar@2x.png create mode 100644 Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~nostatusbar.png create mode 100644 Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~nostatusbar@2x.png diff --git a/Example/UIDevice-Utils.xcodeproj/project.pbxproj b/Example/UIDevice-Utils.xcodeproj/project.pbxproj index 68d1f11..81eec9d 100644 --- a/Example/UIDevice-Utils.xcodeproj/project.pbxproj +++ b/Example/UIDevice-Utils.xcodeproj/project.pbxproj @@ -467,7 +467,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -500,7 +500,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; diff --git a/Example/UIDevice-Utils/Images.xcassets/AppIcon.appiconset/Contents.json b/Example/UIDevice-Utils/Images.xcassets/AppIcon.appiconset/Contents.json index f697f61..eeea76c 100644 --- a/Example/UIDevice-Utils/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/Example/UIDevice-Utils/Images.xcassets/AppIcon.appiconset/Contents.json @@ -5,16 +5,31 @@ "size" : "29x29", "scale" : "2x" }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, { "idiom" : "iphone", "size" : "40x40", "scale" : "2x" }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, { "idiom" : "iphone", "size" : "60x60", "scale" : "2x" }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" + }, { "idiom" : "ipad", "size" : "29x29", @@ -44,10 +59,15 @@ "idiom" : "ipad", "size" : "76x76", "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "83.5x83.5", + "scale" : "2x" } ], "info" : { "version" : 1, "author" : "xcode" } -} +} \ No newline at end of file diff --git a/Example/UIDevice-Utils/Images.xcassets/Contents.json b/Example/UIDevice-Utils/Images.xcassets/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/Example/UIDevice-Utils/Images.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Contents.json b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Contents.json index 4458b40..0c793eb 100644 --- a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Contents.json +++ b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -1,23 +1,53 @@ { "images" : [ + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "736h", + "filename" : "Default-Portrait-736h@3x.png", + "minimum-system-version" : "8.0", + "orientation" : "portrait", + "scale" : "3x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "736h", + "filename" : "Default-Landscape-736h@3x.png", + "minimum-system-version" : "8.0", + "orientation" : "landscape", + "scale" : "3x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "667h", + "filename" : "Default-667h@2x.png", + "minimum-system-version" : "8.0", + "orientation" : "portrait", + "scale" : "2x" + }, { "orientation" : "portrait", "idiom" : "iphone", + "filename" : "Default@2x.png", "extent" : "full-screen", "minimum-system-version" : "7.0", "scale" : "2x" }, { - "orientation" : "portrait", + "extent" : "full-screen", "idiom" : "iphone", "subtype" : "retina4", - "extent" : "full-screen", + "filename" : "Default-568h@2x.png", "minimum-system-version" : "7.0", + "orientation" : "portrait", "scale" : "2x" }, { "orientation" : "portrait", "idiom" : "ipad", + "filename" : "Default~ipad~nostatusbar.png", "extent" : "full-screen", "minimum-system-version" : "7.0", "scale" : "1x" @@ -25,6 +55,7 @@ { "orientation" : "landscape", "idiom" : "ipad", + "filename" : "Default~ipad~landscape~nostatusbar.png", "extent" : "full-screen", "minimum-system-version" : "7.0", "scale" : "1x" @@ -32,6 +63,7 @@ { "orientation" : "portrait", "idiom" : "ipad", + "filename" : "Default~ipad~nostatusbar@2x.png", "extent" : "full-screen", "minimum-system-version" : "7.0", "scale" : "2x" @@ -39,13 +71,92 @@ { "orientation" : "landscape", "idiom" : "ipad", + "filename" : "Default~ipad~landscape~nostatusbar@2x.png", "extent" : "full-screen", "minimum-system-version" : "7.0", "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default.png", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default@2x.png", + "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default-568h@2x.png", + "extent" : "full-screen", + "subtype" : "retina4", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "filename" : "Default~ipad.png", + "extent" : "to-status-bar", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "filename" : "Default~ipad~nostatusbar.png", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "filename" : "Default~ipad~landscape.png", + "extent" : "to-status-bar", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "filename" : "Default~ipad~landscape~nostatusbar.png", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "filename" : "Default~ipad@2x.png", + "extent" : "to-status-bar", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "filename" : "Default~ipad~nostatusbar@2x.png", + "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "filename" : "Default~ipad~landscape@2x.png", + "extent" : "to-status-bar", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "filename" : "Default~ipad~landscape~nostatusbar@2x.png", + "extent" : "full-screen", + "scale" : "2x" } ], "info" : { "version" : 1, "author" : "xcode" } -} +} \ No newline at end of file diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..52555a8338d5ee67df6a30afc9f62222df783fb9 GIT binary patch literal 14960 zcmeI3Jxjw-6o$`DV{J>Tt)dnY4Ai=awQk~KDwSH4B1J@@L(o4^=^`o;3xcAcn;(;d zqZD+IZbnf@adHwtMYMz9;2?tFNprjV1KuHlbMtjCNuGPpIq%t+$fN?kb{`Q1(xb^N zkzx|5d5@c07Pnt{Poj`b4O8j1qr!$aKRQz&YK_{PNN2k~i3VHJ$;9M>__$AmNb|cA z*7@6|@p9I1T8S(@_NGh{is}h!JE4L7qhgb$I}OXibr%UrYgTa^$N71$wB3iDwbQOt zzcu~zT)WJ#56SC;>)x<=a(Nw@dYRV3V^~tswAzt=z;&?qA&h!*N~=1GRe}gQTzi-eFF~w literal 0 HcmV?d00001 diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-667h@2x.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-667h@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..499a1434e34ecd5cab66143dea1434ddf25208cf GIT binary patch literal 20562 zcmeI4u}d3q6vy9PPCX?t*AzsG)I%b=2$e!N=~b?n6HFzzbj#Q=)S-nIF%DA4N|%Cy ze?jQjQYebh!NIZZ&=%?@($LL8MDO=ve)k7-3Veo;-0?1Vzq|Xr_kEw=`~9|-s|$sp zJ3}H;NGfqn#BGc8J@EU}JxAZ~n=fazwlFWPiGMM-wn?X!f0I_*YjV`eE3qG8Z$p{_C48eocngm zbKT8Xd*xe$_K4B;TIW!+CyMqP#dqb2?D)f9MQa-P{%E_o9hYxT7KHVW7n!N+IEQn~ z+i$XyUEm`T>sM^=w7AgdtUxLN+wF(mIU{HURqOWrq*|-lQ?VF z=I3#18V0F#ZgQ()Taq?9mt6;qHcyEs&FigQhCYoWGtLq3O~}%SNt{NUpvY8hB14VD zMthTRXy!(iMQUksbna6G08IBA`h9kp~;mA5E2?g&aBK+5^ a`DSiyarl|LGyFVV7f_PN)wnfZ-?#=2vs@tn literal 0 HcmV?d00001 diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Landscape-736h@3x.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Landscape-736h@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..2d727e8d759736613ed69147b609a367e41b2547 GIT binary patch literal 50837 zcmeI4&r4KM6vywIrW!?S$bOIn&BCIEM3PXnsL>3ah!TmQMNqV;Xps~|LB!Z1Q(Q!} z2>NCJK-8jD8zF1aqKKeCBBD(MEov8KKi;Sh&pFP$zHQBCA?h&9d-I+1{eI8+-aB`w zcW-xNeRI8YuCdh9)#qGp)Vb_LZc+TmsUIWn;$P93zV1$U|HYcm@jrF_JqOP?w{l(O zCo1)|e08qqN?jfM&qZG*9yYo{L$>YkpW9Je=Iyp$TMj(G`SX2$HkU6H%Pz`<{@A|o z&8HV5^E_$lg~polqvx{07n{D|Kue)my6`M?)#T1H%XiFshw*c-X0scHUfxJ?m&NkO z#mS3@Zs1zkt^2mRX?}cix!%bX*DV*9}p)S|E>~34Q!ltfXc2Ae4xNfc`igth8ygo%y z4`9;)W?|DoW2a~IcSrP$Nv~U#U-XQA zW--9{X%%}J15AKfOw+-+pK01ZgA(loV-cbqKeLE-{Isfg8PSe^1|{05+8`%@5$zD| zr~<*Jv1#izOw&x$YA7W1PW-c~SP*(EOVM!)p|@X5;$DQ%TbGNhBtmbc!q{{i88E;w zz(|c?3t3Pj*g_U?UvfrkDZ0%iXViGe#G0H@sjzM0uxV^s6$m+F)#xA*V3q@=xN4}d z>7+`m%1+~iO=Hu_ZP>Nr7n67#VAqacPq1n2J!X2urv1#qrv0?47&kVJO=Ht62O3M! zJw3~T8V{Kv)Yfv~5qI`Vau&c0CS;DX9Ok$QnWM57wJyXCo;l?r8+~^01ek?oW7$ef z7-j-&$#T?*KO?9R37f73oBr_Nyn z59e$kGZvrX)SC7bCvMTo{S2c)(F4qM3C7=>pcXv{z-SLJ$r>)Af+{Gfm?4mjh=)xwL z(8f#X0$n5mbls-slmc4$`XP(G)^TUbhi1$J%ydC9yJ#jMI_#zOS41AV_`$)W@o0kp zbb&4s0h%$IF^fR0&n`_p=Qky10T}s&I;3QzWEufl3aJWOFzCQF9%dIvtvgKs92zs* zmdGH8vEMLBf`jM;cttcH00+@QbSwgRwA5B5yU@iJi-L;5fWbf_09~MqMF4kElKJ1# zWnkjb&gS@ls>?@yAKEv5eBrJ3!6we{@t(fR2p5=A7~uloV6xU?l)%!HN{i8Tgy?8I z)U1c-1i(Rb5FLvEoxL(1DZ9|c7K?%kkCw%vWfzauc;L}2g_;_WS^{05i$MT)!CfQ* zG-EVl76E1#X`;$sp^GgR1r_chwN+a$&6vhR@rryg01l#q=vV~sXk|Q7cA<+c76la^ zEsI6VE*`D%z@y0*O$|sbfiBR+Ab`8zE)oHnv46Q4JH2t$Yv&fNEOmA4uLwWvmbI;= w4>Qzwn7)C5Rd!Aa95nJ@*2r4b#Q|40-uU3&lNHC~FE+T+uDxCNI}cy_3j|V)MgRZ+ literal 0 HcmV?d00001 diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Portrait-736h@3x.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default-Portrait-736h@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..5453d819b787ba0e6c85d2c60e108c13679412f1 GIT binary patch literal 53101 zcmeI4K}Zx)7{}l2ZtJYIHDN`h;0Dzt2*X$iLT0xu-9sAUp`wFz$%_;S;X!D!J=85a zl|iIkLk&U*B7)9_o|5h0%@QmGJLIK$Z|BXvx2qRVvG6;H>oU7fhVT8q|M&a8H;*p& zcBh+*p>UW+<9^Lsq63B*WQ0$`EYwQ;d&WA5Khc`F_wBgv)t9P z<$W)+o+xF{Z}YzAy2H*?i}fARx0bT4T%Y0o5D)f7BOZtc;(>e-llheV=#d|*Vn947 z6G?s~KUTK{@n98a=mYv-7wg0W@jyJ(@+BrHJ3%wC~h#sPc=plND9@Y+r!cX8Q@Dun6`~-diKe0VB@jyHf5BNj; zA^s45h(E*+;0N#n_yPO?e&9d*f%xXe@90?ooF%ctQ3^D@PI{eoo+ciM2jYR=H@)vL zQKE!QI&`90}}C#>tDrQG4Jx_@0=H0XKdWMTUVZ;w7|t==J@ z_7$+$uZoj@0+Q%4nT)m$_{h@I+%!{ z-J&}?KnI{h)Y+4F0_XsAFg`K{bO1U;9eySqLi+%806JI_$)p354n`swv(hydlMYHF zfDS+hpo5hyRk6*8ZFobNbYRj!Q#hc5r4c{}po4MLOgij*(qVk=+qLLf0GQA!-e%lZ zZYw%pbiVXRA)T+PG|>49GcMz{jN6*iri|O_vIG;la}$d3tY#OCC&tsLDkE1I&#E+F zJTaa|8YBmXenLOPEul059rK4#f#HWtG z)3)I4`}-UbO1V-y#aIpI_MHp`3Rr`(7`xrCLJ0VI`}VU`h?i~ zvslOtm<^5#!UgGGBrXUSRErL1z0i6w5kc!kr%hZ?3MU49}8=CbJm zkzx_4w%5ZY$Imz4d=g8AOp404(Ha}Rh3xDSQAe+Hh+LuPgDBCJODCt6#rs1tOnN{~ z+83`?^X0txtQK2&9LQKC6wMpbcf&&mN2ONXa0^z2dKU{xYfkZ)Cku-{X?qU4>(wr` zfIai{T)!<~jLQ2%o4$y3TD|I(cEnn%zbVufr}>TTacRftM>fIG`%Jp_ckW5sq%XH^ zhGk6Hw9`H~C~ccQRj1MX@b!I5MEZ-xzfKsICEgm{3qnZ0wWbr02JKy6HovY#02H9C|8L#4-LN*&v>LtFhWXbC M%8ljI<&;_a1wDK$9{>OV literal 0 HcmV?d00001 diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad.png new file mode 100644 index 0000000000000000000000000000000000000000..d8dfb22816e3d47b0d8a892a45ebb32ed5a4e46c GIT binary patch literal 15495 zcmeI(!ArtW90%~<+r*}6O%Em!v_J_Y!Fxh;D7p?}!%GCQOScY!hk_thc!@4S_y^R< zlLrr88y!1z3L=6KI)qRlojQ1E@2T^j_#R|#`@Owwy1n1~?Cq*nEl0zvVIqo}m7+x? zdtc>mCFo6l7v4|232RzqgSyXaLvJS3sO&e15^4Tnrj;5I<+sdYp?=DKUJEhOB67if z_=2UzimK_3ZVXaZ*qkqLS8|k>W~=Gq#$jsapgs-v$_1TuuiSJ4 zYCK2A(e>_ZUUz9EPqxe>3@NC0j`u>mCQ%|u=YFW8S6ous*^FNqlig)MR8>Mry6ctF zeq}cO%|oRPCTsP6XI@!^cKlFXOWD+VO0=i@sXGoEEQli(OIm@5Q+vCQ&-P2r(bx~g zK~GK#erf!@`6YvE8aFcBy(i5jnk?SNqMb%^!V@oKWJp6rK9AfR9S+`eLoZ7~*OFTS z`qPjTp)o)NAOa9UBuUUv&bJ_7xVP|SAOa8ph#-#~3`77T01@zf8V}|DVGck9 zAc7cr14IBK01^DbVL${R0uVu@2|xrO0uVur&H^Iv(*Q&OA^;J92tWk9xPrHJG{_0$ r1abm75h)Qr4UiMa3FJhO0hf~oI~*^*#I|q8-pj;fma4_BVPF0Ola8U( literal 0 HcmV?d00001 diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad@2x.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d09150355daf13b9fb9035d5c23196fe6bbc61f4 GIT binary patch literal 58215 zcmeI5K}Zx)7=ZuT)!oTf+ss7DU|S3%3O0y{4za5%x(O!RcIXmY5FP3u*`b5bw$Q-{ zBI@A9@=!<-VqU$hc&I}}bg7_VFOh)u2kmO#?lr21T0ps4pXz zZ(9&aOD>x!TruX~&D2XG7Cun?IlB4m%{$YX_e)csK3u9X5DjBqKr_L*{RtYjn>3%3J)bIC|Y0}iG8D-s`i+~a#M&bzC~SUBKNqP-~Q(UWcd zk71u$lvlrfLi

DJ3=c_cjI`PsyC~^8Q$ubuCgpzI{00c#B;2pW#HhrZy%s<2SMa z$76D2tszmbQw~K+)e~LGfa4L_<-CS}a56?Xz3?cxHQ;!-)ZjnE4mHE62bkgH>eSaO zS0|ILo_?8Z$(=fzk~={m1y7Kz3E8Tp4GR?(DtaZ#x--POQ~f2N5zq)|1g-th2xtVY z7SRZ31Wie31T=y!zn~G&2%3`62xtUNNz^+PDxne32s%Nc5zq)|1T=!(nq$ogbR(b< z&YBv#uhv-z%|&BPjH=kkYg zvD$g_d`v4cB}S7!TI-77+GGk+lQT0d2}NaC@+Noy9#|28X%#tx2jBsCpdtVsfCnl9 z-~o659@rgL-~o659)JgqTE`xM2jBsC03O&801v;d+`vv#J%VjcG2W9r2Zk>p%1n<>~g_>f#kE+iL{3(1A#;)%dIk_!n%xm-JjbbKK* zk(tO$WF|6mB`NSfqxq+h)|6;n5#RxM03Lt`-~o659(W>vjs_3V(dcM&v`5BL>qJM> oDNUy|#RVq<*aPgrpY1{XZh702-Q&G&);>j&>*~u+bQH_K0GA?GdH?_b literal 0 HcmV?d00001 diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~landscape.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~landscape.png new file mode 100644 index 0000000000000000000000000000000000000000..942487c679c5238bd7789a45a84ca4ea97bdaf72 GIT binary patch literal 15035 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 literal 0 HcmV?d00001 diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~nostatusbar.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~nostatusbar.png new file mode 100644 index 0000000000000000000000000000000000000000..4401e6ad0063f54932077aac543c7ecf08e988b5 GIT binary patch literal 15801 zcmeI(Jxjwt7zgktNv&yZHFl^)6eF|>g+f1oFKK9L<4|fSf(Vj9HwU4MAjm0Q#KomJ z>(r@3hYl_VadL1K7b!SM2ce@w2Xogp-JSnKUy?qTOVT9w+%K2wO1T&fFNTRIYL)Uf zk>Y&~kQ($p_SUw%camy$(WKVfQqP+RotE}%MDY}VNtT`L6Kx(^`CRo(`gzaIlO9oW z?$h_P^VOMc_twupGet&{98fjgV20UE+F@%l!(GVIhCKe6E^nEnr4Op3aIajDt$5`| z3(#U&GLLU|#?yvNePy_09%0Hsqj|C$;x&m93A*q@nNe~{ZDi7ZWs>5~`JtK`O3;0~ zkn$^Y=ywt-uS$wu?KCHqMQGa(HT0xI_1Ab~w4MfIQg>Qxv6xd2L|EnHAvRtwElUGG z6dOIK#c=J;R=QJ*4xOxwpOEg)$jYT_+*$aZ u$O+^Gaw1Y9z8fGXkQ2y>AOpzBf8@lSI(nHIJl5`(`NP;&p`34-&eb1t4Am+C literal 0 HcmV?d00001 diff --git a/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~nostatusbar@2x.png b/Example/UIDevice-Utils/Images.xcassets/LaunchImage.launchimage/Default~ipad~nostatusbar@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..f77233133724dacb5f78fae3a8dfabfcf1b4fc9e GIT binary patch literal 59384 zcmeI5K}Zx)7=ZuT)pfGf%q+wVHZig&*eE1A#ICOB7MN_?p-XH*6x2boLxIpFbTER7 zE?z33BI+RK)ys-Ob&2XCLBU=k0}nm{IpnGGJE$w;xV!&z-v7Pt|K~Z_ z)7@EB*-$AWRoSjgP9$bOG{sb3O7G`d?Jq`OuCq->-Zp--zggGYb+S)n%MSHnWOL24 zA}Psc()laK%*Tl;NyMZ33cv2JKXdEec>2@)*w@dO%FLQX$`T_Ic#t|$di=p`U*U-U z*?uExHLZN6TpzZK#9aPv$ZxicR7J?4R8LWA`k!|NUW@zciZUDxIh1HAh@1$7;?N`E(gzWBVAS=mx-r0Ga<+0 za%iO?QO`3FiCLxN9Zey}W3tVCj^N;=jc982S<}Xl<58dhEoqP!^zdDuUD>4 zCR;uIGTD+lbv7k;fI&+tCp<`Z_2}J z_r>!z?Z{Y+CV#Z{6~VR16r?6+W?B-8%CO{3@BlopBLLGXat05;1Moma06YK>R0O~S z@Bln;I;_A0@Blmj4_vj5Jpd2D1MmPma3TO6fCu0Kc;H3=JOB^C1MmPm@bzWUdq8o4 z;sV75r!|z;M0yYCJx~$A9$*i!2kzRL;sW;I_1O!1-Ms)X377;-0ww{I;EMnz0h549 zz$7>kz$9Q2FbOs%YfPfh03Lt`-~o659{4se;VuRW4HOzEG*D=8BS4{n;=)=gE+l@= z48`od(M}ItoBHu0AGxuCozU1Kj6Fc~G66gWkHKT`*o8y-aKK~mcrD>EyZf>e8r{g$ z5Emjq4UrlmHAHHN)DWp5`XYcNL6RUzkR)ydkR(VFBndYtaf6cY_8dBpu?N@#>;d)w zd*E9;(_*m-d(b`8`9);s)odo6cW&?@xsY5)E+iL{3(3V7fmI|I5{h!UP7LYzLS`Z} zk(tO$WaeU0;D1K*Pa*9o(Y_+U1MmPm01ve&WyAb G27UwVBmR5< literal 0 HcmV?d00001 diff --git a/Example/UIDevice-Utils/UIDevice-Utils-Info.plist b/Example/UIDevice-Utils/UIDevice-Utils-Info.plist index 6d3dcbd..c136cc7 100644 --- a/Example/UIDevice-Utils/UIDevice-Utils-Info.plist +++ b/Example/UIDevice-Utils/UIDevice-Utils-Info.plist @@ -30,6 +30,8 @@ armv7 + UIRequiresFullScreen + UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/Pod/Classes/UIDevice-Hardware.h b/Pod/Classes/UIDevice-Hardware.h index 763199c..1795609 100755 --- a/Pod/Classes/UIDevice-Hardware.h +++ b/Pod/Classes/UIDevice-Hardware.h @@ -73,6 +73,13 @@ typedef NS_ENUM(NSUInteger, UIDeviceModelInches) { UIDeviceModelInches79, UIDeviceModelInches97, UIDeviceModelInches129, + UIDeviceSimulatorModelInches35 = UIDeviceModelInches35, + UIDeviceSimulatorModelInches4 = UIDeviceModelInches4, + UIDeviceSimulatorModelInches47 = UIDeviceModelInches47, + UIDeviceSimulatorModelInches55 = UIDeviceModelInches55, + UIDeviceSimulatorModelInches79 = UIDeviceModelInches79, + UIDeviceSimulatorModelInches97 = UIDeviceModelInches97, + UIDeviceSimulatorModelInches129 = UIDeviceModelInches129, UIDeviceModelInchesUnKnown }; diff --git a/Pod/Classes/UIDevice-Hardware.m b/Pod/Classes/UIDevice-Hardware.m index ca9bede..eb05862 100755 --- a/Pod/Classes/UIDevice-Hardware.m +++ b/Pod/Classes/UIDevice-Hardware.m @@ -331,42 +331,62 @@ case UIDeviceGenerationModeliPad4: case UIDeviceGenerationModeliPadAir: case UIDeviceGenerationModeliPadAir2:{ - return UIDeviceModelInches97; } break; case UIDeviceGenerationModeliPadMini1: case UIDeviceGenerationModeliPadMini2: case UIDeviceGenerationModeliPadMini3: - case UIDeviceGenerationModeliPadMini4: - { + case UIDeviceGenerationModeliPadMini4:{ return UIDeviceModelInches79; } break; case UIDeviceGenerationModeliPadPro:{ return UIDeviceModelInches129; - } - case UIDeviceGenerationModeliPadSimulator:{ - - } break; + } + case UIDeviceGenerationModeliPadSimulator: case UIDeviceGenerationModeliPhoneSimulator:{ CGRect screenRect = [[UIScreen mainScreen] bounds]; - NSInteger screenWidth = (NSInteger)screenRect.size.width; - NSInteger screenHeight = (NSInteger)screenRect.size.height; + NSInteger screenHeight = ((NSInteger)screenRect.size.height > (NSInteger)screenRect.size.width) ? (NSInteger)screenRect.size.height : (NSInteger)screenRect.size.width; + switch (screenHeight) { - case 480: - + case 480:{ + return UIDeviceSimulatorModelInches35; + } break; - case <#expression#>: - default: + case 568:{ + return UIDeviceSimulatorModelInches4; break; + } + case 667:{ + return UIDeviceSimulatorModelInches47; + break; + } + case 736:{ + return UIDeviceSimulatorModelInches55; + break; + } + case 1024:{ + return UIDeviceModelInches97; + break; + } + case 1366:{ + return UIDeviceSimulatorModelInches129; + break; + } + default:{ + return UIDeviceModelInchesUnKnown; + break; + } } + break; } + default: { + return UIDeviceModelInchesUnKnown; break; - default: - break; + } } return UIDeviceModelInchesUnKnown; }