new intro

iOSClient/Intro/CCIntro.m

@@ -60,21 +60,63 @@
     if (height >= 1024) { titleIconPositionY = 100; titlePositionY = 290; descPositionY = 250; }
     
     EAIntroPage *page1 = [EAIntroPage page];
-    page1.title = [CCUtility localizableBrand:@"_intro_01_" table:@"Intro"];
+    page1.title = [CCUtility localizableBrand:@"_intro_1_title_" table:@"Intro"];
     page1.titlePositionY = titlePositionY;
     page1.titleColor = COLOR_TEXT_ANTHRACITE;
     page1.titleFont = [UIFont systemFontOfSize:20];
-    page1.desc = [CCUtility localizableBrand:@"_intro_02_" table:@"Intro"];
+    page1.desc = [CCUtility localizableBrand:@"_intro_1_text_" table:@"Intro"];
     page1.descPositionY = descPositionY;
     page1.descColor = COLOR_TEXT_ANTHRACITE;
     page1.descFont = [UIFont systemFontOfSize:14];
-    page1.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro1Nextcloud"]];
+    page1.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro1"]];
     page1.bgImage = [UIImage imageNamed:@"bgbianco"];
     page1.titleIconPositionY = titleIconPositionY;
     page1.showTitleView = NO;
     
+    EAIntroPage *page2 = [EAIntroPage page];
+    page2.title = [CCUtility localizableBrand:@"_intro_2_title_" table:@"Intro"];
+    page2.titlePositionY = titlePositionY;
+    page2.titleColor = COLOR_TEXT_ANTHRACITE;
+    page2.titleFont = [UIFont systemFontOfSize:20];
+    page2.desc = [CCUtility localizableBrand:@"_intro_2_text_" table:@"Intro"];
+    page2.descPositionY = descPositionY;
+    page2.descColor = COLOR_TEXT_ANTHRACITE;
+    page2.descFont = [UIFont systemFontOfSize:14];
+    page2.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro2"]];
+    page2.bgImage = [UIImage imageNamed:@"bgbianco"];
+    page2.titleIconPositionY = titleIconPositionY;
+    page2.showTitleView = NO;
+
+    EAIntroPage *page3 = [EAIntroPage page];
+    page3.title = [CCUtility localizableBrand:@"_intro_3_title_" table:@"Intro"];
+    page3.titlePositionY = titlePositionY;
+    page3.titleColor = COLOR_TEXT_ANTHRACITE;
+    page3.titleFont = [UIFont systemFontOfSize:20];
+    page3.desc = [CCUtility localizableBrand:@"_intro_3_text_" table:@"Intro"];
+    page3.descPositionY = descPositionY;
+    page3.descColor = COLOR_TEXT_ANTHRACITE;
+    page3.descFont = [UIFont systemFontOfSize:14];
+    page3.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro3"]];
+    page3.bgImage = [UIImage imageNamed:@"bgbianco"];
+    page3.titleIconPositionY = titleIconPositionY;
+    page3.showTitleView = NO;
+
+    EAIntroPage *page4 = [EAIntroPage page];
+    page4.title = [CCUtility localizableBrand:@"_intro_4_title_" table:@"Intro"];
+    page4.titlePositionY = titlePositionY;
+    page4.titleColor = COLOR_TEXT_ANTHRACITE;
+    page4.titleFont = [UIFont systemFontOfSize:20];
+    page4.desc = [CCUtility localizableBrand:@"_intro_4_text_" table:@"Intro"];
+    page4.descPositionY = descPositionY;
+    page4.descColor = COLOR_TEXT_ANTHRACITE;
+    page4.descFont = [UIFont systemFontOfSize:14];
+    page4.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro4"]];
+    page4.bgImage = [UIImage imageNamed:@"bgbianco"];
+    page4.titleIconPositionY = titleIconPositionY;
+    page4.showTitleView = NO;
+
     
-    EAIntroView *intro = [[EAIntroView alloc] initWithFrame:self.rootView.bounds andPages:@[page1]];
+    EAIntroView *intro = [[EAIntroView alloc] initWithFrame:self.rootView.bounds andPages:@[page1, page2, page3, page4]];
     //intro.backgroundColor = [UIColor whiteColor];
     intro.tapToNext = YES;
     intro.pageControl.pageIndicatorTintColor = [UIColor lightGrayColor];

iOSClient/Intro/ImagesIntro.xcassets/intro3Nextcloud.imageset/Contents.json

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

iOSClient/Intro/ImagesIntro.xcassets/intro4Nextcloud.imageset/Contents.json

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

iOSClient/Intro/ImagesIntro.xcassets/intro5Nextcloud.imageset/Contents.json

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

iOSClient/Intro/ImagesIntro.xcassets/intro6Nextcloud.imageset/Contents.json

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

iOSClient/Intro/ImagesIntro.xcassets/intro7Nextcloud.imageset/Contents.json

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

iOSClient/Intro/ImagesIntro.xcassets/intro8Nextcloud.imageset/Contents.json

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

iOSClient/Intro/ImagesIntro.xcassets/introEndNextcloud.imageset/Contents.json

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

iOSClient/Intro/ImagesIntro.xcassets/introStartNextcloud.imageset/Contents.json

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

iOSClient/en.lproj/Intro.strings

@@ -8,10 +8,14 @@
 
 // Intro
 
-"_intro_01_" = "START";
-"_intro_02_" = "Good, you’re now ready to start using your _brand_. We remind you that you can find further information and news or contact us on the site: \n\n https://nextcloud.com \n\n Come and visit us!";
+"_intro_1_title_"   = "A safe home for all your data";
+"_intro_1_text_"    = "Access, share and protect your files at home and in your enterprise";
 
-// Intro END
+"_intro_2_title_"   = "Multi account";
+"_intro_2_text_"    = "Connect to all your clouds";
 
-"_intro_END_01_" = "_brand_";
-"_intro_END_02_" = "Good ! You’re now ready to start using your _brand_, follow us on Twitter : @Nextclouders and leave your opinion on AppStore, it is important to us.";
+"_intro_3_title_"   = "Instant upload";
+"_intro_3_text_"    = "Keep your photos safe";
+
+"_intro_4_title_"   = "Start";
+"_intro_4_text_"    = "Good, you’re now ready to start using your _brand_. We remind you that you can find further information and news or contact us on the site: \n\n https://nextcloud.com \n\n Come and visit us!";