[FieldService] Fix wrong class name of MapViews, update timer checked…

… status
akhileshsh026 · May 15, 2015 · 9159312 · 9159312
1 parent 3ef15a5
commit 9159312
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/FieldService/FieldService.Android/Activities/AssignmentsActivity.cs b/FieldService/FieldService.Android/Activities/AssignmentsActivity.cs
@@ -88,19 +88,12 @@ protected override void OnCreate (Bundle bundle)
 			phoneButton = view.FindViewById<RelativeLayout> (Resource.Id.assignmentPhoneLayout);
 			mapButton = view.FindViewById<RelativeLayout> (Resource.Id.assignmentAddressLayout);
 
-			assignmentViewModel.LoadTimerEntryAsync ().ContinueWith (_ => {
-				RunOnUiThread (() => {
-					timer.Checked = assignmentViewModel.Recording;
-				});
-			});
-
 			timer.CheckedChange += (sender, e) => {
 				if (e.IsChecked != assignmentViewModel.Recording) {
-					if (assignmentViewModel.Recording) {
+					if (assignmentViewModel.Recording)
 						assignmentViewModel.PauseAsync ();
-					} else {
+					else
 						assignmentViewModel.RecordAsync ();
-					}
 				}
 			};
 
@@ -110,6 +103,7 @@ protected override void OnCreate (Bundle bundle)
 					if (selected != assignment.Status) {
 						switch (selected) {
 						case AssignmentStatus.Hold:
+							timer.Checked = false;
 							assignment.Status = selected;
 							assignmentViewModel.SaveAssignmentAsync (assignment).ContinueWith (_ => RunOnUiThread (ReloadAssignments));
 							break;
@@ -221,6 +215,12 @@ void SetActiveAssignmentVisible (bool visible)
 			phone.Text = assignment.ContactPhone;
 			address.Text = string.Format ("{0}\n{1}, {2} {3}", assignment.Address, assignment.City, assignment.State, assignment.Zip);
 			timerText.Text = assignmentViewModel.Hours.ToString (@"hh\:mm\:ss");
+
+			assignmentViewModel.LoadTimerEntryAsync ().ContinueWith (_ => {
+				RunOnUiThread (() => {
+					timer.Checked = assignmentViewModel.Recording;
+				});
+			});
 		}
 
 		/// <summary>

diff --git a/FieldService/FieldService.Android/Resources/Layout-sw720dp/MapFragmentLayout.axml b/FieldService/FieldService.Android/Resources/Layout-sw720dp/MapFragmentLayout.axml
@@ -3,7 +3,7 @@
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
-    <com.google.android.maps.MapView
+    <com.google.android.gms.maps.MapView
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:apiKey="@string/GoogleMapsAPIKey"

diff --git a/FieldService/FieldService.Android/Resources/Layout-sw720dp/MapViewLayout.axml b/FieldService/FieldService.Android/Resources/Layout-sw720dp/MapViewLayout.axml
@@ -7,7 +7,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:id="@+id/mapViewAssignmentLayout" />
-    <com.google.android.maps.MapView
+    <com.google.android.gms.maps.MapView
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:apiKey="@string/GoogleMapsAPIKey"

diff --git a/FieldService/FieldService.Shared/ViewModels/AssignmentViewModel.cs b/FieldService/FieldService.Shared/ViewModels/AssignmentViewModel.cs
@@ -179,7 +179,7 @@ public Task LoadAssignmentsAsync ()
                 .ContinueOnCurrentThread (t => {
                     //Grab the active assignment
 			var activeAssignment = t.Result.FirstOrDefault (a => a.Status == AssignmentStatus.Active);
-			if (ActiveAssignment == null)
+			if (ActiveAssignment == null || activeAssignment == null)
 				ActiveAssignment = activeAssignment;
 			else if (ActiveAssignment.Id != activeAssignment.Id)
 				ActiveAssignment = activeAssignment;