Project

General

Profile

« Previous | Next » 

Revision 2666a48c

Added by Leszek Koltunski about 5 years ago

1. Change the API of Dynamic: split makeNowRunFor into two separate 'setDuration' and 'resetToBeginning'
2. Major changes to the 'Dynamic' app so that we can check more about the Dynamics.

View differences:

src/main/res/layout/dynamicslayout.xml
6 6
    android:gravity="fill_horizontal"
7 7
    android:orientation="vertical" >
8 8

  
9
    <org.distorted.examples.dynamic.DynamicSurfaceView
10
        android:id="@+id/dynamicSurfaceView"
11
        android:layout_width="fill_parent"
12
        android:layout_height="0dp"
13
        android:layout_weight="1" />
9
    <LinearLayout
10
        android:orientation="horizontal"
11
        android:layout_width="match_parent"
12
        android:layout_height="48dp">
14 13

  
15
        <RadioGroup
16
            android:id="@+id/radioGroup2"
14
        <Button
15
            android:id="@+id/dynamicButtonStart"
17 16
            android:layout_width="wrap_content"
18
            android:layout_height="wrap_content"
19
            android:gravity="fill_horizontal"
20
            android:orientation="horizontal"
21
            android:paddingBottom="5dp"
22
            android:paddingTop="5dp"
23
            android:weightSum="1.0" >
24

  
25
            <RadioButton
26
                android:id="@+id/dynamic1D"
27
                android:layout_width="fill_parent"
28
                android:layout_height="wrap_content"
29
                android:layout_weight="0.25"
30
                android:onClick="Dim1D"
31
                android:text="@string/dim1D" />
32

  
33
            <RadioButton
34
                android:id="@+id/dynamic2D"
35
                android:layout_width="fill_parent"
36
                android:layout_height="wrap_content"
37
                android:layout_weight="0.25"
38
                android:checked="true"
39
                android:onClick="Dim2D"
40
                android:text="@string/dim2D" />
41

  
42
            <RadioButton
43
                android:id="@+id/dynamic3DXY"
44
                android:layout_width="fill_parent"
45
                android:layout_height="wrap_content"
46
                android:layout_weight="0.25"
47
                android:onClick="Dim3DXY"
48
                android:text="@string/dim3DXY" />
49

  
50
            <RadioButton
51
                android:id="@+id/dynamic3DXZ"
52
                android:layout_width="fill_parent"
53
                android:layout_height="wrap_content"
54
                android:layout_weight="0.25"
55
                android:onClick="Dim3DXZ"
56
                android:text="@string/dim3DXZ" />
57

  
58
        </RadioGroup>
17
            android:layout_height="match_parent"
18
            android:layout_weight="0.5"
19
            android:paddingLeft="10dp"
20
            android:paddingRight="10dp"
21
            android:onClick="Start"
22
            android:text="@string/start" />
59 23

  
60
        <RadioGroup
61
            android:id="@+id/radioGroup1"
24
        <Button
25
            android:id="@+id/dynamicButtonReset"
62 26
            android:layout_width="wrap_content"
63
            android:layout_height="wrap_content"
64
            android:orientation="horizontal"
65
            android:paddingRight="20dp" >
66

  
67
            <RadioButton
68
                android:id="@+id/dynamicLoopButton"
69
                android:layout_width="wrap_content"
70
                android:layout_height="wrap_content"
71
                android:checked="true"
72
                android:onClick="Loop"
73
                android:text="@string/loop" />
27
            android:layout_height="match_parent"
28
            android:layout_weight="0.5"
29
            android:paddingLeft="10dp"
30
            android:paddingRight="10dp"
31
            android:onClick="Reset"
32
            android:text="@string/reset" />
33
    </LinearLayout>
74 34

  
75
            <RadioButton
76
                android:id="@+id/dynamicPathButton"
77
                android:layout_width="wrap_content"
78
                android:layout_height="wrap_content"
79
                android:checked="false"
80
                android:onClick="Path"
81
                android:text="@string/path" />
35
    <org.distorted.examples.dynamic.DynamicSurfaceView
36
        android:id="@+id/dynamicSurfaceView"
37
        android:layout_width="fill_parent"
38
        android:layout_height="0dp"
39
        android:layout_weight="1" />
82 40

  
83
            <RadioButton
84
                android:id="@+id/dynamicJumpButton"
85
                android:layout_width="wrap_content"
86
                android:layout_height="wrap_content"
87
                android:checked="false"
88
                android:onClick="Jump"
89
                android:text="@string/jump" />
41
    <LinearLayout
42
        android:orientation="horizontal"
43
        android:layout_width="match_parent"
44
        android:layout_height="48dp">
45

  
46
        <Spinner
47
            android:layout_width="0dp"
48
            android:layout_height="50dp"
49
            android:layout_weight="0.5"
