Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 15:52:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #418 from vector-im/pods_updata

Browse source 
Pods: Update GBDeviceInfo
This commit is contained in:
manuroe 2016-07-01 10:11:32 +02:00 committed by GitHub
commit 94ec39f40e
3 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Podfile
View file

@ -22,7 +22,7 @@ pod 'MatrixKit', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :br
#pod 'MatrixKit', :path => '../matrix-ios-kit/MatrixKit.podspec'
#pod 'MatrixSDK', :path => '../matrix-ios-sdk/MatrixSDK.podspec'
pod 'GBDeviceInfo', '~> 3.4.0'
pod 'GBDeviceInfo', '~> 4.1.0'
pod 'GoogleAnalytics'

2
Vector/ViewController/RoomViewController.m
View file

@ -420,7 +420,7 @@
// It may correspond to an overlay mode in portrait and a side-by-side mode in landscape.
// This display mode change involves a change at the navigation bar level.
// If we don't hide the header, the navigation bar is in a wrong state after rotation. FIXME: Find a way to keep visible the header on rotation.
if ([GBDeviceInfo deviceInfo].display == GBDeviceDisplayiPad || [GBDeviceInfo deviceInfo].display >= GBDeviceDisplayiPhone55Inch)
if ([GBDeviceInfo deviceInfo].family == GBDeviceFamilyiPad || [GBDeviceInfo deviceInfo].displayInfo.display >= GBDeviceDisplay5p5Inch)
{
// Hide expanded header (if any) on device rotation
[self showExpandedHeader:NO];

11
Vector/third_party_licenses.html
View file

@ -49,17 +49,6 @@
href="https://www.apache.org/licenses/LICENSE-2.0">https://www.apache.org/licenses/LICENSE-2.0</a>
<br/><br/>Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
<br/><br/>
</li>
<li>
<b>GBJailbreakDetection</b> (<a
href="https://github.com/lmirosevic/GBJailbreakDetection">https://github.com/lmirosevic/GBJailbreakDetection</a>)
<br/><br/>iOS jailbreak detection framework for GBDeviceInfo.
<br/><br/>Copyright 2015 Goonbee.
<br/><br/>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in compliance with the License. You may obtain a copy of the License at:
<br/><br/><a
href="https://www.apache.org/licenses/LICENSE-2.0">https://www.apache.org/licenses/LICENSE-2.0</a>
<br/><br/>Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
<br/><br/>
</li>
<li>
<b>AFNetworking</b> (<a