fix camera

iscanner · Jul 26, 2015 · 41524c4 · 41524c4
1 parent 47a5845
commit 41524c4
Show file tree

Hide file tree

Showing 8 changed files with 449 additions and 424 deletions.
diff --git a/res/layout/activity_about.xml b/res/layout/activity_about.xml
@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.github.iscanner.iscanner_android.MainActivity" >
+    tools:context=".MainActivity" >
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"

diff --git a/res/layout/activity_history.xml b/res/layout/activity_history.xml
@@ -3,46 +3,44 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".MainActivity" >
-    <LinearLayout
+    <include
+        android:id="@+id/title_layout"
+        layout="@layout/title" />
+    <com.github.iscanner.iscanner_android.SwipeableCell
+        android:id="@+id/historyListView"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:orientation="horizontal" >
-        <include layout="@layout/title" />
-        <com.github.iscanner.iscanner_android.SwipeableCell
-            android:id="@+id/historyListView"
+        android:layout_above="@+id/qr_dialog"
+        android:layout_below="@id/title_layout"
+        android:divider="#dddbdb"
+        android:dividerHeight="1dp" >
+    </com.github.iscanner.iscanner_android.SwipeableCell>
+    <RelativeLayout
+        android:id="@+id/qr_dialog"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="@color/black"
+        android:visibility="gone" >
+        <ImageView
+            android:id="@+id/qr_image_view"
+            android:layout_width="300dp"
+            android:layout_height="300dp"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:background="@color/white"
+            android:contentDescription="@string/app_name"
+            android:scaleType="centerInside"
+            android:src="@drawable/ic_logo"
+            android:visibility="visible" />
+        <TextView
+            android:id="@+id/tip_text"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_above="@+id/qr_dialog"
-            android:divider="#dddbdb"
-            android:dividerHeight="1dp" >
-        </com.github.iscanner.iscanner_android.SwipeableCell>
-        <RelativeLayout
-            android:id="@+id/qr_dialog"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:background="@color/black"
-            android:visibility="gone" >
-            <ImageView
-                android:id="@+id/qr_image_view"
-                android:layout_width="300dp"
-                android:layout_height="300dp"
-                android:layout_centerHorizontal="true"
-                android:layout_centerVertical="true"
-                android:background="@color/white"
-                android:contentDescription="@string/app_name"
-                android:scaleType="centerInside"
-                android:src="@drawable/ic_logo"
-                android:visibility="visible" />
-            <TextView
-                android:id="@+id/tip_text"
-                android:layout_width="match_parent"
-                android:layout_height="60dp"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_below="@+id/qr_image_view"
-                android:gravity="center_vertical|center"
-                android:text="@string/tip_content"
-                android:textColor="@color/white" />
-        </RelativeLayout>
-    </LinearLayout>
+            android:layout_height="60dp"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_below="@+id/qr_image_view"
+            android:gravity="center_vertical|center"
+            android:text="@string/tip_content"
+            android:textColor="@color/white" />
+    </RelativeLayout>
 </RelativeLayout>
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
@@ -11,8 +11,8 @@
     </LinearLayout>
     <SurfaceView
         android:id="@+id/preview_view"
-        android:layout_width="300dp"
-        android:layout_height="300dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="center" />
     <com.zxing.view.ViewfinderView
         android:id="@+id/viewfinder_view"