Browse Source

Change color (brand) mode

Marino Faggiana 7 years ago
parent
commit
17391f57a2
100 changed files with 14 additions and 6 deletions
  1. 1 1
      iOSClient/Login/CCLogin.m
  2. 13 5
      iOSClient/Main/CCMain.m
  3. BIN
      iOSClient/Supporting Files/cs-CZ.lproj/BKPasscodeView.strings
  4. BIN
      iOSClient/Supporting Files/cs-CZ.lproj/CTAssetsPicker.strings
  5. BIN
      iOSClient/Supporting Files/cs-CZ.lproj/Error.strings
  6. BIN
      iOSClient/Supporting Files/cs-CZ.lproj/InfoPlist.strings
  7. BIN
      iOSClient/Supporting Files/cs-CZ.lproj/Intro.strings
  8. BIN
      iOSClient/Supporting Files/cs-CZ.lproj/Localizable.strings
  9. BIN
      iOSClient/Supporting Files/cs-CZ.lproj/SwiftWebVC.strings
  10. BIN
      iOSClient/Supporting Files/es-419.lproj/BKPasscodeView.strings
  11. BIN
      iOSClient/Supporting Files/es-419.lproj/CTAssetsPicker.strings
  12. BIN
      iOSClient/Supporting Files/es-419.lproj/Error.strings
  13. BIN
      iOSClient/Supporting Files/es-419.lproj/InfoPlist.strings
  14. BIN
      iOSClient/Supporting Files/es-419.lproj/Intro.strings
  15. BIN
      iOSClient/Supporting Files/es-419.lproj/Localizable.strings
  16. BIN
      iOSClient/Supporting Files/es-419.lproj/SwiftWebVC.strings
  17. BIN
      iOSClient/Supporting Files/es-CL.lproj/BKPasscodeView.strings
  18. BIN
      iOSClient/Supporting Files/es-CL.lproj/CTAssetsPicker.strings
  19. BIN
      iOSClient/Supporting Files/es-CL.lproj/Error.strings
  20. BIN
      iOSClient/Supporting Files/es-CL.lproj/InfoPlist.strings
  21. BIN
      iOSClient/Supporting Files/es-CL.lproj/Intro.strings
  22. BIN
      iOSClient/Supporting Files/es-CL.lproj/Localizable.strings
  23. BIN
      iOSClient/Supporting Files/es-CL.lproj/SwiftWebVC.strings
  24. BIN
      iOSClient/Supporting Files/es-CO.lproj/BKPasscodeView.strings
  25. BIN
      iOSClient/Supporting Files/es-CO.lproj/CTAssetsPicker.strings
  26. BIN
      iOSClient/Supporting Files/es-CO.lproj/Error.strings
  27. BIN
      iOSClient/Supporting Files/es-CO.lproj/InfoPlist.strings
  28. BIN
      iOSClient/Supporting Files/es-CO.lproj/Intro.strings
  29. BIN
      iOSClient/Supporting Files/es-CO.lproj/Localizable.strings
  30. BIN
      iOSClient/Supporting Files/es-CO.lproj/SwiftWebVC.strings
  31. BIN
      iOSClient/Supporting Files/es-CR.lproj/BKPasscodeView.strings
  32. BIN
      iOSClient/Supporting Files/es-CR.lproj/CTAssetsPicker.strings
  33. BIN
      iOSClient/Supporting Files/es-CR.lproj/Error.strings
  34. BIN
      iOSClient/Supporting Files/es-CR.lproj/InfoPlist.strings
  35. BIN
      iOSClient/Supporting Files/es-CR.lproj/Intro.strings
  36. BIN
      iOSClient/Supporting Files/es-CR.lproj/Localizable.strings
  37. BIN
      iOSClient/Supporting Files/es-CR.lproj/SwiftWebVC.strings
  38. BIN
      iOSClient/Supporting Files/es-DO.lproj/BKPasscodeView.strings
  39. BIN
      iOSClient/Supporting Files/es-DO.lproj/CTAssetsPicker.strings
  40. BIN
      iOSClient/Supporting Files/es-DO.lproj/Error.strings
  41. BIN
      iOSClient/Supporting Files/es-DO.lproj/InfoPlist.strings
  42. BIN
      iOSClient/Supporting Files/es-DO.lproj/Intro.strings
  43. BIN
      iOSClient/Supporting Files/es-DO.lproj/Localizable.strings
  44. BIN
      iOSClient/Supporting Files/es-DO.lproj/SwiftWebVC.strings
  45. BIN
      iOSClient/Supporting Files/es-EC.lproj/BKPasscodeView.strings
  46. BIN
      iOSClient/Supporting Files/es-EC.lproj/CTAssetsPicker.strings
  47. BIN
      iOSClient/Supporting Files/es-EC.lproj/Error.strings
  48. BIN
      iOSClient/Supporting Files/es-EC.lproj/InfoPlist.strings
  49. BIN
      iOSClient/Supporting Files/es-EC.lproj/Intro.strings
  50. BIN
      iOSClient/Supporting Files/es-EC.lproj/Localizable.strings
  51. BIN
      iOSClient/Supporting Files/es-EC.lproj/SwiftWebVC.strings
  52. BIN
      iOSClient/Supporting Files/es-GT.lproj/BKPasscodeView.strings
  53. BIN
      iOSClient/Supporting Files/es-GT.lproj/CTAssetsPicker.strings
  54. BIN
      iOSClient/Supporting Files/es-GT.lproj/Error.strings
  55. BIN
      iOSClient/Supporting Files/es-GT.lproj/InfoPlist.strings
  56. BIN
      iOSClient/Supporting Files/es-GT.lproj/Intro.strings
  57. BIN
      iOSClient/Supporting Files/es-GT.lproj/Localizable.strings
  58. BIN
      iOSClient/Supporting Files/es-GT.lproj/SwiftWebVC.strings
  59. BIN
      iOSClient/Supporting Files/es-HN.lproj/BKPasscodeView.strings
  60. BIN
      iOSClient/Supporting Files/es-HN.lproj/CTAssetsPicker.strings
  61. BIN
      iOSClient/Supporting Files/es-HN.lproj/Error.strings
  62. BIN
      iOSClient/Supporting Files/es-HN.lproj/InfoPlist.strings
  63. BIN
      iOSClient/Supporting Files/es-HN.lproj/Intro.strings
  64. BIN
      iOSClient/Supporting Files/es-HN.lproj/Localizable.strings
  65. BIN
      iOSClient/Supporting Files/es-HN.lproj/SwiftWebVC.strings
  66. BIN
      iOSClient/Supporting Files/es-MX.lproj/BKPasscodeView.strings
  67. BIN
      iOSClient/Supporting Files/es-MX.lproj/CTAssetsPicker.strings
  68. BIN
      iOSClient/Supporting Files/es-MX.lproj/Error.strings
  69. BIN
      iOSClient/Supporting Files/es-MX.lproj/InfoPlist.strings
  70. BIN
      iOSClient/Supporting Files/es-MX.lproj/Intro.strings
  71. BIN
      iOSClient/Supporting Files/es-MX.lproj/Localizable.strings
  72. BIN
      iOSClient/Supporting Files/es-MX.lproj/SwiftWebVC.strings
  73. BIN
      iOSClient/Supporting Files/es-NI.lproj/BKPasscodeView.strings
  74. BIN
      iOSClient/Supporting Files/es-NI.lproj/CTAssetsPicker.strings
  75. BIN
      iOSClient/Supporting Files/es-NI.lproj/Error.strings
  76. BIN
      iOSClient/Supporting Files/es-NI.lproj/InfoPlist.strings
  77. BIN
      iOSClient/Supporting Files/es-NI.lproj/Intro.strings
  78. BIN
      iOSClient/Supporting Files/es-NI.lproj/Localizable.strings
  79. BIN
      iOSClient/Supporting Files/es-NI.lproj/SwiftWebVC.strings
  80. BIN
      iOSClient/Supporting Files/es-PA.lproj/BKPasscodeView.strings
  81. BIN
      iOSClient/Supporting Files/es-PA.lproj/CTAssetsPicker.strings
  82. BIN
      iOSClient/Supporting Files/es-PA.lproj/Error.strings
  83. BIN
      iOSClient/Supporting Files/es-PA.lproj/InfoPlist.strings
  84. BIN
      iOSClient/Supporting Files/es-PA.lproj/Intro.strings
  85. BIN
      iOSClient/Supporting Files/es-PA.lproj/Localizable.strings
  86. BIN
      iOSClient/Supporting Files/es-PA.lproj/SwiftWebVC.strings
  87. BIN
      iOSClient/Supporting Files/es-PE.lproj/BKPasscodeView.strings
  88. BIN
      iOSClient/Supporting Files/es-PE.lproj/CTAssetsPicker.strings
  89. BIN
      iOSClient/Supporting Files/es-PE.lproj/Error.strings
  90. BIN
      iOSClient/Supporting Files/es-PE.lproj/InfoPlist.strings
  91. BIN
      iOSClient/Supporting Files/es-PE.lproj/Intro.strings
  92. BIN
      iOSClient/Supporting Files/es-PE.lproj/Localizable.strings
  93. BIN
      iOSClient/Supporting Files/es-PE.lproj/SwiftWebVC.strings
  94. BIN
      iOSClient/Supporting Files/es-PR.lproj/BKPasscodeView.strings
  95. BIN
      iOSClient/Supporting Files/es-PR.lproj/CTAssetsPicker.strings
  96. BIN
      iOSClient/Supporting Files/es-PR.lproj/Error.strings
  97. BIN
      iOSClient/Supporting Files/es-PR.lproj/InfoPlist.strings
  98. BIN
      iOSClient/Supporting Files/es-PR.lproj/Intro.strings
  99. BIN
      iOSClient/Supporting Files/es-PR.lproj/Localizable.strings
  100. BIN
      iOSClient/Supporting Files/es-PR.lproj/SwiftWebVC.strings

