Browse Source

Add new possibility for branding

Marino Faggiana 7 years ago
parent
commit
523b6a8f08

+ 0 - 4
Nextcloud.xcodeproj/project.pbxproj

@@ -512,7 +512,6 @@
 		F78964AD1EBB576C00403E13 /* JDStatusBarNotification.m in Sources */ = {isa = PBXBuildFile; fileRef = F78964A81EBB576C00403E13 /* JDStatusBarNotification.m */; };
 		F78964AD1EBB576C00403E13 /* JDStatusBarNotification.m in Sources */ = {isa = PBXBuildFile; fileRef = F78964A81EBB576C00403E13 /* JDStatusBarNotification.m */; };
 		F78964AE1EBB576C00403E13 /* JDStatusBarStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = F78964AA1EBB576C00403E13 /* JDStatusBarStyle.m */; };
 		F78964AE1EBB576C00403E13 /* JDStatusBarStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = F78964AA1EBB576C00403E13 /* JDStatusBarStyle.m */; };
 		F78964AF1EBB576C00403E13 /* JDStatusBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = F78964AC1EBB576C00403E13 /* JDStatusBarView.m */; };
 		F78964AF1EBB576C00403E13 /* JDStatusBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = F78964AC1EBB576C00403E13 /* JDStatusBarView.m */; };
-		F78964BB1EBB621200403E13 /* README.md in Sources */ = {isa = PBXBuildFile; fileRef = F78964BA1EBB621200403E13 /* README.md */; };
 		F78BFED41D3111B800E513CF /* LaunchScreenNextcloud.xib in Resources */ = {isa = PBXBuildFile; fileRef = F78BFECA1D3111B800E513CF /* LaunchScreenNextcloud.xib */; };
 		F78BFED41D3111B800E513CF /* LaunchScreenNextcloud.xib in Resources */ = {isa = PBXBuildFile; fileRef = F78BFECA1D3111B800E513CF /* LaunchScreenNextcloud.xib */; };
 		F78BFEE11D31126B00E513CF /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F78BFEDE1D31126B00E513CF /* MainInterface.storyboard */; };
 		F78BFEE11D31126B00E513CF /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F78BFEDE1D31126B00E513CF /* MainInterface.storyboard */; };
 		F7A13A031E7F3D5D00016680 /* CCProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = F7A13A001E7F3D5D00016680 /* CCProgressView.m */; };
 		F7A13A031E7F3D5D00016680 /* CCProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = F7A13A001E7F3D5D00016680 /* CCProgressView.m */; };
@@ -1394,7 +1393,6 @@
 		F78964AA1EBB576C00403E13 /* JDStatusBarStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JDStatusBarStyle.m; sourceTree = "<group>"; };
 		F78964AA1EBB576C00403E13 /* JDStatusBarStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JDStatusBarStyle.m; sourceTree = "<group>"; };
 		F78964AB1EBB576C00403E13 /* JDStatusBarView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JDStatusBarView.h; sourceTree = "<group>"; };
 		F78964AB1EBB576C00403E13 /* JDStatusBarView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JDStatusBarView.h; sourceTree = "<group>"; };
 		F78964AC1EBB576C00403E13 /* JDStatusBarView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JDStatusBarView.m; sourceTree = "<group>"; };
 		F78964AC1EBB576C00403E13 /* JDStatusBarView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JDStatusBarView.m; sourceTree = "<group>"; };
-		F78964BA1EBB621200403E13 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; };
 		F78BFECA1D3111B800E513CF /* LaunchScreenNextcloud.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LaunchScreenNextcloud.xib; sourceTree = "<group>"; };
 		F78BFECA1D3111B800E513CF /* LaunchScreenNextcloud.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LaunchScreenNextcloud.xib; sourceTree = "<group>"; };
 		F78BFEDE1D31126B00E513CF /* MainInterface.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MainInterface.storyboard; sourceTree = "<group>"; };
 		F78BFEDE1D31126B00E513CF /* MainInterface.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MainInterface.storyboard; sourceTree = "<group>"; };
 		F78F6FAE1CC8CCB700F4EA25 /* CCSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSection.h; sourceTree = "<group>"; };
 		F78F6FAE1CC8CCB700F4EA25 /* CCSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSection.h; sourceTree = "<group>"; };
@@ -3364,7 +3362,6 @@
 				F72B60941A24F04E004EF66F /* Localizations */,
 				F72B60941A24F04E004EF66F /* Localizations */,
 				F7F67BAD1A24D27800EE80DA /* main.m */,
 				F7F67BAD1A24D27800EE80DA /* main.m */,
 				F7D154271E2392A300202FD9 /* Nextcloud-Bridging-Header.h */,
 				F7D154271E2392A300202FD9 /* Nextcloud-Bridging-Header.h */,
-				F78964BA1EBB621200403E13 /* README.md */,
 				F76344751BF259A800188725 /* synchronized.gif */,
 				F76344751BF259A800188725 /* synchronized.gif */,
 				F76344761BF259A800188725 /* synchronizedcrypto.gif */,
 				F76344761BF259A800188725 /* synchronizedcrypto.gif */,
 			);
 			);
