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

1.修改Apex Mobile Indicator颜色和大小。

Pen Li 8 жил өмнө
parent
commit
be8ccd165a

+ 2 - 1
Apex Mobile/Apex Mobile/Apex Mobile-Prefix.pch

@@ -17,4 +17,5 @@
 
 #define APREDCOLOR [UIColor colorWithRed:168 / 255.0 green:9 / 255.0 blue:26 / 255.0 alpha:1.0]
 #define APGRAYCOLOR [UIColor colorWithRed:53 / 255.0 green:53 / 255.0 blue:55 / 255.0 alpha:1.0]
-#define APGRAYCOLOR_HALF_ALPHA [UIColor colorWithRed:53 / 255.0 green:53 / 255.0 blue:55 / 255.0 alpha:0.1]
+#define APGRAYCOLOR_HALF_ALPHA [UIColor colorWithRed:53 / 255.0 green:53 / 255.0 blue:55 / 255.0 alpha:0.4]
+

+ 4 - 3
Apex Mobile/Apex Mobile/AppDelegate.m

@@ -236,12 +236,13 @@ void UncaughtExceptionHandler(NSException *exception) {
     [[UITabBarItem appearance] setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:APGRAYCOLOR, NSForegroundColorAttributeName, nil] forState:UIControlStateNormal];
     
     // Nav Bar
-    [[UIBarButtonItem appearance] setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:APREDCOLOR, NSForegroundColorAttributeName, nil] forState:UIControlStateHighlighted];
+//    [[UIBarButtonItem appearance] setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:APREDCOLOR, NSForegroundColorAttributeName, nil] forState:UIControlStateHighlighted];
     [[UIBarButtonItem appearance] setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:APGRAYCOLOR, NSForegroundColorAttributeName, nil] forState:UIControlStateNormal];
     [[UIBarButtonItem appearance] setTintColor:APGRAYCOLOR];
     
     // Activity
-    [[UIActivityIndicatorView appearance] setColor:APREDCOLOR];
-    [[UIActivityIndicatorView appearance] setBackgroundColor:APGRAYCOLOR_HALF_ALPHA];
+    [[UIActivityIndicatorView appearance] setColor:[UIColor colorWithRed:43 / 255.0 green:43 / 255.0 blue:43 / 255.0 alpha:1.0]];
+//    [[UIActivityIndicatorView appearance] setBackgroundColor:[UIColor colorWithRed:255 / 255.0 green:255 / 255.0 blue:255 / 255.0 alpha:0.9]];
+    
 }
 @end

+ 7 - 0
Apex Mobile/Apex Mobile/HomeViewController.m

@@ -49,6 +49,13 @@
     self.shipSearchBar.delegate =self;
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(logout) name:APLogoutNotification object:nil];
+    
+//    self.loadIndicator.layer.cornerRadius = 5;
+//    self.loadIndicator.layer.masksToBounds = YES;
+//    self.loadIndicator.layer.borderColor = [UIColor colorWithRed:169 / 255.0 green:169 / 255.0 blue:169 / 255.0 alpha:1.0].CGColor;
+//    self.loadIndicator.layer.borderWidth = 0.3f;
+//    self.loadIndicator.color = [UIColor colorWithRed:43 / 255.0 green:43 / 255.0 blue:43 / 255.0 alpha:1.0];
+//    self.loadIndicator.backgroundColor = [UIColor colorWithRed:255 / 255.0 green:255 / 255.0 blue:255 / 255.0 alpha:0.9];
 }
 
 - (void)didReceiveMemoryWarning {

+ 9 - 17
Apex Mobile/Apex Mobile/Main.storyboard

@@ -118,11 +118,7 @@
                                 </connections>
                             </button>
                             <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="lwb-OB-0ec">
-                                <rect key="frame" x="162.5" y="308.5" width="50" height="50"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="50" id="0Je-vB-BLA"/>
-                                    <constraint firstAttribute="height" constant="50" id="kQF-ER-vE6"/>
-                                </constraints>
+                                <rect key="frame" x="169" y="315" width="37" height="37"/>
                                 <color key="color" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             </activityIndicatorView>
                         </subviews>
@@ -324,12 +320,8 @@
                                 </constraints>
                             </view>
                             <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="WyF-Pl-7ix">
-                                <rect key="frame" x="162.5" y="308.5" width="50" height="50"/>
+                                <rect key="frame" x="169" y="315" width="37" height="37"/>
                                 <color key="tintColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="50" id="0Us-Fh-cOj"/>
-                                    <constraint firstAttribute="width" constant="50" id="6oj-Jm-fcK"/>
-                                </constraints>
                                 <color key="color" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             </activityIndicatorView>
                         </subviews>
@@ -571,14 +563,14 @@
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="apexlogo-1" translatesAutoresizingMaskIntoConstraints="NO" id="kly-ZP-lFy">
-                                <rect key="frame" x="0.0" y="20" width="320" height="56"/>
+                                <rect key="frame" x="10" y="25" width="200" height="56"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="320" id="4Rr-EF-U6t"/>
+                                    <constraint firstAttribute="width" constant="200" id="4Rr-EF-U6t"/>
                                     <constraint firstAttribute="height" constant="56" id="Dn7-V2-xCg"/>
                                 </constraints>
                             </imageView>
                             <webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Abt-ML-WTx">
-                                <rect key="frame" x="0.0" y="76" width="375" height="591"/>
+                                <rect key="frame" x="5" y="81" width="365" height="586"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <connections>
                                     <outlet property="delegate" destination="0gA-6x-keH" id="ck1-Fk-zK6"/>
@@ -587,12 +579,12 @@
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="kly-ZP-lFy" firstAttribute="top" secondItem="qa6-ye-yCI" secondAttribute="bottom" id="2jQ-3a-dZP"/>
-                            <constraint firstItem="Abt-ML-WTx" firstAttribute="leading" secondItem="Ssf-nl-y6a" secondAttribute="leading" id="3y5-5b-L66"/>
+                            <constraint firstItem="kly-ZP-lFy" firstAttribute="top" secondItem="qa6-ye-yCI" secondAttribute="bottom" constant="5" id="2jQ-3a-dZP"/>
+                            <constraint firstItem="Abt-ML-WTx" firstAttribute="leading" secondItem="Ssf-nl-y6a" secondAttribute="leading" constant="5" id="3y5-5b-L66"/>
                             <constraint firstItem="NRY-LM-qAI" firstAttribute="top" secondItem="Abt-ML-WTx" secondAttribute="bottom" id="DBb-g4-j57"/>
                             <constraint firstItem="Abt-ML-WTx" firstAttribute="top" secondItem="kly-ZP-lFy" secondAttribute="bottom" id="d8J-A7-Auz"/>
-                            <constraint firstAttribute="trailing" secondItem="Abt-ML-WTx" secondAttribute="trailing" id="eLo-Cl-6EL"/>
-                            <constraint firstItem="kly-ZP-lFy" firstAttribute="leading" secondItem="Ssf-nl-y6a" secondAttribute="leading" id="mhk-KJ-KLI"/>
+                            <constraint firstAttribute="trailing" secondItem="Abt-ML-WTx" secondAttribute="trailing" constant="5" id="eLo-Cl-6EL"/>
+                            <constraint firstItem="kly-ZP-lFy" firstAttribute="leading" secondItem="Ssf-nl-y6a" secondAttribute="leading" constant="10" id="mhk-KJ-KLI"/>
                         </constraints>
                     </view>
                     <connections>