Project

General

Profile

« Previous | Next » 

Revision af225332

Added by Leszek Koltunski almost 8 years ago

More progress with Effects2D app.

View differences:

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

  
7 7
    <org.distorted.examples.effects2d.Effects2DSurfaceView
8
        android:id="@+id/scratchpadSurfaceView"
8
        android:id="@+id/effects2dSurfaceView"
9 9
        android:layout_width="fill_parent"
10 10
        android:layout_height="0dp"
11 11
        android:layout_weight="1" />
12 12

  
13
    <ScrollView
14
        android:id="@+id/effects2dscrollView"
15
        android:layout_width="match_parent"
16
        android:layout_height="0dp"
17
        android:layout_weight="0.82" >
18

  
13 19
    <LinearLayout
14 20
        android:id="@+id/linearLayout1"
15 21
        android:layout_width="fill_parent"
......
42 48
            android:layout_gravity="center_horizontal">
43 49

  
44 50
            <RadioButton
45
                android:id="@+id/scratchpadDistort"
51
                android:id="@+id/effects2dDistort"
46 52
                android:layout_width="wrap_content"
47 53
                android:layout_height="wrap_content"
48 54
                android:checked="true"
......
51 57
                android:textSize="12dp"/>
52 58

  
53 59
            <RadioButton
54
                android:id="@+id/scratchpadSink"
60
                android:id="@+id/effects2dSink"
55 61
                android:layout_width="wrap_content"
56 62
                android:layout_height="wrap_content"
57 63
                android:onClick="Sink"
......
59 65
                android:textSize="12dp"/>
60 66

  
61 67
            <RadioButton
62
                android:id="@+id/scratchpadTransparency"
68
                android:id="@+id/effects2dTransparency"
63 69
                android:layout_width="wrap_content"
64 70
                android:layout_height="wrap_content"
65 71
                android:onClick="Transparency"
......
67 73
                android:textSize="12dp"/>
68 74

  
69 75
            <RadioButton
70
                android:id="@+id/scratchpadMacroblock"
76
                android:id="@+id/effects2dMacroblock"
71 77
                android:layout_width="wrap_content"
72 78
                android:layout_height="wrap_content"
73 79
                android:onClick="Macroblock"
......
75 81
                android:textSize="12dp"/>
76 82

  
77 83
            <RadioButton
78
                android:id="@+id/scratchpadBrightness"
84
                android:id="@+id/effects2dBrightness"
79 85
                android:layout_width="wrap_content"
80 86
                android:layout_height="wrap_content"
81 87
                android:onClick="Chroma"
......
89 95
            android:background="#FF0000"
90 96
            android:layout_width="match_parent"/>
91 97

  
92
        <TextView
93
            android:layout_width="wrap_content"
94
            android:layout_height="wrap_content"
95
            android:text="@string/remove"
96
            android:id="@+id/textView2"
97
            android:layout_gravity="center_horizontal"/>
98

  
99 98
        <TableLayout
100 99
            android:layout_width="fill_parent"
101 100
            android:layout_height="wrap_content"
102
            android:paddingTop="10dp"
103
            android:paddingBottom="10dp"
104
            android:stretchColumns="0,1"
101
            android:paddingTop="2dp"
102
            android:paddingBottom="2dp"
103
            android:stretchColumns="0,1,2"
105 104
            android:paddingLeft="10dp"
106 105
            android:paddingRight="10dp">
107 106

  
......
111 110
                android:layout_gravity="center"
112 111
                android:orientation="vertical">
113 112

  
113
                <Button
114
                    android:layout_width="wrap_content"
115
                    android:layout_height="40dp"
116
                    android:text="@string/removebut"
117
                    android:id="@+id/effects2dRemoveID"
118
                    android:onClick="removeByID"/>
119

  
114 120
                <TextView
115 121
                    android:layout_width="match_parent"
116 122
                    android:layout_height="wrap_content"
......
129 135
                android:layout_height="wrap_content"
130 136
                android:layout_gravity="center">
131 137

  
138
                <Button
139
                    android:layout_width="wrap_content"
140
                    android:layout_height="40dp"
141
                    android:text="@string/removebut"
142
                    android:id="@+id/effects2dRemoveName"
143
                    android:onClick="removeByName"/>
144

  
132 145
                <TextView
133 146
                    android:layout_width="match_parent"
134 147
                    android:layout_height="wrap_content"
......
147 160
                android:layout_height="wrap_content"
148 161
                android:layout_gravity="center">
149 162

  
163
                <Button
164
                    android:layout_width="wrap_content"
165
                    android:layout_height="40dp"
166
                    android:text="@string/removebut"
167
                    android:id="@+id/effects2dRemoveType"
168
                    android:onClick="removeByType"/>
169

  
150 170
                <TextView
151 171
                    android:layout_width="wrap_content"
152 172
                    android:layout_height="wrap_content"
......
174 194
            android:id="@+id/textView6"
175 195
            android:layout_gravity="center_horizontal"/>
176 196
    </LinearLayout>
177

  
197
    </ScrollView>
178 198
</LinearLayout>

Also available in: Unified diff