50
            android:id="@+id/dynamicSpinnerDimension"/>
51

  
52
        <Spinner
53
            android:layout_width="0dp"
54
            android:layout_height="50dp"
55
            android:layout_weight="0.5"
56
            android:id="@+id/dynamicSpinnerMode"/>
90 57

  
91
        </RadioGroup>
58
    </LinearLayout>
92 59

  
93 60
    <LinearLayout
94
        android:id="@+id/linearLayout1"
95 61
        android:layout_width="fill_parent"
96 62
        android:layout_height="wrap_content"
97 63
        android:layout_gravity="center_vertical"
98 64
        android:gravity="center|fill_horizontal"
99 65
        android:orientation="vertical">
100 66

  
101
        <TextView
102
            android:id="@+id/dynamicTextDuration"
103
            android:layout_width="wrap_content"
67
        <LinearLayout
68
            android:layout_width="fill_parent"
104 69
            android:layout_height="wrap_content"
105
            android:layout_gravity="center_horizontal"
106
            android:layout_weight="15"
107
            android:paddingLeft="10dp"
108
            android:text="@string/duration"
109
            android:textAppearance="?android:attr/textAppearanceMedium"
110
            android:textSize="12sp" />
70
            android:orientation="horizontal"
71
            android:baselineAligned="false">
111 72

  
112
        <SeekBar
113
            android:id="@+id/dynamicSeekDuration"
114
            android:layout_width="match_parent"
115
            android:layout_height="wrap_content"
116
            android:layout_weight="15"
117
            android:paddingLeft="5dp"
118
            android:paddingRight="10dp" />
73
            <LinearLayout
74
                android:layout_width="wrap_content"
75
                android:layout_height="fill_parent"
76
                android:layout_weight="0.5"
77
                android:layout_gravity="center_vertical"
78
                android:gravity="center|fill_horizontal"
79
                android:orientation="vertical">
80

  
81
                <TextView
82
                    android:id="@+id/dynamicTextDuration"
83
                    android:layout_width="wrap_content"
84
                    android:layout_height="wrap_content"
85
                    android:layout_gravity="center_horizontal"
86
                    android:text="@string/duration"
87
                    android:textAppearance="?android:attr/textAppearanceMedium"
88
                    android:textSize="12sp" />
89

  
90
                <SeekBar
91
                    android:id="@+id/dynamicSeekDuration"
92
                    android:layout_width="match_parent"
93
                    android:layout_height="wrap_content"
94
                    android:paddingStart="10dp"
95
                    android:paddingEnd="10dp" />
96

  
97
            </LinearLayout>
98

  
99
            <LinearLayout
100
                android:layout_width="wrap_content"
101
                android:layout_height="fill_parent"
102
                android:layout_weight="0.5"
103
                android:layout_gravity="center_vertical"
104
                android:gravity="center|fill_horizontal"
105
                android:orientation="vertical">
106

  
107
                <TextView
108
                    android:id="@+id/dynamicTextCount"
109
                    android:layout_width="wrap_content"
110
                    android:layout_height="wrap_content"
111
                    android:layout_gravity="center_horizontal"
112
                    android:text="@string/count"
113
                    android:textAppearance="?android:attr/textAppearanceMedium"
114
                    android:textSize="12sp" />
115

  
116
                <SeekBar
117
                    android:id="@+id/dynamicSeekCount"
118
                    android:layout_width="match_parent"
119
                    android:layout_height="wrap_content"
120
                    android:paddingStart="5dp"
121
                    android:paddingEnd="10dp" />
122

  
123
            </LinearLayout>
124

  
125
        </LinearLayout>
119 126

  
120 127
        <TextView
121 128
            android:id="@+id/dynamicTextNoise"
......
123 130
            android:layout_height="wrap_content"
124 131
            android:layout_gravity="center_horizontal"
125 132
            android:layout_weight="15"
126
            android:paddingLeft="10dp"
127 133
            android:text="@string/noise"
128 134
            android:textAppearance="?android:attr/textAppearanceMedium"
129 135
            android:textSize="12sp" />
......
139 145
                android:layout_width="match_parent"
140 146
                android:layout_height="wrap_content"
141 147
                android:layout_weight="1"
142
                android:paddingLeft="5dp"
143
                android:paddingRight="10dp" />
148
                android:paddingLeft="10dp"
149
                android:paddingRight="5dp" />
144 150

  
145 151
            <SeekBar
146 152
                android:id="@+id/dynamicSeekNoise1"
......
148 154
                android:layout_height="wrap_content"
149 155
                android:layout_weight="1"
150 156
                android:paddingLeft="5dp"
151
                android:paddingRight="10dp" />
157
                android:paddingRight="5dp" />
152 158

  
153 159
            <SeekBar
154 160
                android:id="@+id/dynamicSeekNoise2"

Also available in: Unified diff