Browse Source

remove old font Raleway

Marino Faggiana 8 years ago
parent
commit
7dfb5560eb

+ 0 - 46
Nextcloud.xcodeproj/project.pbxproj

@@ -386,7 +386,6 @@
 		F77B0EEE1D118A16002130FE /* VideoOverlay@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0C851C8892DF008DAB36 /* VideoOverlay@2x.png */; };
 		F77B0EEF1D118A16002130FE /* UIBarButtonItemArrowLeft.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0C7B1C8892DF008DAB36 /* UIBarButtonItemArrowLeft.png */; };
 		F77B0EF01D118A16002130FE /* ZSSh4@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0DA01C889300008DAB36 /* ZSSh4@2x.png */; };
-		F77B0EF11D118A16002130FE /* Raleway-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F722CEEC1A40361A00C40606 /* Raleway-SemiBold.ttf */; };
 		F77B0EF21D118A16002130FE /* ZSSunderline.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0DCD1C889300008DAB36 /* ZSSunderline.png */; };
 		F77B0EF31D118A16002130FE /* VideoOverlay@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0C861C8892DF008DAB36 /* VideoOverlay@3x.png */; };
 		F77B0EF41D118A16002130FE /* ImageSelectedOff.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0C691C8892DF008DAB36 /* ImageSelectedOff.png */; };
@@ -400,7 +399,6 @@
 		F77B0EFF1D118A16002130FE /* ZSSinsertkeyword.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0DAB1C889300008DAB36 /* ZSSinsertkeyword.png */; };
 		F77B0F001D118A16002130FE /* UIBarButtonItemArrowRight@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0C801C8892DF008DAB36 /* UIBarButtonItemArrowRight@3x.png */; };
 		F77B0F011D118A16002130FE /* UIBarButtonItemArrowRight.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0C7E1C8892DF008DAB36 /* UIBarButtonItemArrowRight.png */; };
-		F77B0F021D118A16002130FE /* Raleway-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F722CEED1A40361A00C40606 /* Raleway-Thin.ttf */; };
 		F77B0F031D118A16002130FE /* ImageSelectedSmallOff.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0C6F1C8892DF008DAB36 /* ImageSelectedSmallOff.png */; };
 		F77B0F041D118A16002130FE /* ZSSoutdent@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0DB81C889300008DAB36 /* ZSSoutdent@2x.png */; };
 		F77B0F051D118A16002130FE /* ZSSindent.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0DA91C889300008DAB36 /* ZSSindent.png */; };
@@ -458,7 +456,6 @@
 		F77B0F401D118A16002130FE /* UIBarButtonItemArrowLeft@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0C7C1C8892DF008DAB36 /* UIBarButtonItemArrowLeft@2x.png */; };
 		F77B0F411D118A16002130FE /* ZSStextcolor@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0DCC1C889300008DAB36 /* ZSStextcolor@2x.png */; };
 		F77B0F421D118A16002130FE /* ImageSelectedOn.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0C6C1C8892DF008DAB36 /* ImageSelectedOn.png */; };
-		F77B0F431D118A16002130FE /* Raleway-ExtraBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F722CEE61A40361A00C40606 /* Raleway-ExtraBold.ttf */; };
 		F77B0F441D118A16002130FE /* Reader-Button-N@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0EA71C889317008DAB36 /* Reader-Button-N@2x.png */; };
 		F77B0F461D118A16002130FE /* Reader-Button-H@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0EA51C889317008DAB36 /* Reader-Button-H@2x.png */; };
 		F77B0F471D118A16002130FE /* ZSSbgcolor@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0D901C889300008DAB36 /* ZSSbgcolor@2x.png */; };
@@ -477,18 +474,15 @@
 		F77B0F571D118A16002130FE /* synchronizedcrypto.gif in Resources */ = {isa = PBXBuildFile; fileRef = F76344761BF259A800188725 /* synchronizedcrypto.gif */; };
 		F77B0F581D118A16002130FE /* TTOpenInAppActivityLocalizable.string in Resources */ = {isa = PBXBuildFile; fileRef = F7BFE0CA1B67925500F072A4 /* TTOpenInAppActivityLocalizable.string */; };
 		F77B0F591D118A16002130FE /* ZSSRichTextEditor.js in Resources */ = {isa = PBXBuildFile; fileRef = F70F0DF01C889300008DAB36 /* ZSSRichTextEditor.js */; };
-		F77B0F5A1D118A16002130FE /* Raleway-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F722CEE91A40361A00C40606 /* Raleway-Light.ttf */; };
 		F77B0F5B1D118A16002130FE /* ZSSclearstyle.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0D951C889300008DAB36 /* ZSSclearstyle.png */; };
 		F77B0F5C1D118A16002130FE /* ImagesIntro.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F744BE961BEBB31E004FFF66 /* ImagesIntro.xcassets */; };
 		F77B0F5D1D118A16002130FE /* Reader-Print.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0EB01C889317008DAB36 /* Reader-Print.png */; };
 		F77B0F5E1D118A16002130FE /* ZSSlink@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0DB41C889300008DAB36 /* ZSSlink@2x.png */; };
 		F77B0F5F1D118A16002130FE /* Reader-Email.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0EA81C889317008DAB36 /* Reader-Email.png */; };
-		F77B0F601D118A16002130FE /* Raleway-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F722CEEA1A40361A00C40606 /* Raleway-Medium.ttf */; };
 		F77B0F611D118A16002130FE /* Acknowledgements.rtf in Resources */ = {isa = PBXBuildFile; fileRef = F7ACE42B1BAC0268006C0017 /* Acknowledgements.rtf */; };
 		F77B0F621D118A16002130FE /* ZSSunorderedlist.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0DD31C889300008DAB36 /* ZSSunorderedlist.png */; };
 		F77B0F631D118A16002130FE /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = F7E70DE91A24DE4100E1B66A /* Localizable.strings */; };
 		F77B0F641D118A16002130FE /* ZSSh4.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0D9F1C889300008DAB36 /* ZSSh4.png */; };
-		F77B0F651D118A16002130FE /* Raleway-Heavy.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F722CEE81A40361A00C40606 /* Raleway-Heavy.ttf */; };
 		F77B0F661D118A16002130FE /* ImageSelectedOff@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0C6A1C8892DF008DAB36 /* ImageSelectedOff@2x.png */; };
 		F77B0F671D118A16002130FE /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F7C6D5F61BE371D800AC83AD /* InfoPlist.strings */; };
 		F77B0F691D118A16002130FE /* ImageSelectedSmallOff@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0C701C8892DF008DAB36 /* ImageSelectedSmallOff@2x.png */; };
@@ -497,7 +491,6 @@
 		F77B0F6C1D118A16002130FE /* ZSSsubscript.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0DC51C889300008DAB36 /* ZSSsubscript.png */; };
 		F77B0F6E1D118A16002130FE /* ZSShorizontalrule@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0DA61C889300008DAB36 /* ZSShorizontalrule@2x.png */; };
 		F77B0F6F1D118A16002130FE /* ZSSforcejustify.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0D971C889300008DAB36 /* ZSSforcejustify.png */; };
-		F77B0F711D118A16002130FE /* Raleway-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F722CEE51A40361A00C40606 /* Raleway-Bold.ttf */; };
 		F77B0F721D118A16002130FE /* PlayButtonOverlayLarge@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0C761C8892DF008DAB36 /* PlayButtonOverlayLarge@2x.png */; };
 		F77B0F731D118A16002130FE /* ImageSelectedSmallOn@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0C741C8892DF008DAB36 /* ImageSelectedSmallOn@3x.png */; };
 		F77B0F741D118A16002130FE /* ZSSunorderedlist@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0DD41C889300008DAB36 /* ZSSunorderedlist@2x.png */; };
@@ -518,8 +511,6 @@
 		F77B0F841D118A16002130FE /* Reader-Print@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0EB11C889317008DAB36 /* Reader-Print@2x.png */; };
 		F77B0F851D118A16002130FE /* Reader-Export@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0EAB1C889317008DAB36 /* Reader-Export@2x.png */; };
 		F77B0F861D118A16002130FE /* LMMediaPlayerView.bundle in Resources */ = {isa = PBXBuildFile; fileRef = F70F0F281C889339008DAB36 /* LMMediaPlayerView.bundle */; };
-		F77B0F871D118A16002130FE /* Raleway-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F722CEEB1A40361A00C40606 /* Raleway-Regular.ttf */; };
-		F77B0F891D118A16002130FE /* Raleway-ExtraLight.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F722CEE71A40361A00C40606 /* Raleway-ExtraLight.ttf */; };
 		F77B0F8A1D118A16002130FE /* CCCellMain.xib in Resources */ = {isa = PBXBuildFile; fileRef = F70211F61BAC56E9003FC03E /* CCCellMain.xib */; };
 		F77B0F8B1D118A16002130FE /* PlayButtonOverlayLargeTap@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0C791C8892DF008DAB36 /* PlayButtonOverlayLargeTap@2x.png */; };
 		F77B0F8C1D118A16002130FE /* CCCellMainTransfer.xib in Resources */ = {isa = PBXBuildFile; fileRef = F70211F91BAC56E9003FC03E /* CCCellMainTransfer.xib */; };
