Project

General

Profile

« Previous | Next » 

Revision 314e9ff0

Added by Leszek Koltunski over 2 years ago

Refactor RubikObject in preparation for creating RubikObjects from DownloadedObjects.

View differences:

src/main/java/org/distorted/dialogs/RubikDialogTutorialView.java
70 70
    {
71 71
    super(act);
72 72

  
73
    InputStream jsonStream = RubikObjectList.getExtrasStream(position,act);
73
    int objectOrdinal = RubikObjectList.getObjectOrdinal(position);
74
    RubikObject robject = RubikObjectList.getObject(objectOrdinal);
75
    InputStream jsonStream = robject==null ? null : robject.getExtrasStream(act);
74 76
    String[][] tutorials=null;
75 77

  
76 78
    if( jsonStream!=null )
......
95 97
      int colorB = getResources().getColor(R.color.light_grey);
96 98
      int colorT = getResources().getColor(R.color.white);
97 99

  
98
      int objectOrdinal = RubikObjectList.getObjectOrdinal(position);
99

  
100 100
      for (String[] tutorial : tutorials)
101 101
        {
102 102
        String coun = tutorial[0];

Also available in: Unified diff