Project

General

Profile

« Previous | Next » 

Revision fe7fe83e

Added by Leszek Koltunski almost 6 years ago

Overhaul of the Effects3D generic test app.

Still not perfect (the 'postprocess' tab does not work; things crash when we rotate)

View differences:

src/main/res/layout/effects3dlayout.xml
2 2
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 3
    android:layout_width="fill_parent"
4 4
    android:layout_height="fill_parent"
5
    android:layout_weight="1"
5 6
    android:orientation="vertical" >
6 7

  
7 8
    <org.distorted.examples.effects3d.Effects3DSurfaceView
......
54 55
            android:onClick="triggerOIT"
55 56
            android:text="@string/oit"
56 57
            android:textSize="12sp"/>
57
    </LinearLayout>
58

  
59
    <LinearLayout
60
        android:layout_width="match_parent"
61
        android:layout_height="42dp"
62
        android:layout_gravity="center"
63
        android:orientation="horizontal">
64

  
65
        <Button
66
            android:id="@+id/buttonAdd"
67
            android:layout_width="wrap_content"
68
            android:layout_height="wrap_content"
69
            android:onClick="newEffect"
70
            android:text="@string/Add"
71
            />
72

  
73
        <TextView
74
            android:id="@+id/textView10"
75
            android:layout_width="wrap_content"
76
            android:layout_height="wrap_content"
77
            android:text="@string/New"
78
            android:textAppearance="?android:attr/textAppearanceMedium"/>
79

  
80
        <Spinner
81
            android:id="@+id/effects3dspinner"
82
            android:layout_width="0dp"
83
            android:layout_height="wrap_content"
84
            android:layout_weight="0.5"/>
85

  
86
        <Button
87
            android:id="@+id/buttonRemove"
88
            android:layout_width="wrap_content"
89
            android:layout_height="wrap_content"
90
            android:onClick="removeAll"
91
            android:text="@string/reset"
92
            />
93 58

  
94 59
    </LinearLayout>
95 60

  
96
    <View
97
        android:layout_height="4dip"
98
        android:background="#777777"
61
    <android.support.design.widget.TabLayout
62
        android:id="@+id/effects3d_sliding_tabs"
99 63
        android:layout_width="match_parent"
100
        />
64
        android:layout_height="32dp"
65
        android:theme="@style/Theme.AppCompat.NoActionBar">
66
    </android.support.design.widget.TabLayout>
101 67

  
102
    <ScrollView
103
        android:id="@+id/effects3dscrollView"
68
    <android.support.v4.view.ViewPager
69
        android:id="@+id/effects3d_viewpager"
104 70
        android:layout_width="match_parent"
105 71
        android:layout_height="0dp"
106
        android:layout_weight="0.80"
107
        >
108

  
109
        <LinearLayout
110
            android:id="@+id/effects3dlayout"
111
            android:layout_width="match_parent"
112
            android:layout_height="wrap_content"
113
            android:orientation="vertical" >
114
        </LinearLayout>
115

  
116
    </ScrollView>
72
        android:layout_weight="1"
73
        android:background="@android:color/black" />
117 74

  
118 75
</LinearLayout>

Also available in: Unified diff