Skip to content
This repository has been archived by the owner on Feb 6, 2020. It is now read-only.

Commit

Permalink
Merge pull request #5 from ladybirdweb/HotFix
Browse files Browse the repository at this point in the history
Hot fix
  • Loading branch information
Mallikarjun Hanagandi committed Jun 4, 2018
2 parents b7f8db2 + b5591e3 commit 0780e2b
Show file tree
Hide file tree
Showing 586 changed files with 16,037 additions and 25,592 deletions.
Binary file modified .DS_Store
Binary file not shown.
272 changes: 188 additions & 84 deletions Faveo Helpdesk Community.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Binary file modified Faveo Helpdesk Community/.DS_Store
100644 → 100755
Binary file not shown.
Empty file modified Faveo Helpdesk Community/AboutViewController.h
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion Faveo Helpdesk Community/AboutViewController.m
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ - (BOOL)slideNavigationControllerShouldDisplayLeftMenu
- (void)viewDidLoad {
[super viewDidLoad];
[self setTitle:@"About"];
_websiteButton.backgroundColor=[UIColor hx_colorWithHexRGBAString:@"#00aeef"];
_websiteButton.backgroundColor=[UIColor hx_colorWithHexString:@"#00aeef"];
// Do any additional setup after loading the view.
}

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ typedef void(^ActionStringCancelBlock)(ActionSheetStringPicker *picker);
@property (nonatomic, copy) ActionStringDoneBlock onActionSheetDone;
@property (nonatomic, copy) ActionStringCancelBlock onActionSheetCancel;

@end
@end
File renamed without changes.
5 changes: 1 addition & 4 deletions Faveo Helpdesk Community/AppConstanst.h
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,10 @@
#define AppConstanst_h

#define APP_NAME @"Faveo Helpdesk"
#define ALERT_COLOR @"#FFCC00"
#define SUCCESS_COLOR @"#4CD964"
#define FAILURE_COLOR @"#d50000"
#define URL @"http://jamboreebliss.com/sarfraz/public/api/v1/helpdesk/url"
#define DEMO_URL @"http://www.faveohelpdesk.com/api/v1/"
#define API_KEY @"9p41T2XFZ34YRZJUNQAdmM7iV0Rr1CjN"
#define NO_INTERNET @"There is no Internet Connection"
#define NO_INTERNET @"No Internet Connection"
#define IP @""
#define APP_VERSION @"1.0"

Expand Down
12 changes: 4 additions & 8 deletions Faveo Helpdesk Community/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
#import "LoginViewController.h"
#import "InboxViewController.h"
#import "HexColors.h"
#import <Fabric/Fabric.h>
#import <Crashlytics/Crashlytics.h>

@interface AppDelegate ()
@property (nonatomic, strong) MBProgressHUD *progressView;
Expand All @@ -21,8 +19,6 @@ @implementation AppDelegate


- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {

[Fabric with:@[[Crashlytics class]]];
[self setApplicationApperance];

UIStoryboard *mainStoryboard = [UIStoryboard storyboardWithName:@"Main" bundle: nil];
Expand Down Expand Up @@ -65,8 +61,8 @@ -(void)setApplicationApperance
{

// [[UINavigationBar appearance] setBarTintColor:[UIColor hx_colorWithHexString:@"#00aeef"]];
[[UINavigationBar appearance] setTintColor:[UIColor hx_colorWithHexRGBAString:@"#00aeef"]];
[[UINavigationBar appearance] setTitleTextAttributes:@{NSForegroundColorAttributeName : [UIColor hx_colorWithHexRGBAString:@"#00aeef"]}];
[[UINavigationBar appearance] setTintColor:[UIColor hx_colorWithHexString:@"#00aeef"]];
[[UINavigationBar appearance] setTitleTextAttributes:@{NSForegroundColorAttributeName : [UIColor hx_colorWithHexString:@"#00aeef"]}];

// [[UINavigationBar appearance] setBarTintColor:[UIColor colorWithRed:8/255.0f green:16/255.0f blue:91/255.0f alpha:1.0f]];
// [[UINavigationBar appearance] setTintColor: [UIColor whiteColor]];
Expand All @@ -90,15 +86,15 @@ +(AppDelegate*)sharedAppdelegate
- (void)showProgressView
{
MBProgressHUD *HUD =[MBProgressHUD showHUDAddedTo:self.window animated:YES];
HUD.label.text = @"Please wait";
HUD.labelText = @"Please wait";
HUD.dimBackground = YES;
self.progressView = HUD;
}

- (void)showProgressViewWithText:(NSString *)text
{
MBProgressHUD *HUD =[MBProgressHUD showHUDAddedTo:self.window animated:YES];
HUD.label.text = text;
HUD.labelText = text;
HUD.dimBackground = YES;
self.progressView = HUD;
}
Expand Down
24 changes: 3 additions & 21 deletions ...xcassets/AppIcon.appiconset/Contents.json → ...assets/AppIcon-1.appiconset/Contents.json
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -145,28 +145,10 @@
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "Icon-App-40x40@1x.png",
"scale" : "1x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "Icon-App-60x60@1x.png",
"size" : "1024x1024",
"idiom" : "ios-marketing",
"filename" : "iTunesArtwork@2x.png",
"scale" : "1x"
},
{
"size" : "76x76",
"idiom" : "iphone",
"filename" : "Icon-App-76x76@1x.png",
"scale" : "1x"
},
{
"size" : "76x76",
"idiom" : "ipad",
"filename" : "Icon-App-76x76@3x.png",
"scale" : "3x"
}
],
"info" : {
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,28 @@
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"scale" : "1x"
"minimum-system-version" : "11.0",
"subtype" : "2436h",
"scale" : "3x"
},
{
"orientation" : "portrait",
"orientation" : "landscape",
"idiom" : "iphone",
"extent" : "full-screen",
"scale" : "2x"
"minimum-system-version" : "11.0",
"subtype" : "2436h",
"scale" : "3x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"subtype" : "retina4",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"scale" : "2x"
"minimum-system-version" : "8.0",
"subtype" : "736h",
"scale" : "3x"
},
{
"orientation" : "portrait",
"orientation" : "landscape",
"idiom" : "iphone",
"extent" : "full-screen",
"minimum-system-version" : "8.0",
Expand Down Expand Up @@ -69,25 +62,93 @@
"minimum-system-version" : "7.0",
"scale" : "1x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "2x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"minimum-system-version" : "7.0",
"extent" : "full-screen",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"minimum-system-version" : "7.0",
"extent" : "full-screen",
"subtype" : "retina4",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "to-status-bar",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"scale" : "1x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "to-status-bar",
"scale" : "1x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "to-status-bar",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"scale" : "2x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "to-status-bar",
"scale" : "2x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"scale" : "2x"
}
],
"info" : {
Expand Down
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file.
Empty file modified Faveo Helpdesk Community/Assets.xcassets/add.imageset/add.png
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified Faveo Helpdesk Community/Assets.xcassets/done.imageset/done.png
100644 → 100755
Empty file.
Loading

0 comments on commit 0780e2b

Please sign in to comment.