Skip to content
Snippets Groups Projects
Commit 60359b86 authored by Xavier Gibert's avatar Xavier Gibert
Browse files

Attitude and Orbit fragments load same page for the moment, runs.

parent 3da070db
No related branches found
No related tags found
No related merge requests found
......@@ -15,6 +15,7 @@ import cs.si.stavor.dialogs.TutorialDialogFragment;
import cs.si.stavor.dialogs.WelcomeDialogFragment;
import cs.si.stavor.fragments.HudFragment;
import cs.si.stavor.fragments.NavigationDrawerFragment;
import cs.si.stavor.fragments.OrbitFragment;
import cs.si.stavor.fragments.RetainedFragment;
import cs.si.stavor.fragments.SimulatorFragment;
import cs.si.stavor.fragments.TestFragment;
......
......@@ -67,11 +67,11 @@ public final class OrbitFragment extends Fragment {
View rootView = inflater.inflate(R.layout.orb_display, container,
false);
((MainActivity)getActivity()).showTutorialOrbitDisplay();
((MainActivity)getActivity()).showTutorialDisplay();
//Browser
if(mXwalkView==null){
mXwalkView = ((MainActivity)getActivity()).getOrbitBrowser();
mXwalkView = ((MainActivity)getActivity()).getBrowser();
}
TextView fps = ((TextView) rootView.findViewById(R.id.textViewFPS));
fps.setAlpha((float)0.0);
......@@ -103,11 +103,11 @@ public final class OrbitFragment extends Fragment {
@Override
public void run()
{
if(((MainActivity)getActivity()).getLoadOrbitBrowserFlag()){
if(((MainActivity)getActivity()).getLoadBrowserFlag()){
//mXwalkView.load(Parameters.Web.STARTING_PAGE,null);
//mXwalkView.load("javascript:showLoadingScreen()",null);
mXwalkView.load("javascript:reloadModel()",null);
((MainActivity)getActivity()).resetLoadOrbitBrowserFlag();
((MainActivity)getActivity()).resetLoadBrowserFlag();
}else{
mXwalkView.load("javascript:setLoaded()",null);
}
......@@ -129,7 +129,7 @@ public final class OrbitFragment extends Fragment {
@Override
public void onDestroyView(){
simulator.setOrbitBrowserLoaded(false);
simulator.setBrowserLoaded(false);
super.onDestroyView();
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment