Project

General

Profile

« Previous | Next » 

Revision 52547ba7

Added by Leszek Koltunski over 2 years ago

Simplification

View differences:

src/main/java/org/distorted/dialogs/RubikDialogTutorial.java
43 43

  
44 44
import org.distorted.main.R;
45 45
import org.distorted.main.RubikActivity;
46
import org.distorted.objectlib.main.ObjectType;
47
import org.distorted.screens.RubikScreenPlay;
48
import org.distorted.screens.ScreenList;
46 49
import org.distorted.tutorials.TutorialList;
47 50

  
48 51
///////////////////////////////////////////////////////////////////////////////////////////////////
......
80 83
        }
81 84
      });
82 85

  
83
    Bundle args = getArguments();
84
    int curTab;
85

  
86
    try
87
      {
88
      curTab = args.getInt("tab");
89
      }
90
    catch(Exception e)
91
      {
92
      curTab = 0;
93
      }
94

  
95 86
    LayoutInflater inflater = act.getLayoutInflater();
96 87
    final View view = inflater.inflate(R.layout.dialog_tabbed, null);
97 88
    builder.setView(view);
......
100 91
    TabLayout tabLayout = view.findViewById(R.id.sliding_tabs);
101 92
    mPagerAdapter = new RubikDialogTutorialPagerAdapter(act,viewPager);
102 93
    tabLayout.setupWithViewPager(viewPager);
103
    viewPager.setCurrentItem(curTab);
94
    viewPager.setCurrentItem(getTutorialOrdinal());
104 95

  
105 96
    for(int i=0; i<TutorialList.NUM_OBJECTS; i++)
106 97
      {
......
134 125
    return dialog;
135 126
    }
136 127

  
128
///////////////////////////////////////////////////////////////////////////////////////////////////
129

  
130
  private int getTutorialOrdinal()
131
    {
132
    RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();
133
    ObjectType obj  = play.getObject();
134

  
135
    int ret = TutorialList.getOrdinal(obj);
136

  
137
    if( ret<0 )
138
      {
139
      ret = TutorialList.getOrdinal(RubikScreenPlay.DEF_OBJECT);
140
      }
141

  
142
    return ret;
143
    }
144

  
137 145
///////////////////////////////////////////////////////////////////////////////////////////////////
138 146

  
139 147
  @Override

Also available in: Unified diff