Project

General

Profile

« Previous | Next » 

Revision a7a7cc9c

Added by Leszek Koltunski over 4 years ago

Add a 5x5x5 cube.

View differences:

src/main/res/layout/main.xml
6 6

  
7 7
    <LinearLayout
8 8
        android:layout_width="fill_parent"
9
        android:layout_height="wrap_content"
9
        android:layout_height="50dp"
10 10
        android:gravity="center|fill_horizontal" >
11 11

  
12
         <Button
13
            android:id="@+id/rubikSettings"
12
        <Button
13
            android:id="@+id/rubikScramble"
14 14
            android:layout_width="wrap_content"
15
            android:layout_height="64dp"
15
            android:layout_height="fill_parent"
16 16
            android:layout_weight="0.5"
17
            android:onClick="Settings"
17
            android:onClick="Scramble"
18 18
            android:paddingLeft="5dp"
19 19
            android:paddingRight="5dp"
20
            android:text="@string/settings" />
20
            android:text="@string/scramble" />
21

  
22
        <org.distorted.component.HorizontalNumberPicker
23
            android:id="@+id/rubikNumberPicker"
24
            android:layout_width="192dp"
25
            android:layout_height="fill_parent"/>
26

  
27
        <Button
28
            android:id="@+id/rubikSolve"
29
            android:layout_width="wrap_content"
30
            android:layout_height="fill_parent"
31
            android:layout_weight="0.5"
32
            android:onClick="Solve"
33
            android:paddingLeft="5dp"
34
            android:paddingRight="5dp"
35
            android:text="@string/solve" />
36

  
37
    </LinearLayout>
38

  
39
    <org.distorted.magic.RubikSurfaceView
40
        android:id="@+id/rubikSurfaceView"
41
        android:layout_width="fill_parent"
42
        android:layout_height="0dp"
43
        android:layout_weight="1" />
44

  
45
    <LinearLayout
46
        android:layout_width="match_parent"
47
        android:layout_height="wrap_content"
48
        android:gravity="center" >
21 49

  
22 50
        <ImageButton
23 51
            android:id="@+id/rubikSize2"
24 52
            android:layout_width="64dp"
25 53
            android:layout_height="64dp"
26 54
            android:onClick="setSize"
27
            android:paddingLeft="5dp"
28
            android:paddingRight="5dp"
29
            android:src="@drawable/button2"/>
55
            android:paddingLeft="3dp"
56
            android:paddingRight="3dp"
57
            android:src="@drawable/button2" />
30 58

  
31 59
        <ImageButton
32 60
            android:id="@+id/rubikSize3"
33 61
            android:layout_width="64dp"
34 62
            android:layout_height="64dp"
35 63
            android:onClick="setSize"
36
            android:paddingLeft="5dp"
37
            android:paddingRight="5dp"
38
            android:src="@drawable/button3"/>
64
            android:paddingLeft="3dp"
65
            android:paddingRight="3dp"
66
            android:src="@drawable/button3" />
39 67

  
40 68
        <ImageButton
41 69
            android:id="@+id/rubikSize4"
42 70
            android:layout_width="64dp"
43 71
            android:layout_height="64dp"
44 72
            android:onClick="setSize"
45
            android:paddingLeft="5dp"
46
            android:paddingRight="5dp"
47
            android:src="@drawable/button4"/>
73
            android:paddingLeft="3dp"
74
            android:paddingRight="3dp"
75
            android:src="@drawable/button4" />
48 76

  
49
        <Button
50
            android:id="@+id/rubikAbout"
51
            android:layout_width="wrap_content"
77
        <ImageButton
78
            android:id="@+id/rubikSize5"
79
            android:layout_width="64dp"
52 80
            android:layout_height="64dp"
53
            android:layout_weight="0.5"
54
            android:onClick="About"
55
            android:paddingLeft="5dp"
56
            android:paddingRight="5dp"
57
            android:text="@string/about" />
58

  
81
            android:onClick="setSize"
82
            android:paddingLeft="3dp"
83
            android:paddingRight="3dp"
84
            android:src="@drawable/button5" />
59 85
    </LinearLayout>
60 86

  
61 87
    <LinearLayout
62 88
        android:layout_width="fill_parent"
63
        android:layout_height="64dp"
89
        android:layout_height="50dp"
64 90
        android:gravity="center|fill_horizontal" >
65 91

  
66 92
        <Button
67
            android:id="@+id/rubikScramble"
93
            android:id="@+id/rubikSettings"
68 94
            android:layout_width="wrap_content"
69 95
            android:layout_height="fill_parent"
70
            android:layout_weight="0.5"
71
            android:onClick="Scramble"
72
            android:paddingLeft="5dp"
73
            android:paddingRight="5dp"
74
            android:text="@string/scramble" />
96
            android:layout_weight="1"
97
            android:onClick="Settings"
98
            android:paddingLeft="3dp"
99
            android:paddingRight="3dp"
100
            android:text="@string/settings" />
75 101

  
76
        <org.distorted.component.HorizontalNumberPicker
77
            android:id="@+id/rubikNumberPicker"
78
            android:layout_width="192dp"
79
            android:layout_height="fill_parent"/>
102
        <Button
103
            android:id="@+id/rubikScores"
104
            android:layout_width="wrap_content"
105
            android:layout_height="fill_parent"
106
            android:layout_weight="1"
107
            android:onClick="Scores"
108
            android:paddingLeft="3dp"
109
            android:paddingRight="3dp"
110
            android:text="@string/scores" />
80 111

  
81 112
        <Button
82
            android:id="@+id/rubikSolve"
113
            android:id="@+id/rubikAbout"
83 114
            android:layout_width="wrap_content"
84 115
            android:layout_height="fill_parent"
85
            android:layout_weight="0.5"
86
            android:onClick="Solve"
87
            android:paddingLeft="5dp"
88
            android:paddingRight="5dp"
89
            android:text="@string/solve" />
116
            android:layout_weight="1"
117
            android:onClick="About"
118
            android:paddingLeft="3dp"
119
            android:paddingRight="3dp"
120
            android:text="@string/about" />
90 121

  
91 122
    </LinearLayout>
92 123

  
93
    <org.distorted.magic.RubikSurfaceView
94
        android:id="@+id/rubikSurfaceView"
95
        android:layout_width="fill_parent"
96
        android:layout_height="0dp"
97
        android:layout_weight="1" />
98

  
99 124
</LinearLayout>

Also available in: Unified diff