Project

General

Profile

« Previous | Next » 

Revision bfcf419a

Added by Leszek Koltunski over 7 years ago

Improvements for the 'Cubes' and 'Effects3D' apps.

View differences:

src/main/res/layout/objectpickerlayout.xml
1 1
<?xml version="1.0" encoding="utf-8"?>
2 2

  
3
   <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
4
                 android:orientation="vertical"
5
                 android:layout_width="match_parent"
6
                 android:layout_height="match_parent"
7
                 android:gravity="center_vertical">
3
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
4
     android:orientation="vertical"
5
     android:layout_width="match_parent"
6
     android:layout_height="match_parent">
8 7

  
9
       <TableLayout
8
     <LinearLayout
9
           android:orientation="horizontal"
10 10
           android:layout_width="match_parent"
11
           android:layout_height="wrap_content"
12
           android:stretchColumns="1,2,3,4"
13
           android:shrinkColumns="1,2,3,4"
14
           >
11
           android:layout_height="wrap_content">
15 12

  
16
        <TableRow
17
            android:layout_width="match_parent"
18
            android:layout_height="match_parent"
19
            android:paddingTop="10dp">
20

  
21
            <TextView
22
                android:layout_width="wrap_content"
23
                android:layout_height="wrap_content"
24
                android:textAppearance="?android:attr/textAppearanceMedium"
25
                android:text="@string/Create"
26
                android:id="@+id/textView2"
27
                android:layout_gravity="center_vertical"
28
                android:layout_marginLeft="10dp"/>
29

  
30
            <Spinner
31
                android:layout_width="fill_parent"
13
           <Spinner
14
                android:layout_width="0dp"
32 15
                android:layout_height="50dp"
16
                android:layout_weight="0.5"
33 17
                android:id="@+id/objectpicker_spinnerType"
34
                android:layout_span="4"/>
35
        </TableRow>
36

  
37
           <TableRow
38
               android:layout_width="match_parent"
39
               android:layout_height="match_parent"
40
               android:paddingTop="10dp">
18
           />
41 19

  
42
               <TextView
43
                   android:layout_width="wrap_content"
44
                   android:layout_height="wrap_content"
45
                   android:textAppearance="?android:attr/textAppearanceMedium"
46
                   android:text="@string/Bitmap"
47
                   android:id="@+id/textView7"
48
                   android:layout_marginLeft="10dp"
49
                   android:layout_gravity="center_vertical"/>
50

  
51
               <Spinner
52
                   android:layout_width="wrap_content"
20
           <Spinner
21
                   android:layout_width="0dp"
53 22
                   android:layout_height="50dp"
23
                   android:layout_weight="0.5"
54 24
                   android:id="@+id/objectpicker_spinnerBitmap"
55
                   android:layout_span="4"/>
56
           </TableRow>
57

  
58
           <TableRow
59
            android:layout_width="match_parent"
60
            android:layout_height="match_parent"
61
            android:paddingTop="10dp"
62
            android:paddingBottom="10dp">
63

  
64
            <TextView
65
                android:layout_width="wrap_content"
66
                android:layout_height="wrap_content"
67
                android:textAppearance="?android:attr/textAppearanceMedium"
68
                android:text="@string/rows"
69
                android:id="@+id/textView8"
70
                android:layout_gravity="center_vertical"
71
                android:layout_marginLeft="10dp"
72
                />
25
           />
26
     </LinearLayout>
73 27

  
74
            <NumberPicker
75
                android:id="@+id/objectpicker_rows"
76
                android:layout_width="wrap_content"
77
                android:layout_height="wrap_content"
78
                android:orientation="vertical"
79
                />
80

  
81
            <TextView
82
                android:layout_width="wrap_content"
83
                android:layout_height="wrap_content"
84
                android:textAppearance="?android:attr/textAppearanceMedium"
85
                android:text="@string/cols"
86
                android:id="@+id/textView9"
87
                android:layout_marginLeft="10dp"
88
                android:layout_gravity="center_vertical"
89
                />
90

  
91
            <NumberPicker
92
                android:id="@+id/objectpicker_cols"
93
                android:layout_width="wrap_content"
94
                android:layout_height="wrap_content"
95
                android:orientation="vertical"
96
                />
97
        </TableRow>
98

  
99
       </TableLayout>
28
     <LinearLayout
29
           android:orientation="horizontal"
30
           android:layout_width="match_parent"
31
           android:layout_height="wrap_content">
32

  
33
           <NumberPicker
34
               android:id="@+id/objectpicker_rows"
35
               android:layout_width="wrap_content"
36
               android:layout_height="wrap_content"
37
               android:orientation="vertical"
38
               android:descendantFocusability="blocksDescendants"
39
           />
40

  
41
           <NumberPicker
42
               android:id="@+id/objectpicker_cols"
43
               android:layout_width="wrap_content"
44
               android:layout_height="wrap_content"
45
               android:orientation="vertical"
46
               android:descendantFocusability="blocksDescendants"
47
           />
48

  
49
           <Button
50
               android:id="@+id/objectpicker_create"
51
               android:onClick="Create"
52
               android:text="@string/Create"
53
               android:layout_width="match_parent"
54
               android:layout_height="fill_parent"
55
           />
56
       </LinearLayout>
100 57

  
101
    <Button
102
        android:id="@+id/objectpicker_create"
103
        android:onClick="Continue"
104
        android:text="@string/continu"
105
        android:layout_width="match_parent"
106
        android:layout_height="50dp"
107
        android:layout_span="4"
108
        android:layout_marginTop="5dp"/>
58
       <LinearLayout
59
           android:id="@+id/objectpicker_buttongrid"
60
           android:layout_width="match_parent"
61
           android:layout_height="0dp"
62
           android:gravity="center"
63
           android:orientation="vertical"
64
           android:layout_weight="0.8">
65
       </LinearLayout>
109 66

  
110 67
</LinearLayout>

Also available in: Unified diff