Merge pull request #10 from jrmfelipe/master

* Update "Upload" button UI location
ZavenArra · Jul 22, 2013 · f59443c · f59443c
2 parents 9b7a6d2 + 25d1e41
commit f59443c
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 39 deletions.
diff --git a/Rhus.xcodeproj/project.pbxproj b/Rhus.xcodeproj/project.pbxproj
@@ -609,7 +609,7 @@
 		F4D3928614BBA6650051E831 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0420;
+				LastUpgradeCheck = 0460;
 			};
 			buildConfigurationList = F4D3928914BBA6650051E831 /* Build configuration list for PBXProject "Rhus" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -762,8 +762,12 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CLANG_ENABLE_OBJC_ARC = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -776,12 +780,12 @@
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "-ObjC";
-				PROVISIONING_PROFILE = "";
-				SDKROOT = iphoneos5.0;
+				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = 1;
 				VALID_ARCHS = armv7;
 			};
@@ -793,20 +797,24 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CLANG_ENABLE_OBJC_ARC = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				COPY_PHASE_STRIP = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				OTHER_LDFLAGS = "-ObjC";
-				PROVISIONING_PROFILE = "";
-				SDKROOT = iphoneos5.0;
+				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = 1;
 				VALIDATE_PRODUCT = YES;
 				VALID_ARCHS = armv7;
@@ -828,8 +836,8 @@
 				INFOPLIST_FILE = "Targets/Rhus/$(PRODUCT_NAME)-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				PRODUCT_NAME = Rhus;
-				PROVISIONING_PROFILE = "C4DC449C-EC4E-40F1-8310-BF35D8067404";
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "C4DC449C-EC4E-40F1-8310-BF35D8067404";
+				PROVISIONING_PROFILE = "E2F925F8-7FF1-4EAE-BD7A-64CD847155C4";
+				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "E2F925F8-7FF1-4EAE-BD7A-64CD847155C4";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = 1;
 				VALID_ARCHS = armv7;

diff --git a/Source/DataModels/RHSettings.h b/Source/DataModels/RHSettings.h
@@ -10,18 +10,19 @@
 
 @interface RHSettings : NSObject
 
+//Database for App
+
++ (NSString *) databaseName;
++ (NSString *) databaseUser;
++ (NSString *) databasePassword;
++ (NSString *) databaseHost;
+
 //Map Settings
 + (float) mapCenterLatitudeOnLoad;
 + (float) mapCenterLongitudeOnLoad;
 + (float) mapDeltaLatitudeOnLoad;
 + (float) mapDeltaLongitudeOnLoad;
 
-
-//Sync Server
-+ (NSString *) couchRemoteSyncURL;
-
-//Database for App
-+ (NSString *) databaseName;
 + (BOOL) useRemoteServer;
 + (NSString *) couchRemoteServer;
 
@@ -33,17 +34,3 @@
 + (BOOL) useCamera;
 
 @end
-
-//Base implementation
-/*
-@implementation RHSettings
-+ (BOOL) useRemoteServer{
-    return false;
-}
-
-+ (NSString *) couchRemoteServer{
-    return nil;
-}
-
-@end
- */
diff --git a/Source/Views and Controllers/CameraViewController.m b/Source/Views and Controllers/CameraViewController.m
@@ -140,8 +140,9 @@ - (void) showImagePickerView {
                             1.2, 1.2)
     ;
 
+
     [self.imagePicker.view removeFromSuperview];
-    [self.imagePicker.view setFrame:CGRectMake(0.0f, 0.0f, 568.0f, 320.0f)];
+    [self.imagePicker.view setFrame:CGRectMake(-0.0f, -1.0f, 569.0f, 321.0f)];
     //[self.imagePicker.view setFrame:self.view.frame];
     NSLog(@"self.imagePicker.view %fx%f at %f,%f",self.imagePicker.view.frame.size.width,self.imagePicker.view.frame.size.height,self.imagePicker.view.frame.origin.x,self.imagePicker.view.frame.origin.y);
 
@@ -159,10 +160,11 @@ - (void)viewDidUnload
 - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
 {
     // Return YES for supported orientations
-    return (interfaceOrientation == UIInterfaceOrientationLandscapeLeft);
+    return (interfaceOrientation == UIInterfaceOrientationLandscapeRight);
 }
 
 
+
 #pragma mark Interface Methods
 
 - (void) secondTapTabButton{
@@ -271,7 +273,16 @@ - (void)savePhotoToAlbum:(UIImage *)image
 #pragma mark IBActions
 - (IBAction) didTouchRetakeButton:(id)sender{
     [self hidePictureDialog];
-    [self.view exchangeSubviewAtIndex:1 withSubviewAtIndex:0];
+    //REYF add fix when user successfully created a new obs document the camera viewer does not show up.
+    NSInteger imgViewIndex = 0;
+    for (NSInteger i=0; i<[self.view.subviews count]; i++)
+    {
+        if ([[self.view.subviews objectAtIndex:i] isKindOfClass:[UIImageView class]])
+            imgViewIndex = i;
+        //NSLog(@"view %d = %@", i, [self.view.subviews objectAtIndex:i]);
+    }
+
+    [self.view exchangeSubviewAtIndex:imgViewIndex withSubviewAtIndex:0];
 }
 
 - (IBAction) didTouchCancelUploadButton:(id)sender{

diff --git a/Source/Views and Controllers/SwoopTabViewController.m b/Source/Views and Controllers/SwoopTabViewController.m
@@ -81,6 +81,7 @@ - (void)viewDidLoad
         NSLog(@"LandScape");
     else
         NSLog(@"not LandScape = %d",[[UIDevice currentDevice] orientation]);
+
 }
 
 
@@ -107,7 +108,7 @@ - (NSUInteger)supportedInterfaceOrientations
         NSLog(@"LandScape");
     else
         NSLog(@"not LandScape = %d",[[UIDevice currentDevice] orientation]);
-    return UIInterfaceOrientationMaskLandscape;
+    return UIInterfaceOrientationMaskLandscapeRight;
 }
 
 - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation

diff --git a/Source/Views and Controllers/SwoopTabViewController.xib b/Source/Views and Controllers/SwoopTabViewController.xib
@@ -164,24 +164,27 @@
 					</object>
 					<object class="IBUIButton" id="736747289">
 						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{12, 9}, {75, 44}}</string>
+						<int key="NSvFlags">265</int>
+						<string key="NSFrame">{{327, 264}, {87, 36}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="203454563"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
+						<float key="IBUIAlpha">0.69999998807907104</float>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<int key="IBUIContentHorizontalAlignment">0</int>
 						<int key="IBUIContentVerticalAlignment">0</int>
-						<int key="IBUIButtonType">1</int>
-						<string key="IBUINormalTitle">Upload</string>
 						<reference key="IBUIHighlightedTitleColor" ref="556111890"/>
 						<object class="NSColor" key="IBUINormalTitleColor">
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
 						</object>
 						<reference key="IBUINormalTitleShadowColor" ref="987675618"/>
+						<object class="NSCustomResource" key="IBUINormalImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">uploadButton.png</string>
+						</object>
 						<reference key="IBUIFontDescription" ref="243181861"/>
 						<reference key="IBUIFont" ref="398291503"/>
 					</object>
@@ -472,6 +475,7 @@
 			<string key="MapIconT.png">{46, 46}</string>
 			<string key="cameraIcon.png">{88, 90}</string>
 			<string key="swoopBarMiddle.png">{58, 320}</string>
+			<string key="uploadButton.png">{87, 36}</string>
 		</dictionary>
 		<string key="IBCocoaTouchPluginVersion">2083</string>
 	</data>