Skip to content

Commit a1282d7

Browse files
author
phishman3579
committed
Updated the XML and SDK versions
git-svn-id: https://android-quick-response-code.googlecode.com/svn/trunk@21 27ab3a52-890b-1a32-11f2-b4d3198529b6
1 parent 2567bbc commit a1282d7

File tree

6 files changed

+130
-350
lines changed

6 files changed

+130
-350
lines changed

Diff for: ‎AndroidManifest.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
android:versionCode="1"
55
android:versionName="1.0">
66

7-
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="7"/>
7+
<uses-sdk android:minSdkVersion="5" android:targetSdkVersion="5"/>
8+
89
<uses-feature android:name="android.hardware.camera"/>
910
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
1011
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
12+
1113
<uses-permission android:name="android.permission.CAMERA"/>
1214

1315
<application android:icon="@drawable/icon"

Diff for: ‎project.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
# project structure.
99

1010
# Project target.
11-
target=android-7
11+
target=android-5

Diff for: ‎res/layout/capture.xml

+121-118
Original file line numberDiff line numberDiff line change
@@ -20,143 +20,145 @@
2020

2121
<SurfaceView android:id="@+id/preview_view"
2222
android:layout_width="fill_parent"
23-
android:layout_height="fill_parent"
24-
android:layout_centerInParent="true"/>
23+
android:layout_height="fill_parent">
24+
</SurfaceView>
2525

2626
<com.jwetherell.quick_response_code.ViewfinderView
2727
android:id="@+id/viewfinder_view"
2828
android:layout_width="fill_parent"
2929
android:layout_height="fill_parent"
30-
android:background="@color/transparent"/>
30+
android:background="@color/transparent">
31+
</com.jwetherell.quick_response_code.ViewfinderView>
3132

3233
<LinearLayout android:id="@+id/result_view"
33-
android:orientation="vertical"
34+
android:orientation="horizontal"
3435
android:layout_width="fill_parent"
3536
android:layout_height="fill_parent"
3637
android:background="@color/result_view"
37-
android:visibility="gone"
38+
android:gravity="center"
3839
android:padding="4dip">
3940

4041
<LinearLayout
41-
android:orientation="horizontal"
42-
android:layout_width="fill_parent"
43-
android:layout_height="wrap_content"
44-
android:layout_weight="1"
45-
android:gravity="center"
46-
android:padding="12dip">
42+
android:orientation="vertical"
43+
android:layout_width="wrap_content"
44+
android:layout_height="fill_parent"
45+
android:gravity="right|center_vertical">
46+
47+
<ImageView android:id="@+id/barcode_image_view"
48+
android:layout_width="160dip"
49+
android:layout_height="wrap_content"
50+
android:maxWidth="160dip"
51+
android:maxHeight="160dip"
52+
android:layout_marginBottom="4dip"
53+
android:adjustViewBounds="true"
54+
android:scaleType="centerInside"
55+
android:contentDescription="@string/barcode_image">
56+
</ImageView>
4757

