Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/ios.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarinofaggiana <marino@marinofaggiana.com>2019-09-21 13:52:16 +0300
committermarinofaggiana <marino@marinofaggiana.com>2019-09-21 13:52:16 +0300
commit0f12b46e730ba640e07c53a7ee8ae7c2fdb14a4b (patch)
tree2c8e1f594e12763f37965b83c1cf389e790280a5 /iOSClient/Login
parent0d22c135f1c0945d37033e5fcee0ac6858798ae7 (diff)
Xcode 11 - compatibility
Diffstat (limited to 'iOSClient/Login')
-rw-r--r--iOSClient/Login/CCLogin.m3
-rw-r--r--iOSClient/Login/CCLogin.storyboard12
2 files changed, 7 insertions, 8 deletions
diff --git a/iOSClient/Login/CCLogin.m b/iOSClient/Login/CCLogin.m
index 2f8fe2425..74c1d28d9 100644
--- a/iOSClient/Login/CCLogin.m
+++ b/iOSClient/Login/CCLogin.m
@@ -118,6 +118,9 @@
_baseUrl.hidden = YES;
}
+ // QrCode image
+ [self.qrCode setImage:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"qrcode"] width:100 height:100 color:[UIColor whiteColor]] forState:UIControlStateNormal];
+
NSArray *listAccount = [[NCManageDatabase sharedInstance] getAccounts];
if ([listAccount count] == 0) {
_imageUser.hidden = YES;
diff --git a/iOSClient/Login/CCLogin.storyboard b/iOSClient/Login/CCLogin.storyboard
index c1ffe8b1d..c4cf9198c 100644
--- a/iOSClient/Login/CCLogin.storyboard
+++ b/iOSClient/Login/CCLogin.storyboard
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
- <device id="retina6_1" orientation="portrait">
- <adaptation id="fullscreen"/>
- </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+ <device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@@ -13,7 +11,7 @@
<!--Login-->
<scene sceneID="fVe-zF-WhZ">
<objects>
- <viewController storyboardIdentifier="CCLoginNextcloud" id="yj9-jo-WIn" customClass="CCLogin" sceneMemberID="viewController">
+ <viewController storyboardIdentifier="CCLoginNextcloud" modalPresentationStyle="fullScreen" id="yj9-jo-WIn" customClass="CCLogin" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Bv6-g3-l0M">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -130,7 +128,6 @@
<constraint firstAttribute="width" constant="50" id="3hb-Ez-hOz"/>
<constraint firstAttribute="height" constant="50" id="OLT-tb-4Qb"/>
</constraints>
- <state key="normal" backgroundImage="qrcode"/>
<connections>
<action selector="handleQRCode:" destination="yj9-jo-WIn" eventType="touchUpInside" id="IW6-a9-880"/>
</connections>
@@ -270,7 +267,6 @@
<image name="loginURL" width="25" height="25"/>
<image name="loginUser" width="25" height="25"/>
<image name="logo" width="223" height="157.5"/>
- <image name="qrcode" width="300" height="300"/>
<image name="visiblePassword" width="25" height="25"/>
</resources>
</document>