Skip to content

Commit

Permalink
add bs banner and new categories
Browse files Browse the repository at this point in the history
  • Loading branch information
leoru committed Feb 13, 2015
1 parent 57807bf commit 651062a
Show file tree
Hide file tree
Showing 11 changed files with 207 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Pods/Objective-C-HMTL-Parser/HTMLNode.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//
// FLBannerViewController.h
// freelansim
//
// Created by Kirill Kunst on 13.02.15.
// Copyright (c) 2015 Kirill Kunst. All rights reserved.
//

#import "FLBaseController.h"

@interface FLBannerViewController : FLBaseController

@end
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
//
// FLBannerViewController.m
// freelansim
//
// Created by Kirill Kunst on 13.02.15.
// Copyright (c) 2015 Kirill Kunst. All rights reserved.
//

#import "FLBannerViewController.h"

@interface FLBannerViewController ()

@end

@implementation FLBannerViewController

- (void)viewDidLoad {
[super viewDidLoad];
}

- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
}

- (IBAction)actionOpenBrainstorage:(id)sender
{
}

- (IBAction)actionClose:(id)sender
{
[self dismissViewControllerAnimated:YES completion:nil];
}

@end
19 changes: 18 additions & 1 deletion freelansim-client/Classes/Controllers/FLTasksController.m
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#import "FLTaskCell.h"
#import "FLInternetConnectionUtils.h"
#import "SVProgressHUD.h"

#import "FLBannerViewController.h"

@interface FLTasksController ()
@end
Expand Down Expand Up @@ -52,6 +52,8 @@ - (void)viewDidLoad
self.view.backgroundColor = [UIColor patternBackgroundColor];

[self.tasksTable registerNib:[UINib nibWithNibName:@"FLTaskCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:@"FLTaskCell"];

[self showBanner];
}


Expand All @@ -60,6 +62,21 @@ - (void)didReceiveMemoryWarning
[super didReceiveMemoryWarning];
}

- (void)showBanner
{
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
NSNumber *bannerShownFlag = [defaults objectForKey:@"bannerShown"];
if (bannerShownFlag) {
return;
}

[defaults setObject:@(YES) forKey:@"bannerShown"];
[defaults synchronize];

FLBannerViewController *bannerController = [self.storyboard instantiateViewControllerWithIdentifier:@"FLBannerViewController"];
[self presentViewController:bannerController animated:YES completion:nil];
}


