浏览代码

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

Marino Faggiana 6 年之前
父节点
当前提交
75441303b2
共有 3 个文件被更改,包括 10 次插入11 次删除
  1. 7 9
      iOSClient/Brand/Intro/CCIntro.m
  2. 1 0
      iOSClient/Brand/NCBrand.swift
  3. 2 2
      iOSClient/Login/CCLogin.storyboard

+ 7 - 9
iOSClient/Brand/Intro/CCIntro.m

@@ -28,7 +28,6 @@
 @interface CCIntro () <SwiftModalWebVCDelegate>
 {
     int titlePositionY;
-    int descPositionY;
     int titleIconPositionY;
     int buttonPosition;
     
@@ -78,18 +77,16 @@
     if (height <= 568) {
         titleIconPositionY = 20;
         titlePositionY = height / 2 + 40.0;
-        descPositionY  = height / 2;
         buttonPosition = height / 2 + 50.0;
     } else {
-        titleIconPositionY = 100;
+        titleIconPositionY = 40;
         titlePositionY = height / 2 + 40.0;
-        descPositionY  = height / 2;
         buttonPosition = height / 2 + 120.0;
     }
     
     // Button
     
-    UIView *buttonView = [[UIView alloc] initWithFrame:CGRectMake(0,0,self.rootView.bounds.size.width,220)];
+    UIView *buttonView = [[UIView alloc] initWithFrame:CGRectMake(0,0,self.rootView.bounds.size.width, height - buttonPosition)];
     buttonView.userInteractionEnabled = YES ;
     
     UIButton *buttonLogin = [UIButton buttonWithType:UIButtonTypeRoundedRect];
@@ -117,12 +114,12 @@
     [buttonView addSubview:buttonSignUp];
     
     UIButton *buttonHost = [UIButton buttonWithType:UIButtonTypeRoundedRect];
-    buttonHost.frame = CGRectMake(50.0, 200.0, width - 100.0, 20.0);
+    buttonHost.frame = CGRectMake(50.0, height - buttonPosition - 40.0, width - 100.0, 20.0);
     buttonHost.layer.cornerRadius = 3;
     buttonHost.clipsToBounds = YES;
     [buttonHost setTitle:NSLocalizedString(@"_host_your_own_server", nil) forState:UIControlStateNormal];
     buttonHost.titleLabel.font = [UIFont systemFontOfSize:14];
-    [buttonHost setTitleColor:[UIColor lightGrayColor] forState:UIControlStateNormal];
+    [buttonHost setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
     buttonHost.backgroundColor = [UIColor clearColor];
     [buttonHost addTarget:self action:@selector(host:) forControlEvents:UIControlEventTouchDown];
     
@@ -187,8 +184,9 @@
     self.intro = [[EAIntroView alloc] initWithFrame:self.rootView.bounds andPages:@[page1,page2,page3,page4]];
 
     self.intro.tapToNext = NO;
-    self.intro.pageControl.pageIndicatorTintColor = [UIColor whiteColor];
-    self.intro.pageControl.currentPageIndicatorTintColor = [UIColor blackColor];
+    self.intro.pageControlY = height - buttonPosition + 50;
+    self.intro.pageControl.pageIndicatorTintColor = [[NCBrandColor sharedInstance] nextcloudSoft];
+    self.intro.pageControl.currentPageIndicatorTintColor = [UIColor whiteColor];
     self.intro.pageControl.backgroundColor = [[NCBrandColor sharedInstance] customer];
 //    [intro.skipButton setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
 //    intro.skipButton.enabled = NO;

+ 1 - 0
iOSClient/Brand/NCBrand.swift

@@ -45,6 +45,7 @@ class NCBrandColor: NSObject {
     @objc public var seperator:             UIColor = UIColor(red: 235.0/255.0, green: 235.0/255.0, blue: 235.0/255.0, alpha: 1.0)
     @objc public var tabBar:                UIColor = .white
     @objc public let nextcloud:             UIColor = UIColor(red: 0.0/255.0, green: 130.0/255.0, blue: 201.0/255.0, alpha: 1.0)
+    @objc public let nextcloudSoft:         UIColor = UIColor(red: 90.0/255.0, green: 160.0/255.0, blue: 210.0/255.0, alpha: 1.0)
     @objc public let icon:                  UIColor = UIColor(red: 104.0/255.0, green: 104.0/255.0, blue: 104.0/255.0, alpha: 1.0)
     @objc public let optionItem:            UIColor = UIColor(red: 178.0/255.0, green: 178.0/255.0, blue: 178.0/255.0, alpha: 1.0)
     @objc public let graySoft:              UIColor = UIColor(red: 162.0/255.0, green: 162.0/255.0, blue: 162.0/255.0, alpha: 0.5)

+ 2 - 2
iOSClient/Login/CCLogin.storyboard

@@ -101,9 +101,9 @@
                                 </constraints>
                             </imageView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="owR-PS-F32" userLabel="loginTypeView">
-                                <rect key="frame" x="153.66666666666666" y="842" width="106.99999999999997" height="20"/>
+                                <rect key="frame" x="153.66666666666666" y="822" width="106.99999999999997" height="40"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="20" id="PaU-7J-gkn"/>
+                                    <constraint firstAttribute="height" constant="40" id="PaU-7J-gkn"/>
                                 </constraints>
                                 <state key="normal" title="Login type view"/>
                                 <connections>