Rename menu items, add icons

[hornmich/skoda-qr-demo.git] / QRScanner / mobile / src / main / res / layout-land / activity_preview.xml

diff --git a/QRScanner/mobile/src/main/res/layout-land/activity_preview.xml b/QRScanner/mobile/src/main/res/layout-land/activity_preview.xml
index b3f52fea4ba3b84c0e90f0ae4539e0683b45658c..d85e88312cc1a6207628275dd145dad50753c357 100644 (file)
--- a/QRScanner/mobile/src/main/res/layout-land/activity_preview.xml
+++ b/QRScanner/mobile/src/main/res/layout-land/activity_preview.xml
@@ -51,24 +51,25 @@
                     android:id="@+id/butManufactImages"
                     android:onClick="showManufactImages"
                     android:layout_gravity="center_horizontal"
-                    android:layout_column="0"
-                    android:layout_below="@+id/textView4"
+                    android:layout_above="@+id/textView4"
                     android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
-                    android:layout_alignParentBottom="true"/>
+                    android:layout_alignParentBottom="true"
+                    android:layout_below="@+id/textView4"/>
 
                 <Button
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/butManufacturingGuide"
-                    android:id="@+id/butManufactGuide"
-                    android:onClick="showManufactGuide"
+                    android:text="@string/butManufacturing"
+                    android:id="@+id/butManufacturing"
+                    android:onClick="showManufacturing"
+                    android:layout_below="@+id/textView4"
                     android:layout_gravity="center_horizontal"
-                    android:layout_column="0"
-                    android:layout_above="@+id/textView4"
                     android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
-                    android:layout_alignParentTop="true"/>
+                    android:layout_alignParentTop="true"
+                    android:layout_above="@+id/textView4"/>
+
             </RelativeLayout>
 
             <RelativeLayout
@@ -88,38 +89,72 @@
                 <Button
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/butContacts"
-                    android:id="@+id/butContacts"
-                    android:onClick="showContacts"
-                    android:layout_column="0"
-                    android:layout_below="@+id/textView5"
+                    android:text="@string/butManufacturingGuide"
+                    android:id="@+id/butManufactGuide"
+                    android:onClick="showManufactGuide"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_above="@+id/textView5"
                     android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
-                    android:layout_alignParentBottom="true"/>
+                    android:layout_alignParentTop="true"/>
 
                 <Button
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/butManufacturing"
-                    android:id="@+id/butManufacturing"
-                    android:onClick="showManufacturing"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_column="0"
-                    android:layout_above="@+id/textView5"
+                    android:text="@string/butContacts"
+                    android:id="@+id/butContacts"
+                    android:onClick="showContacts"
+                    android:layout_below="@+id/textView5"
                     android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
-                    android:layout_alignParentTop="true"/>
+                    android:layout_alignParentBottom="true"/>
+
             </RelativeLayout>
         </RelativeLayout>
 
     </LinearLayout>
 
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/imgComponent"
-        android:layout_weight="0.95"
-        android:layout_gravity="center_horizontal"
-        android:scaleType="center"/>
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/imgComponent"
+            android:layout_gravity="center_horizontal"
+            android:scaleType="center"
+            android:contentDescription="@string/preview_content_desc"/>
+
+        <RelativeLayout
+            android:layout_width="73dp"
+            android:layout_height="match_parent"
+            android:id="@+id/progress_container"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentRight="true">
+
+            <ProgressBar
+                style="?android:attr/progressBarStyleLarge"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/progressBar"
+                android:layout_centerVertical="true"
+                android:layout_centerHorizontal="true"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/loading_page"
+                android:id="@+id/textView7"
+                android:layout_below="@+id/progressBar"
+                android:layout_alignStart="@+id/progressBar"
+                android:layout_alignLeft="@+id/progressBar"/>
+        </RelativeLayout>
+    </RelativeLayout>
 
 </LinearLayout>
\ No newline at end of file