Project

General

Profile

« Previous | Next » 

Revision 072682e6

Added by Leszek Koltunski over 7 years ago

Solve the issue of moving SeekBars

View differences:

src/main/res/layout/deformlayout.xml
60 60

  
61 61
                <TextView
62 62
                    android:id="@+id/deformTextRadius"
63
                    android:layout_width="wrap_content"
63
                    android:layout_width="0dp"
64 64
                    android:layout_height="wrap_content"
65
                    android:layout_weight="1"
65
                    android:layout_weight="0.8"
66 66
                    android:paddingLeft="15dp"
67 67
                    android:text="Radius"
68 68
                    android:textAppearance="?android:attr/textAppearanceMedium" />
69 69

  
70 70
                <SeekBar
71 71
                    android:id="@+id/deformSeekRadius"
72
                    android:layout_width="106dp"
72
                    android:layout_width="wrap_content"
73 73
                    android:layout_height="wrap_content"
74
                    android:layout_weight="0.65"
74
                    android:layout_weight="1"
75 75
                    android:paddingLeft="20dp"
76 76
                    android:paddingRight="10dp" />
77 77

  
src/main/res/layout/flaglayout.xml
13 13
    <TableLayout
14 14
        android:layout_width="match_parent"
15 15
        android:layout_height="wrap_content"
16
        android:paddingLeft="10dp"
17
        android:paddingRight="10dp" >
16
        android:paddingLeft="3dp"
17
        android:paddingRight="3dp" >
18 18

  
19 19
        <TableRow
20 20
            android:id="@+id/tableRow1"
......
25 25

  
26 26
            <TextView
27 27
                android:id="@+id/flagAmplitude"
28
                android:layout_width="wrap_content"
28
                android:layout_width="0dp"
29 29
                android:layout_height="wrap_content"
30
                android:gravity="center_vertical|center"
30
                android:layout_weight="0.75"
31
                android:gravity="bottom|left"
31 32
                android:text="@string/amplitude"
32
                android:textAppearance="?android:attr/textAppearanceMedium" />
33
                android:textAppearance="?android:attr/textAppearanceSmall" />
33 34

  
34 35
            <SeekBar
35 36
                android:id="@+id/flagSeekAmplitude"
36
                android:layout_width="105dp"
37
                android:layout_width="wrap_content"
37 38
                android:layout_height="wrap_content"
38 39
                android:layout_weight="1"
39
                android:paddingLeft="15dp"
40
                android:paddingRight="10dp" />
40
                android:paddingLeft="5dp"
41
                android:paddingRight="5dp" />
41 42

  
42 43
            <TextView
43 44
                android:id="@+id/flagNoiseAmplitude"
44
                android:layout_width="wrap_content"
45
                android:layout_width="0dp"
45 46
                android:layout_height="wrap_content"
46
                android:gravity="center_vertical|center"
47
                android:layout_weight="0.6"
48
                android:gravity="center_vertical|left"
47 49
                android:text="@string/noise"
48
                android:textAppearance="?android:attr/textAppearanceMedium" />
50
                android:textAppearance="?android:attr/textAppearanceSmall" />
49 51

  
50 52
            <SeekBar
51 53
                android:id="@+id/flagSeekNoiseAmplitude"
52
                android:layout_width="105dp"
54
                android:layout_width="wrap_content"
53 55
                android:layout_height="wrap_content"
54 56
                android:layout_weight="1"
55
                android:paddingLeft="15dp"
56
                android:paddingRight="10dp" />
57
                android:paddingLeft="5dp"
58
                android:paddingRight="5dp" />
57 59

  
58 60
        </TableRow>
59 61

  
......
66 68

  
67 69
            <TextView
68 70
                android:id="@+id/flagLength"
69
                android:layout_width="wrap_content"
71
                android:layout_width="0dp"
70 72
                android:layout_height="wrap_content"
71
                android:gravity="center_vertical|center"
73
                android:layout_weight="0.75"
74
                android:gravity="left|center_vertical"
72 75
                android:text="@string/length"
73
                android:textAppearance="?android:attr/textAppearanceMedium" />
76
                android:textAppearance="?android:attr/textAppearanceSmall" />
74 77

  
75 78
            <SeekBar
76 79
                android:id="@+id/flagSeekLength"
77
                android:layout_width="106dp"
80
                android:layout_width="wrap_content"
78 81
                android:layout_height="wrap_content"
79 82
                android:layout_weight="1"
80
                android:paddingLeft="15dp"
81
                android:paddingRight="10dp" />
83
                android:paddingLeft="5dp"
84
                android:paddingRight="5dp" />
