diff --git a/CleanMunch/Assets/Scenes/Search.unity b/CleanMunch/Assets/Scenes/Search.unity index 76ad576..d863e80 100644 --- a/CleanMunch/Assets/Scenes/Search.unity +++ b/CleanMunch/Assets/Scenes/Search.unity @@ -154,7 +154,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1334493028} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -336,10 +336,8 @@ MonoBehaviour: OutputText: {fileID: 1171726436} OutputTextResult: {fileID: 1171726438} Loading: {fileID: 1028089637} - NextButtonSearch: {fileID: 754847288} - PreviousButtonSearch: {fileID: 1280573067} - NextButtonLocation: {fileID: 481965700} - PreviousButtonLocation: {fileID: 1273428728} + NextButton: {fileID: 754847288} + PreviousButton: {fileID: 1280573067} ResultInfo: {fileID: 276633385} --- !u!1 &135414800 GameObject: @@ -725,7 +723,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22470464, guid: c30bf848394926f458d1fac63a64fade, type: 3} propertyPath: m_RootOrder - value: 9 + value: 7 objectReference: {fileID: 0} - target: {fileID: 22470464, guid: c30bf848394926f458d1fac63a64fade, type: 3} propertyPath: m_AnchoredPosition.x @@ -1127,12 +1125,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1180976066} m_PrefabAsset: {fileID: 0} ---- !u!1 &481965700 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 129214, guid: b95be68355f9c2440be3969316a2e27b, - type: 3} - m_PrefabInstance: {fileID: 1127371898} - m_PrefabAsset: {fileID: 0} --- !u!224 &547155032 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 22470464, guid: c30bf848394926f458d1fac63a64fade, @@ -1176,7 +1168,7 @@ MonoBehaviour: m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_ForceModuleActive: 1 + m_ForceModuleActive: 0 --- !u!114 &589904028 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1184,7 +1176,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 589904026} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: @@ -1210,7 +1202,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} m_sendNavigationEvents: 1 - m_DragThreshold: 5 + m_DragThreshold: 2 --- !u!4 &589904030 Transform: m_ObjectHideFlags: 0 @@ -1266,7 +1258,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22416428, guid: 8802e9844807d8c46bb7c9e8d540adf2, type: 3} propertyPath: m_RootOrder - value: 12 + value: 10 objectReference: {fileID: 0} - target: {fileID: 22416428, guid: 8802e9844807d8c46bb7c9e8d540adf2, type: 3} propertyPath: m_AnchoredPosition.x @@ -1499,7 +1491,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 11470458, guid: c30bf848394926f458d1fac63a64fade, type: 3} propertyPath: m_Transition - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c30bf848394926f458d1fac63a64fade, type: 3} @@ -1574,7 +1566,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1590,35 +1582,35 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_AnchoredPosition.x - value: 170.64 + value: -90.36 objectReference: {fileID: 0} - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_AnchoredPosition.y - value: -941 + value: 104 objectReference: {fileID: 0} - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_SizeDelta.x - value: 60.725 + value: 60.725006 objectReference: {fileID: 0} - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_SizeDelta.y - value: 60.725 + value: 60.724976 objectReference: {fileID: 0} - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_Pivot.x @@ -1670,7 +1662,7 @@ PrefabInstance: objectReference: {fileID: 63540857} - target: {fileID: 11429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: NextPageSearch + value: NextPage objectReference: {fileID: 0} - target: {fileID: 11429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName @@ -1678,7 +1670,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 11429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_Transition - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22429212, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_AnchoredPosition.y @@ -1723,7 +1715,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 11429212, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_Enabled - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b95be68355f9c2440be3969316a2e27b, type: 3} @@ -2136,206 +2128,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1126427603} m_CullTransparentMesh: 0 ---- !u!1001 &1127371898 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1334493028} - m_Modifications: - - target: {fileID: 129214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_Name - value: Next_Location - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 170.64001 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_AnchoredPosition.y - value: -940.9999 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_SizeDelta.x - value: 60.725 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_SizeDelta.y - value: 60.725 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalScale.x - value: 1.0000013 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalScale.y - value: 1.0000013 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalScale.z - value: 1.0000013 - objectReference: {fileID: 0} - - target: {fileID: 11429210, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_Color.r - value: 0.7490196 - objectReference: {fileID: 0} - - target: {fileID: 11429210, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_Color.g - value: 0.11764707 - objectReference: {fileID: 0} - - target: {fileID: 11429210, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_Color.b - value: 0.36078432 - objectReference: {fileID: 0} - - target: {fileID: 11429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 11429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 63540857} - - target: {fileID: 11429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: NextPageLocation - objectReference: {fileID: 0} - - target: {fileID: 11429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 11429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_Transition - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22429212, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_AnchoredPosition.y - value: -0.0000038146973 - objectReference: {fileID: 0} - - target: {fileID: 22429212, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22429212, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalRotation.w - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22429212, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22429212, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22429212, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22429212, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalRotation.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22429212, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 180 - objectReference: {fileID: 0} - - target: {fileID: 11429208, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 298d432d587bc4d58890d16e6339fa90, - type: 3} - - target: {fileID: 11429208, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_RaycastTarget - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11429212, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b95be68355f9c2440be3969316a2e27b, type: 3} ---- !u!224 &1127371899 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, - type: 3} - m_PrefabInstance: {fileID: 1127371898} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1132325414 PrefabInstance: m_ObjectHideFlags: 0 @@ -2497,7 +2289,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 11470458, guid: c30bf848394926f458d1fac63a64fade, type: 3} propertyPath: m_Transition - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c30bf848394926f458d1fac63a64fade, type: 3} @@ -2700,7 +2492,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1334493028} - m_RootOrder: 10 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2910,7 +2702,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 11470458, guid: c30bf848394926f458d1fac63a64fade, type: 3} propertyPath: m_Transition - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c30bf848394926f458d1fac63a64fade, type: 3} @@ -2932,12 +2724,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 593839450} m_PrefabAsset: {fileID: 0} ---- !u!1 &1273428728 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 129214, guid: b95be68355f9c2440be3969316a2e27b, - type: 3} - m_PrefabInstance: {fileID: 1562325157} - m_PrefabAsset: {fileID: 0} --- !u!1 &1280573067 stripped GameObject: m_CorrespondingSourceObject: {fileID: 129214, guid: b95be68355f9c2440be3969316a2e27b, @@ -2957,7 +2743,6 @@ GameObject: - component: {fileID: 1322711707} - component: {fileID: 1322711706} - component: {fileID: 1322711705} - - component: {fileID: 1322711710} m_Layer: 5 m_Name: Material Design Canvas m_TagString: Untagged @@ -2972,7 +2757,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1322711704} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 56014e6f11eff044ebf3cfef8ec3788e, type: 3} m_Name: @@ -3060,38 +2845,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!114 &1322711710 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1322711704} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1367256648, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Content: {fileID: 1334493028} - m_Horizontal: 0 - m_Vertical: 0 - m_MovementType: 1 - m_Elasticity: 0.1 - m_Inertia: 1 - m_DecelerationRate: 0.2 - m_ScrollSensitivity: 1 - m_Viewport: {fileID: 0} - m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 0} - m_HorizontalScrollbarVisibility: 0 - m_VerticalScrollbarVisibility: 0 - m_HorizontalScrollbarSpacing: 0 - m_VerticalScrollbarSpacing: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1329139647 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 11470454, guid: c30bf848394926f458d1fac63a64fade, @@ -3137,11 +2890,9 @@ RectTransform: - {fileID: 1400592400} - {fileID: 1222399592} - {fileID: 923390665} - - {fileID: 1562325158} - {fileID: 2104346728} - {fileID: 39300734} - {fileID: 741113247} - - {fileID: 1127371899} - {fileID: 1691468904} - {fileID: 738154694} - {fileID: 1171726437} @@ -3250,15 +3001,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22466258, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} propertyPath: m_AnchoredPosition.x - value: 162.34999 + value: 162.34998 objectReference: {fileID: 0} - target: {fileID: 22466258, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} propertyPath: m_AnchoredPosition.y - value: 317 + value: -205 objectReference: {fileID: 0} - target: {fileID: 22466258, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} propertyPath: m_SizeDelta.x - value: 75.3 + value: -446.7 objectReference: {fileID: 0} - target: {fileID: 22466258, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} propertyPath: m_SizeDelta.y @@ -3266,19 +3017,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22466258, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22466258, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} propertyPath: m_AnchorMin.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22466258, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22466258, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} propertyPath: m_AnchorMax.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22466258, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} propertyPath: m_Pivot.x @@ -3330,7 +3081,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 11466256, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} propertyPath: m_Transition - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 166260, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} propertyPath: m_IsActive @@ -3338,11 +3089,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 11466258, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} propertyPath: m_Enabled - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 11466258, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} propertyPath: m_ShowMaskGraphic - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} @@ -3382,10 +3133,10 @@ RectTransform: m_Father: {fileID: 1334493028} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -88, y: 317.33035} - m_SizeDelta: {x: 225, y: 69} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -88.00012, y: -204.66968} + m_SizeDelta: {x: -297, y: 69} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1400592401 MonoBehaviour: @@ -3668,7 +3419,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 11470458, guid: c30bf848394926f458d1fac63a64fade, type: 3} propertyPath: m_Transition - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c30bf848394926f458d1fac63a64fade, type: 3} @@ -3737,11 +3488,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22466258, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} propertyPath: m_AnchoredPosition.y - value: 317.00003 + value: -204.99997 objectReference: {fileID: 0} - target: {fileID: 22466258, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} propertyPath: m_SizeDelta.x - value: 74.805 + value: -447.195 objectReference: {fileID: 0} - target: {fileID: 22466258, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} propertyPath: m_SizeDelta.y @@ -3749,19 +3500,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22466258, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22466258, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} propertyPath: m_AnchorMin.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22466258, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22466258, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} propertyPath: m_AnchorMax.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22466258, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} propertyPath: m_Pivot.x @@ -3825,7 +3576,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 11466256, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} propertyPath: m_Transition - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 166260, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} propertyPath: m_IsActive @@ -3833,7 +3584,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 11466258, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} propertyPath: m_Enabled - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2ea12a2ab6365a64995624be5545cb0c, type: 3} @@ -4054,178 +3805,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1561743315} m_CullTransparentMesh: 0 ---- !u!1001 &1562325157 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1334493028} - m_Modifications: - - target: {fileID: 129214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_Name - value: Prev_Location - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_AnchoredPosition.x - value: -168.64005 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_AnchoredPosition.y - value: -940.9999 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_SizeDelta.x - value: 60.725 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_SizeDelta.y - value: 60.725 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalScale.x - value: 1.0000013 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalScale.y - value: 1.0000013 - objectReference: {fileID: 0} - - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_LocalScale.z - value: 1.0000013 - objectReference: {fileID: 0} - - target: {fileID: 11429210, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_Color.r - value: 0.7490196 - objectReference: {fileID: 0} - - target: {fileID: 11429210, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_Color.g - value: 0.11764707 - objectReference: {fileID: 0} - - target: {fileID: 11429210, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_Color.b - value: 0.36078432 - objectReference: {fileID: 0} - - target: {fileID: 11429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 11429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 63540857} - - target: {fileID: 11429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: PreviousPageLocation - objectReference: {fileID: 0} - - target: {fileID: 11429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 11429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_Transition - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22429212, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_AnchoredPosition.y - value: -0.0000038146973 - objectReference: {fileID: 0} - - target: {fileID: 11429208, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 298d432d587bc4d58890d16e6339fa90, - type: 3} - - target: {fileID: 11429208, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_RaycastTarget - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11429212, guid: b95be68355f9c2440be3969316a2e27b, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b95be68355f9c2440be3969316a2e27b, type: 3} ---- !u!224 &1562325158 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, - type: 3} - m_PrefabInstance: {fileID: 1562325157} - m_PrefabAsset: {fileID: 0} --- !u!114 &1589665712 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 11454010, guid: c65262b903afe5b4da9579260914cb87, @@ -4411,7 +3990,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 11470458, guid: c30bf848394926f458d1fac63a64fade, type: 3} propertyPath: m_Transition - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c30bf848394926f458d1fac63a64fade, type: 3} @@ -4458,12 +4037,12 @@ RectTransform: - {fileID: 1180976067} - {fileID: 1132325415} m_Father: {fileID: 1334493028} - m_RootOrder: 8 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.24963379, y: -47.81494} - m_SizeDelta: {x: -124, y: -384.03} + m_AnchoredPosition: {x: 0.24963379, y: -85.91507} + m_SizeDelta: {x: -124, y: -460.23} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1691468905 MonoBehaviour: @@ -4482,7 +4061,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 4 + m_ChildAlignment: 1 m_StartCorner: 0 m_StartAxis: 0 m_CellSize: {x: 400, y: 100} @@ -4953,7 +4532,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22421458, guid: f7bfb06539b1f8c43ab6aac1bc9af4d4, type: 3} propertyPath: m_RootOrder - value: 11 + value: 9 objectReference: {fileID: 0} - target: {fileID: 22421458, guid: f7bfb06539b1f8c43ab6aac1bc9af4d4, type: 3} propertyPath: m_AnchoredPosition.x @@ -5054,7 +4633,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5070,35 +4649,35 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_AnchoredPosition.x - value: -168.64 + value: 92.36 objectReference: {fileID: 0} - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_AnchoredPosition.y - value: -941 + value: 104 objectReference: {fileID: 0} - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_SizeDelta.x - value: 60.725 + value: 60.725006 objectReference: {fileID: 0} - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_SizeDelta.y - value: 60.725 + value: 60.724976 objectReference: {fileID: 0} - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_Pivot.x @@ -5138,7 +4717,7 @@ PrefabInstance: objectReference: {fileID: 63540857} - target: {fileID: 11429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: PreviousPageSearch + value: PreviousPage objectReference: {fileID: 0} - target: {fileID: 11429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName @@ -5146,7 +4725,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 11429214, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_Transition - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22429212, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_AnchoredPosition.y @@ -5163,7 +4742,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 11429212, guid: b95be68355f9c2440be3969316a2e27b, type: 3} propertyPath: m_Enabled - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b95be68355f9c2440be3969316a2e27b, type: 3} diff --git a/CleanMunch/Assets/Scripts/Search.cs b/CleanMunch/Assets/Scripts/Search.cs index 0b17016..96e72fd 100644 --- a/CleanMunch/Assets/Scripts/Search.cs +++ b/CleanMunch/Assets/Scripts/Search.cs @@ -5,7 +5,6 @@ using Proyecto26; using System.Collections; using System; -using UnityEngine.SceneManagement; public class Search : MonoBehaviour { @@ -42,13 +41,9 @@ public class Search : MonoBehaviour [SerializeField] private GameObject Loading; [SerializeField] - private GameObject NextButtonSearch; + private GameObject NextButton; [SerializeField] - private GameObject PreviousButtonSearch; - [SerializeField] - private GameObject NextButtonLocation; - [SerializeField] - private GameObject PreviousButtonLocation; + private GameObject PreviousButton; [SerializeField] private Text ResultInfo; @@ -75,10 +70,8 @@ public void Start() FifthPanel.SetActive(false); OutputText.SetActive(true); Loading.SetActive(false); - PreviousButtonSearch.SetActive(false); - NextButtonSearch.SetActive(false); - PreviousButtonLocation.SetActive(false); - NextButtonLocation.SetActive(false); + PreviousButton.SetActive(false); + NextButton.SetActive(false); PageTextObj.SetActive(false); OutputTextResult.text = "Search for a business name"; @@ -95,14 +88,15 @@ public void ClickLocation() OutputText.SetActive(false); Loading.SetActive(false); - - PreviousButtonSearch.SetActive(false); - NextButtonSearch.SetActive(false); - PreviousButtonLocation.SetActive(false); - NextButtonLocation.SetActive(false); + PreviousButton.SetActive(false); + NextButton.SetActive(false); LocationClicked = true; SearchClicked = false; + FirstPage = true; + LastPage = false; + OnlyPage = false; + try { //Ask for Permission @@ -124,6 +118,7 @@ public void ClickLocation() private IEnumerator GetLocation() { + FirstPanel.SetActive(false); SecondPanel.SetActive(false); ThirdPanel.SetActive(false); @@ -131,10 +126,8 @@ private IEnumerator GetLocation() FifthPanel.SetActive(false); OutputText.SetActive(false); Loading.SetActive(false); - PreviousButtonSearch.SetActive(false); - NextButtonSearch.SetActive(false); - PreviousButtonLocation.SetActive(false); - NextButtonLocation.SetActive(false); + PreviousButton.SetActive(false); + NextButton.SetActive(false); Loading.SetActive(true); // First, check if user has location service enabled @@ -204,7 +197,7 @@ private IEnumerator GetLocation() OutputText.SetActive(true); OutputTextResult.text = "No results found..."; PageTextObj.SetActive(false); - PageText.text = "Page 1 of 1"; + PageText.text = ""; FirstPanel.SetActive(false); SecondPanel.SetActive(false); ThirdPanel.SetActive(false); @@ -301,8 +294,8 @@ private IEnumerator GetLocation() OnlyPage = false; Debug.Log("This is the first page!"); - PreviousButtonLocation.SetActive(false); - NextButtonLocation.SetActive(true); + PreviousButton.SetActive(false); + NextButton.SetActive(true); //Page x of y, x ≠ y } else if (!(CurrentPage == System.Convert.ToInt32(response.FHRSEstablishment.Header.PageCount))) @@ -311,8 +304,8 @@ private IEnumerator GetLocation() LastPage = false; OnlyPage = false; - PreviousButtonLocation.SetActive(true); - NextButtonLocation.SetActive(true); + PreviousButton.SetActive(true); + NextButton.SetActive(true); } //If we reached the last page else if (CurrentPage == System.Convert.ToInt32(response.FHRSEstablishment.Header.PageCount) && (CurrentPage > 1)) { @@ -320,8 +313,8 @@ private IEnumerator GetLocation() FirstPage = false; Debug.Log("This is the last page!"); - PreviousButtonLocation.SetActive(true); - NextButtonLocation.SetActive(false); + PreviousButton.SetActive(true); + NextButton.SetActive(false); } //If this is the only page if ((System.Convert.ToInt32(response.FHRSEstablishment.Header.PageCount) == 1) && (CurrentPage == 1)) @@ -331,8 +324,8 @@ private IEnumerator GetLocation() OnlyPage = true; Debug.Log("This is the only page!"); - PreviousButtonLocation.SetActive(false); - NextButtonLocation.SetActive(false); + PreviousButton.SetActive(false); + NextButton.SetActive(false); } }) #if UNITY_EDITOR @@ -373,7 +366,7 @@ public void Get() OutputText.SetActive(true); OutputTextResult.text = "No results found..."; PageTextObj.SetActive(false); - PageText.text = "Page 1 of 1"; + PageText.text = ""; FirstPanel.SetActive(false); SecondPanel.SetActive(false); ThirdPanel.SetActive(false); @@ -465,24 +458,24 @@ public void Get() OnlyPage = false; Debug.Log("This is the first page!"); - PreviousButtonSearch.SetActive(false); - NextButtonSearch.SetActive(true); + PreviousButton.SetActive(false); + NextButton.SetActive(true); //Page x of y, x ≠ y } else if (!(CurrentPage == System.Convert.ToInt32(response.FHRSEstablishment.Header.PageCount))) { FirstPage = false; LastPage = false; OnlyPage = false; - PreviousButtonSearch.SetActive(true); - NextButtonSearch.SetActive(true); + PreviousButton.SetActive(true); + NextButton.SetActive(true); } //If we reached the last page else if (CurrentPage == System.Convert.ToInt32(response.FHRSEstablishment.Header.PageCount) && (CurrentPage > 1)) { LastPage = true; FirstPage = false; Debug.Log("This is the last page!"); - PreviousButtonSearch.SetActive(true); - NextButtonSearch.SetActive(false); + PreviousButton.SetActive(true); + NextButton.SetActive(false); } //If this is the only page if ((System.Convert.ToInt32(response.FHRSEstablishment.Header.PageCount) == 1) && (CurrentPage == 1)) @@ -492,8 +485,8 @@ public void Get() OnlyPage = true; Debug.Log("This is the only page!"); - PreviousButtonSearch.SetActive(false); - NextButtonSearch.SetActive(false); + PreviousButton.SetActive(false); + NextButton.SetActive(false); } }) #if UNITY_EDITOR @@ -523,52 +516,56 @@ public void ClickSearch() } } - public void NextPageSearch() + public void NextPage() { - //Make sure nothing accidentally typed in there will affect the result - inputbox.text = PlayerPrefs.GetString("Query"); + CurrentPage++; + Debug.Log("You are on page " + CurrentPage); - if (LastPage == false && OnlyPage == false) + if (SearchClicked == true) { - CurrentPage++; - Get(); - Debug.Log("You are on page " + CurrentPage); - } - } + //Make sure nothing accidentally typed in there will affect the result + inputbox.text = PlayerPrefs.GetString("Query"); - public void PreviousPageSearch() - { - //Make sure nothing accidentally typed in there will affect the result - inputbox.text = PlayerPrefs.GetString("Query"); - - if (FirstPage == false && OnlyPage == false) + if (LastPage == false && OnlyPage == false) + { + Get(); + } + } + else if (LocationClicked == true) { - CurrentPage--; - Get(); - Debug.Log("You are on page " + CurrentPage); + if (LastPage == false && OnlyPage == false) + { + StartCoroutine(GetLocation()); + } } } - public void NextPageLocation() + public void PreviousPage() { - if (LastPage == false && OnlyPage == false) + CurrentPage--; + Debug.Log("You are on page " + CurrentPage); + + if (SearchClicked == true) { - CurrentPage++; - GetLocation(); - Debug.Log("You are on page " + CurrentPage); - } - } + //Make sure nothing accidentally typed in there will affect the result + inputbox.text = PlayerPrefs.GetString("Query"); - public void PreviousPageLocation() - { - if (FirstPage == false && OnlyPage == false) + if (LastPage == false && OnlyPage == false) + { + Get(); + } + } + else if (LocationClicked == true) { - CurrentPage--; - GetLocation(); - Debug.Log("You are on page " + CurrentPage); + if (LastPage == false && OnlyPage == false) + { + StartCoroutine(GetLocation()); + } } } + + #region result buttons public void ResultClick1() { @@ -614,7 +611,6 @@ public void ResultClick1() + "\n" + response.FHRSEstablishment.EstablishmentCollection.EstablishmentDetail[0].LocalAuthorityName + "\n" + response.FHRSEstablishment.EstablishmentCollection.EstablishmentDetail[0].LocalAuthorityEmailAddress; }); - } public void ResultClick2()