Marino Faggiana 8 жил өмнө
parent
commit
1a0debf5a9

+ 1 - 0
iOSClient/CCImages.h

@@ -122,6 +122,7 @@
 #define image_settingsClearCache                @"settingsClearCache"
 #define image_settingsCredentials               @"settingsCredentials"
 #define image_settingsCryptoCloud               @"settingsCryptoCloud"
+#define image_settingsRemoveCryptoCloud         @"settingsRemoveCryptoCloud"
 #define image_settingsExit                      @"settingsExit"
 #define image_settingsHelp                      @"settingsHelp"
 #define image_settingsKeyMail                   @"settingsKeyMail"

+ 23 - 0
iOSClient/Images.xcassets/settingsRemoveCryptoCloud.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "settingsRemoveCryptoCloud.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "settingsRemoveCryptoCloud@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "settingsRemoveCryptoCloud@3x copia.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
iOSClient/Images.xcassets/settingsRemoveCryptoCloud.imageset/settingsRemoveCryptoCloud.png


BIN
iOSClient/Images.xcassets/settingsRemoveCryptoCloud.imageset/settingsRemoveCryptoCloud@2x.png


BIN
iOSClient/Images.xcassets/settingsRemoveCryptoCloud.imageset/settingsRemoveCryptoCloud@3x copia.png


+ 21 - 0
iOSClient/Settings/CCManageCryptoCloud.m

@@ -54,8 +54,17 @@
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [row.cellConfig setObject:[UIImage imageNamed:image_settingsCryptoCloud] forKey:@"imageView.image"];
     row.action.formSelector = @selector(activateCryptoCloud:);
+    row.hidden = @(YES);
     [section addFormRow:row];
     
+    // Deactivation Crypto Cloud Mode
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"deactivatecryptocloud" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_deactivation_crypto_cloud_", nil)];
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
+    [row.cellConfig setObject:[UIImage imageNamed:image_settingsRemoveCryptoCloud] forKey:@"imageView.image"];
+    row.action.formSelector = @selector(disactivateCryptoCloud:);
+    row.hidden = @(YES);
+    [section addFormRow:row];
+
     // Send aes-256 password via mail
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"sendmailencryptpass" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_encryptpass_by_email_", nil)];
     [row.cellConfig setObject:@(NSTextAlignmentCenter) forKey:@"textLabel.textAlignment"];
@@ -63,6 +72,7 @@
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [row.cellConfig setObject:[UIImage imageNamed:image_settingsKeyMail] forKey:@"imageView.image"];
     row.action.formSelector = @selector(checkEncryptPass:);
+    row.hidden = @(YES);
     [section addFormRow:row];
 
     section = [XLFormSectionDescriptor formSection];
@@ -112,6 +122,11 @@
     [self presentViewController:navigationController animated:YES completion:nil];
 }
 
+- (void)disactivateCryptoCloud:(XLFormRowDescriptor *)sender
+{
+    
+}
+
 - (void)checkEncryptPass:(XLFormRowDescriptor *)sender
 {
     
@@ -253,13 +268,19 @@
 - (void)reloadForm
 {
     XLFormRowDescriptor *rowActivateCryptoCloud = [self.form formRowWithTag:@"activatecryptocloud"];
+    XLFormRowDescriptor *rowDeactivateCryptoCloud = [self.form formRowWithTag:@"deactivatecryptocloud"];
     XLFormRowDescriptor *rowSendMailEncryptPass = [self.form formRowWithTag:@"sendmailencryptpass"];
 
     if (app.isCryptoCloudMode) {
+        
         rowActivateCryptoCloud.hidden = @(YES);
+        rowDeactivateCryptoCloud.hidden = @(NO);
         rowSendMailEncryptPass.hidden = @(NO);
+        
     } else {
+        
         rowActivateCryptoCloud.hidden = @(NO);
+        rowDeactivateCryptoCloud.hidden = @(YES);
         rowSendMailEncryptPass.hidden = @(YES);
     }
 

+ 2 - 1
iOSClient/en.lproj/Localizable.strings

@@ -159,7 +159,8 @@
 
 // Manage Crypto Cloud
 
-"_activation_crypto_cloud_" = "Activation Crypto Cloud";
+"_activation_crypto_cloud_"     = "Activation Crypto Cloud";
+"_deactivation_crypto_cloud_"   = "Deactivation Crypto Cloud";
 
 // Manage Photos