82 85

  
83 86
            <TextView
84 87
                android:id="@+id/flagNoiseLength"
85
                android:layout_width="wrap_content"
88
                android:layout_width="0dp"
86 89
                android:layout_height="wrap_content"
87
                android:gravity="center_vertical|center"
90
                android:layout_weight="0.6"
91
                android:gravity="center_vertical|left"
88 92
                android:text="@string/noise"
89
                android:textAppearance="?android:attr/textAppearanceMedium" />
93
                android:textAppearance="?android:attr/textAppearanceSmall" />
90 94

  
91 95
            <SeekBar
92 96
                android:id="@+id/flagSeekNoiseLength"
93
                android:layout_width="106dp"
97
                android:layout_width="wrap_content"
94 98
                android:layout_height="wrap_content"
95 99
                android:layout_weight="1"
96
                android:paddingLeft="15dp"
97
                android:paddingRight="10dp" />
100
                android:paddingLeft="5dp"
101
                android:paddingRight="5dp" />
98 102

  
99 103
        </TableRow>
100 104

  
......
107 111

  
108 112
            <TextView
109 113
                android:id="@+id/flagAngleA"
110
                android:layout_width="wrap_content"
114
                android:layout_width="0dp"
111 115
                android:layout_height="wrap_content"
112
                android:gravity="center_vertical|center"
116
                android:layout_weight="0.75"
117
                android:gravity="left|center_vertical"
113 118
                android:text="@string/angleA"
114
                android:textAppearance="?android:attr/textAppearanceMedium" />
119
                android:textAppearance="?android:attr/textAppearanceSmall" />
115 120

  
116 121
            <SeekBar
117 122
                android:id="@+id/flagSeekAngleA"
118
                android:layout_width="105dp"
123
                android:layout_width="wrap_content"
119 124
                android:layout_height="wrap_content"
120 125
                android:layout_weight="1"
121
                android:paddingLeft="15dp"
122
                android:paddingRight="10dp" />
126
                android:paddingLeft="5dp"
127
                android:paddingRight="5dp" />
123 128

  
124 129
            <TextView
125 130
                android:id="@+id/flagNoiseAngleA"
126
                android:layout_width="wrap_content"
131
                android:layout_width="0dp"
127 132
                android:layout_height="wrap_content"
128
                android:gravity="center_vertical|center"
133
                android:layout_weight="0.6"
134
                android:gravity="center_vertical|left"
129 135
                android:text="@string/noise"
130
                android:textAppearance="?android:attr/textAppearanceMedium" />
136
                android:textAppearance="?android:attr/textAppearanceSmall" />
131 137

  
132 138
            <SeekBar
133 139
                android:id="@+id/flagSeekNoiseAngleA"
134
                android:layout_width="105dp"
140
                android:layout_width="wrap_content"
135 141
                android:layout_height="wrap_content"
136 142
                android:layout_weight="1"
137
                android:paddingLeft="15dp"
138
                android:paddingRight="10dp" />
143
                android:paddingLeft="5dp"
144
                android:paddingRight="5dp" />
139 145

  
140 146
        </TableRow>
141 147

  
......
148 154

  
149 155
            <TextView
150 156
                android:id="@+id/flagAngleB"
151
                android:layout_width="wrap_content"
157
                android:layout_width="0dp"
152 158
                android:layout_height="wrap_content"
153
                android:gravity="center_vertical|center"
159
                android:layout_weight="0.75"
160
                android:gravity="left|center_vertical"
154 161
                android:text="@string/angleB"
155
                android:textAppearance="?android:attr/textAppearanceMedium" />
162
                android:textAppearance="?android:attr/textAppearanceSmall" />
156 163

  
157 164
            <SeekBar
158 165
                android:id="@+id/flagSeekAngleB"
159
                android:layout_width="105dp"
166
                android:layout_width="wrap_content"
160 167
                android:layout_height="wrap_content"
161 168
                android:layout_weight="1"
162
                android:paddingLeft="15dp"
163
                android:paddingRight="10dp" />
169
                android:paddingLeft="5dp"
170
                android:paddingRight="5dp" />
164 171

  
165 172
            <TextView
166 173
                android:id="@+id/flagNoiseAngleB"
167
                android:layout_width="wrap_content"
174
                android:layout_width="0dp"
168 175
                android:layout_height="wrap_content"
169
                android:gravity="center_vertical|center"
176
                android:layout_weight="0.6"
177
                android:gravity="center_vertical|left"
170 178
                android:text="@string/noise"
171
                android:textAppearance="?android:attr/textAppearanceMedium" />
