Эх сурвалжийг харах

remove control center on intro

Marino Faggiana 8 жил өмнө
parent
commit
42edfdb0cb

+ 1 - 15
iOSClient/Intro/CCIntro.m

@@ -107,22 +107,8 @@
     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, page2, page3, page4]];
+    EAIntroView *intro = [[EAIntroView alloc] initWithFrame:self.rootView.bounds andPages:@[page1, page2, page3]];
     //intro.backgroundColor = [UIColor whiteColor];
     intro.tapToNext = YES;
     intro.pageControl.pageIndicatorTintColor = [UIColor lightGrayColor];

+ 3 - 1
iOSClient/Intro/ImagesIntro.xcassets/intro3.imageset/Contents.json

@@ -2,15 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
+      "filename" : "intro4.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "intro3@2x.png",
+      "filename" : "intro4@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
+      "filename" : "intro4@3x.png",
       "scale" : "3x"
     }
   ],

BIN
iOSClient/Intro/ImagesIntro.xcassets/intro3.imageset/intro3@2x.png


+ 0 - 0
iOSClient/Intro/ImagesIntro.xcassets/intro4.imageset/intro4.png → iOSClient/Intro/ImagesIntro.xcassets/intro3.imageset/intro4.png


+ 0 - 0
iOSClient/Intro/ImagesIntro.xcassets/intro4.imageset/intro4@2x.png → iOSClient/Intro/ImagesIntro.xcassets/intro3.imageset/intro4@2x.png


+ 0 - 0
iOSClient/Intro/ImagesIntro.xcassets/intro4.imageset/intro4@3x.png → iOSClient/Intro/ImagesIntro.xcassets/intro3.imageset/intro4@3x.png


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

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

+ 2 - 5
iOSClient/Supporting Files/en.lproj/Intro.strings

@@ -14,8 +14,5 @@
 "_intro_2_title_"   = "Multi account";
 "_intro_2_text_"    = "Connect to all your clouds and touch _brand_ logo to quickly switch";
 
-"_intro_3_title_"   = "Control Center";
-"_intro_3_text_"    = "Slide your finger from the title bar downwards to see all the upload and download underway and swipe left to see the last Activities";
-
-"_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!";
+"_intro_3_title_"   = "Start";
+"_intro_3_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!";