Browse Source

new settings for : preferred provider

Marino Faggiana 6 years ago
parent
commit
d6d865e257
2 changed files with 13 additions and 11 deletions
  1. 9 7
      iOSClient/Brand/Intro/CCIntro.m
  2. 4 4
      iOSClient/Supporting Files/en.lproj/Intro.strings

+ 9 - 7
iOSClient/Brand/Intro/CCIntro.m

@@ -67,13 +67,13 @@
 - (void)login:(id)sender
 {
     selector = k_intro_login;
-    [self.intro hideWithFadeOutDuration:0.3];
+    [self.intro hideWithFadeOutDuration:0.7];
 }
 
 - (void)signUp:(id)sender
 {
     selector = k_intro_signup;
-    [self.intro hideWithFadeOutDuration:0.3];
+    [self.intro hideWithFadeOutDuration:0.7];
 }
 
 - (void)show
@@ -104,16 +104,18 @@
     
     UIButton *buttonLogin = [UIButton buttonWithType:UIButtonTypeRoundedRect];
     buttonLogin.frame = CGRectMake(50.0, 0.0, width - 100.0, 40.0);
-    [buttonLogin setTitle:@"Login" forState:UIControlStateNormal];
-    buttonLogin.titleLabel.font = [UIFont systemFontOfSize:20];
+    [buttonLogin setTitle:[NSLocalizedStringFromTable(@"_log_in_", @"Intro", nil) uppercaseString] forState:UIControlStateNormal];
+    buttonLogin.titleLabel.font = [UIFont systemFontOfSize:14];
+    [buttonLogin setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
     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 setTitle:@"Sign up with provider" forState:UIControlStateNormal];
-    buttonSignUp.titleLabel.font = [UIFont systemFontOfSize:20];
-    buttonSignUp.backgroundColor = [[NCBrandColor sharedInstance] customerText];
+    [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];

+ 4 - 4
iOSClient/Supporting Files/en.lproj/Intro.strings

@@ -21,10 +21,7 @@
 //
 
 "_intro_1_title_"   = "A safe home for all your data";
-"_intro_1_text_"    = "Access, share and protect your files at home and at work";
-
-"_intro_11_title_"  = "Use gestures in files view";
-"_intro_11_text_"   = "Swipe → or ←: Options \n\nLong touch: Copy/Paste or Open in… \n\nPress: 3D Touch (when available)";
+"_intro_1_text_"    = "Keep your data secure and under your control";
 
 "_intro_2_title_"   = "Multi account";
 "_intro_2_text_"    = "Connect to all your clouds and touch the Nextcloud logo on the Files tab to switch between them";
@@ -34,3 +31,6 @@
 
 "_introNoCryptoCloud_1_title_" = "Crypto Cloud";
 "_introNoCryptoCloud_1_text_"  = "Crypto Cloud encryption protocol is no longer available, you can still decrypt your files by downloading the free app from AppStore\n\n'CryptoCloud for Nextcloud'\n\nSoon there will be a new EndToEnd protocol available on all Nextcloud clients\n\n\nTap to Start";
+
+"_log_in_"          = "Log in";
+"_sign_up_"         = "Sign up with provider";