Project

General

Profile

« Previous | Next » 

Revision 923d267c

Added by Leszek Koltunski about 3 years ago

Progress with ConfigPane.

View differences:

src/main/java/org/distorted/config/ConfigScreenPane.java
43 43
  private static final float RADIO_RATIO   = 0.900f;
44 44

  
45 45
  private JsonReader mReader;
46
  private int mObjectOrdinal;
47

  
48
///////////////////////////////////////////////////////////////////////////////////////////////////
49

  
50
  private void switchMesh(ConfigActivity act, boolean simple)
51
    {
52

  
53
    }
46 54

  
47 55
///////////////////////////////////////////////////////////////////////////////////////////////////
48 56

  
......
50 58
    {
51 59
    if( mReader==null ) mReader = new JsonReader();
52 60

  
61
    mObjectOrdinal = objectOrdinal;
62

  
53 63
    ObjectType type = ObjectType.getObject(objectOrdinal);
54 64
    InputStream stream = ObjectJson.getStream(type,act);
55 65
    mReader.parseJsonFileMetadata(stream);
......
122 132
      @Override
123 133
      public void onCheckedChanged(RadioGroup group, int checkedId)
124 134
        {
125
        if(checkedId == R.id.meshNice)
126
          {
127
          android.util.Log.e("D", "mesh Nice");
128
          }
129
        else
130
          {
131
          android.util.Log.e("D", "mesh Simple");
132
          }
135
        switchMesh( act, checkedId != R.id.meshNice );
133 136
        }
134 137
      });
135 138

  
src/main/res/layout/config_difficulty.xml
39 39
             android:layout_height="match_parent"
40 40
             android:layout_weight="1"
41 41
             android:gravity="center"
42
             android:src="@drawable/ui_huge_info" />
42
             android:src="@drawable/difficulty0" />
43 43

  
44 44
        <ImageView
45 45
             android:id="@+id/configDifficulty1"
......
47 47
             android:layout_height="match_parent"
48 48
             android:layout_weight="1"
49 49
             android:gravity="center"
50
             android:src="@drawable/ui_huge_tutorial" />
50
             android:src="@drawable/difficulty1" />
51 51

  
52 52
        <ImageView
53 53
             android:id="@+id/configDifficulty2"
......
55 55
             android:layout_height="match_parent"
56 56
             android:layout_weight="1"
57 57
             android:gravity="center"
58
             android:src="@drawable/ui_huge_cube_back" />
58
             android:src="@drawable/difficulty2" />
59 59

  
60 60
        <ImageView
61 61
             android:id="@+id/configDifficulty3"
......
63 63
             android:layout_height="match_parent"
64 64
             android:layout_weight="1"
65 65
             android:gravity="center"
66
             android:src="@drawable/ui_huge_cube_grey" />
66
             android:src="@drawable/difficulty3" />
67 67

  
68 68
        <ImageView
69 69
             android:id="@+id/configDifficulty4"
......
71 71
             android:layout_height="match_parent"
72 72
             android:layout_weight="1"
73 73
             android:gravity="center"
74
             android:src="@drawable/ui_huge_cube_scramble" />
74
             android:src="@drawable/difficulty4" />
75 75

  
76 76
    </LinearLayout>
77 77

  

Also available in: Unified diff