4858
<LinearLayout
49-
android:orientation="vertical"
50-
android:layout_width="wrap_content"
51-
android:layout_height="fill_parent"
52-
android:gravity="right|center_vertical">
53-
54-
<ImageView android:id="@+id/barcode_image_view"
55-
android:layout_width="160dip"
56-
android:layout_height="wrap_content"
57-
android:maxWidth="160dip"
58-
android:maxHeight="160dip"
59-
android:layout_marginBottom="4dip"
60-
android:adjustViewBounds="true"
61-
android:scaleType="centerInside"/>
62-
63-
<LinearLayout
64-
android:orientation="horizontal"
65-
android:layout_width="wrap_content"
66-
android:layout_height="wrap_content">
67-
<TextView android:id="@+id/format_text_view_label"
68-
android:layout_width="wrap_content"
69-
android:layout_height="wrap_content"
70-
android:text="@string/msg_default_format"
71-
android:textColor="@color/result_minor_text"
72-
android:textStyle="bold"
73-
android:textSize="14sp"
74-
android:paddingRight="4dip"/>
75-
<TextView android:id="@+id/format_text_view"
76-
android:layout_width="wrap_content"
77-
android:layout_height="wrap_content"
78-
android:textColor="@color/result_minor_text"
79-
android:textSize="14sp"/>
80-
</LinearLayout>
59+
android:orientation="horizontal"
60+
android:layout_width="wrap_content"
61+
android:layout_height="wrap_content">
62+
<TextView android:id="@+id/format_text_view_label"
63+
android:layout_width="wrap_content"
64+
android:layout_height="wrap_content"
65+
android:text="@string/msg_default_format"
66+
android:textColor="@color/result_minor_text"
67+
android:textStyle="bold"
68+
android:textSize="14sp"
69+
android:paddingRight="4dip">
70+
</TextView>
71+
<TextView android:id="@+id/format_text_view"
72+
android:layout_width="wrap_content"
73+
android:layout_height="wrap_content"
74+
android:textColor="@color/result_minor_text"
75+
android:textSize="14sp">
76+
</TextView>
77+
</LinearLayout>
8178

82-
<LinearLayout
83-
android:orientation="horizontal"
84-
android:layout_width="wrap_content"
85-
android:layout_height="wrap_content">
86-
<TextView android:id="@+id/type_text_view_label"
87-
android:layout_width="wrap_content"
88-
android:layout_height="wrap_content"
89-
android:text="@string/msg_default_type"
90-
android:textColor="@color/result_minor_text"
91-
android:textStyle="bold"
92-
android:textSize="14sp"
93-
android:paddingRight="4dip"/>
94-
<TextView android:id="@+id/type_text_view"
95-
android:layout_width="wrap_content"
96-
android:layout_height="wrap_content"
97-
android:textColor="@color/result_minor_text"
98-
android:textSize="14sp"/>
99-
</LinearLayout>
79+
<LinearLayout
80+
android:orientation="horizontal"
81+
android:layout_width="wrap_content"
82+
android:layout_height="wrap_content">
83+
<TextView android:id="@+id/type_text_view_label"
84+
android:layout_width="wrap_content"
85+
android:layout_height="wrap_content"
86+
android:text="@string/msg_default_type"
87+
android:textColor="@color/result_minor_text"
88+
android:textStyle="bold"
89+
android:textSize="14sp"
90+
android:paddingRight="4dip">
91+
</TextView>
92+
<TextView android:id="@+id/type_text_view"
93+
android:layout_width="wrap_content"
94+
android:layout_height="wrap_content"
95+
android:textColor="@color/result_minor_text"
96+
android:textSize="14sp">
97+
</TextView>
98+
</LinearLayout>
10099