@@ -4087,7 +4084,6 @@
 				F7F06EA91DBFACC600099AE9 /* CTAssetScrollView.m in Sources */,
 				F7F06EA91DBFACC600099AE9 /* CTAssetScrollView.m in Sources */,
 				F762CB771EACB7D400B38484 /* ReaderViewController.m in Sources */,
 				F762CB771EACB7D400B38484 /* ReaderViewController.m in Sources */,
 				F7F06E931DBFACC600099AE9 /* NSNumberFormatter+CTAssetsPickerController.m in Sources */,
 				F7F06E931DBFACC600099AE9 /* NSNumberFormatter+CTAssetsPickerController.m in Sources */,
-				F78964BB1EBB621200403E13 /* README.md in Sources */,
 				F72AAECC1E5C60C700BB17E1 /* UIImage+AHKAdditions.m in Sources */,
 				F72AAECC1E5C60C700BB17E1 /* UIImage+AHKAdditions.m in Sources */,
 				F762CB071EACB66200B38484 /* XLFormOptionsObject.m in Sources */,
 				F762CB071EACB66200B38484 /* XLFormOptionsObject.m in Sources */,
 				F7C525A01E3B48B700FFE02C /* CCNotification.swift in Sources */,
 				F7C525A01E3B48B700FFE02C /* CCNotification.swift in Sources */,

BIN
Nextcloud.xcodeproj/project.xcworkspace/xcuserdata/marinofaggiana.xcuserdatad/UserInterfaceState.xcuserstate


+ 0 - 27
README.md

@@ -1,27 +0,0 @@
-# [Nextcloud](https://nextcloud.com)  iOS app V 2.17.2
-
-[<img src="Animation.gif" 
-      alt="Download from App Storey" 
-      height="400">](https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8)
-
-[![irc](https://img.shields.io/badge/IRC-%23nextcloud%20on%20freenode-orange.svg)](https://webchat.freenode.net/?channels=nextcloud)
-[![irc](https://img.shields.io/badge/IRC-%23nextcloud--mobile%20on%20freenode-blue.svg)](https://webchat.freenode.net/?channels=nextcloud-mobile)
-
-Check out [nextcloud.com](https://nextcloud.com) and follow us on [@nextclouders](https://twitter.com/nextclouders) and [@NextcloudiOS](https://twitter.com/NextcloudiOS)
-
-If you want to [contribute](https://nextcloud.com/contribute/), you are very welcome: 
-
-- on our IRC channels #nextcloud and #nextcloud-mobile (on freenode)
-- our forum at https://help.nextcloud.com/c/clients/ios
-
-Please read the [Code of Conduct](https://nextcloud.com/community/code-of-conduct/). This document offers some guidance to ensure Nextcloud participants can cooperate effectively in a positive and inspiring atmosphere, and to explain how together we can strengthen and support each other.
-
-If you want to join the Github organization just let us know and we’ll add you! :)
-
-## Start contributing
-Fork this repository and contribute back using pull requests to the master branch! More info coming.
-Easy starting points are also reviewing [pull requests](https://github.com/nextcloud/ios/pulls) and working on [starter issue](https://github.com/nextcloud/ios/issues?q=is%3Aopen+is%3Aissue+label%3A%22starter+issue%22) - we're working on adding those, of course!
-
-**License:** [GPLv3](https://github.com/nextcloud/ios/blob/master/LICENSE) with [Apple app store exception](https://github.com/nextcloud/ios/blob/master/COPYING.iOS).
-
-Like to see this app using your language? Start translating at https://www.transifex.com/nextcloud/nextcloud/dashboard/

+ 3 - 0
iOSClient/Brand/NCBrandConstant.h

@@ -27,10 +27,12 @@
 #define k_textCopyrightNextcloudiOS             @"Nextcloud for iOS %@ © 2017 T.W.S. Inc."
 #define k_textCopyrightNextcloudiOS             @"Nextcloud for iOS %@ © 2017 T.W.S. Inc."
 #define k_textCopyrightNextcloudServer          @"Nextcloud Server %@"
 #define k_textCopyrightNextcloudServer          @"Nextcloud Server %@"
 #define k_loginBaseUrl                          @"https://cloud.twsweb.it"
 #define k_loginBaseUrl                          @"https://cloud.twsweb.it"
+#define k_loginBaseUrlMultiDomains              {@"domain.com", "domain.it"}
 #define k_pushNotificationServer                @"https://push-notifications.nextcloud.com"
 #define k_pushNotificationServer                @"https://push-notifications.nextcloud.com"
 #define k_loginButtonLabelLink                  @"https://nextcloud.com/providers"
 #define k_loginButtonLabelLink                  @"https://nextcloud.com/providers"
 #define k_webLoginAutenticationProtocol         @""
 #define k_webLoginAutenticationProtocol         @""
 
 
+
 // Capabilities Group
 // Capabilities Group
 #define k_capabilitiesGroups                    @"group.it.twsweb.Crypto-Cloud"
 #define k_capabilitiesGroups                    @"group.it.twsweb.Crypto-Cloud"
 
 
@@ -40,6 +42,7 @@
 #define k_option_use_default_automatic_upload   NO
 #define k_option_use_default_automatic_upload   NO
 #define k_option_use_themingColor               YES
 #define k_option_use_themingColor               YES
 #define k_option_use_themingBackground          YES
 #define k_option_use_themingBackground          YES
+#define k_option_use_multiDomains               NO
 
 
 #define k_option_disable_intro                  NO
 #define k_option_disable_intro                  NO
 #define k_option_disable_request_login_url      NO
 #define k_option_disable_request_login_url      NO