浏览代码

https://github.com/nextcloud-gmbh/preferred_providers/issues/16

Marino Faggiana 6 年之前
父节点
当前提交
5961eff596

+ 28 - 2
iOSClient/Brand/Intro/CCIntro.m

@@ -140,11 +140,13 @@
     page1.titlePositionY = titlePositionY;
     page1.titleColor = [[NCBrandColor sharedInstance] customerText];
     page1.titleFont = [UIFont systemFontOfSize:20];
-    
+
+    /*
     page1.desc = NSLocalizedStringFromTable(@"_intro_1_text_",  @"Intro", nil);
     page1.descPositionY = descPositionY;
     page1.descColor = [[NCBrandColor sharedInstance] customerText];
     page1.descFont = [UIFont systemFontOfSize:14];
+    */
     
     page1.bgColor = [[NCBrandColor sharedInstance] customer];
     page1.showTitleView = YES;
@@ -159,10 +161,12 @@
     page2.titleColor = [[NCBrandColor sharedInstance] customerText];
     page2.titleFont = [UIFont systemFontOfSize:20];
     
+    /*
     page2.desc = NSLocalizedStringFromTable(@"_intro_2_text_",  @"Intro", nil);
     page2.descPositionY = descPositionY;
     page2.descColor = [[NCBrandColor sharedInstance] customerText];
     page2.descFont = [UIFont systemFontOfSize:14];
+    */
     
     page2.bgColor = [[NCBrandColor sharedInstance] customer];
     page2.showTitleView = YES;
@@ -177,17 +181,39 @@
     page3.titleColor = [[NCBrandColor sharedInstance] customerText];
     page3.titleFont = [UIFont systemFontOfSize:20];
     
+    /*
     page3.desc = NSLocalizedStringFromTable(@"_intro_3_text_",  @"Intro", nil);
     page3.descPositionY = descPositionY;
     page3.descColor = [[NCBrandColor sharedInstance] customerText];
     page3.descFont = [UIFont systemFontOfSize:14];
+    */
     
     page3.bgColor = [[NCBrandColor sharedInstance] customer];
     page3.showTitleView = YES;
 
+    EAIntroPage *page4 = [EAIntroPage page];
+    
+    page4.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro4"]];
+    page4.titleIconPositionY = titleIconPositionY;
+    
+    page4.title = NSLocalizedStringFromTable(@"_intro_4_title_",  @"Intro", nil);
+    page4.titlePositionY = titlePositionY;
+    page4.titleColor = [[NCBrandColor sharedInstance] customerText];
+    page4.titleFont = [UIFont systemFontOfSize:20];
+    
+    /*
+    page4.desc = NSLocalizedStringFromTable(@"_intro_4_text_",  @"Intro", nil);
+    page4.descPositionY = descPositionY;
+    page4.descColor = [[NCBrandColor sharedInstance] customerText];
+    page4.descFont = [UIFont systemFontOfSize:14];
+    */
+    
+    page4.bgColor = [[NCBrandColor sharedInstance] customer];
+    page4.showTitleView = YES;
+    
     // INTRO
     
-    self.intro = [[EAIntroView alloc] initWithFrame:self.rootView.bounds andPages:@[page1,page2,page3]];
+    self.intro = [[EAIntroView alloc] initWithFrame:self.rootView.bounds andPages:@[page1,page2,page3,page4]];
 
     self.intro.tapToNext = NO;
     self.intro.pageControl.pageIndicatorTintColor = [UIColor whiteColor];

+ 0 - 2
iOSClient/Brand/Intro/ImagesIntro.xcassets/intro1.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "intro1.png",
       "scale" : "1x"
     },
     {
@@ -12,7 +11,6 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "intro1@3x.png",
       "scale" : "3x"
     }
   ],

二进制
iOSClient/Brand/Intro/ImagesIntro.xcassets/intro1.imageset/intro1.png


二进制
iOSClient/Brand/Intro/ImagesIntro.xcassets/intro1.imageset/intro1@2x.png


二进制
iOSClient/Brand/Intro/ImagesIntro.xcassets/intro1.imageset/intro1@3x.png


二进制
iOSClient/Brand/Intro/ImagesIntro.xcassets/intro2.imageset/intro2@2x.png


+ 0 - 2
iOSClient/Brand/Intro/ImagesIntro.xcassets/intro3.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "intro@3x.png",
       "scale" : "1x"
     },
     {
@@ -12,7 +11,6 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "intro3@3x.png",
       "scale" : "3x"
     }
   ],

二进制
iOSClient/Brand/Intro/ImagesIntro.xcassets/intro3.imageset/intro3@2x.png


二进制
iOSClient/Brand/Intro/ImagesIntro.xcassets/intro3.imageset/intro3@3x.png


二进制
iOSClient/Brand/Intro/ImagesIntro.xcassets/intro3.imageset/intro@3x.png


+ 21 - 0
iOSClient/Brand/Intro/ImagesIntro.xcassets/intro4.imageset/Contents.json

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

二进制
iOSClient/Brand/Intro/ImagesIntro.xcassets/intro4.imageset/intro4@2x.png


+ 7 - 13
iOSClient/Supporting Files/en.lproj/Intro.strings

@@ -20,17 +20,11 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-"_intro_1_title_"   = "A safe home for all your data";
-"_intro_1_text_"    = "Keep your data secure and under your control";
+"_intro_1_title_"       = "Keep your data secure and under your control";
+"_intro_2_title_"       = "Secure collaboration & file exchange";
+"_intro_3_title_"       = "Easy-to-use web mail, calendering & contacts";
+"_intro_4_title_"       = "Screensharing, online meetings & web conferences";
 
-"_intro_2_title_"   = "Multi account";
-"_intro_2_text_"    = "Connect to all your clouds and touch the Nextcloud logo on the Files tab to switch between them";
-
-"_intro_3_title_"   = "Start";
-"_intro_3_text_"    = "Good, your Nextcloud is ready for use. Further information, news and contact-information to be found on https://nextcloud.com";
-
-"_introNoCryptoCloud_1_title_" = "Crypto Cloud";
-"_introNoCryptoCloud_1_text_"  = "Crypto Cloud encryption protocol is no longer available, you can still decrypt your files by downloading the free app from AppStore\n\n'CryptoCloud for Nextcloud'\n\nSoon there will be a new EndToEnd protocol available on all Nextcloud clients\n\n\nTap to Start";
-
-"_log_in_"          = "Log in";
-"_sign_up_"         = "Sign up with provider";
+"_log_in_"              = "Log in";
+"_sign_up_"             = "Sign up with provider";
+"_host_your_own_server" = "Host your own server";