Revision 7ac0ee88
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/tutorials/TutorialActivity.java | ||
|---|---|---|
| 63 | 63 |
private int mCurrentApiVersion; |
| 64 | 64 |
private TutorialState mState; |
| 65 | 65 |
private String mURL; |
| 66 |
private int mObjectOrdinal, mObjectSize;
|
|
| 66 |
private int mObjectOrdinal; |
|
| 67 | 67 |
private TutorialWebView mWebView; |
| 68 | 68 |
|
| 69 | 69 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 82 | 82 |
{
|
| 83 | 83 |
mURL = b.getString("url");
|
| 84 | 84 |
mObjectOrdinal = b.getInt("obj");
|
| 85 |
mObjectSize = b.getInt("siz");
|
|
| 86 | 85 |
} |
| 87 | 86 |
|
| 88 | 87 |
unlock(); |
| ... | ... | |
| 211 | 210 |
if( mObjectOrdinal>=0 && mObjectOrdinal< ObjectList.NUM_OBJECTS ) |
| 212 | 211 |
{
|
| 213 | 212 |
ObjectList obj = ObjectList.getObject(mObjectOrdinal); |
| 214 |
int[] sizes = obj.getSizes(); |
|
| 215 |
int sizeIndex = ObjectList.getSizeIndex(mObjectOrdinal,mObjectSize); |
|
| 216 |
|
|
| 217 |
if( sizeIndex>=0 && sizeIndex<sizes.length ) |
|
| 218 |
{
|
|
| 219 |
view.getPreRender().changeObject(obj,mObjectSize); |
|
| 220 |
} |
|
| 213 |
view.getPreRender().changeObject(obj); |
|
| 221 | 214 |
} |
| 222 | 215 |
} |
| 223 | 216 |
|
Also available in: Unified diff
Simplify ObjectList: now there's just one object per size.