@@ -1099,16 +1090,6 @@
 		F72137301BAFF0920012B613 /* CCTemplates.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCTemplates.m; sourceTree = "<group>"; };
 		F7229B461DF71BA800E8C4E7 /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ChangeLog; sourceTree = SOURCE_ROOT; };
 		F7229B491DF71BB300E8C4E7 /* AUTHORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AUTHORS; sourceTree = SOURCE_ROOT; };
-		F722CEE41A40361A00C40606 /* OFL.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = OFL.txt; sourceTree = "<group>"; };
-		F722CEE51A40361A00C40606 /* Raleway-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Raleway-Bold.ttf"; sourceTree = "<group>"; };
-		F722CEE61A40361A00C40606 /* Raleway-ExtraBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Raleway-ExtraBold.ttf"; sourceTree = "<group>"; };
-		F722CEE71A40361A00C40606 /* Raleway-ExtraLight.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Raleway-ExtraLight.ttf"; sourceTree = "<group>"; };
-		F722CEE81A40361A00C40606 /* Raleway-Heavy.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Raleway-Heavy.ttf"; sourceTree = "<group>"; };
-		F722CEE91A40361A00C40606 /* Raleway-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Raleway-Light.ttf"; sourceTree = "<group>"; };
-		F722CEEA1A40361A00C40606 /* Raleway-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Raleway-Medium.ttf"; sourceTree = "<group>"; };
-		F722CEEB1A40361A00C40606 /* Raleway-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Raleway-Regular.ttf"; sourceTree = "<group>"; };
-		F722CEEC1A40361A00C40606 /* Raleway-SemiBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Raleway-SemiBold.ttf"; sourceTree = "<group>"; };
-		F722CEED1A40361A00C40606 /* Raleway-Thin.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Raleway-Thin.ttf"; sourceTree = "<group>"; };
 		F7253FC81E38BAF20084135B /* JSAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAlertView.h; sourceTree = "<group>"; };
 		F7253FC91E38BAF20084135B /* JSAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSAlertView.m; sourceTree = "<group>"; };
 		F7296A601C8880C9001A7809 /* CCCellShareExt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCCellShareExt.h; sourceTree = "<group>"; };
@@ -2373,23 +2354,6 @@
 			path = Templates;
 			sourceTree = "<group>";
 		};
-		F722CEE31A40361A00C40606 /* Raleway */ = {
-			isa = PBXGroup;
-			children = (
-				F722CEE41A40361A00C40606 /* OFL.txt */,
-				F722CEE51A40361A00C40606 /* Raleway-Bold.ttf */,
-				F722CEE61A40361A00C40606 /* Raleway-ExtraBold.ttf */,
-				F722CEE71A40361A00C40606 /* Raleway-ExtraLight.ttf */,
-				F722CEE81A40361A00C40606 /* Raleway-Heavy.ttf */,
-				F722CEE91A40361A00C40606 /* Raleway-Light.ttf */,
-				F722CEEA1A40361A00C40606 /* Raleway-Medium.ttf */,
-				F722CEEB1A40361A00C40606 /* Raleway-Regular.ttf */,
-				F722CEEC1A40361A00C40606 /* Raleway-SemiBold.ttf */,
-				F722CEED1A40361A00C40606 /* Raleway-Thin.ttf */,
-			);
-			path = Raleway;
-			sourceTree = "<group>";
-		};
 		F7253FC71E38BAF20084135B /* JSAlertView */ = {
 			isa = PBXGroup;
 			children = (
@@ -3238,7 +3202,6 @@
 				F7F0617A1BAACDD300846525 /* CryptoCloud.pch */,
 				F7F67BAD1A24D27800EE80DA /* main.m */,
 				F72B60941A24F04E004EF66F /* Localizzazione */,
-				F722CEE31A40361A00C40606 /* Raleway */,
 			);
 			name = "Supporting Files";
 			path = iOSClient;
@@ -3586,7 +3549,6 @@
 				F77B0EEE1D118A16002130FE /* VideoOverlay@2x.png in Resources */,
 				F77B0EEF1D118A16002130FE /* UIBarButtonItemArrowLeft.png in Resources */,
 				F77B0EF01D118A16002130FE /* ZSSh4@2x.png in Resources */,
-				F77B0EF11D118A16002130FE /* Raleway-SemiBold.ttf in Resources */,
 				F77D49A91DC238E500CDC568 /* loading@2x.gif in Resources */,
 				F77B0EF21D118A16002130FE /* ZSSunderline.png in Resources */,
 				F77B0EF31D118A16002130FE /* VideoOverlay@3x.png in Resources */,
@@ -3604,7 +3566,6 @@
 				F77B0F001D118A16002130FE /* UIBarButtonItemArrowRight@3x.png in Resources */,
 				F77B0F011D118A16002130FE /* UIBarButtonItemArrowRight.png in Resources */,
 				F7676A7B1D5CB2A400DF734C /* icon-error@2x.png in Resources */,
-				F77B0F021D118A16002130FE /* Raleway-Thin.ttf in Resources */,
 				F78BFED41D3111B800E513CF /* LaunchScreenNextcloud.xib in Resources */,
 				F77B0F031D118A16002130FE /* ImageSelectedSmallOff.png in Resources */,
 				F77B0F041D118A16002130FE /* ZSSoutdent@2x.png in Resources */,
@@ -3670,7 +3631,6 @@
 				F77B0F401D118A16002130FE /* UIBarButtonItemArrowLeft@2x.png in Resources */,
 				F77B0F411D118A16002130FE /* ZSStextcolor@2x.png in Resources */,
 				F77B0F421D118A16002130FE /* ImageSelectedOn.png in Resources */,
-				F77B0F431D118A16002130FE /* Raleway-ExtraBold.ttf in Resources */,
 				F77B0F441D118A16002130FE /* Reader-Button-N@2x.png in Resources */,
 				F77B0F461D118A16002130FE /* Reader-Button-H@2x.png in Resources */,
 				F77B0F471D118A16002130FE /* ZSSbgcolor@2x.png in Resources */,
@@ -3689,18 +3649,15 @@
 				F77B0F571D118A16002130FE /* synchronizedcrypto.gif in Resources */,
 				F77B0F581D118A16002130FE /* TTOpenInAppActivityLocalizable.string in Resources */,
 				F77B0F591D118A16002130FE /* ZSSRichTextEditor.js in Resources */,
-				F77B0F5A1D118A16002130FE /* Raleway-Light.ttf in Resources */,
 				F77B0F5B1D118A16002130FE /* ZSSclearstyle.png in Resources */,
 				F77B0F5C1D118A16002130FE /* ImagesIntro.xcassets in Resources */,
 				F77B0F5D1D118A16002130FE /* Reader-Print.png in Resources */,
 				F77B0F5E1D118A16002130FE /* ZSSlink@2x.png in Resources */,
 				F77B0F5F1D118A16002130FE /* Reader-Email.png in Resources */,
-				F77B0F601D118A16002130FE /* Raleway-Medium.ttf in Resources */,
 				F77B0F611D118A16002130FE /* Acknowledgements.rtf in Resources */,
 				F77B0F621D118A16002130FE /* ZSSunorderedlist.png in Resources */,
 				F77B0F631D118A16002130FE /* Localizable.strings in Resources */,
 				F77B0F641D118A16002130FE /* ZSSh4.png in Resources */,
-				F77B0F651D118A16002130FE /* Raleway-Heavy.ttf in Resources */,
 				F77B0F661D118A16002130FE /* ImageSelectedOff@2x.png in Resources */,
 				F77B0F671D118A16002130FE /* InfoPlist.strings in Resources */,
 				F77B0F691D118A16002130FE /* ImageSelectedSmallOff@2x.png in Resources */,
@@ -3711,7 +3668,6 @@
 				F7F06EC31DBFACC600099AE9 /* CTAssetsPickerController.bundle in Resources */,
 				F77B0F6E1D118A16002130FE /* ZSShorizontalrule@2x.png in Resources */,
 				F77B0F6F1D118A16002130FE /* ZSSforcejustify.png in Resources */,
-				F77B0F711D118A16002130FE /* Raleway-Bold.ttf in Resources */,
 				F77B0F721D118A16002130FE /* PlayButtonOverlayLarge@2x.png in Resources */,
 				F77B0F731D118A16002130FE /* ImageSelectedSmallOn@3x.png in Resources */,
 				F77B0F741D118A16002130FE /* ZSSunorderedlist@2x.png in Resources */,
@@ -3734,8 +3690,6 @@
 				F7676A831D5CB2A400DF734C /* icon-success@2x.png in Resources */,
 				F77B0F851D118A16002130FE /* Reader-Export@2x.png in Resources */,
 				F77B0F861D118A16002130FE /* LMMediaPlayerView.bundle in Resources */,
-				F77B0F871D118A16002130FE /* Raleway-Regular.ttf in Resources */,
-				F77B0F891D118A16002130FE /* Raleway-ExtraLight.ttf in Resources */,
 				F77B0F8A1D118A16002130FE /* CCCellMain.xib in Resources */,
 				F77B0F8B1D118A16002130FE /* PlayButtonOverlayLargeTap@2x.png in Resources */,
 				F77B0F8C1D118A16002130FE /* CCCellMainTransfer.xib in Resources */,

+ 0 - 10
iOSClient/CCGlobal.h

@@ -131,16 +131,6 @@ extern NSString *const BKPasscodeKeychainServiceName;
 #define k_returnCartaIdentita                   12
 #define k_returnPassaporto                      13
 
-#define RalewayBold(s) [UIFont fontWithName:@"Raleway-Bold" size:s]
-#define RalewayExtraBold(s) [UIFont fontWithName:@"Raleway-ExtraBold" size:s]
-#define RalewayExtraLight(s) [UIFont fontWithName:@"Raleway-ExtraLight" size:s]
-#define RalewayHeavy(s) [UIFont fontWithName:@"Raleway-Heavy" size:s]
-#define RalewayLight(s) [UIFont fontWithName:@"Raleway-Light" size:s]
-#define RalewayMedium(s) [UIFont fontWithName:@"Raleway-Medium" size:s]
-#define RalewayRegular(s) [UIFont fontWithName:@"Raleway-Regular" size:s]
-#define RalewaySemiBold(s) [UIFont fontWithName:@"Raleway-SemiBold" size:s]
-#define RalewayThin(s) [UIFont fontWithName:@"Raleway-Thin" size:s]
-
 // File Name Const
 #define k_folderDefaultCameraUpload                     @"Photos"
 

+ 0 - 12
iOSClient/Info.plist

@@ -93,18 +93,6 @@
 	<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>NSPhotoLibraryUsageDescription</key>
 	<string>$(PRODUCT_NAME)</string>
-	<key>UIAppFonts</key>
-	<array>
-		<string>Raleway-Thin.ttf</string>
-		<string>Raleway-SemiBold.ttf</string>
-		<string>Raleway-Regular.ttf</string>
-		<string>Raleway-Medium.ttf</string>
-		<string>Raleway-Light.ttf</string>
-		<string>Raleway-Heavy.ttf</string>
-		<string>Raleway-ExtraLight.ttf</string>
-		<string>Raleway-Bold.ttf</string>
-		<string>Raleway-ExtraBold.ttf</string>
-	</array>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>audio</string>

+ 118 - 118
iOSClient/Intro/CCIntro.m

@@ -63,11 +63,11 @@
     page1.title = [CCUtility localizableBrand:@"_intro_01_" table:@"Intro"]; // "BENVENUTO"
     page1.titlePositionY = titlePositionY;
     page1.titleColor = COLOR_GRAY;
-    page1.titleFont = RalewayMedium(20.0f);
+    page1.titleFont = [UIFont systemFontOfSize:20];
     page1.desc = [CCUtility localizableBrand:@"_intro_02_" table:@"Intro"];
     page1.descPositionY = descPositionY;
     page1.descColor = COLOR_GRAY;
-    page1.descFont = RalewayLight(14.0f);
+    page1.descFont = [UIFont systemFontOfSize:14];
 #ifdef CC
     page1.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro1"]];
     page1.bgImage = [UIImage imageNamed:@"bgbianco"];
@@ -82,10 +82,10 @@
     EAIntroPage *page2 = [EAIntroPage page];
     page2.title = [CCUtility localizableBrand:@"_intro_03_" table:@"Intro"]; // "CHIAVE DI CRIPTAZIONE"
     page2.titlePositionY = titlePositionY;
-    page2.titleFont = RalewayMedium(20.0f);
+    page2.titleFont = [UIFont systemFontOfSize:20];
     page2.desc = [CCUtility localizableBrand:@"_intro_04_" table:@"Intro"];
     page2.descPositionY = descPositionY;
-    page2.descFont = RalewayLight(14.0f);
+    page2.descFont = [UIFont systemFontOfSize:14];
 #ifdef CC
     page2.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro2"]];
     page2.bgImage = [UIImage imageNamed:@"bggrigio"];
@@ -104,9 +104,9 @@
     EAIntroPage *page3 = [EAIntroPage page];
     page3.title = [CCUtility localizableBrand:@"_intro_05_" table:@"Intro"]; // ACCEDI
     page3.titlePositionY = titlePositionY;
-    page3.titleFont = RalewayMedium(20.0f);
+    page3.titleFont = [UIFont systemFontOfSize:20];
     page3.descPositionY = descPositionY;
-    page3.descFont = RalewayLight(14.0f);
+    page3.descFont = [UIFont systemFontOfSize:14];
 #ifdef CC
     page3.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro3"]];
     page3.bgImage = [UIImage imageNamed:@"bgarancio"];
@@ -128,11 +128,11 @@
     page4.title = [[CCUtility localizableBrand:@"_intro_07_" table:@"Intro"] uppercaseString]; // "CRYPTO CLOUD" - "NEXTCLOUD"
     page4.titlePositionY = titlePositionY;
     page4.titleColor = COLOR_GRAY;
-    page4.titleFont = RalewayMedium(20.0f);
+    page4.titleFont = [UIFont systemFontOfSize:20];
     page4.desc = [CCUtility localizableBrand:@"_intro_08_" table:@"Intro"];
     page4.descPositionY = descPositionY;
     page4.descColor = COLOR_GRAY;
-    page4.descFont = RalewayLight(14.0f);
+    page4.descFont = [UIFont systemFontOfSize:14];
 #ifdef CC
     page4.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro4"]];
     page4.bgImage = [UIImage imageNamed:@"bgbianco"];
@@ -147,10 +147,10 @@
     EAIntroPage *page5 = [EAIntroPage page];
     page5.title = [CCUtility localizableBrand:@"_intro_09_" table:@"Intro"]; // "OFFLINE & LOCAL"
     page5.titlePositionY = titlePositionY;
-    page5.titleFont = RalewayMedium(20.0f);
+    page5.titleFont = [UIFont systemFontOfSize:20];
     page5.desc = [CCUtility localizableBrand:@"_intro_10_" table:@"Intro"];
     page5.descPositionY = descPositionY;
-    page5.descFont = RalewayLight(14.0f);
+    page5.descFont = [UIFont systemFontOfSize:14];
 #ifdef CC
     page5.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro5"]];
     page5.bgImage = [UIImage imageNamed:@"bgarancio"];
@@ -169,10 +169,10 @@
     EAIntroPage *page6 = [EAIntroPage page];
     page6.title = [CCUtility localizableBrand:@"_intro_11_" table:@"Intro"]; // "CRIPTA / DECRIPTA"
     page6.titlePositionY = titlePositionY;
-    page6.titleFont = RalewayMedium(20.0f);
+    page6.titleFont = [UIFont systemFontOfSize:20];
     page6.desc = [CCUtility localizableBrand:@"_intro_12_" table:@"Intro"];
     page6.descPositionY = descPositionY;
-    page6.descFont = RalewayLight(14.0f);
+    page6.descFont = [UIFont systemFontOfSize:14];
 #ifdef CC
     page6.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro6"]];
     page6.bgImage = [UIImage imageNamed:@"bggrigio"];
@@ -192,11 +192,11 @@
     page7.title = [CCUtility localizableBrand:@"_intro_13_" table:@"Intro"]; // "AGGIUNGI"
     page7.titlePositionY = titlePositionY;
     page7.titleColor = COLOR_GRAY;
-    page7.titleFont = RalewayMedium(20.0f);
+    page7.titleFont = [UIFont systemFontOfSize:20];
     page7.desc = [CCUtility localizableBrand:@"_intro_14_" table:@"Intro"];
     page7.descPositionY = descPositionY;
     page7.descColor = COLOR_GRAY;
-    page7.descFont = RalewayLight(14.0f);
+    page7.descFont = [UIFont systemFontOfSize:14];
 #ifdef CC
     page7.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro7"]];
     page7.bgImage = [UIImage imageNamed:@"bgbianco"];
@@ -211,10 +211,10 @@
     EAIntroPage *page8 = [EAIntroPage page];
     page8.title = [CCUtility localizableBrand:@"_intro_15_" table:@"Intro"]; // "TEMPLATES"
     page8.titlePositionY = titlePositionY;
-    page8.titleFont = RalewayMedium(20.0f);
+    page8.titleFont = [UIFont systemFontOfSize:20];
     page8.desc = [CCUtility localizableBrand:@"_intro_16_" table:@"Intro"];
     page8.descPositionY = descPositionY;
-    page8.descFont = RalewayLight(14.0f);
+    page8.descFont = [UIFont systemFontOfSize:14];
 #ifdef CC
     page8.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro8"]];
     page8.bgImage = [UIImage imageNamed:@"bgarancio"];
@@ -233,10 +233,10 @@
     EAIntroPage *page9 = [EAIntroPage page];
     page9.title = [CCUtility localizableBrand:@"_intro_17_" table:@"Intro"]; // "BLOCCO PASSCODE"
     page9.titlePositionY = titlePositionY;
-    page9.titleFont = RalewayMedium(20.0f);
+    page9.titleFont = [UIFont systemFontOfSize:20];
     page9.desc = [CCUtility localizableBrand:@"_intro_18_" table:@"Intro"];
     page9.descPositionY = descPositionY;
-    page9.descFont = RalewayLight(14.0f);
+    page9.descFont = [UIFont systemFontOfSize:14];
 #ifdef CC
     page9.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro9"]];
     page9.bgImage = [UIImage imageNamed:@"bggrigio"];
@@ -256,10 +256,10 @@
     page10.title = [CCUtility localizableBrand:@"_intro_19_" table:@"Intro"]; // "INIZIO"
     page10.titlePositionY = titlePositionY;
     page10.titleColor = COLOR_GRAY;
-    page10.titleFont = RalewayMedium(20.0f);
+    page10.titleFont = [UIFont systemFontOfSize:20];
     page10.descPositionY = descPositionY;
     page10.descColor = COLOR_GRAY;
-    page10.descFont = RalewayLight(14.0f);
+    page10.descFont = [UIFont systemFontOfSize:14];
 #ifdef CC
     page10.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro10"]];
     page10.bgImage = [UIImage imageNamed:@"bgbianco"];
@@ -300,11 +300,11 @@
         page0.title = [@"Version " stringByAppendingString:version];
         page0.titlePositionY = titlePositionY;
         page0.titleColor = COLOR_GRAY;
-        page0.titleFont = RalewayMedium(20.0f);
+        page0.titleFont = [UIFont systemFontOfSize:20];
         page0.desc = [CCUtility localizableBrand:@"_intro_190_00_" table:@"Intro"];
         page0.descPositionY = descPositionY;
         page0.descColor = COLOR_GRAY;
-        page0.descFont = RalewayLight(14.0f);
+        page0.descFont = [UIFont systemFontOfSize:14];
         page0.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introStart"]];
         page0.bgImage = [UIImage imageNamed:@"bgbianco"];
         page0.titleIconPositionY = titleIconPositionY;
@@ -314,11 +314,11 @@
         page1.title = [CCUtility localizableBrand:@"_intro_190_01_" table:@"Intro"]; //
         page1.titlePositionY = titlePositionY;
         page1.titleColor = COLOR_GRAY;
-        page1.titleFont = RalewayMedium(20.0f);
+        page1.titleFont = [UIFont systemFontOfSize:20];
         page1.desc = [CCUtility localizableBrand:@"_intro_190_02_" table:@"Intro"];
         page1.descPositionY = descPositionY;
         page1.descColor = COLOR_GRAY;
-        page1.descFont = RalewayLight(14.0f);
+        page1.descFont = [UIFont systemFontOfSize:14];
         page1.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro190-1"]];
         page1.bgImage = [UIImage imageNamed:@"bgbianco"];
         page1.titleIconPositionY = titleIconPositionY;
@@ -328,11 +328,11 @@
         page2.title = [CCUtility localizableBrand:@"_intro_190_03_" table: @"Intro"]; //
         page2.titlePositionY = titlePositionY;
         page2.titleColor = COLOR_GRAY;
-        page2.titleFont = RalewayMedium(20.0f);
+        page2.titleFont = [UIFont systemFontOfSize:20];
         page2.desc = [CCUtility localizableBrand:@"_intro_190_04_" table: @"Intro"];
         page2.descPositionY = descPositionY;
         page2.descColor = COLOR_GRAY;
-        page2.descFont = RalewayLight(14.0f);
+        page2.descFont = [UIFont systemFontOfSize:14];
         page2.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro190-2"]];
         page2.bgImage = [UIImage imageNamed:@"bgbianco"];
         page2.titleIconPositionY = titleIconPositionY;
@@ -342,11 +342,11 @@
         page3.title = [CCUtility localizableBrand:@"_intro_190_05_" table: @"Intro"]; //
         page3.titlePositionY = titlePositionY;
         page3.titleColor = COLOR_GRAY;
-        page3.titleFont = RalewayMedium(20.0f);
+        page3.titleFont = [UIFont systemFontOfSize:20];
         page3.desc = [CCUtility localizableBrand:@"_intro_190_06_" table: @"Intro"];
         page3.descPositionY = descPositionY;
         page3.descColor = COLOR_GRAY;
-        page3.descFont = RalewayLight(14.0f);
+        page3.descFont = [UIFont systemFontOfSize:14];
         page3.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro190-3"]];
         page3.bgImage = [UIImage imageNamed:@"bgbianco"];
         page3.titleIconPositionY = titleIconPositionY;
@@ -356,11 +356,11 @@
         page4.title = [CCUtility localizableBrand:@"_intro_190_07_" table: @"Intro"]; //
         page4.titlePositionY = titlePositionY;
         page4.titleColor = COLOR_GRAY;
-        page4.titleFont = RalewayMedium(20.0f);
+        page4.titleFont = [UIFont systemFontOfSize:20];
         page4.desc = [CCUtility localizableBrand:@"_intro_190_08_" table: @"Intro"];
         page4.descPositionY = descPositionY;
         page4.descColor = COLOR_GRAY;
-        page4.descFont = RalewayLight(14.0f);
+        page4.descFont = [UIFont systemFontOfSize:14];
         page4.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro190-4"]];
         page4.bgImage = [UIImage imageNamed:@"bgbianco"];
         page4.titleIconPositionY = titleIconPositionY;
@@ -370,11 +370,11 @@
         page5.title = [CCUtility localizableBrand:@"_intro_190_09_" table: @"Intro"]; //
         page5.titlePositionY = titlePositionY;
         page5.titleColor = COLOR_GRAY;
-        page5.titleFont = RalewayMedium(20.0f);
+        page5.titleFont = [UIFont systemFontOfSize:20];
         page5.desc = [CCUtility localizableBrand:@"_intro_190_10_" table: @"Intro"];
         page5.descPositionY = descPositionY;
         page5.descColor = COLOR_GRAY;
-        page5.descFont = RalewayLight(14.0f);
+        page5.descFont = [UIFont systemFontOfSize:14];
         page5.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro190-5"]];
         page5.bgImage = [UIImage imageNamed:@"bgbianco"];
         page5.titleIconPositionY = titleIconPositionY;
@@ -384,11 +384,11 @@
         page6.title = [CCUtility localizableBrand:@"_intro_190_11_" table: @"Intro"]; //
         page6.titlePositionY = titlePositionY;
         page6.titleColor = COLOR_GRAY;
-        page6.titleFont = RalewayMedium(20.0f);
+        page6.titleFont = [UIFont systemFontOfSize:20];
         page6.desc = [CCUtility localizableBrand:@"_intro_190_12_" table: @"Intro"];
         page6.descPositionY = descPositionY;
         page6.descColor = COLOR_GRAY;
-        page6.descFont = RalewayLight(14.0f);
+        page6.descFont = [UIFont systemFontOfSize:14];
         page6.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro190-6"]];
         page6.bgImage = [UIImage imageNamed:@"bgbianco"];
         page6.titleIconPositionY = titleIconPositionY;
@@ -398,11 +398,11 @@
         pageEnd.title = [CCUtility localizableBrand:@"_intro_END_01_" table: @"Intro"]; //
         pageEnd.titlePositionY = titlePositionY;
         pageEnd.titleColor = COLOR_GRAY;
-        pageEnd.titleFont = RalewayMedium(20.0f);
+        pageEnd.titleFont = [UIFont systemFontOfSize:20];
         pageEnd.desc = [CCUtility localizableBrand:@"_intro_END_02_" table: @"Intro"];
         pageEnd.descPositionY = descPositionY;
         pageEnd.descColor = COLOR_GRAY;
-        pageEnd.descFont = RalewayLight(14.0f);
+        pageEnd.descFont = [UIFont systemFontOfSize:14];
         pageEnd.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introEnd"]];
         pageEnd.bgImage = [UIImage imageNamed:@"bgbianco"];
         pageEnd.titleIconPositionY = titleIconPositionY;
@@ -432,11 +432,11 @@
         page0.title = [@"Version " stringByAppendingString:version];
         page0.titlePositionY = titlePositionY;
         page0.titleColor = COLOR_GRAY;
-        page0.titleFont = RalewayMedium(20.0f);
+        page0.titleFont = [UIFont systemFontOfSize:20];
         page0.desc = [CCUtility localizableBrand:@"_intro_191_00_" table: @"Intro"];
         page0.descPositionY = descPositionY;
         page0.descColor = COLOR_GRAY;
-        page0.descFont = RalewayLight(14.0f);
+        page0.descFont = [UIFont systemFontOfSize:14];
         page0.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introStart"]];
         page0.bgImage = [UIImage imageNamed:@"bgbianco"];
         page0.titleIconPositionY = titleIconPositionY;
@@ -446,11 +446,11 @@
         page1.title = [CCUtility localizableBrand:@"_intro_191_01_" table: @"Intro"]; //
         page1.titlePositionY = titlePositionY;
         page1.titleColor = COLOR_GRAY;
-        page1.titleFont = RalewayMedium(20.0f);
+        page1.titleFont = [UIFont systemFontOfSize:20];
         page1.desc = [CCUtility localizableBrand:@"_intro_191_02_" table: @"Intro"];
         page1.descPositionY = descPositionY;
         page1.descColor = COLOR_GRAY;
-        page1.descFont = RalewayLight(14.0f);
+        page1.descFont = [UIFont systemFontOfSize:14];
         page1.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro191-1"]];
         page1.bgImage = [UIImage imageNamed:@"bgbianco"];
         page1.titleIconPositionY = titleIconPositionY;
@@ -460,11 +460,11 @@
         page2.title = [CCUtility localizableBrand:@"_intro_191_03_" table: @"Intro"]; //
         page2.titlePositionY = titlePositionY;
         page2.titleColor = COLOR_GRAY;
-        page2.titleFont = RalewayMedium(20.0f);
+        page2.titleFont = [UIFont systemFontOfSize:20];
         page2.desc = [CCUtility localizableBrand:@"_intro_191_04_" table: @"Intro"];
         page2.descPositionY = descPositionY;
         page2.descColor = COLOR_GRAY;
-        page2.descFont = RalewayLight(14.0f);
+        page2.descFont = [UIFont systemFontOfSize:14];
         page2.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro191-2"]];
         page2.bgImage = [UIImage imageNamed:@"bgbianco"];
         page2.titleIconPositionY = titleIconPositionY;
@@ -474,11 +474,11 @@
         page3.title = [CCUtility localizableBrand:@"_intro_191_05_" table: @"Intro"]; //
         page3.titlePositionY = titlePositionY;
         page3.titleColor = COLOR_GRAY;
-        page3.titleFont = RalewayMedium(20.0f);
+        page3.titleFont = [UIFont systemFontOfSize:20];
         page3.desc = [CCUtility localizableBrand:@"_intro_191_06_" table: @"Intro"];
         page3.descPositionY = descPositionY;
         page3.descColor = COLOR_GRAY;
-        page3.descFont = RalewayLight(14.0f);
+        page3.descFont = [UIFont systemFontOfSize:14];
         page3.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro191-3"]];
         page3.bgImage = [UIImage imageNamed:@"bgbianco"];
         page3.titleIconPositionY = titleIconPositionY;
@@ -488,11 +488,11 @@
         page4.title = [CCUtility localizableBrand:@"_intro_191_07_" table:@"Intro"]; //
         page4.titlePositionY = titlePositionY;
         page4.titleColor = COLOR_GRAY;
-        page4.titleFont = RalewayMedium(20.0f);
+        page4.titleFont = [UIFont systemFontOfSize:20];
         page4.desc = [CCUtility localizableBrand:@"_intro_191_08_" table: @"Intro"];
         page4.descPositionY = descPositionY;
         page4.descColor = COLOR_GRAY;
-        page4.descFont = RalewayLight(14.0f);
+        page4.descFont = [UIFont systemFontOfSize:14];
         page4.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro191-4"]];
         page4.bgImage = [UIImage imageNamed:@"bgbianco"];
         page4.titleIconPositionY = titleIconPositionY;
@@ -502,11 +502,11 @@
         pageEnd.title = [CCUtility localizableBrand:@"_intro_END_01_" table: @"Intro"]; //
         pageEnd.titlePositionY = titlePositionY;
         pageEnd.titleColor = COLOR_GRAY;
-        pageEnd.titleFont = RalewayMedium(20.0f);
+        pageEnd.titleFont = [UIFont systemFontOfSize:20];
         pageEnd.desc = [CCUtility localizableBrand:@"_intro_END_02_" table: @"Intro"];
         pageEnd.descPositionY = descPositionY;
         pageEnd.descColor = COLOR_GRAY;
-        pageEnd.descFont = RalewayLight(14.0f);
+        pageEnd.descFont = [UIFont systemFontOfSize:14];
         pageEnd.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introEnd"]];
         pageEnd.bgImage = [UIImage imageNamed:@"bgbianco"];
         pageEnd.titleIconPositionY = titleIconPositionY;
@@ -536,11 +536,11 @@
         page0.title = [@"Version " stringByAppendingString:version];
         page0.titlePositionY = titlePositionY;
         page0.titleColor = COLOR_GRAY;
-        page0.titleFont = RalewayMedium(20.0f);
+        page0.titleFont = [UIFont systemFontOfSize:20];
         page0.desc = [CCUtility localizableBrand:@"_intro_194_00_"table: @"Intro"];
         page0.descPositionY = descPositionY;
         page0.descColor = COLOR_GRAY;
-        page0.descFont = RalewayLight(14.0f);
+        page0.descFont = [UIFont systemFontOfSize:14];
         page0.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introStart"]];
         page0.bgImage = [UIImage imageNamed:@"bgbianco"];
         page0.titleIconPositionY = titleIconPositionY;
@@ -550,11 +550,11 @@
         page1.title = [CCUtility localizableBrand:@"_intro_194_01_" table:@"Intro"]; //
         page1.titlePositionY = titlePositionY;
         page1.titleColor = COLOR_GRAY;
-        page1.titleFont = RalewayMedium(20.0f);
+        page1.titleFont = [UIFont systemFontOfSize:20];
         page1.desc = [CCUtility localizableBrand:@"_intro_194_02_" table: @"Intro"];
         page1.descPositionY = descPositionY;
         page1.descColor = COLOR_GRAY;
-        page1.descFont = RalewayLight(14.0f);
+        page1.descFont = [UIFont systemFontOfSize:14];
         page1.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro194-1"]];
         page1.bgImage = [UIImage imageNamed:@"bgbianco"];
         page1.titleIconPositionY = titleIconPositionY;
@@ -564,11 +564,11 @@
         page2.title = [CCUtility localizableBrand:@"_intro_194_03_" table: @"Intro"]; //
         page2.titlePositionY = titlePositionY;
         page2.titleColor = COLOR_GRAY;
-        page2.titleFont = RalewayMedium(20.0f);
+        page2.titleFont = [UIFont systemFontOfSize:20];
         page2.desc = [CCUtility localizableBrand:@"_intro_194_04_" table: @"Intro"];
         page2.descPositionY = descPositionY;
         page2.descColor = COLOR_GRAY;
-        page2.descFont = RalewayLight(14.0f);
+        page2.descFont = [UIFont systemFontOfSize:14];
         page2.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro194-2"]];
         page2.bgImage = [UIImage imageNamed:@"bgbianco"];
         page2.titleIconPositionY = titleIconPositionY;
@@ -578,11 +578,11 @@
         page3.title = [CCUtility localizableBrand:@"_intro_194_05_" table: @"Intro"]; //
         page3.titlePositionY = titlePositionY;
         page3.titleColor = COLOR_GRAY;
-        page3.titleFont = RalewayMedium(20.0f);
+        page3.titleFont = [UIFont systemFontOfSize:20];
         page3.desc = [CCUtility localizableBrand:@"_intro_194_06_" table: @"Intro"];
         page3.descPositionY = descPositionY;
         page3.descColor = COLOR_GRAY;
-        page3.descFont = RalewayLight(14.0f);
+        page3.descFont = [UIFont systemFontOfSize:14];
         page3.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro194-3"]];
         page3.bgImage = [UIImage imageNamed:@"bgbianco"];
         page3.titleIconPositionY = titleIconPositionY;
@@ -592,11 +592,11 @@
         page4.title = [CCUtility localizableBrand:@"_intro_194_07_" table: @"Intro"]; //
         page4.titlePositionY = titlePositionY;
         page4.titleColor = COLOR_GRAY;
-        page4.titleFont = RalewayMedium(20.0f);
+        page4.titleFont = [UIFont systemFontOfSize:20];
         page4.desc = [CCUtility localizableBrand:@"_intro_194_08_" table: @"Intro"];
         page4.descPositionY = descPositionY;
         page4.descColor = COLOR_GRAY;
-        page4.descFont = RalewayLight(14.0f);
+        page4.descFont = [UIFont systemFontOfSize:14];
         page4.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro194-4"]];
         page4.bgImage = [UIImage imageNamed:@"bgbianco"];
         page4.titleIconPositionY = titleIconPositionY;
@@ -606,11 +606,11 @@
         pageEnd.title = [CCUtility localizableBrand:@"_intro_END_01_" table: @"Intro"]; //
         pageEnd.titlePositionY = titlePositionY;
         pageEnd.titleColor = COLOR_GRAY;
-        pageEnd.titleFont = RalewayMedium(20.0f);
+        pageEnd.titleFont = [UIFont systemFontOfSize:20];
         pageEnd.desc = [CCUtility localizableBrand:@"_intro_END_02_" table: @"Intro"];
         pageEnd.descPositionY = descPositionY;
         pageEnd.descColor = COLOR_GRAY;
-        pageEnd.descFont = RalewayLight(14.0f);
+        pageEnd.descFont = [UIFont systemFontOfSize:14];
         pageEnd.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introEnd"]];
         pageEnd.bgImage = [UIImage imageNamed:@"bgbianco"];
         pageEnd.titleIconPositionY = titleIconPositionY;
@@ -640,11 +640,11 @@
         page0.title = [@"Version " stringByAppendingString:version];
         page0.titlePositionY = titlePositionY;
         page0.titleColor = COLOR_GRAY;
-        page0.titleFont = RalewayMedium(20.0f);
+        page0.titleFont = [UIFont systemFontOfSize:20];
         page0.desc = [CCUtility localizableBrand:@"_intro_196_00_" table: @"Intro"];
         page0.descPositionY = descPositionY;
         page0.descColor = COLOR_GRAY;
-        page0.descFont = RalewayLight(14.0f);
+        page0.descFont = [UIFont systemFontOfSize:14];
         page0.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introStart"]];
         page0.bgImage = [UIImage imageNamed:@"bgbianco"];
         page0.titleIconPositionY = titleIconPositionY;
@@ -654,11 +654,11 @@
         page1.title = [CCUtility localizableBrand:@"_intro_196_01_" table: @"Intro"]; //
         page1.titlePositionY = titlePositionY;
         page1.titleColor = COLOR_GRAY;
-        page1.titleFont = RalewayMedium(20.0f);
+        page1.titleFont = [UIFont systemFontOfSize:20];
         page1.desc = [CCUtility localizableBrand:@"_intro_196_02_" table: @"Intro"];
         page1.descPositionY = descPositionY;
         page1.descColor = COLOR_GRAY;
-        page1.descFont = RalewayLight(14.0f);
+        page1.descFont = [UIFont systemFontOfSize:14];
         page1.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro196-1"]];
         page1.bgImage = [UIImage imageNamed:@"bgbianco"];
         page1.titleIconPositionY = titleIconPositionY;
@@ -668,11 +668,11 @@
         page2.title = [CCUtility localizableBrand:@"_intro_196_03_" table: @"Intro"]; //
         page2.titlePositionY = titlePositionY;
         page2.titleColor = COLOR_GRAY;
-        page2.titleFont = RalewayMedium(20.0f);
+        page2.titleFont = [UIFont systemFontOfSize:20];
         page2.desc = [CCUtility localizableBrand:@"_intro_196_04_" table: @"Intro"];
         page2.descPositionY = descPositionY;
         page2.descColor = COLOR_GRAY;
-        page2.descFont = RalewayLight(14.0f);
+        page2.descFont = [UIFont systemFontOfSize:14];
         page2.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro196-2"]];
         page2.bgImage = [UIImage imageNamed:@"bgbianco"];
         page2.titleIconPositionY = titleIconPositionY;
@@ -682,11 +682,11 @@
         page3.title = [CCUtility localizableBrand:@"_intro_196_05_" table: @"Intro"]; //
         page3.titlePositionY = titlePositionY;
         page3.titleColor = COLOR_GRAY;
-        page3.titleFont = RalewayMedium(20.0f);
+        page3.titleFont = [UIFont systemFontOfSize:20];
         page3.desc = [CCUtility localizableBrand:@"_intro_196_06_" table: @"Intro"];
         page3.descPositionY = descPositionY;
         page3.descColor = COLOR_GRAY;
-        page3.descFont = RalewayLight(14.0f);
+        page3.descFont = [UIFont systemFontOfSize:14];
         page3.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro196-3"]];
         page3.bgImage = [UIImage imageNamed:@"bgbianco"];
         page3.titleIconPositionY = titleIconPositionY;
@@ -696,11 +696,11 @@
         page4.title = [CCUtility localizableBrand:@"_intro_196_07_" table: @"Intro"]; //
         page4.titlePositionY = titlePositionY;
         page4.titleColor = COLOR_GRAY;
-        page4.titleFont = RalewayMedium(20.0f);
+        page4.titleFont = [UIFont systemFontOfSize:20];
         page4.desc = [CCUtility localizableBrand:@"_intro_196_08_" table: @"Intro"];
         page4.descPositionY = descPositionY;
         page4.descColor = COLOR_GRAY;
-        page4.descFont = RalewayLight(14.0f);
+        page4.descFont = [UIFont systemFontOfSize:14];
         page4.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro196-4"]];
         page4.bgImage = [UIImage imageNamed:@"bgbianco"];
         page4.titleIconPositionY = titleIconPositionY;
@@ -710,11 +710,11 @@
         page5.title = [CCUtility localizableBrand:@"_intro_196_09_" table: @"Intro"]; //
         page5.titlePositionY = titlePositionY;
         page5.titleColor = COLOR_GRAY;
-        page5.titleFont = RalewayMedium(20.0f);
+        page5.titleFont = [UIFont systemFontOfSize:20];
         page5.desc = [CCUtility localizableBrand:@"_intro_196_10_" table: @"Intro"];
         page5.descPositionY = descPositionY;
         page5.descColor = COLOR_GRAY;
-        page5.descFont = RalewayLight(14.0f);
+        page5.descFont = [UIFont systemFontOfSize:14];
         page5.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro196-5"]];
         page5.bgImage = [UIImage imageNamed:@"bgbianco"];
         page5.titleIconPositionY = titleIconPositionY;
@@ -724,11 +724,11 @@
         page6.title = [CCUtility localizableBrand:@"_intro_196_11_" table: @"Intro"]; //
         page6.titlePositionY = titlePositionY;
         page6.titleColor = COLOR_GRAY;
-        page6.titleFont = RalewayMedium(20.0f);
+        page6.titleFont = [UIFont systemFontOfSize:20];
         page6.desc = [CCUtility localizableBrand:@"_intro_196_12_" table: @"Intro"];
         page6.descPositionY = descPositionY;
         page6.descColor = COLOR_GRAY;
-        page6.descFont = RalewayLight(14.0f);
+        page6.descFont = [UIFont systemFontOfSize:14];
         page6.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro196-6"]];
         page6.bgImage = [UIImage imageNamed:@"bgbianco"];
         page6.titleIconPositionY = titleIconPositionY;
@@ -738,11 +738,11 @@
         page7.title = [CCUtility localizableBrand:@"_intro_196_13_" table: @"Intro"]; //
         page7.titlePositionY = titlePositionY;
         page7.titleColor = COLOR_GRAY;
-        page7.titleFont = RalewayMedium(20.0f);
+        page7.titleFont = [UIFont systemFontOfSize:20];
         page7.desc = [CCUtility localizableBrand:@"_intro_196_14_" table: @"Intro"];
         page7.descPositionY = descPositionY;
         page7.descColor = COLOR_GRAY;
-        page7.descFont = RalewayLight(14.0f);
+        page7.descFont = [UIFont systemFontOfSize:14];
         page7.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro196-7"]];
         page7.bgImage = [UIImage imageNamed:@"bgbianco"];
         page7.titleIconPositionY = titleIconPositionY;
@@ -752,11 +752,11 @@
         page8.title = [CCUtility localizableBrand:@"_intro_196_17_" table: @"Intro"]; //
         page8.titlePositionY = titlePositionY;
         page8.titleColor = COLOR_GRAY;
-        page8.titleFont = RalewayMedium(20.0f);
+        page8.titleFont = [UIFont systemFontOfSize:20];
         page8.desc = [CCUtility localizableBrand:@"_intro_196_18_" table: @"Intro"];
         page8.descPositionY = descPositionY;
         page8.descColor = COLOR_GRAY;
-        page8.descFont = RalewayLight(14.0f);
+        page8.descFont = [UIFont systemFontOfSize:14];
         page8.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro196-9"]];
         page8.bgImage = [UIImage imageNamed:@"bgbianco"];
         page8.titleIconPositionY = titleIconPositionY;
@@ -766,11 +766,11 @@
         page9.title = [CCUtility localizableBrand:@"_intro_196_19_" table: @"Intro"]; //
         page9.titlePositionY = titlePositionY;
         page9.titleColor = COLOR_GRAY;
-        page9.titleFont = RalewayMedium(20.0f);
+        page9.titleFont = [UIFont systemFontOfSize:20];
         page9.desc = [CCUtility localizableBrand:@"_intro_196_20_" table: @"Intro"];
         page9.descPositionY = descPositionY;
         page9.descColor = COLOR_GRAY;
-        page9.descFont = RalewayLight(14.0f);
+        page9.descFont = [UIFont systemFontOfSize:14];
         page9.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro196-10"]];
         page9.bgImage = [UIImage imageNamed:@"bgbianco"];
         page9.titleIconPositionY = titleIconPositionY;
@@ -780,11 +780,11 @@
         page10.title = [CCUtility localizableBrand:@"_intro_196_21_" table: @"Intro"]; //
         page10.titlePositionY = titlePositionY;
         page10.titleColor = COLOR_GRAY;
-        page10.titleFont = RalewayMedium(20.0f);
+        page10.titleFont = [UIFont systemFontOfSize:20];
         page10.desc = [CCUtility localizableBrand:@"_intro_196_22_" table: @"Intro"];
         page10.descPositionY = descPositionY;
         page10.descColor = COLOR_GRAY;
-        page10.descFont = RalewayLight(14.0f);
+        page10.descFont = [UIFont systemFontOfSize:14];
         page10.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro196-11"]];
         page10.bgImage = [UIImage imageNamed:@"bgbianco"];
         page10.titleIconPositionY = titleIconPositionY;
@@ -794,11 +794,11 @@
         pageEnd.title = [CCUtility localizableBrand:@"_intro_END_01_" table: @"Intro"]; //
         pageEnd.titlePositionY = titlePositionY;
         pageEnd.titleColor = COLOR_GRAY;
-        pageEnd.titleFont = RalewayMedium(20.0f);
+        pageEnd.titleFont = [UIFont systemFontOfSize:20];
         pageEnd.desc = [CCUtility localizableBrand:@"_intro_END_02_" table: @"Intro"];
         pageEnd.descPositionY = descPositionY;
         pageEnd.descColor = COLOR_GRAY;
-        pageEnd.descFont = RalewayLight(14.0f);
+        pageEnd.descFont = [UIFont systemFontOfSize:14];
         pageEnd.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introEnd"]];
         pageEnd.bgImage = [UIImage imageNamed:@"bgbianco"];
         pageEnd.titleIconPositionY = titleIconPositionY;
@@ -828,11 +828,11 @@
         page0.title = [@"Version " stringByAppendingString:version];
         page0.titlePositionY = titlePositionY;
         page0.titleColor = COLOR_GRAY;
-        page0.titleFont = RalewayMedium(20.0f);
+        page0.titleFont = [UIFont systemFontOfSize:20];
         page0.desc = [CCUtility localizableBrand:@"_intro_197_00_" table: @"Intro"];
         page0.descPositionY = descPositionY;
         page0.descColor = COLOR_GRAY;
-        page0.descFont = RalewayLight(14.0f);
+        page0.descFont = [UIFont systemFontOfSize:14];
         page0.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introStart"]];
         page0.bgImage = [UIImage imageNamed:@"bgbianco"];
         page0.titleIconPositionY = titleIconPositionY;
@@ -842,11 +842,11 @@
         page1.title = [CCUtility localizableBrand:@"_intro_197_01_" table: @"Intro"]; //
         page1.titlePositionY = titlePositionY;
         page1.titleColor = COLOR_GRAY;
-        page1.titleFont = RalewayMedium(20.0f);
+        page1.titleFont = [UIFont systemFontOfSize:20];
         page1.desc = [CCUtility localizableBrand:@"_intro_197_02_" table: @"Intro"];
         page1.descPositionY = descPositionY;
         page1.descColor = COLOR_GRAY;
-        page1.descFont = RalewayLight(14.0f);
+        page1.descFont = [UIFont systemFontOfSize:14];
         page1.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro197-1"]];
         page1.bgImage = [UIImage imageNamed:@"bgbianco"];
         page1.titleIconPositionY = titleIconPositionY;
@@ -856,11 +856,11 @@
         pageEnd.title = [CCUtility localizableBrand:@"_intro_END_01_" table: @"Intro"]; //
         pageEnd.titlePositionY = titlePositionY;
         pageEnd.titleColor = COLOR_GRAY;
-        pageEnd.titleFont = RalewayMedium(20.0f);
+        pageEnd.titleFont = [UIFont systemFontOfSize:20];
         pageEnd.desc = [CCUtility localizableBrand:@"_intro_END_02_" table: @"Intro"];
         pageEnd.descPositionY = descPositionY;
         pageEnd.descColor = COLOR_GRAY;
-        pageEnd.descFont = RalewayLight(14.0f);
+        pageEnd.descFont = [UIFont systemFontOfSize:14];
         pageEnd.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introEnd"]];
         pageEnd.bgImage = [UIImage imageNamed:@"bgbianco"];
         pageEnd.titleIconPositionY = titleIconPositionY;
@@ -890,11 +890,11 @@
         page0.title = [@"Version " stringByAppendingString:version];
         page0.titlePositionY = titlePositionY;
         page0.titleColor = COLOR_GRAY;
-        page0.titleFont = RalewayMedium(20.0f);
+        page0.titleFont = [UIFont systemFontOfSize:20];
         page0.desc = [CCUtility localizableBrand:@"_intro_199_00_" table: @"Intro"];
         page0.descPositionY = descPositionY;
         page0.descColor = COLOR_GRAY;
-        page0.descFont = RalewayLight(14.0f);
+        page0.descFont = [UIFont systemFontOfSize:14];
         page0.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introStart"]];
         page0.bgImage = [UIImage imageNamed:@"bgbianco"];
         page0.titleIconPositionY = titleIconPositionY;
@@ -904,11 +904,11 @@
         page1.title = [CCUtility localizableBrand:@"_intro_199_01_" table: @"Intro"]; //
         page1.titlePositionY = titlePositionY;
         page1.titleColor = COLOR_GRAY;
-        page1.titleFont = RalewayMedium(20.0f);
+        page1.titleFont = [UIFont systemFontOfSize:20];
         page1.desc = [CCUtility localizableBrand:@"_intro_199_02_" table: @"Intro"];
         page1.descPositionY = descPositionY;
         page1.descColor = COLOR_GRAY;
-        page1.descFont = RalewayLight(14.0f);
+        page1.descFont = [UIFont systemFontOfSize:14];
 #ifdef CC
         page1.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro199-1"]];
 #endif
@@ -923,11 +923,11 @@
         pageEnd.title = [CCUtility localizableBrand:@"_intro_END_01_" table: @"Intro"]; //
         pageEnd.titlePositionY = titlePositionY;
         pageEnd.titleColor = COLOR_GRAY;
-        pageEnd.titleFont = RalewayMedium(20.0f);
+        pageEnd.titleFont = [UIFont systemFontOfSize:20];
         pageEnd.desc = [CCUtility localizableBrand:@"_intro_END_02_" table: @"Intro"];
         pageEnd.descPositionY = descPositionY;
         pageEnd.descColor = COLOR_GRAY;
-        pageEnd.descFont = RalewayLight(14.0f);
+        pageEnd.descFont = [UIFont systemFontOfSize:14];
         pageEnd.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introEnd"]];
         pageEnd.bgImage = [UIImage imageNamed:@"bgbianco"];
         pageEnd.titleIconPositionY = titleIconPositionY;
@@ -957,11 +957,11 @@
         page0.title = [@"Version " stringByAppendingString:version];
         page0.titlePositionY = titlePositionY;
         page0.titleColor = COLOR_GRAY;
-        page0.titleFont = RalewayMedium(20.0f);
+        page0.titleFont = [UIFont systemFontOfSize:20];
         page0.desc = [CCUtility localizableBrand:@"_intro_200_00_" table: @"Intro"];
         page0.descPositionY = descPositionY;
         page0.descColor = COLOR_GRAY;
-        page0.descFont = RalewayLight(14.0f);
+        page0.descFont = [UIFont systemFontOfSize:14];
         page0.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introStart"]];
         page0.bgImage = [UIImage imageNamed:@"bgbianco"];
         page0.titleIconPositionY = titleIconPositionY;
@@ -971,11 +971,11 @@
         page1.title = [CCUtility localizableBrand:@"_intro_200_01_" table: @"Intro"]; //
         page1.titlePositionY = titlePositionY;
         page1.titleColor = COLOR_GRAY;
-        page1.titleFont = RalewayMedium(20.0f);
+        page1.titleFont = [UIFont systemFontOfSize:20];
         page1.desc = [CCUtility localizableBrand:@"_intro_200_02_" table: @"Intro"];
         page1.descPositionY = descPositionY;
         page1.descColor = COLOR_GRAY;
-        page1.descFont = RalewayLight(14.0f);
+        page1.descFont = [UIFont systemFontOfSize:14];
         page1.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro200-1"]];
         page1.bgImage = [UIImage imageNamed:@"bgbianco"];
         page1.titleIconPositionY = titleIconPositionY;
@@ -985,11 +985,11 @@
         page2.title = [CCUtility localizableBrand:@"_intro_200_03_" table: @"Intro"]; //
         page2.titlePositionY = titlePositionY;
         page2.titleColor = COLOR_GRAY;
-        page2.titleFont = RalewayMedium(20.0f);
+        page2.titleFont = [UIFont systemFontOfSize:20];
         page2.desc = [CCUtility localizableBrand:@"_intro_200_04_" table: @"Intro"];
         page2.descPositionY = descPositionY;
         page2.descColor = COLOR_GRAY;
-        page2.descFont = RalewayLight(14.0f);
+        page2.descFont = [UIFont systemFontOfSize:14];
         page2.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro200-2"]];
         page2.bgImage = [UIImage imageNamed:@"bgbianco"];
         page2.titleIconPositionY = titleIconPositionY;
@@ -999,11 +999,11 @@
         page3.title = [CCUtility localizableBrand:@"_intro_200_05_" table: @"Intro"]; //
         page3.titlePositionY = titlePositionY;
         page3.titleColor = COLOR_GRAY;
-        page3.titleFont = RalewayMedium(20.0f);
+        page3.titleFont = [UIFont systemFontOfSize:20];
         page3.desc = [CCUtility localizableBrand:@"_intro_200_06_" table: @"Intro"];
         page3.descPositionY = descPositionY;
         page3.descColor = COLOR_GRAY;
-        page3.descFont = RalewayLight(14.0f);
+        page3.descFont = [UIFont systemFontOfSize:14];
         page3.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro200-3"]];
         page3.bgImage = [UIImage imageNamed:@"bgbianco"];
         page3.titleIconPositionY = titleIconPositionY;
@@ -1013,11 +1013,11 @@
         page4.title = [CCUtility localizableBrand:@"_intro_200_07_" table: @"Intro"]; //
         page4.titlePositionY = titlePositionY;
         page4.titleColor = COLOR_GRAY;
-        page4.titleFont = RalewayMedium(20.0f);
+        page4.titleFont = [UIFont systemFontOfSize:20];
         page4.desc = [CCUtility localizableBrand:@"_intro_200_08_" table: @"Intro"];
         page4.descPositionY = descPositionY;
         page4.descColor = COLOR_GRAY;
-        page4.descFont = RalewayLight(14.0f);
+        page4.descFont = [UIFont systemFontOfSize:14];
         page4.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro200-4"]];
         page4.bgImage = [UIImage imageNamed:@"bgbianco"];
         page4.titleIconPositionY = titleIconPositionY;
@@ -1027,11 +1027,11 @@
         page5.title = [CCUtility localizableBrand:@"_intro_200_09_" table: @"Intro"]; //
         page5.titlePositionY = titlePositionY;
         page5.titleColor = COLOR_GRAY;
-        page5.titleFont = RalewayMedium(20.0f);
+        page5.titleFont = [UIFont systemFontOfSize:20];
         page5.desc = [CCUtility localizableBrand:@"_intro_200_10_" table: @"Intro"];
         page5.descPositionY = descPositionY;
         page5.descColor = COLOR_GRAY;
-        page5.descFont = RalewayLight(14.0f);
+        page5.descFont = [UIFont systemFontOfSize:14];
         page5.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro200-5"]];
         page5.bgImage = [UIImage imageNamed:@"bgbianco"];
         page5.titleIconPositionY = titleIconPositionY;
@@ -1041,11 +1041,11 @@
         pageEnd.title = [CCUtility localizableBrand:@"_intro_END_01_" table: @"Intro"]; //
         pageEnd.titlePositionY = titlePositionY;
         pageEnd.titleColor = COLOR_GRAY;
-        pageEnd.titleFont = RalewayMedium(20.0f);
+        pageEnd.titleFont = [UIFont systemFontOfSize:20];
         pageEnd.desc = [CCUtility localizableBrand:@"_intro_END_02_" table: @"Intro"];
         pageEnd.descPositionY = descPositionY;
         pageEnd.descColor = COLOR_GRAY;
-        pageEnd.descFont = RalewayLight(14.0f);
+        pageEnd.descFont = [UIFont systemFontOfSize:14];
         pageEnd.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introEnd"]];
         pageEnd.bgImage = [UIImage imageNamed:@"bgbianco"];
         pageEnd.titleIconPositionY = titleIconPositionY;
@@ -1075,11 +1075,11 @@
         page0.title = [@"Version " stringByAppendingString:version];
         page0.titlePositionY = titlePositionY;
         page0.titleColor = COLOR_GRAY;
-        page0.titleFont = RalewayMedium(20.0f);
+        page0.titleFont = [UIFont systemFontOfSize:20];
         page0.desc = [CCUtility localizableBrand:@"_intro_210_00_" table: @"Intro"];
         page0.descPositionY = descPositionY;
         page0.descColor = COLOR_GRAY;
-        page0.descFont = RalewayLight(14.0f);
+        page0.descFont = [UIFont systemFontOfSize:14];
 #ifdef CC
         page0.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introStart"]];
 #endif
@@ -1094,11 +1094,11 @@
         page1.title = [CCUtility localizableBrand:@"_intro_210_01_" table: @"Intro"]; //
         page1.titlePositionY = titlePositionY;
         page1.titleColor = COLOR_GRAY;
-        page1.titleFont = RalewayMedium(20.0f);
+        page1.titleFont = [UIFont systemFontOfSize:20];
         page1.desc = [CCUtility localizableBrand:@"_intro_210_02_" table: @"Intro"];
         page1.descPositionY = descPositionY;
         page1.descColor = COLOR_GRAY;
-        page1.descFont = RalewayLight(14.0f);
+        page1.descFont = [UIFont systemFontOfSize:14];
         page1.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro210-1"]];
         page1.bgImage = [UIImage imageNamed:@"bgbianco"];
         page1.titleIconPositionY = titleIconPositionY;
@@ -1108,11 +1108,11 @@
         page2.title = [CCUtility localizableBrand:@"_intro_210_03_" table: @"Intro"]; //
         page2.titlePositionY = titlePositionY;
         page2.titleColor = COLOR_GRAY;
-        page2.titleFont = RalewayMedium(20.0f);
+        page2.titleFont = [UIFont systemFontOfSize:20];
         page2.desc = [CCUtility localizableBrand:@"_intro_210_04_" table: @"Intro"];
         page2.descPositionY = descPositionY;
         page2.descColor = COLOR_GRAY;
-        page2.descFont = RalewayLight(14.0f);
+        page2.descFont = [UIFont systemFontOfSize:14];
         page2.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro210-2"]];
         page2.bgImage = [UIImage imageNamed:@"bgbianco"];
         page2.titleIconPositionY = titleIconPositionY;
@@ -1122,10 +1122,10 @@
         pageEnd.title = [CCUtility localizableBrand:@"_intro_END_01_" table: @"Intro"]; //
         pageEnd.titlePositionY = titlePositionY;
         pageEnd.titleColor = COLOR_GRAY;
-        pageEnd.titleFont = RalewayMedium(20.0f);
+        pageEnd.titleFont = [UIFont systemFontOfSize:20];
         pageEnd.descPositionY = descPositionY;
         pageEnd.descColor = COLOR_GRAY;
-        pageEnd.descFont = RalewayLight(14.0f);
+        pageEnd.descFont = [UIFont systemFontOfSize:14];
 #ifdef CC
         pageEnd.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introEnd"]];
         pageEnd.desc = [CCUtility localizableBrand:@"_intro_END_02_" table: @"Intro"];

+ 2 - 7
iOSClient/Login/CCLogin.storyboard

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -9,11 +9,6 @@
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
-    <customFonts key="customFonts">
-        <array key="Raleway-Regular.ttf">
-            <string>Raleway</string>
-        </array>
-    </customFonts>
     <scenes>
         <!--Login-->
         <scene sceneID="IVZ-Md-KoU">
@@ -33,7 +28,7 @@
                                     <constraint firstAttribute="width" constant="300" id="64Q-qN-Vng"/>
                                     <constraint firstAttribute="height" constant="60" id="PFP-Wy-f1y"/>
                                 </constraints>
-                                <fontDescription key="fontDescription" name="Raleway" family="Raleway" pointSize="13"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                 <state key="normal" title="          Nextcloud" image="newAccountNextcloud">
                                     <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 </state>

+ 2 - 6
iOSClient/Main/CCMain.m

@@ -544,11 +544,11 @@
         if ([app.reachability isReachable] == NO) {
             messageLabel.text = NSLocalizedString(@"_comm_erro_pull_down_", nil);
             messageLabel.textColor = COLOR_NO_CONNECTION;
-            messageLabel.font = RalewayLight(14.0f);
+            messageLabel.font = [UIFont systemFontOfSize:14];
         } else {
             messageLabel.text = NSLocalizedString(title ,nil);
             messageLabel.textColor = [UIColor blackColor];
-            messageLabel.font = RalewayLight(14.0f);
+            messageLabel.font = [UIFont systemFontOfSize:14];
         }
         messageLabel.numberOfLines = 0;
         messageLabel.textAlignment = NSTextAlignmentCenter;
@@ -4996,14 +4996,10 @@
     // colori e font
     if (metadata.cryptated) {
         cell.labelTitle.textColor = COLOR_ENCRYPTED;
-        //nameLabel.font = RalewayLight(13.0f);
         cell.labelInfoFile.textColor = [UIColor blackColor];
-        //detailLabel.font = RalewayLight(9.0f);
     } else {
         cell.labelTitle.textColor = COLOR_CLEAR;
-        //nameLabel.font = RalewayLight(13.0f);
         cell.labelInfoFile.textColor = [UIColor blackColor];
-        //detailLabel.font = RalewayLight(9.0f);
     }
     
     // ----------------------------------------------------------------------------------------------------------

+ 0 - 4
iOSClient/MenuAccount+ControlCenter/CCControlCenter.m

@@ -768,14 +768,10 @@
     // colori e font
     if (metadata.cryptated) {
         cell.labelTitle.textColor = COLOR_ENCRYPTED;
-        //nameLabel.font = RalewayLight(13.0f);
         cell.labelInfoFile.textColor = [UIColor blackColor];
-        //detailLabel.font = RalewayLight(9.0f);
     } else {
         cell.labelTitle.textColor = COLOR_CLEAR;
-        //nameLabel.font = RalewayLight(13.0f);
         cell.labelInfoFile.textColor = [UIColor blackColor];
-        //detailLabel.font = RalewayLight(9.0f);
     }
     
     // ----------------------------------------------------------------------------------------------------------

+ 0 - 4
iOSClient/Offline/CCOfflinePageContent.m

@@ -495,14 +495,10 @@
     // color and font
     if (metadata.cryptated) {
         cell.labelTitle.textColor = COLOR_ENCRYPTED;
-        //nameLabel.font = RalewayLight(13.0f);
         cell.labelInfoFile.textColor = [UIColor blackColor];
-        //detailLabel.font = RalewayLight(9.0f);
     } else {
         cell.labelTitle.textColor = COLOR_CLEAR;
-        //nameLabel.font = RalewayLight(13.0f);
         cell.labelInfoFile.textColor = [UIColor blackColor];
-        //detailLabel.font = RalewayLight(9.0f);
     }
     
     if (metadata.directory) {

+ 0 - 94
iOSClient/Raleway/OFL.txt

@@ -1,94 +0,0 @@
-Copyright (c) 2010, Matt McInerney (matt@pixelspread.com),
-Copyright (c) 2011, Pablo Impallari (www.impallari.com|impallari@gmail.com),
-Copyright (c) 2011, Rodrigo Fuenzalida (www.rfuenzalida.com|hello@rfuenzalida.com), with Reserved Font Name Raleway
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

BIN
iOSClient/Raleway/Raleway-Bold.ttf


BIN
iOSClient/Raleway/Raleway-ExtraBold.ttf


BIN
iOSClient/Raleway/Raleway-ExtraLight.ttf


BIN
iOSClient/Raleway/Raleway-Heavy.ttf


BIN
iOSClient/Raleway/Raleway-Light.ttf


BIN
iOSClient/Raleway/Raleway-Medium.ttf


BIN
iOSClient/Raleway/Raleway-Regular.ttf


BIN
iOSClient/Raleway/Raleway-SemiBold.ttf


BIN
iOSClient/Raleway/Raleway-Thin.ttf