Project

General

Profile

« Previous | Next » 

Revision b4a73ea5

Added by Leszek Koltunski almost 8 years ago

Essentially revert the last commit :)

View differences:

src/main/res/layout/fragment3dlayout.xml
13 13
    <LinearLayout
14 14
        android:orientation="horizontal"
15 15
        android:layout_width="match_parent"
16
        android:layout_height="50dp">
16
        android:layout_height="wrap_content"
17
        android:layout_marginBottom="5dp"
18
        android:background="@android:color/holo_green_dark">
17 19

  
18
        <Button
19
            android:layout_width="wrap_content"
20
            android:layout_height="wrap_content"
21
            android:text="@string/chroma"
22
            android:id="@+id/newChroma"
23
            android:onClick="newChroma"/>
20
        <LinearLayout
21
            android:orientation="vertical"
22
            android:layout_width="0dp"
23
            android:layout_height="match_parent"
24
            android:layout_weight="0.8">
24 25

  
25
        <Button
26
            android:layout_width="wrap_content"
27
            android:layout_height="wrap_content"
28
            android:text="@string/alpha"
29
            android:id="@+id/newAlpha"
30
            android:onClick="newAlpha"/>
26
            <TextView
27
                android:id="@+id/fragment3dcenterText"
28
                android:layout_width="wrap_content"
29
                android:layout_height="wrap_content"
30
                android:layout_marginEnd="5dp"
31
                android:layout_marginStart="5dp"
32
                android:layout_marginTop="3dp"
33
                />
31 34

  
32
        <Button
33
            android:layout_width="wrap_content"
34
            android:layout_height="wrap_content"
35
            android:text="@string/brightness"
36
            android:id="@+id/newBrigthness"
37
            android:onClick="newBrightness"/>
35
            <LinearLayout
36
                android:orientation="horizontal"
37
                android:layout_width="match_parent"
38
                android:layout_height="match_parent"
39
                >
38 40

  
39
        <Button
40
            android:layout_width="wrap_content"
41
            android:layout_height="wrap_content"
42
            android:text="@string/saturation"
43
            android:id="@+id/newSaturation"
44
            android:onClick="newSaturation"/>
41
                <SeekBar
42
                    android:layout_width="fill_parent"
43
                    android:layout_height="wrap_content"
44
                    android:id="@+id/fragment3dcenterX"
45
                    android:layout_weight="0.5"
46
                    android:paddingLeft="5dp"
47
                    android:paddingRight="3dp"/>
48

  
49
                <SeekBar
50
                    android:layout_width="fill_parent"
51
                    android:layout_height="wrap_content"
52
                    android:id="@+id/fragment3dcenterY"
53
                    android:layout_weight="0.5"
54
                    android:paddingLeft="3dp"
55
                    android:paddingRight="5dp"/>
56
            </LinearLayout>
57

  
58
        </LinearLayout>
45 59

  
46 60
        <Button
47 61
            android:id="@+id/buttonDefault"
48
            android:layout_width="fill_parent"
62
            android:layout_width="60dp"
49 63
            android:layout_height="wrap_content"
50
            android:onClick="Remove"
51
            android:text="@string/removebut"
64
            android:onClick="Default"
65
            android:text="@string/reset"
52 66
            android:layout_gravity="right"
53 67
            android:layout_marginTop="3dp"/>
54 68
    </LinearLayout>

Also available in: Unified diff