design updates #2

Muhit.xcodeproj/project.pbxproj

@@ -79,6 +79,7 @@
 		4BD654E01B32035100343C16 /* PlacesView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BD654DE1B32035100343C16 /* PlacesView.xib */; };
 		4BD654E41B32043700343C16 /* PlacesCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD654E21B32043700343C16 /* PlacesCell.m */; };
 		4BD654E51B32043700343C16 /* PlacesCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BD654E31B32043700343C16 /* PlacesCell.xib */; };
+		4BDE9F111D0E8F5F005431BA /* SourceSansPro-Semibold-Italic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4BDE9F101D0E8F5F005431BA /* SourceSansPro-Semibold-Italic.ttf */; };
 		4BE862881D0AD2CD00CF4013 /* KeyboardControls.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BE862871D0AD2CD00CF4013 /* KeyboardControls.m */; };
 		4BE8628C1D0AD49C00CF4013 /* FacebookManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BE8628B1D0AD49C00CF4013 /* FacebookManager.m */; };
 		4BF7F9051B1CF39D00A35FD1 /* MuhitServices.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BF7F9011B1CF39D00A35FD1 /* MuhitServices.m */; };
@@ -189,7 +190,7 @@
 		4BC583801B1C4D4800180B3D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		4BC583821B1C4D4800180B3D /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		4BC583831B1C4D4800180B3D /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		4BC5838B1B1C4D4800180B3D /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