101-
<LinearLayout
102-
android:orientation="horizontal"
103-
android:layout_width="wrap_content"
104-
android:layout_height="wrap_content">
105-
<TextView android:id="@+id/time_text_view_label"
106-
android:layout_width="wrap_content"
107-
android:layout_height="wrap_content"
108-
android:text="@string/msg_default_time"
109-
android:textColor="@color/result_minor_text"
110-
android:textStyle="bold"
111-
android:textSize="14sp"
112-
android:paddingRight="4dip"/>
113-
<TextView android:id="@+id/time_text_view"
114-
android:layout_width="wrap_content"
115-
android:layout_height="wrap_content"
116-
android:textColor="@color/result_minor_text"
117-
android:textSize="14sp"/>
118-
</LinearLayout>
119-
120-
<LinearLayout
121-
android:orientation="horizontal"
122-
android:layout_width="wrap_content"
123-
android:layout_height="wrap_content">
124-
<TextView android:id="@+id/meta_text_view_label"
125-
android:layout_width="wrap_content"
126-
android:layout_height="wrap_content"
127-
android:text="@string/msg_default_meta"
128-
android:textColor="@color/result_minor_text"
129-
android:textStyle="bold"
130-
android:textSize="14sp"
131-
android:paddingRight="4dip"/>
132-
<TextView android:id="@+id/meta_text_view"
133-
android:layout_width="wrap_content"
134-
android:layout_height="wrap_content"
135-
android:textColor="@color/result_minor_text"
136-
android:textSize="14sp"/>
137-
</LinearLayout>
100+
<LinearLayout
101+
android:orientation="horizontal"
102+
android:layout_width="wrap_content"
103+
android:layout_height="wrap_content">
104+
<TextView android:id="@+id/time_text_view_label"
105+
android:layout_width="wrap_content"
106+
android:layout_height="wrap_content"
107+
android:text="@string/msg_default_time"
108+
android:textColor="@color/result_minor_text"
109+
android:textStyle="bold"
110+
android:textSize="14sp"
111+
android:paddingRight="4dip">
112+
</TextView>
113+
<TextView android:id="@+id/time_text_view"
114+
android:layout_width="wrap_content"
115+
android:layout_height="wrap_content"
116+
android:textColor="@color/result_minor_text"
117+
android:textSize="14sp">
118+
</TextView>
119+
</LinearLayout>
138120

121+
<LinearLayout
122+
android:orientation="horizontal"
123+
android:layout_width="wrap_content"
124+
android:layout_height="wrap_content">
125+
<TextView android:id="@+id/meta_text_view_label"
126+
android:layout_width="wrap_content"
127+
android:layout_height="wrap_content"
128+
android:text="@string/msg_default_meta"
129+
android:textColor="@color/result_minor_text"
130+
android:textStyle="bold"
131+
android:textSize="14sp"
132+
android:paddingRight="4dip">
133+
</TextView>
134+
<TextView android:id="@+id/meta_text_view"
135+
android:layout_width="wrap_content"
136+
android:layout_height="wrap_content"
137+
android:textColor="@color/result_minor_text"
138+
android:textSize="14sp">
139+
</TextView>
139140
</LinearLayout>
140-
141-
<ScrollView
142-
android:layout_width="wrap_content"
143-
android:layout_height="wrap_content">
144-
<LinearLayout
145-
android:layout_width="wrap_content"
146-
android:layout_height="wrap_content"
147-
android:orientation="vertical">
148-
<TextView android:id="@+id/contents_text_view"
149-
android:layout_width="wrap_content"
150-
android:layout_height="wrap_content"
151-
android:textColor="@color/result_text"
152-
android:textColorLink="@color/result_text"
153-
android:textSize="22sp"
154-
android:paddingLeft="12dip"/>
155-
</LinearLayout>
156-
</ScrollView>
157-
141+
158142
</LinearLayout>
159143

144+
<ScrollView
145+
android:layout_width="wrap_content"
146+
android:layout_height="wrap_content">
147+
<LinearLayout
148+
android:layout_width="wrap_content"
149+
android:layout_height="wrap_content"
150+
android:orientation="vertical">
151+
<TextView android:id="@+id/contents_text_view"
152+
android:layout_width="wrap_content"
153+
android:layout_height="wrap_content"
154+
android:textColor="@color/result_text"
155+
android:textColorLink="@color/result_text"
156+
android:textSize="22sp"
157+
android:paddingLeft="12dip">
158+
</TextView>
159+
</LinearLayout>
160+
</ScrollView>
161+
160162
</LinearLayout>
161163

162164
<TextView android:id="@+id/status_view"
@@ -166,6 +168,7 @@
166168
android:background="@color/transparent"
167169
android:text="@string/msg_default_status"
168170
android:textColor="@color/status_text"
169-
android:textSize="14sp"/>
171+
android:textSize="14sp">
172+
</TextView>
170173

171-
</FrameLayout>
174+
</FrameLayout>

0 commit comments

Comments
 (0)