+ 1 - 1
iOSClient/Login/CCLogin.m

@@ -61,7 +61,7 @@
     self.annulla.tintColor = [NCBrandColor sharedInstance].customerText;
     
     // Base URL
-    _imageBaseUrl.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"loginURL"] color:[NCBrandColor sharedInstance].customerText];
+    _imageBaseUrl.image = [UIImage imageNamed:@"loginURL"];
     _baseUrl.textColor = [NCBrandColor sharedInstance].customerText;
     _baseUrl.tintColor = [NCBrandColor sharedInstance].customerText;
     _baseUrl.placeholder = NSLocalizedString(@"_login_url_", nil);

+ 13 - 5
iOSClient/Main/CCMain.m

@@ -565,11 +565,19 @@
             if ([appDelegate.reachability isReachable] == NO) {
                 _ImageTitleHomeCryptoCloud = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"navigationLogoOffline"]];
             } else {
-                tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilites];
-                if ([capabilities.themingColor isEqualToString:@"#FFFFFF"])
-                    _ImageTitleHomeCryptoCloud = [[UIImageView alloc] initWithImage:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"navigationLogo"] color:[UIColor blackColor]]];
-                else
-                    _ImageTitleHomeCryptoCloud = [[UIImageView alloc] initWithImage:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"navigationLogo"] color:[UIColor whiteColor]]];
+                
+                if ([NCBrandOptions sharedInstance].use_themingColor) {
+                
+                    tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilites];
+                    
+                    if ([capabilities.themingColor isEqualToString:@"#FFFFFF"])
+                        _ImageTitleHomeCryptoCloud = [[UIImageView alloc] initWithImage:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"navigationLogo"] color:[UIColor blackColor]]];
+                    else
+                        _ImageTitleHomeCryptoCloud = [[UIImageView alloc] initWithImage:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"navigationLogo"] color:[UIColor whiteColor]]];
+                } else {
+                    
+                    _ImageTitleHomeCryptoCloud = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"navigationLogo"]];
+                }
             }
             
             [_ImageTitleHomeCryptoCloud setUserInteractionEnabled:YES];

