瀏覽代碼

Screens improvements

doganekici 6 年之前
父節點
當前提交
5b3cbed9cc

+ 8 - 2
Appcircle.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		C316CFD62371563E00EAFD54 /* ViewController2.m in Sources */ = {isa = PBXBuildFile; fileRef = C316CFD52371563E00EAFD54 /* ViewController2.m */; };
 		C335FD492347815B00627CB4 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = C335FD482347815B00627CB4 /* AppDelegate.m */; };
 		C335FD4C2347815B00627CB4 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = C335FD4B2347815B00627CB4 /* SceneDelegate.m */; };
 		C335FD4F2347815B00627CB4 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C335FD4E2347815B00627CB4 /* ViewController.m */; };
@@ -36,6 +37,8 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		C316CFD42371563E00EAFD54 /* ViewController2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController2.h; sourceTree = "<group>"; };
+		C316CFD52371563E00EAFD54 /* ViewController2.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController2.m; sourceTree = "<group>"; };
 		C335FD442347815B00627CB4 /* Appcircle.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Appcircle.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		C335FD472347815B00627CB4 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		C335FD482347815B00627CB4 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -110,6 +113,8 @@
 				C335FD4B2347815B00627CB4 /* SceneDelegate.m */,
 				C335FD4D2347815B00627CB4 /* ViewController.h */,
 				C335FD4E2347815B00627CB4 /* ViewController.m */,
+				C316CFD42371563E00EAFD54 /* ViewController2.h */,
+				C316CFD52371563E00EAFD54 /* ViewController2.m */,
 				C335FD502347815B00627CB4 /* Main.storyboard */,
 				C335FD532347815C00627CB4 /* Assets.xcassets */,
 				C335FD552347815C00627CB4 /* LaunchScreen.storyboard */,
@@ -269,6 +274,7 @@
 			files = (
 				C335FD4F2347815B00627CB4 /* ViewController.m in Sources */,
 				C335FD492347815B00627CB4 /* AppDelegate.m in Sources */,
+				C316CFD62371563E00EAFD54 /* ViewController2.m in Sources */,
 				C335FD5A2347815C00627CB4 /* main.m in Sources */,
 				C335FD4C2347815B00627CB4 /* SceneDelegate.m in Sources */,
 			);
@@ -448,7 +454,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1;
+				MARKETING_VERSION = 1.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.appcircle.Appcircle;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -468,7 +474,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1;
+				MARKETING_VERSION = 1.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.appcircle.Appcircle;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";

二進制
Appcircle.xcodeproj/project.xcworkspace/xcuserdata/doganekici.xcuserdatad/UserInterfaceState.xcuserstate


二進制
Appcircle/Assets.xcassets/Appcircle.imageset/180-removebg-preview-1.png


二進制
Appcircle/Assets.xcassets/Appcircle.imageset/180-removebg-preview.png


+ 22 - 0
Appcircle/Assets.xcassets/Appcircle.imageset/Contents.json

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

+ 96 - 14
Appcircle/Base.lproj/Main.storyboard

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="7aF-YI-2t0">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
@@ -8,7 +8,7 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
-        <!--View Controller-->
+        <!--Page 1-->
         <scene sceneID="tne-QT-ifu">
             <objects>
                 <viewController id="BYZ-38-t0r" customClass="ViewController" sceneMemberID="viewController">
@@ -16,34 +16,116 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Appcircle.io" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zEY-c0-YAE">
-                                <rect key="frame" x="0.0" y="429" width="414" height="48"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dbY-Yo-aTf">
+                                <rect key="frame" x="160" y="483" width="94" height="36"/>
+                                <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="20"/>
+                                <state key="normal" title="Next Page"/>
+                                <connections>
+                                    <segue destination="W5I-xn-GsK" kind="show" id="w4n-7z-4bp"/>
+                                </connections>
+                            </button>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Appcircle" translatesAutoresizingMaskIntoConstraints="NO" id="Chf-CY-MZC">
+                                <rect key="frame" x="177" y="200" width="60" height="60"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="60" id="7wh-kF-ozf"/>
+                                    <constraint firstAttribute="width" constant="60" id="UWB-hP-KUg"/>
+                                </constraints>
+                            </imageView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Appcircle.io" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VPj-S8-XbZ">
+                                <rect key="frame" x="0.0" y="270" width="414" height="36"/>
+                                <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="30"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <constraints>
+                            <constraint firstItem="dbY-Yo-aTf" firstAttribute="centerY" secondItem="6Tk-OE-BBY" secondAttribute="centerY" id="8mW-C2-zJN"/>
+                            <constraint firstItem="Chf-CY-MZC" firstAttribute="top" secondItem="6Tk-OE-BBY" secondAttribute="top" constant="60" id="a8u-fm-ON0"/>
+                            <constraint firstItem="dbY-Yo-aTf" firstAttribute="centerX" secondItem="6Tk-OE-BBY" secondAttribute="centerX" id="d5D-xx-iax"/>
+                            <constraint firstItem="VPj-S8-XbZ" firstAttribute="top" secondItem="Chf-CY-MZC" secondAttribute="bottom" constant="10" id="r5n-TF-X0F"/>
+                            <constraint firstItem="VPj-S8-XbZ" firstAttribute="trailing" secondItem="6Tk-OE-BBY" secondAttribute="trailing" id="rTL-gx-o2b"/>
+                            <constraint firstItem="Chf-CY-MZC" firstAttribute="centerX" secondItem="6Tk-OE-BBY" secondAttribute="centerX" id="unc-hy-R3p"/>
+                            <constraint firstItem="VPj-S8-XbZ" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" id="zTa-iW-YRD"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                    </view>
+                    <navigationItem key="navigationItem" title="Page 1" id="HBB-iR-JEJ"/>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1047.8260869565217" y="133.92857142857142"/>
+        </scene>
+        <!--Page 2-->
+        <scene sceneID="gNa-el-FDv">
+            <objects>
+                <viewController id="W5I-xn-GsK" customClass="ViewController2" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="u6a-Kk-NxX">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Appcircle.io" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JHs-nA-rYW">
+                                <rect key="frame" x="0.0" y="477" width="414" height="48"/>
                                 <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="40"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="v1.1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dhr-Oi-yBu">