+		4BC5838B1B1C4D4800180B3D /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Assets/Images.xcassets; sourceTree = "<group>"; };
 		4BC5838E1B1C4D4800180B3D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
 		4BC583991B1C4D4800180B3D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		4BC5839A1B1C4D4800180B3D /* MuhitTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MuhitTests.m; sourceTree = "<group>"; };
@@ -205,6 +206,7 @@
 		4BD654E11B32043700343C16 /* PlacesCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlacesCell.h; sourceTree = "<group>"; };
 		4BD654E21B32043700343C16 /* PlacesCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlacesCell.m; sourceTree = "<group>"; };
 		4BD654E31B32043700343C16 /* PlacesCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PlacesCell.xib; sourceTree = "<group>"; };
+		4BDE9F101D0E8F5F005431BA /* SourceSansPro-Semibold-Italic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SourceSansPro-Semibold-Italic.ttf"; sourceTree = "<group>"; };
 		4BE862861D0AD2CD00CF4013 /* KeyboardControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeyboardControls.h; sourceTree = "<group>"; };
 		4BE862871D0AD2CD00CF4013 /* KeyboardControls.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KeyboardControls.m; sourceTree = "<group>"; };
 		4BE8628A1D0AD49C00CF4013 /* FacebookManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FacebookManager.h; sourceTree = "<group>"; };
@@ -412,13 +414,15 @@
 		4B9F05411B1DE5A6009CB713 /* Fonts */ = {
 			isa = PBXGroup;
 			children = (
+				4BDE9F101D0E8F5F005431BA /* SourceSansPro-Semibold-Italic.ttf */,
 				4B9F05371B1DE38E009CB713 /* SourceSansPro-Black.ttf */,
 				4B9F05381B1DE38E009CB713 /* SourceSansPro-Bold.ttf */,
 				4B9F05391B1DE38E009CB713 /* SourceSansPro-Italic.ttf */,
 				4B9F053A1B1DE38E009CB713 /* SourceSansPro-Regular.ttf */,
 				4B9F053B1B1DE38E009CB713 /* SourceSansPro-Semibold.ttf */,
 			);
 			name = Fonts;
+			path = Assets/Fonts;
 			sourceTree = "<group>";
 		};
 		4BC583721B1C4D4800180B3D = {
@@ -443,15 +447,15 @@
 		4BC5837D1B1C4D4800180B3D /* Muhit */ = {
 			isa = PBXGroup;
 			children = (
+				4BC5838D1B1C4D4800180B3D /* LaunchScreen.xib */,
 				4BC583821B1C4D4800180B3D /* AppDelegate.h */,
 				4BC583831B1C4D4800180B3D /* AppDelegate.m */,
 				4BF7F8FB1B1CF31100A35FD1 /* ViewControllers */,
 				4BF7F8FC1B1CF31F00A35FD1 /* Classes */,
 				4BF7F8FD1B1CF33E00A35FD1 /* Managers */,
 				4B9F05131B1D9736009CB713 /* Categories */,
 				4BF7F9071B1CF3B700A35FD1 /* Networking */,
-				4BC5838B1B1C4D4800180B3D /* Images.xcassets */,
-				4BC5838D1B1C4D4800180B3D /* LaunchScreen.xib */,
+				4BDE9F0F1D0E8F00005431BA /* Assets */,
 				4BC5837E1B1C4D4800180B3D /* Supporting Files */,
 			);
 			path = Muhit;
@@ -460,7 +464,6 @@
 		4BC5837E1B1C4D4800180B3D /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
-				4B9F05411B1DE5A6009CB713 /* Fonts */,
 				4B9F04F01B1D9415009CB713 /* lang-en.plist */,
 				4B9F04F11B1D9415009CB713 /* lang-tr.plist */,
 				4B9F04F21B1D9415009CB713 /* Prefix-Header.pch */,
@@ -533,6 +536,15 @@
 			path = PlacesView;
 			sourceTree = "<group>";
 		};
+		4BDE9F0F1D0E8F00005431BA /* Assets */ = {
+			isa = PBXGroup;
+			children = (
+				4B9F05411B1DE5A6009CB713 /* Fonts */,
+				4BC5838B1B1C4D4800180B3D /* Images.xcassets */,
+			);
+			name = Assets;
+			sourceTree = "<group>";
+		};
 		4BE862891D0AD2F500CF4013 /* Keyboard */ = {
 			isa = PBXGroup;
 			children = (
@@ -732,6 +744,7 @@
 				4BD654E01B32035100343C16 /* PlacesView.xib in Resources */,
 				4B6FF5AF1B3F0D5B00F3ED8A /* TagCell.xib in Resources */,
 				4B9F050F1B1D96D7009CB713 /* PresentedRootVC.xib in Resources */,
+				4BDE9F111D0E8F5F005431BA /* SourceSansPro-Semibold-Italic.ttf in Resources */,
 				4B9F053F1B1DE38E009CB713 /* SourceSansPro-Regular.ttf in Resources */,
 				4B21692F1B20798500DEBA01 /* MainCell.xib in Resources */,
 				4B21696F1B21D5C500DEBA01 /* SearchVC.xib in Resources */,

Muhit/Base.lproj/LaunchScreen.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -132,11 +132,11 @@
                     <exclude reference="shz-zS-6wf"/>
                 </mask>
                 <mask key="constraints">
-                    <exclude reference="29j-lk-QTc"/>
-                    <exclude reference="Han-1Q-tVd"/>
                     <exclude reference="6lS-KQ-BGd"/>
                     <exclude reference="JHc-SE-JUk"/>
                     <exclude reference="fXR-px-7kq"/>
+                    <exclude reference="29j-lk-QTc"/>
+                    <exclude reference="Han-1Q-tVd"/>
                 </mask>
             </variation>
             <variation key="heightClass=regular-widthClass=compact">
@@ -145,11 +145,11 @@
                     <include reference="shz-zS-6wf"/>
                 </mask>
                 <mask key="constraints">
-                    <include reference="29j-lk-QTc"/>
-                    <include reference="Han-1Q-tVd"/>
                     <include reference="6lS-KQ-BGd"/>
                     <include reference="JHc-SE-JUk"/>
                     <include reference="fXR-px-7kq"/>
+                    <include reference="29j-lk-QTc"/>
+                    <include reference="Han-1Q-tVd"/>
                 </mask>
             </variation>
             <point key="canvasLocation" x="548" y="455"/>

Muhit/Supporting Files/Info.plist

@@ -88,6 +88,7 @@
 		<string>SourceSansPro-Italic.ttf</string>
 		<string>SourceSansPro-Regular.ttf</string>
 		<string>SourceSansPro-Semibold.ttf</string>
+		<string>SourceSansPro-Semibold-Italic.ttf</string>
 		<string>ionicons.ttf</string>
 	</array>
 	<key>UILaunchStoryboardName</key>

Muhit/ViewControllers/Main/MainVC.m

@@ -10,12 +10,11 @@
 #import "MainCell.h"
 
 @interface MainVC (){
-    IBOutlet UIButton *btnCreateIssue,*btnPopular,*btnNewest,*btnHood;
+    IBOutlet UIButton *btnCreateIssue,*btnPopular,*btnLatest,*btnMap,*btnMenu,*btnPickHood,*btnLocation;
     IBOutlet UITextField *txtSearch;
     IBOutlet UIImageView *imgLocation;
     IBOutlet NSLayoutConstraint *constActiveLine;
-    IBOutlet UIView *viewActiveLine,*viewSearch,*viewHood;
-    IBOutlet UIImageView *imgSearch,*imgDownIcon;
+    IBOutlet UIView *viewActiveLine,*viewHood;
     IBOutlet UITableView *tblIssues;
     NSMutableArray *arrIssues;
     NSString *fullGeoCode;
@@ -38,7 +37,7 @@ - (void)viewDidLoad {
 - (void)geoCodePicked:(NSNotification*)notification{
     NSDictionary *dict = [notification object];
     fullGeoCode = dict[@"full"];
-    [btnHood setTitle:dict[@"hood"]];
+    [btnPickHood setTitle:dict[@"hood"]];
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -60,18 +59,13 @@ -(void)viewDidLayoutSubviews{
 
 -(void)adjustUI{
     btnCreateIssue.layer.cornerRadius = cornerRadius;
-    btnCreateIssue.layer.borderColor = [CLR_WHITE CGColor];
-    btnCreateIssue.layer.borderWidth = 1;
-
-    [btnCreateIssue setImage:[IonIcons imageWithIcon:ion_plus size:15 color:[HXColor hx_colorWithHexRGBAString:@"FFFFFF"]]];
-
-    [imgLocation setImage:[IonIcons imageWithIcon:ion_location size:115 color:[HXColor hx_colorWithHexRGBAString:@"676778"]]];
-
-    [imgDownIcon setImage:[IonIcons imageWithIcon:ion_android_locate size:20 color:CLR_LIGHT_BLUE]];
-    [imgSearch setImage:[IonIcons imageWithIcon:ion_search size:20 color:CLR_LIGHT_BLUE]];
-
     viewHood.layer.cornerRadius = cornerRadius;
-    viewSearch.layer.cornerRadius = cornerRadius;
+    viewHood.layer.borderColor = [CLR_WHITE CGColor];
+    viewHood.layer.borderWidth = 1;
+
+    [btnMenu setImage:[IonIcons imageWithIcon:ion_navicon size:36 color:CLR_WHITE]];
+    [btnCreateIssue setImage:[IonIcons imageWithIcon:ion_plus size:15 color:CLR_WHITE]];
+    [btnLocation setImage:[IonIcons imageWithIcon:ion_android_locate size:24 color:CLR_WHITE]];
 }
 
 - (void)getIssues{
@@ -99,22 +93,37 @@ - (void)getIssues{
     }];
 }
 
+-(IBAction)actLatest:(id)sender{
+    if (![btnLatest isSelected]) {
+        [btnLatest setSelected:YES];
+        [btnPopular setSelected:NO];
+        [btnMap setSelected:NO];
+
+        [UIView animateWithDuration:0.2 animations:^{
+            constActiveLine.constant = 0;
+            [self.view layoutIfNeeded];
+        }];
+    }
+}
 
 -(IBAction)actPopular:(id)sender{
     if (![btnPopular isSelected]) {
         [btnPopular setSelected:YES];
-        [btnNewest setSelected:NO];
+        [btnLatest setSelected:NO];
+        [btnMap setSelected:NO];
 
         [UIView animateWithDuration:0.2 animations:^{
-            constActiveLine.constant = 0;
+            constActiveLine.constant = [btnLatest rightPosition];
             [self.view layoutIfNeeded];
         }];
+
     }
 }
 
--(IBAction)actNewest:(id)sender{
-    if (![btnNewest isSelected]) {
-        [btnNewest setSelected:YES];
+-(IBAction)actMap:(id)sender{
+    if (![btnMap isSelected]) {
+        [btnMap setSelected:YES];
+        [btnLatest setSelected:NO];
         [btnPopular setSelected:NO];
 
         [UIView animateWithDuration:0.2 animations:^{
@@ -138,10 +147,14 @@ -(IBAction)actMenu:(id)sender{
     [[MT drawerController] toggleDrawerSide:MMDrawerSideLeft animated:YES completion:nil];
 }
 
--(IBAction)actSearchHood:(id)sender{
+-(IBAction)actPickHood:(id)sender{
     [ScreenOperations openPickFromMap];
 }
 
+-(IBAction)actLocation:(id)sender{
+
+}
+
 -(BOOL)textFieldShouldReturn:(UITextField *)textField{
     return [textField resignFirstResponder];
 }
@@ -197,7 +210,7 @@ - (void)didReceiveMemoryWarning {
 
 - (void)setLocalizedStrings{
     [btnPopular setTitle:[LocalizedString(@"Popüler") toUpper]];
-    [btnNewest setTitle:[LocalizedString(@"En Son") toUpper]];
+    [btnLatest setTitle:[LocalizedString(@"En Son") toUpper]];
     [btnCreateIssue setTitle:[LocalizedString(@"Fikir") toUpper]];
 }
 @end