Jason Lee 10 سال پیش
والد
کامیت
7541fec9e6

+ 0 - 5
kneet2.xcodeproj/project.pbxproj

@@ -172,7 +172,6 @@
 		A130CDB61BF9BB5000126AC5 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A12BBC4C1BA9527300DE1B94 /* AppDelegate.m */; };
 		A130CDB81BF9BB5000126AC5 /* JDFacade.m in Sources */ = {isa = PBXBuildFile; fileRef = A12BBC911BA9527300DE1B94 /* JDFacade.m */; };
 		A130CDBA1BF9BB5000126AC5 /* JDObject.m in Sources */ = {isa = PBXBuildFile; fileRef = A12BBC931BA9527300DE1B94 /* JDObject.m */; };
-		A130CDBD1BF9BB5000126AC5 /* Prefix.pch in Sources */ = {isa = PBXBuildFile; fileRef = A12BBCDE1BA952D200DE1B94 /* Prefix.pch */; };
 		A130CDCE1BF9BD5A00126AC5 /* KeychainItemWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = A12BBCAC1BA9527300DE1B94 /* KeychainItemWrapper.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		A130CDCF1BF9BE6800126AC5 /* SignUp.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A132A59C1BBE70D6004877ED /* SignUp.storyboard */; };
 		A130CDD01BF9BEF900126AC5 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = A12BBC261BA94FAE00DE1B94 /* main.m */; };
@@ -186,7 +185,6 @@
 		A130CDD81BF9C02100126AC5 /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A132A59A1BBE70D6004877ED /* Settings.storyboard */; };
 		A130CDD91BF9C02100126AC5 /* Common.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A132A5901BBE70D6004877ED /* Common.storyboard */; };
 		A130CDDA1BF9C02100126AC5 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = A12BBC331BA94FAE00DE1B94 /* LaunchScreen.xib */; };
-		A1B02E051BF9B13500D1D4E7 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A1B02E041BF9B13500D1D4E7 /* Assets.xcassets */; };
 		B07AEF45071D67A7C948B31B /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D6B1A9CF6F5E71320D607201 /* Pods.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 /* End PBXBuildFile section */
 
@@ -387,7 +385,6 @@
 		A19E83D01BDA0815002B92DB /* HomeHubStartViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeHubStartViewController.h; sourceTree = "<group>"; };
 		A19E83D11BDA0815002B92DB /* HomeHubStartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeHubStartViewController.m; sourceTree = "<group>"; };
 		A1B02DF61BF9B13500D1D4E7 /* kneet2.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = kneet2.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		A1B02E041BF9B13500D1D4E7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = "/Volumes/Macintosh HD2/Projects/NTels/Project_kneet2/kneet2/kneet2/Assets.xcassets"; sourceTree = "<absolute>"; };
 		A1B0376F1BF5B4F900CB4A05 /* ThingsAddStartViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThingsAddStartViewController.h; sourceTree = "<group>"; };
 		A1B037701BF5B4F900CB4A05 /* ThingsAddStartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThingsAddStartViewController.m; sourceTree = "<group>"; };
 		A1B037721BF5BE0000CB4A05 /* ThingsAddIncludeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThingsAddIncludeViewController.h; sourceTree = "<group>"; };
@@ -1212,7 +1209,6 @@
 				A130CDD11BF9BF9000126AC5 /* Images.xcassets in Resources */,
 				A130CDCF1BF9BE6800126AC5 /* SignUp.storyboard in Resources */,
 				A130CDDA1BF9C02100126AC5 /* LaunchScreen.xib in Resources */,
-				A1B02E051BF9B13500D1D4E7 /* Assets.xcassets in Resources */,
 				A130CDD31BF9C02100126AC5 /* HomeHub.storyboard in Resources */,
 				A130CDD21BF9BFEF00126AC5 /* Main.storyboard in Resources */,
 				A130CDD71BF9C02100126AC5 /* HomeMember.storyboard in Resources */,
@@ -1451,7 +1447,6 @@
 				A130CDB61BF9BB5000126AC5 /* AppDelegate.m in Sources */,
 				A130CDB81BF9BB5000126AC5 /* JDFacade.m in Sources */,
 				A130CDBA1BF9BB5000126AC5 /* JDObject.m in Sources */,
-				A130CDBD1BF9BB5000126AC5 /* Prefix.pch in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

+ 2 - 2
kneet2/Base.lproj/HomeMember.storyboard

@@ -236,7 +236,7 @@
                                                 <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
-                                                    <rect key="frame" x="0.0" y="0.0" width="160" height="160"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="457-Hm-o4g" userLabel="View - Container">
@@ -407,7 +407,7 @@
                                                 <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
-                                                    <rect key="frame" x="0.0" y="0.0" width="160" height="160"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rPe-eM-rB6" userLabel="View - Container">

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 474 - 150
kneet2/Base.lproj/Main.storyboard


+ 1 - 1
kneet2/Base.lproj/Things.storyboard

@@ -1499,7 +1499,7 @@
                                     </tableViewCell>
                                 </prototypes>
                             </tableView>
-                            <view contentMode="scaleToFill" ambiguous="YES" placeholderIntrinsicWidth="320" placeholderIntrinsicHeight="60" translatesAutoresizingMaskIntoConstraints="NO" id="Y35-2O-7JF" userLabel="View - ButtonContainer">
+                            <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" placeholderIntrinsicWidth="320" placeholderIntrinsicHeight="60" translatesAutoresizingMaskIntoConstraints="NO" id="Y35-2O-7JF" userLabel="View - ButtonContainer">
                                 <rect key="frame" x="0.0" y="276" width="320" height="60"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" ambiguous="YES" placeholderIntrinsicWidth="160" placeholderIntrinsicHeight="60" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="58z-Pl-MlL" customClass="CustomButton">

+ 7 - 0
kneet2/Classes/ViewControllers/MainScreens/HomeModeSettingsViewController.m

@@ -178,6 +178,13 @@
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
     CGFloat height = 110.0f;
+    
+    if (indexPath.section == 0) {
+        height = 110.0f;
+    } else if (indexPath.section == 1 || indexPath.section == 2) {
+        height = 95.0f;
+    }
+    
     return height;
 }