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:
authortest <test@macbook-pro-di-marino.local>2018-09-21 12:11:19 +0300
committertest <test@MacBook-Pro-di-Marino.local>2018-09-21 12:11:19 +0300
commitc37ad5f9f55c179a16851104ad0860c8effc3be2 (patch)
tree9e6931bc6ac5132767324bdc9f9a1803801ed304
parent0a195e2d539c5d2772f5568da000b84a51fe93bf (diff)
new version for Apple Store2.22.3
-rw-r--r--iOSClient/Brand/File_Provider_Extension.plist2
-rw-r--r--iOSClient/Brand/Intro/CCIntro.m26
-rw-r--r--iOSClient/Brand/NCBrand.swift2
-rw-r--r--iOSClient/Brand/Notification_Service_Extension.plist2
-rw-r--r--iOSClient/Brand/Share.plist2
-rw-r--r--iOSClient/Brand/iOSClient.plist10
6 files changed, 25 insertions, 19 deletions
diff --git a/iOSClient/Brand/File_Provider_Extension.plist b/iOSClient/Brand/File_Provider_Extension.plist
index 195b32e7e..be2195145 100644
--- a/iOSClient/Brand/File_Provider_Extension.plist
+++ b/iOSClient/Brand/File_Provider_Extension.plist
@@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>2.22.3</string>
<key>CFBundleVersion</key>
- <string>11</string>
+ <string>12</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionFileProviderDocumentGroup</key>
diff --git a/iOSClient/Brand/Intro/CCIntro.m b/iOSClient/Brand/Intro/CCIntro.m
index 08a7dd056..e8a115164 100644
--- a/iOSClient/Brand/Intro/CCIntro.m
+++ b/iOSClient/Brand/Intro/CCIntro.m
@@ -112,18 +112,22 @@
buttonLogin.backgroundColor = [[NCBrandColor sharedInstance] customerText];
[buttonLogin addTarget:self action:@selector(login:) forControlEvents:UIControlEventTouchDown];
- UIButton *buttonSignUp = [UIButton buttonWithType:UIButtonTypeRoundedRect];
- buttonSignUp.frame = CGRectMake(50.0, 60.0, width - 100.0, 40.0);
- buttonSignUp.layer.cornerRadius = 3;
- buttonSignUp.clipsToBounds = YES;
- [buttonSignUp setTitle:[NSLocalizedStringFromTable(@"_sign_up_", @"Intro", nil) uppercaseString] forState:UIControlStateNormal];
- buttonSignUp.titleLabel.font = [UIFont systemFontOfSize:14];
- [buttonSignUp setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
- buttonSignUp.backgroundColor = [UIColor colorWithRed:25.0/255.0 green:89.0/255.0 blue:141.0/255.0 alpha:1.000];
- [buttonSignUp addTarget:self action:@selector(signUp:) forControlEvents:UIControlEventTouchDown];
-
[buttonView addSubview:buttonLogin];
- [buttonView addSubview:buttonSignUp];
+
+ if (![NCBrandOptions sharedInstance].disable_linkLoginProvider) {
+
+ UIButton *buttonSignUp = [UIButton buttonWithType:UIButtonTypeRoundedRect];
+ buttonSignUp.frame = CGRectMake(50.0, 60.0, width - 100.0, 40.0);
+ buttonSignUp.layer.cornerRadius = 3;
+ buttonSignUp.clipsToBounds = YES;
+ [buttonSignUp setTitle:[NSLocalizedStringFromTable(@"_sign_up_", @"Intro", nil) uppercaseString] forState:UIControlStateNormal];
+ buttonSignUp.titleLabel.font = [UIFont systemFontOfSize:14];
+ [buttonSignUp setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+ buttonSignUp.backgroundColor = [UIColor colorWithRed:25.0/255.0 green:89.0/255.0 blue:141.0/255.0 alpha:1.000];
+ [buttonSignUp addTarget:self action:@selector(signUp:) forControlEvents:UIControlEventTouchDown];
+
+ [buttonView addSubview:buttonSignUp];
+ }
// Pages
diff --git a/iOSClient/Brand/NCBrand.swift b/iOSClient/Brand/NCBrand.swift
index 8ca1677ab..155f95ec3 100644
--- a/iOSClient/Brand/NCBrand.swift
+++ b/iOSClient/Brand/NCBrand.swift
@@ -98,7 +98,7 @@ class NCBrandColor: NSObject {
@objc public let use_storeLocalAutoUploadAll: Bool = false
@objc public let disable_intro: Bool = false
- @objc public let disable_linkLoginProvider: Bool = false
+ @objc public let disable_linkLoginProvider: Bool = true
@objc public let disable_request_login_url: Bool = false
@objc public let disable_multiaccount: Bool = false
@objc public let disable_manage_account: Bool = false
diff --git a/iOSClient/Brand/Notification_Service_Extension.plist b/iOSClient/Brand/Notification_Service_Extension.plist
index 34e1b8301..892d0fd9f 100644
--- a/iOSClient/Brand/Notification_Service_Extension.plist
+++ b/iOSClient/Brand/Notification_Service_Extension.plist
@@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>2.22.3</string>
<key>CFBundleVersion</key>
- <string>11</string>
+ <string>12</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
diff --git a/iOSClient/Brand/Share.plist b/iOSClient/Brand/Share.plist
index cfa24e781..ebf84b48c 100644
--- a/iOSClient/Brand/Share.plist
+++ b/iOSClient/Brand/Share.plist
@@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>2.22.3</string>
<key>CFBundleVersion</key>
- <string>11</string>
+ <string>12</string>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
diff --git a/iOSClient/Brand/iOSClient.plist b/iOSClient/Brand/iOSClient.plist
index 18867eed3..fa1e7055b 100644
--- a/iOSClient/Brand/iOSClient.plist
+++ b/iOSClient/Brand/iOSClient.plist
@@ -69,7 +69,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>11</string>
+ <string>12</string>
<key>FIREBASE_ANALYTICS_COLLECTION_DEACTIVATED</key>
<true/>
<key>Fabric</key>
@@ -106,7 +106,9 @@
<true/>
</dict>
<key>NSCameraUsageDescription</key>
- <string>The use of Camera is used to scan documet</string>
+ <string>$(PRODUCT_NAME) requires access to the camera for scan documents</string>
+ <key>NSFaceIDUsageDescription</key>
+ <string>This app requires Face ID permission to authenticate using Face recognition.</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>The use of GPS is used to detect new photos from camera roll, continued use of GPS running in the background can dramatically decrease battery life.</string>
<key>NSLocationAlwaysUsageDescription</key>
@@ -114,9 +116,9 @@
<key>NSLocationWhenInUseUsageDescription</key>
<string>The use of GPS is used to detect new photos from camera roll on background, the use of GPS only when the App is in use is useless</string>
<key>NSPhotoLibraryAddUsageDescription</key>
- <string>$(PRODUCT_NAME) requires access to the photo library</string>
+ <string>$(PRODUCT_NAME) requires access to the photo library for send your photos and videos to your cloud.</string>
<key>NSPhotoLibraryUsageDescription</key>
- <string>$(PRODUCT_NAME) requires access to the photo library for send your photos and videos to your cloud</string>
+ <string>$(PRODUCT_NAME) requires access to the photo library for send your photos and videos to your cloud.</string>
<key>UIBackgroundModes</key>
<array>
<string>audio</string>