BIN
iOSClient/Supporting Files/cs-CZ.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/cs-CZ.lproj/CTAssetsPicker.strings


BIN
iOSClient/Supporting Files/cs-CZ.lproj/Error.strings


BIN
iOSClient/Supporting Files/cs-CZ.lproj/InfoPlist.strings


BIN
iOSClient/Supporting Files/cs-CZ.lproj/Intro.strings


BIN
iOSClient/Supporting Files/cs-CZ.lproj/Localizable.strings


BIN
iOSClient/Supporting Files/cs-CZ.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/es-419.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/es-419.lproj/CTAssetsPicker.strings


BIN
iOSClient/Supporting Files/es-419.lproj/Error.strings


BIN
iOSClient/Supporting Files/es-419.lproj/InfoPlist.strings


BIN
iOSClient/Supporting Files/es-419.lproj/Intro.strings


BIN
iOSClient/Supporting Files/es-419.lproj/Localizable.strings


BIN
iOSClient/Supporting Files/es-419.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/es-CL.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/es-CL.lproj/CTAssetsPicker.strings


BIN
iOSClient/Supporting Files/es-CL.lproj/Error.strings


BIN
iOSClient/Supporting Files/es-CL.lproj/InfoPlist.strings


BIN
iOSClient/Supporting Files/es-CL.lproj/Intro.strings


BIN
iOSClient/Supporting Files/es-CL.lproj/Localizable.strings


BIN
iOSClient/Supporting Files/es-CL.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/es-CO.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/es-CO.lproj/CTAssetsPicker.strings


BIN
iOSClient/Supporting Files/es-CO.lproj/Error.strings


BIN
iOSClient/Supporting Files/es-CO.lproj/InfoPlist.strings


BIN
iOSClient/Supporting Files/es-CO.lproj/Intro.strings


BIN
iOSClient/Supporting Files/es-CO.lproj/Localizable.strings


BIN
iOSClient/Supporting Files/es-CO.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/es-CR.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/es-CR.lproj/CTAssetsPicker.strings


BIN
iOSClient/Supporting Files/es-CR.lproj/Error.strings