179
                android:textAppearance="?android:attr/textAppearanceSmall" />
172 180

  
173 181
            <SeekBar
174 182
                android:id="@+id/flagSeekNoiseAngleB"
175
                android:layout_width="105dp"
183
                android:layout_width="wrap_content"
176 184
                android:layout_height="wrap_content"
177 185
                android:layout_weight="1"
178
                android:paddingLeft="15dp"
179
                android:paddingRight="10dp" />
186
                android:paddingLeft="5dp"
187
                android:paddingRight="5dp" />
180 188

  
181 189
        </TableRow>
182 190

  
src/main/res/layout/fovlayout.xml
21 21

  
22 22
        <TextView
23 23
            android:id="@+id/textFOV"
24
            android:layout_width="wrap_content"
24
            android:layout_width="0dp"
25 25
            android:layout_height="wrap_content"
26
            android:layout_weight="1"
26
            android:layout_weight="0.5"
27 27
            android:paddingLeft="15dp"
28 28
            android:textAppearance="?android:attr/textAppearanceMedium" />
29 29

  
30 30
        <SeekBar
31 31
            android:id="@+id/seekFOV"
32
            android:layout_width="106dp"
32
            android:layout_width="wrap_content"
33 33
            android:layout_height="wrap_content"
34
            android:layout_weight="0.94"
34
            android:layout_weight="1"
35 35
            android:paddingLeft="15dp"
36 36
            android:paddingRight="10dp" />
37 37

  
src/main/res/layout/girllayout.xml
25 25

  
26 26
            <TextView
27 27
                android:id="@+id/girlTextSwing"
28
                android:layout_width="wrap_content"
28
                android:layout_width="0dp"
29 29
                android:layout_height="wrap_content"
30
                android:layout_weight="0.5"
30 31
                android:gravity="center_vertical|center"
31 32
                android:text="@string/swing"
32 33
                android:textAppearance="?android:attr/textAppearanceMedium" />
33 34

  
34 35
            <SeekBar
35 36
                android:id="@+id/girlSeekSwing"
36
                android:layout_width="105dp"
37
                android:layout_width="wrap_content"
37 38
                android:layout_height="wrap_content"
38 39
                android:layout_weight="1"
39 40
                android:paddingLeft="15dp"
......
50 51

  
51 52
            <TextView
52 53
                android:id="@+id/girlTextSize"
53
                android:layout_width="wrap_content"
54
                android:layout_width="0dp"
54 55
                android:layout_height="wrap_content"
56
                android:layout_weight="0.5"
55 57
                android:gravity="center_vertical|center"
56 58
                android:text="@string/size"
57 59
                android:textAppearance="?android:attr/textAppearanceMedium" />
58 60

  
59 61
            <SeekBar
60 62
                android:id="@+id/girlSeekSize"
61
                android:layout_width="106dp"
63
                android:layout_width="wrap_content"
62 64
                android:layout_height="wrap_content"
63 65
                android:layout_weight="1"
64 66
                android:paddingLeft="15dp"
......
75 77

  
76 78
            <TextView
77 79
                android:id="@+id/girlTextHips"
78
                android:layout_width="wrap_content"
80
                android:layout_width="0dp"
79 81
                android:layout_height="wrap_content"
82
                android:layout_weight="0.5"
80 83
                android:gravity="center_vertical|center"
81 84
                android:text="@string/hips"
82 85
                android:textAppearance="?android:attr/textAppearanceMedium" />
83 86

  
84 87
            <SeekBar
85 88
                android:id="@+id/girlSeekHips"
86
                android:layout_width="105dp"
89
                android:layout_width="wrap_content"
87 90
                android:layout_height="wrap_content"
88 91
                android:layout_weight="1"
89 92
                android:paddingLeft="15dp"
src/main/res/layout/windlayout.xml
21 21

  
22 22
        <TextView
23 23
            android:id="@+id/windText"
24
            android:layout_width="wrap_content"
24
            android:layout_width="0dp"
25 25
            android:layout_height="wrap_content"
26
            android:layout_weight="1"
26
            android:layout_weight="0.5"
27 27
            android:paddingLeft="15dp"
28 28
            android:textAppearance="?android:attr/textAppearanceMedium" />
29 29

  
30 30
        <SeekBar
31 31
            android:id="@+id/windSeek"
32
            android:layout_width="106dp"
32
            android:layout_weight="1"
33
            android:layout_width="wrap_content"
33 34
            android:layout_height="wrap_content"
34
            android:layout_weight="0.94"
35 35
            android:paddingLeft="15dp"
36 36
            android:paddingRight="10dp" />
37 37

  

Also available in: Unified diff