-                                <rect key="frame" x="0.0" y="485" width="414" height="20.5"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="v1.1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DL3-Qa-VWz">
+                                <rect key="frame" x="0.0" y="533" width="414" height="20.5"/>
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Appcircle" translatesAutoresizingMaskIntoConstraints="NO" id="8FF-zy-vuc">
+                                <rect key="frame" x="167" y="389" width="80" height="80"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="80" id="6oH-AG-w8z"/>
+                                    <constraint firstAttribute="width" constant="80" id="oNl-rM-Q1m"/>
+                                </constraints>
+                            </imageView>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
-                            <constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="zEY-c0-YAE" secondAttribute="trailing" id="AHb-1Y-hze"/>
-                            <constraint firstItem="dhr-Oi-yBu" firstAttribute="trailing" secondItem="6Tk-OE-BBY" secondAttribute="trailing" id="ZFm-BE-RwD"/>
-                            <constraint firstItem="dhr-Oi-yBu" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" id="bjd-2A-ub1"/>
-                            <constraint firstItem="zEY-c0-YAE" firstAttribute="centerY" secondItem="6Tk-OE-BBY" secondAttribute="centerY" id="cHG-5C-dcy"/>
-                            <constraint firstItem="zEY-c0-YAE" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" id="kkE-SQ-ago"/>
-                            <constraint firstItem="dhr-Oi-yBu" firstAttribute="top" secondItem="zEY-c0-YAE" secondAttribute="bottom" constant="8" id="l3E-T7-QYh"/>
+                            <constraint firstItem="JHs-nA-rYW" firstAttribute="top" secondItem="8FF-zy-vuc" secondAttribute="bottom" constant="8" id="0ya-9F-KQv"/>
+                            <constraint firstItem="JHs-nA-rYW" firstAttribute="leading" secondItem="JoR-XE-yvE" secondAttribute="leading" id="399-U0-d8k"/>
+                            <constraint firstItem="DL3-Qa-VWz" firstAttribute="leading" secondItem="JoR-XE-yvE" secondAttribute="leading" id="9H6-BC-MVH"/>
+                            <constraint firstItem="DL3-Qa-VWz" firstAttribute="top" secondItem="JHs-nA-rYW" secondAttribute="bottom" constant="8" id="Leh-rL-jaf"/>
+                            <constraint firstItem="8FF-zy-vuc" firstAttribute="centerX" secondItem="JHs-nA-rYW" secondAttribute="centerX" id="fbv-wS-7t1"/>
+                            <constraint firstItem="DL3-Qa-VWz" firstAttribute="trailing" secondItem="JoR-XE-yvE" secondAttribute="trailing" id="hpm-4Y-adh"/>
+                            <constraint firstItem="JoR-XE-yvE" firstAttribute="trailing" secondItem="JHs-nA-rYW" secondAttribute="trailing" id="lPI-fN-W8e"/>
+                            <constraint firstItem="JHs-nA-rYW" firstAttribute="centerY" secondItem="JoR-XE-yvE" secondAttribute="centerY" id="nkg-NN-bc5"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                        <viewLayoutGuide key="safeArea" id="JoR-XE-yvE"/>
                     </view>
+                    <navigationItem key="navigationItem" title="Page 2" id="GN7-V9-c7e"/>
+                    <connections>
+                        <outlet property="lblVersion" destination="DL3-Qa-VWz" id="VEF-4v-FJT"/>
+                    </connections>
                 </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="pce-j3-UIb" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1831.8840579710147" y="133.92857142857142"/>
+        </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="wwX-uu-wgJ">
+            <objects>
+                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="7aF-YI-2t0" sceneMemberID="viewController">
+                    <toolbarItems/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" largeTitles="YES" id="g0J-SG-cuq">
+                        <rect key="frame" x="0.0" y="44" width="414" height="96"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <nil name="viewControllers"/>
+                    <connections>
+                        <segue destination="BYZ-38-t0r" kind="relationship" relationship="rootViewController" id="7cQ-i0-X0k"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="h3G-6Q-mq5" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="137.68115942028987" y="133.92857142857142"/>
         </scene>
     </scenes>
+    <resources>
+        <image name="Appcircle" width="90" height="90"/>
+    </resources>
 </document>

+ 19 - 0
Appcircle/ViewController2.h

@@ -0,0 +1,19 @@
+//
+//  ViewController2.h
+//  Appcircle
+//
+//  Created by Dogan Ekici on 5.11.2019.
+//  Copyright © 2019 Dogan Ekici. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ViewController2 : UIViewController
+
+@property (weak, nonatomic) IBOutlet UILabel *lblVersion;
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 34 - 0
Appcircle/ViewController2.m

@@ -0,0 +1,34 @@
+//
+//  ViewController2.m
+//  Appcircle
+//
+//  Created by Dogan Ekici on 5.11.2019.
+//  Copyright © 2019 Dogan Ekici. All rights reserved.
+//
+
+#import "ViewController2.h"
+
+@interface ViewController2 ()
+
+@end
+
+@implementation ViewController2
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+   
+    self.lblVersion.text =  [NSString stringWithFormat:@"v%@",[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"]];;
+    // Do any additional setup after loading the view.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end