Project

General

Profile

« Previous | Next » 

Revision 4235de9b

Added by Leszek Koltunski over 4 years ago

Major rearrangement of the UI.

View differences:

src/main/res/layout/main.xml
5 5
    android:orientation="vertical" >
6 6

  
7 7
    <LinearLayout
8
        android:id="@+id/mainTitle"
8 9
        android:layout_width="fill_parent"
9 10
        android:layout_height="50dp"
10
        android:gravity="center|fill_horizontal" >
11

  
12
        <Button
13
            android:id="@+id/rubikScramble"
14
            android:layout_width="wrap_content"
15
            android:layout_height="fill_parent"
16
            android:layout_weight="0.5"
17
            android:onClick="Scramble"
18
            android:paddingLeft="5dp"
19
            android:paddingRight="5dp"
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

  
11
        android:gravity="center"
12
        android:orientation="horizontal">
37 13
    </LinearLayout>
38 14

  
39 15
    <org.distorted.magic.RubikSurfaceView
......
43 19
        android:layout_weight="1" />
44 20

  
45 21
    <LinearLayout
46
        android:id="@+id/sizeLayout"
47
        android:layout_width="match_parent"
48
        android:layout_height="wrap_content"
49
        android:gravity="center"
50
        android:orientation="horizontal">
51
    </LinearLayout>
52

  
53
    <LinearLayout
22
        android:id="@+id/mainBar"
54 23
        android:layout_width="fill_parent"
55
        android:layout_height="50dp"
56
        android:gravity="center|fill_horizontal" >
57

  
58
        <Button
59
            android:id="@+id/rubikSettings"
60
            android:layout_width="wrap_content"
61
            android:layout_height="fill_parent"
62
            android:layout_weight="1"
63
            android:onClick="Settings"
64
            android:paddingLeft="3dp"
65
            android:paddingRight="3dp"
66
            android:text="@string/settings" />
67

  
68
        <Button
69
            android:id="@+id/rubikScores"
70
            android:layout_width="wrap_content"
71
            android:layout_height="fill_parent"
72
            android:layout_weight="1"
73
            android:onClick="Scores"
74
            android:paddingLeft="3dp"
75
            android:paddingRight="3dp"
76
            android:text="@string/scores" />
77

  
78
        <Button
79
            android:id="@+id/rubikAbout"
80
            android:layout_width="wrap_content"
81
            android:layout_height="fill_parent"
82
            android:layout_weight="1"
83
            android:onClick="About"
84
            android:paddingLeft="3dp"
85
            android:paddingRight="3dp"
86
            android:text="@string/about" />
87

  
24
        android:layout_height="60dp"
25
        android:gravity="right"
26
        android:orientation="horizontal">
88 27
    </LinearLayout>
89 28

  
90 29
</LinearLayout>

Also available in: Unified diff