#pragma mark - UITableView Datasource
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
Expand Down
11 changes: 11 additions & 0 deletions freelansim-client/Classes/Models/FLCategory.m
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ +(NSArray *)categories {
category = [[FLCategory alloc] initWithTitle:@"Разработка ПО" subcategories:@"app_all_inclusive,app_scripts,app_bots,app_plugins,app_utilites,app_design,app_programming,app_prototyping,app_test,app_other"];
[categories addObject:category];



category = [[FLCategory alloc] initWithTitle:@"Контент" subcategories:@"content_copywriting,content_rewriting,content_article,content_reviews,content_news,content_translations,content_press_releases,content_documentation,content_scenarios,content_other,content_correction"];
[categories addObject:category];

Expand All @@ -40,6 +42,15 @@ +(NSArray *)categories {
category = [[FLCategory alloc] initWithTitle:@"Дизайн и мультимедиа" subcategories:@"design_graphics,design_logos,design_illustrations,design_banners,design_prints,design_modeling,design_animation,design_presentations,design_photo,design_video,design_audio,design_other,design_icons"];
[categories addObject:category];

category = [[FLCategory alloc] initWithTitle:@"Полиграфия" subcategories:@"printing_all_inclusive,printing_design,printing_makeup,printing_packaging_design,printing_corporate_identity,printing_outdoor_advertising,printing_others"];
[categories addObject:category];

category = [[FLCategory alloc] initWithTitle:@"Инженерия" subcategories:@"engineering_development_electronics,engineering_programming_electronics,engineering_drawings_diagrams,engineering_architecture,engineering_other"];
[categories addObject:category];

category = [[FLCategory alloc] initWithTitle:@"Реклама и маркетинг" subcategories:@"advertising_seo,advertising_context,advertising_smo,advertising_smm,advertising_sem,advertising_other"];
[categories addObject:category];

category = [[FLCategory alloc] initWithTitle:@"Разное" subcategories:@"other_seo,other_smm,other_advertisement,other_jurisprudence,other_other"];
[categories addObject:category];

Expand Down
13 changes: 13 additions & 0 deletions freelansim-client/Classes/UI/FLRoundedButton.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//
// FLRoundedButton.h
// freelansim
//
// Created by Kirill Kunst on 13.02.15.
// Copyright (c) 2015 Kirill Kunst. All rights reserved.
//

#import <UIKit/UIKit.h>

@interface FLRoundedButton : UIButton

@end
26 changes: 26 additions & 0 deletions freelansim-client/Classes/UI/FLRoundedButton.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//
// FLRoundedButton.m
// freelansim
//
// Created by Kirill Kunst on 13.02.15.
// Copyright (c) 2015 Kirill Kunst. All rights reserved.
//

#import "FLRoundedButton.h"

@implementation FLRoundedButton

- (id)initWithCoder:(NSCoder *)aDecoder
{
self = [super initWithCoder:aDecoder];
[self setup];
return self;
}

- (void)setup
{
self.layer.cornerRadius = 5.0f;
self.clipsToBounds = YES;
}

@end
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
77 changes: 66 additions & 11 deletions freelansim-client/en.lproj/MainStoryboard.storyboard
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="5056" systemVersion="14A261i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="4">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6254" systemVersion="14D72i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="4">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
</dependencies>
<scenes>
<!--Navigation Controller - Заказы-->
<!--Заказы-->
<scene sceneID="0GQ-ev-3Ml">
<objects>
<navigationController definesPresentationContext="YES" id="Nkf-Ws-XBL" sceneMemberID="viewController">
Expand All @@ -24,7 +25,7 @@
</objects>
<point key="canvasLocation" x="267" y="-23"/>
</scene>
<!--Categories Controller - Разделы-->
<!--Разделы-->
<scene sceneID="JoW-71-3gr">
<objects>
<viewController extendedLayoutIncludesOpaqueBars="YES" id="UJw-tk-e7F" customClass="FLCategoriesController" sceneMemberID="viewController">
Expand Down Expand Up @@ -64,7 +65,7 @@
</objects>
<point key="canvasLocation" x="1161" y="-1216"/>
</scene>
<!--Tasks Controller - Заказы-->
<!--Заказы-->
<scene sceneID="lUK-06-Ga8">
<objects>
<viewController autoresizesArchivedViewToFullSize="NO" title="Заказы" id="48R-Ah-N3M" customClass="FLTasksController" sceneMemberID="viewController">
Expand Down Expand Up @@ -214,7 +215,60 @@
</objects>
<point key="canvasLocation" x="1645" y="-69"/>
</scene>
<!--Navigation Controller - Фрилансеры-->
<!--Banner View Controller-->
<scene sceneID="cjM-fS-hgQ">
<objects>
<viewController storyboardIdentifier="FLBannerViewController" id="2eQ-Ju-Rto" customClass="FLBannerViewController" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="ZRm-rL-9Sd">
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="brainstorage_icon.png" id="Any-xR-eWN">
<rect key="frame" x="98" y="42" width="124" height="137"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="У нас отличная новость! Мы сделали клиент для brainstorage.me" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="7tC-bQ-on9">
<rect key="frame" x="57" y="187" width="206" height="98"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
<color key="textColor" red="0.16078431372549021" green="0.67450980392156867" blue="0.65490196078431373" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="i9l-ac-OA8" customClass="FLRoundedButton">
<rect key="frame" x="21" y="280" width="283" height="48"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.31372549019607843" green="0.6588235294117647" blue="0.8901960784313725" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
<state key="normal" title="Скачать">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="actionOpenBrainstorage:" destination="2eQ-Ju-Rto" eventType="touchUpInside" id="IoJ-Mq-qwh"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="8Jh-rT-1tt" customClass="FLRoundedButton">
<rect key="frame" x="21" y="336" width="283" height="48"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.88235294117647056" green="0.2627450980392157" blue="0.17647058823529413" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
<state key="normal" title="Закрыть">
<color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="actionClose:" destination="2eQ-Ju-Rto" eventType="touchUpInside" id="mnp-2a-uOU"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" red="0.8784313725490196" green="0.90196078431372551" blue="0.90588235294117647" alpha="1" colorSpace="calibratedRGB"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="9ru-OY-NIx" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="2100" y="-479"/>
</scene>
<!--Фрилансеры-->
<scene sceneID="bfl-G7-gg2">
<objects>
<navigationController definesPresentationContext="YES" id="Krs-YF-5sG" sceneMemberID="viewController">
Expand All @@ -230,7 +284,7 @@
</objects>
<point key="canvasLocation" x="267" y="707"/>
</scene>
<!--Freelancers Controller - Фрилансеры-->
<!--Фрилансеры-->
<scene sceneID="gxI-Gc-GUP">
<objects>
<viewController id="nd1-8g-wBg" customClass="FLFreelancersController" sceneMemberID="viewController">
Expand Down Expand Up @@ -273,7 +327,7 @@
</objects>
<point key="canvasLocation" x="778" y="707"/>
</scene>
<!--Favourites Controller - Избранное-->
<!--Избранное-->
<scene sceneID="k7x-up-LGU">
<objects>
<tableViewController title="Избранное" id="09X-e2-HdT" customClass="FLFavouritesController" sceneMemberID="viewController">
Expand Down Expand Up @@ -307,7 +361,7 @@
</objects>
<point key="canvasLocation" x="803" y="1433"/>
</scene>
<!--Navigation Controller - О программе-->
<!--О программе-->
<scene sceneID="vnx-fQ-yiE">
<objects>
<navigationController definesPresentationContext="YES" id="lUt-L8-xmZ" sceneMemberID="viewController">
Expand All @@ -324,7 +378,7 @@
</objects>
<point key="canvasLocation" x="267" y="2138"/>
</scene>
<!--About Controller - О программе-->
<!--О программе-->
<scene sceneID="Jiv-wQ-9TN">
<objects>
<viewController id="EF8-17-RdQ" customClass="FLAboutController" sceneMemberID="viewController">
Expand Down Expand Up @@ -362,7 +416,7 @@
</objects>
<point key="canvasLocation" x="809" y="2138"/>
</scene>
<!--Navigation Controller - Избранное-->
<!--Избранное-->
<scene sceneID="Kci-nh-Zp7">
<objects>
<navigationController title="Избранное" definesPresentationContext="YES" id="0Ej-Xz-B6Z" sceneMemberID="viewController">
Expand Down Expand Up @@ -504,6 +558,7 @@
<image name="0089.png" width="35" height="35"/>
<image name="0220.png" width="35" height="35"/>
<image name="0260.png" width="35" height="35"/>
<image name="brainstorage_icon.png" width="124" height="137"/>
</resources>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>
Expand Down
Loading

0 comments on commit 651062a

Please sign in to comment.