Revision 804293f0
Added by Leszek Koltunski almost 4 years ago
| src/main/java/org/distorted/dialogs/RubikDialogTutorial.java | ||
|---|---|---|
| 44 | 44 |
|
| 45 | 45 |
import org.distorted.main.R; |
| 46 | 46 |
import org.distorted.main.RubikActivity; |
| 47 |
import org.distorted.objects.RubikObject; |
|
| 47 | 48 |
import org.distorted.objects.RubikObjectList; |
| 48 |
import org.distorted.tutorials.TutorialList; |
|
| 49 | 49 |
|
| 50 | 50 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 51 | 51 |
|
| ... | ... | |
| 96 | 96 |
viewPager.setCurrentItem(getTutorialOrdinal()); |
| 97 | 97 |
|
| 98 | 98 |
ViewGroup.LayoutParams paramsView = new ViewGroup.LayoutParams( tabWidth,tabHeight ); |
| 99 |
int numObjects = RubikObjectList.getNumTutorialObjects(); |
|
| 99 | 100 |
|
| 100 |
for(int i=0; i<TutorialList.NUM_OBJECTS; i++)
|
|
| 101 |
for(int i=0; i<numObjects; i++)
|
|
| 101 | 102 |
{
|
| 102 |
TutorialList list = TutorialList.getObject(i);
|
|
| 103 |
int iconID = list.getIconID();
|
|
| 103 |
RubikObject object = RubikObjectList.getObject(i);
|
|
| 104 |
int iconID = object.getIconID();
|
|
| 104 | 105 |
ImageView imageView = new ImageView(act); |
| 105 | 106 |
imageView.setLayoutParams(paramsView); |
| 106 | 107 |
imageView.setImageResource(iconID); |
| ... | ... | |
| 135 | 136 |
private int getTutorialOrdinal() |
| 136 | 137 |
{
|
| 137 | 138 |
int obj = RubikObjectList.getCurrObject(); |
| 138 |
int ret = TutorialList.getOrdinal(obj); |
|
| 139 |
|
|
| 140 |
if( ret<0 ) |
|
| 141 |
{
|
|
| 142 |
ret = TutorialList.getOrdinal(RubikObjectList.DEF_OBJECT); |
|
| 143 |
} |
|
| 144 |
|
|
| 145 |
return ret; |
|
| 139 |
return RubikObjectList.getTutorialOrdinal(obj); |
|
| 146 | 140 |
} |
| 147 | 141 |
|
| 148 | 142 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Re-organize tutorial list so that we can pull this one from JSON files.