Added:
/books/res/layout/capture.xml
Deleted:
/books/res/layout/common_ad_bottom.xml
/books/res/layout/common_ad_top.xml
Modified:
/books/res/layout/common_top.xml
=======================================
--- /dev/null
+++ /books/res/layout/capture.xml Mon Nov 28 21:14:55 2011
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2008 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+
+ <SurfaceView android:id="@+id/preview_view"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:layout_centerInParent="true"/>
+
+ <com.google.zxing.client.android.ViewfinderView
+ android:id="@+id/viewfinder_view"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:background="@color/transparent"/>
+
+ <LinearLayout android:id="@+id/result_view"
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:background="@color/result_view"
+ android:visibility="gone"
+ android:padding="4dip">
+
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:padding="12dip">
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:gravity="right|center_vertical">
+
+ <ImageView android:id="@+id/barcode_image_view"
+ android:layout_width="160dip"
+ android:layout_height="wrap_content"
+ android:maxWidth="160dip"
+ android:maxHeight="160dip"
+ android:layout_marginBottom="4dip"
+ android:adjustViewBounds="true"
+ android:scaleType="centerInside"/>
+
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+
+ <TextView android:id="@+id/format_text_view_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/msg_default_format"
+ android:textColor="@color/result_minor_text"
+ android:textStyle="bold"
+ android:textSize="14sp"
+ android:paddingRight="4dip"/>
+
+ <TextView android:id="@+id/format_text_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/result_minor_text"
+ android:textSize="14sp"/>
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+
+ <TextView android:id="@+id/type_text_view_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/msg_default_type"
+ android:textColor="@color/result_minor_text"
+ android:textStyle="bold"
+ android:textSize="14sp"
+ android:paddingRight="4dip"/>
+
+ <TextView android:id="@+id/type_text_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/result_minor_text"
+ android:textSize="14sp"/>
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+
+ <TextView android:id="@+id/time_text_view_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/msg_default_time"
+ android:textColor="@color/result_minor_text"
+ android:textStyle="bold"
+ android:textSize="14sp"
+ android:paddingRight="4dip"/>
+
+ <TextView android:id="@+id/time_text_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/result_minor_text"
+ android:textSize="14sp"/>
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+
+ <TextView android:id="@+id/meta_text_view_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/msg_default_meta"
+ android:textColor="@color/result_minor_text"
+ android:textStyle="bold"
+ android:textSize="14sp"
+ android:paddingRight="4dip"/>
+
+ <TextView android:id="@+id/meta_text_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/result_minor_text"
+ android:textSize="14sp"/>
+
+ </LinearLayout>
+
+ </LinearLayout>
+
+ <ScrollView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <TextView android:id="@+id/contents_text_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/result_text"
+ android:textColorLink="@color/result_text"
+ android:textSize="22sp"
+ android:paddingLeft="12dip"
+ android:autoLink="web"/>
+
+ <TextView android:id="@+id/contents_supplement_text_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/result_text"
+ android:textColorLink="@color/result_text"
+ android:textSize="14sp"
+ android:padding="24dip"
+ android:autoLink="web"
+ android:clickable="true"/>
+
+ </LinearLayout>
+
+ </ScrollView>
+
+ </LinearLayout>
+
+ <LinearLayout android:id="@+id/result_button_view"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:gravity="center">
+
+ <Button android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textSize="14sp"
+ android:visibility="gone"/>
+
+ <Button android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textSize="14sp"
+ android:visibility="gone"/>
+
+ <Button android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textSize="14sp"
+ android:visibility="gone"/>
+
+ <Button android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textSize="14sp"
+ android:visibility="gone"/>
+
+ </LinearLayout>
+
+ </LinearLayout>
+
+ <TextView android:id="@+id/status_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom|center_horizontal"
+ android:background="@color/transparent"
+ android:text="@string/msg_default_status"
+ android:textColor="@color/status_text"
+ android:textSize="14sp"/>
+
+</FrameLayout>
=======================================
--- /books/res/layout/common_ad_bottom.xml Thu Sep 8 02:30:34 2011
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res/com.iym.bookstore">
- <com.adwo.adsdk.AdwoAdView android:id="@+id/ad1"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
- app:background="#000000" app:primaryText="#FFFFFF"
- app:secondaryTextColor="#CCCCCC" app:isTesting="false"
android:layout_alignParentBottom="true"/>
-</merge>
=======================================
--- /books/res/layout/common_ad_top.xml Thu Sep 8 02:30:34 2011
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res/com.iym.bookstore">
- <com.adwo.adsdk.AdwoAdView android:id="@+id/ad1"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
- app:background="#000000" app:primaryText="#FFFFFF"
- app:secondaryTextColor="#CCCCCC" app:isTesting="false" />
-</merge>
=======================================
--- /books/res/layout/common_top.xml Thu Sep 8 02:30:34 2011
+++ /books/res/layout/common_top.xml Mon Nov 28 21:14:55 2011
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:adsdk="http://schemas.android.com/apk/res/com.iym.bookstore">
- <com.madhouse.android.ads.AdView
- android:id="@+id/ad1" android:layout_width="wrap_content"
- android:layout_height="wrap_content"
android:layout_gravity="center_vertical|center_horizontal"
- adsdk:debug="false" adsdk:adPosition="90002636" adsdk:adInterval="20"
- adsdk:adMeasure="0" adsdk:adBannerAnimation="4" />
+ xmlns:myapp="http://schemas.android.com/apk/res/com.iym.bookstore">
+ <cn.domob.android.ads.DomobAdView
+ android:id="@+id/domobAd"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ myapp:keywords="game"
+ myapp:refreshInterval="20"
+ />
</merge>