Project

General

Profile

« Previous | Next » 

Revision 584f7954

Added by Leszek Koltunski about 5 years ago

- adjust SizeChangeEffects
- implement first two UnscrambleEffects

View differences:

src/main/res/layout/settings.xml
11 11
        android:paddingStart="15dp"
12 12
        android:paddingEnd="15dp"
13 13
        android:gravity="start|center"
14
        android:text="@string/disappear_effect"
15
        android:textAppearance="?android:attr/textAppearanceMedium" />
16

  
17
    <LinearLayout
18
        android:layout_width="fill_parent"
19
        android:layout_height="fill_parent"
20
        android:layout_weight="0.5"
21
        android:gravity="center|fill_horizontal"
22
        android:layout_marginLeft="10dp"
23
        android:layout_marginRight="10dp"
24
        android:background="@color/grey"
25
        android:orientation="vertical">
26

  
27
        <LinearLayout
28
            android:layout_width="fill_parent"
29
            android:layout_height="36dp"
30
            android:gravity="center|fill_horizontal"
31
            android:orientation="horizontal">
32

  
33
            <TextView
34
                android:layout_weight="0.2"
35
                android:layout_width="0dp"
36
                android:layout_height="fill_parent"
37
                android:paddingStart="5dp"
38
                android:paddingEnd="5dp"
39
                android:gravity="start|center"
40
                android:text="@string/duration"
41
                android:textAppearance="?android:attr/textAppearanceSmall" />
42

  
43
            <TextView
44
                android:id="@+id/disappearDurationText"
45
                android:layout_weight="0.2"
46
                android:layout_width="0dp"
47
                android:layout_height="fill_parent"
48
                android:paddingStart="5dp"
49
                android:paddingEnd="5dp"
50
                android:gravity="end|center"
51
                android:textAppearance="?android:attr/textAppearanceSmall" />
52

  
53
            <SeekBar
54
                android:id="@+id/disappearDuration"
55
                android:layout_weight="0.6"
56
                android:layout_width="0dp"
57
                android:layout_height="fill_parent"
58
                android:paddingLeft="10dp"
59
                android:paddingRight="10dp" />
60

  
61
        </LinearLayout>
62

  
63
        <LinearLayout
64
            android:layout_width="fill_parent"
65
            android:layout_height="36dp"
66
            android:gravity="center|fill_horizontal"
67
            android:orientation="horizontal">
68

  
69
            <TextView
70
                android:layout_weight="0.4"
71
                android:layout_width="0dp"
72
                android:layout_height="fill_parent"
73
                android:paddingStart="5dp"
74
                android:paddingEnd="5dp"
75
                android:gravity="start|center"
76
                android:text="@string/type"
77
                android:textAppearance="?android:attr/textAppearanceSmall" />
78

  
79
            <Spinner
80
                android:id="@+id/disappearType"
81
                android:layout_weight="0.6"
82
                android:layout_width="0dp"
83
                android:layout_height="fill_parent"
84
                android:textAlignment="center"
85
                android:paddingLeft="10dp"
86
                android:paddingRight="10dp" />
87

  
88
        </LinearLayout>
89
    </LinearLayout>
90

  
91
    <TextView
92
        android:layout_width="fill_parent"
93
        android:layout_height="48dp"
94
        android:paddingStart="15dp"
95
        android:paddingEnd="15dp"
96
        android:gravity="start|center"
97
        android:text="@string/appear_effect"
14
        android:text="@string/sizechange_effect"
98 15
        android:textAppearance="?android:attr/textAppearanceMedium" />
99 16

  
100 17
    <LinearLayout
......
125 42
                android:textAppearance="?android:attr/textAppearanceSmall" />
126 43

  
127 44
            <TextView
128
                android:id="@+id/appearDurationText"
45
                android:id="@+id/sizechangeDurationText"
129 46
                android:layout_weight="0.2"
130 47
                android:layout_width="0dp"
131 48
                android:layout_height="fill_parent"
......
135 52
                android:textAppearance="?android:attr/textAppearanceSmall" />
136 53

  
137 54
            <SeekBar
138
                android:id="@+id/appearDuration"
55
                android:id="@+id/sizechangeDuration"
139 56
                android:layout_weight="0.6"
140 57
                android:layout_width="0dp"
141 58
                android:layout_height="fill_parent"
......
161 78
                android:textAppearance="?android:attr/textAppearanceSmall" />
162 79

  
163 80
            <Spinner
164
                android:id="@+id/appearType"
81
                android:id="@+id/sizechangeType"
165 82
                android:layout_weight="0.6"
166 83
                android:layout_width="0dp"
167 84
                android:layout_height="fill_parent"

Also available in: Unified diff