BIN
iOSClient/Supporting Files/es-CR.lproj/InfoPlist.strings


BIN
iOSClient/Supporting Files/es-CR.lproj/Intro.strings


BIN
iOSClient/Supporting Files/es-CR.lproj/Localizable.strings


BIN
iOSClient/Supporting Files/es-CR.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/es-DO.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/es-DO.lproj/CTAssetsPicker.strings


BIN
iOSClient/Supporting Files/es-DO.lproj/Error.strings


BIN
iOSClient/Supporting Files/es-DO.lproj/InfoPlist.strings


BIN
iOSClient/Supporting Files/es-DO.lproj/Intro.strings


BIN
iOSClient/Supporting Files/es-DO.lproj/Localizable.strings


BIN
iOSClient/Supporting Files/es-DO.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/es-EC.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/es-EC.lproj/CTAssetsPicker.strings


BIN
iOSClient/Supporting Files/es-EC.lproj/Error.strings


BIN
iOSClient/Supporting Files/es-EC.lproj/InfoPlist.strings


BIN
iOSClient/Supporting Files/es-EC.lproj/Intro.strings


BIN
iOSClient/Supporting Files/es-EC.lproj/Localizable.strings


BIN
iOSClient/Supporting Files/es-EC.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/es-GT.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/es-GT.lproj/CTAssetsPicker.strings


BIN
iOSClient/Supporting Files/es-GT.lproj/Error.strings


BIN
iOSClient/Supporting Files/es-GT.lproj/InfoPlist.strings


BIN
iOSClient/Supporting Files/es-GT.lproj/Intro.strings


BIN
iOSClient/Supporting Files/es-GT.lproj/Localizable.strings


BIN
iOSClient/Supporting Files/es-GT.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/es-HN.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/es-HN.lproj/CTAssetsPicker.strings


BIN
iOSClient/Supporting Files/es-HN.lproj/Error.strings


BIN
iOSClient/Supporting Files/es-HN.lproj/InfoPlist.strings


BIN
iOSClient/Supporting Files/es-HN.lproj/Intro.strings


BIN
iOSClient/Supporting Files/es-HN.lproj/Localizable.strings


BIN
iOSClient/Supporting Files/es-HN.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/es-MX.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/es-MX.lproj/CTAssetsPicker.strings


BIN
iOSClient/Supporting Files/es-MX.lproj/Error.strings


BIN
iOSClient/Supporting Files/es-MX.lproj/InfoPlist.strings


BIN
iOSClient/Supporting Files/es-MX.lproj/Intro.strings


BIN
iOSClient/Supporting Files/es-MX.lproj/Localizable.strings


BIN
iOSClient/Supporting Files/es-MX.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/es-NI.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/es-NI.lproj/CTAssetsPicker.strings


BIN
iOSClient/Supporting Files/es-NI.lproj/Error.strings


BIN
iOSClient/Supporting Files/es-NI.lproj/InfoPlist.strings


BIN
iOSClient/Supporting Files/es-NI.lproj/Intro.strings


BIN
iOSClient/Supporting Files/es-NI.lproj/Localizable.strings


BIN
iOSClient/Supporting Files/es-NI.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/es-PA.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/es-PA.lproj/CTAssetsPicker.strings


BIN
iOSClient/Supporting Files/es-PA.lproj/Error.strings


BIN
iOSClient/Supporting Files/es-PA.lproj/InfoPlist.strings


BIN
iOSClient/Supporting Files/es-PA.lproj/Intro.strings


BIN
iOSClient/Supporting Files/es-PA.lproj/Localizable.strings


BIN
iOSClient/Supporting Files/es-PA.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/es-PE.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/es-PE.lproj/CTAssetsPicker.strings


BIN
iOSClient/Supporting Files/es-PE.lproj/Error.strings


BIN
iOSClient/Supporting Files/es-PE.lproj/InfoPlist.strings


BIN
iOSClient/Supporting Files/es-PE.lproj/Intro.strings


BIN
iOSClient/Supporting Files/es-PE.lproj/Localizable.strings


BIN
iOSClient/Supporting Files/es-PE.lproj/SwiftWebVC.strings


BIN
iOSClient/Supporting Files/es-PR.lproj/BKPasscodeView.strings


BIN
iOSClient/Supporting Files/es-PR.lproj/CTAssetsPicker.strings


BIN
iOSClient/Supporting Files/es-PR.lproj/Error.strings


BIN
iOSClient/Supporting Files/es-PR.lproj/InfoPlist.strings


BIN
iOSClient/Supporting Files/es-PR.lproj/Intro.strings


BIN
iOSClient/Supporting Files/es-PR.lproj/Localizable.strings


BIN
iOSClient/Supporting Files/es-PR.lproj/SwiftWebVC.strings


Some files were not shown because too many files changed in this diff