Project

General

Profile

« Previous | Next » 

Revision cb30e768

Added by Leszek Koltunski 6 months ago

Version 2.0: add Solver Activity.

View differences:

src/main/res/layout/main.xml
1 1
<?xml version="1.0" encoding="utf-8"?>
2
<RelativeLayout  xmlns:android="http://schemas.android.com/apk/res/android"
2
<LinearLayout  xmlns:android="http://schemas.android.com/apk/res/android"
3 3
    android:id="@+id/relativeLayout"
4 4
    android:layout_width="match_parent"
5
    android:layout_height="match_parent" >
6

  
7
    <org.distorted.main_old.RubikSurfaceView
8
        android:id="@+id/rubikSurfaceView"
9
        android:layout_width="match_parent"
10
        android:layout_height="match_parent"
11
        android:layout_alignParentStart="true"
12
        android:layout_alignParentTop="true"/>
5
    android:layout_height="match_parent"
6
    android:weightSum="1.0"
7
    android:orientation="vertical">
13 8

  
14 9
    <LinearLayout
15 10
        android:id="@+id/hiddenBar"
16
        android:layout_alignParentTop="true"
17 11
        android:layout_width="match_parent"
18 12
        android:layout_height="0dp"
13
        android:layout_weight="0.00"
19 14
        android:gravity="center"
20 15
        android:orientation="horizontal"
21
        android:background="@android:color/transparent">
16
        android:background="@color/dark_grey">
22 17
    </LinearLayout>
23 18

  
24 19
    <LinearLayout
25 20
        android:id="@+id/upperBar"
26
        android:layout_below="@id/hiddenBar"
27 21
        android:layout_width="match_parent"
28 22
        android:layout_height="0dp"
23
        android:layout_weight="0.08"
29 24
        android:gravity="center"
25
        android:weightSum="1.0"
30 26
        android:orientation="horizontal"
31
        android:background="@android:color/transparent">
27
        android:background="@color/dark_grey">
28

  
29
        <LinearLayout
30
            android:layout_width="0dp"
31
            android:layout_height="match_parent"
32
            android:layout_weight="0.25"
33
            android:orientation="horizontal"
34
            android:gravity="center"
35
            android:background="@android:color/transparent">
36

  
37
            <ImageButton
38
                android:id="@+id/buttonScores"
39
                android:adjustViewBounds="true"
40
                android:scaleType="fitCenter"
41
                android:layout_width="wrap_content"
42
                android:layout_height="match_parent"
43
                android:onClick="onScores"
44
                android:background="@android:color/transparent"
45
                android:src="@drawable/ui_podium"/>
46

  
47
        </LinearLayout>
48

  
49
        <LinearLayout
50
            android:layout_width="0dp"
51
            android:layout_height="match_parent"
52
            android:layout_weight="0.5"
53
            android:orientation="horizontal"
54
            android:gravity="center"
55
            android:background="@android:color/transparent">
56
        </LinearLayout>
57

  
58
        <LinearLayout
59
            android:layout_width="0dp"
60
            android:layout_height="match_parent"
61
            android:layout_weight="0.25"
62
            android:orientation="horizontal"
63
            android:gravity="center"
64
            android:background="@android:color/transparent">
65

  
66
            <ImageButton
67
                android:id="@+id/buttonBandage"
68
                android:adjustViewBounds="true"
69
                android:scaleType="fitCenter"
70
                android:layout_width="wrap_content"
71
                android:layout_height="match_parent"
72
                android:onClick="onBandage"
73
                android:background="@android:color/transparent"
74
                android:src="@drawable/ui_bandaged"/>
75

  
76
        </LinearLayout>
77

  
32 78
    </LinearLayout>
33 79

  
80
    <ScrollView
81
        android:id="@+id/objectScroll"
82
        android:layout_width="match_parent"
83
        android:layout_height="0dp"
84
        android:layout_weight="0.84"
85
        android:background="@color/grey">
86

  
87
        <GridLayout
88
            android:id="@+id/objectGrid"
89
            android:layout_width="match_parent"
90
            android:layout_height="wrap_content">
91
        </GridLayout>
92

  
93
    </ScrollView>
94

  
34 95
    <LinearLayout
35 96
        android:id="@+id/lowerBar"
36
        android:layout_alignParentBottom="true"
37 97
        android:layout_width="match_parent"
38 98
        android:layout_height="0dp"
99
        android:layout_weight="0.08"
39 100
        android:orientation="horizontal"
40
        android:background="@android:color/transparent">
101
        android:background="@color/dark_grey">
102

  
103
        <RelativeLayout
104
            android:id="@+id/bottomLayout"
105
            android:layout_width="match_parent"
106
            android:layout_height="match_parent"
107
            android:paddingEnd="10dp"
108
            android:paddingStart="10dp">
109

  
110
            <ImageButton
111
                android:id="@+id/buttonAbout"
112
                android:layout_alignParentStart="true"
113
                android:adjustViewBounds="true"
114
                android:scaleType="fitCenter"
115
                android:layout_width="wrap_content"
116
                android:layout_height="match_parent"
117
                android:onClick="onAbout"
118
                android:background="@android:color/transparent"
119
                android:src="@drawable/ui_info"/>
120

  
121
            <ImageButton
122
                android:id="@+id/buttonUpdates"
123
                android:layout_centerHorizontal="true"
124
                android:adjustViewBounds="true"
125
                android:scaleType="fitCenter"
126
                android:layout_width="wrap_content"
127
                android:layout_height="match_parent"
128
                android:onClick="onUpdates"
129
                android:background="@android:color/transparent"
130
                android:src="@drawable/ui_download"/>
131

  
132
            <TextView
133
                android:id="@+id/bubbleUpdates"
134
                android:adjustViewBounds="true"
135
                android:layout_width="wrap_content"
136
                android:layout_height="wrap_content"
137
                android:layout_alignTop="@+id/buttonUpdates"
138
                android:layout_alignEnd="@+id/buttonUpdates"
139
                android:scaleType="fitCenter"
140
                android:textColor="#FFF"
141
                android:textSize="16sp"
142
                android:textStyle="bold"
143
                android:background="@drawable/badge_circle"/>
144

  
145
            <ImageButton
146
                android:id="@+id/buttonExit"
147
                android:adjustViewBounds="true"
148
                android:layout_alignParentEnd="true"
149
                android:scaleType="fitCenter"
150
                android:layout_width="wrap_content"
151
                android:layout_height="match_parent"
152
                android:onClick="onExit"
153
                android:background="@android:color/transparent"
154
                android:src="@drawable/ui_exit"/>
155

  
156
        </RelativeLayout>
157

  
41 158
    </LinearLayout>
42 159

  
43
</RelativeLayout>
160
</LinearLayout>

Also available in: Unified diff