Project

General

Profile

« Previous | Next » 

Revision 4d5b37fe

Added by Leszek Koltunski over 7 years ago

Unify Effects3D and Matrix3D (still incomplete!)

View differences:

src/main/res/layout/matrix3dlayout.xml
10 10
        android:layout_height="0dp"
11 11
        android:layout_weight="1" />
12 12

  
13
    <Button
14
        android:id="@+id/button1"
15
        android:layout_width="fill_parent"
16
        android:layout_height="wrap_content"
17
        android:onClick="Default"
18
        android:text="@string/reset" />
13
    <LinearLayout
14
        android:orientation="horizontal"
15
        android:layout_width="match_parent"
16
        android:layout_height="50dp"
17
        android:layout_gravity="center">
18

  
19
        <Button
20
            android:layout_width="wrap_content"
21
            android:layout_height="wrap_content"
22
            android:text="@string/Add"
23
            android:id="@+id/buttonAdd"
24
            android:onClick="newEffect"
25
            />
26

  
27
        <TextView
28
            android:layout_width="wrap_content"
29
            android:layout_height="wrap_content"
30
            android:textAppearance="?android:attr/textAppearanceMedium"
31
            android:text="@string/New"
32
            android:id="@+id/textView10"/>
33

  
34
        <Spinner
35
            android:layout_width="wrap_content"
36
            android:layout_height="wrap_content"
37
            android:id="@+id/matrix3dspinner"
38
            android:layout_weight="0.5"/>
39

  
40
        <Button
41
            android:layout_width="wrap_content"
42
            android:layout_height="wrap_content"
43
            android:text="@string/reset"
44
            android:id="@+id/buttonRemove"
45
            android:onClick="removeAll"
46
            />
47

  
48
    </LinearLayout>
49

  
50
    <View
51
        android:layout_height="4dip"
52
        android:background="#777777"
53
        android:layout_width="match_parent"
54
        />
19 55

  
20 56
    <ScrollView
21 57
        android:id="@+id/matrix3dscrollView"
22 58
        android:layout_width="match_parent"
23 59
        android:layout_height="0dp"
24
        android:layout_weight="0.82" >
60
        android:layout_weight="0.82"
61
        >
25 62

  
26 63
        <LinearLayout
27 64
            android:id="@+id/matrix3dlayout"

Also available in: Unified diff