Rename menu items, add icons

diff --git a/QRScanner/glass/src/main/res/drawable/ic_document_50.png b/QRScanner/glass/src/main/res/drawable/ic_document_50.png
new file mode 100644 (file)
index 0000000..17062ac
Binary files /dev/null and b/QRScanner/glass/src/main/res/drawable/ic_document_50.png differ

diff --git a/QRScanner/glass/src/main/res/drawable/ic_gear_50.png b/QRScanner/glass/src/main/res/drawable/ic_gear_50.png
new file mode 100644 (file)
index 0000000..b440125
Binary files /dev/null and b/QRScanner/glass/src/main/res/drawable/ic_gear_50.png differ

diff --git a/QRScanner/glass/src/main/res/drawable/ic_people_50.png b/QRScanner/glass/src/main/res/drawable/ic_people_50.png
new file mode 100644 (file)
index 0000000..43742e3
Binary files /dev/null and b/QRScanner/glass/src/main/res/drawable/ic_people_50.png differ

diff --git a/QRScanner/glass/src/main/res/drawable/ic_photo_50.png b/QRScanner/glass/src/main/res/drawable/ic_photo_50.png
new file mode 100644 (file)
index 0000000..61f3dbb
Binary files /dev/null and b/QRScanner/glass/src/main/res/drawable/ic_photo_50.png differ

diff --git a/QRScanner/glass/src/main/res/menu/menu_preview.xml b/QRScanner/glass/src/main/res/menu/menu_preview.xml
index a51c3596e4cda3efd878c510b0cf9891c6ad8151..d7979a8a6815af8aa466c67636791f315d0ab3b2 100644 (file)
--- a/QRScanner/glass/src/main/res/menu/menu_preview.xml
+++ b/QRScanner/glass/src/main/res/menu/menu_preview.xml
@@ -2,19 +2,24 @@
       xmlns:app="http://schemas.android.com/apk/res-auto"
       xmlns:tools="http://schemas.android.com/tools"
       tools:context="cz.cvut.fel.dce.qrscanner.PreviewActivity">
-    <item android:id="@+id/show_contacts"
-          android:title="@string/show_contacts"
-          android:orderInCategory="100"/>
     <item android:id="@+id/show_manufacturing"
+          android:icon="@drawable/ic_document_50"
           android:title="@string/show_manufacturing"
           android:orderInCategory="100"/>
     <item android:id="@+id/show_pictured_manufacturing"
           android:title="@string/show_pictured_manufacturing"
+          android:icon="@drawable/ic_photo_50"
           android:orderInCategory="100"/>
     <item android:id="@+id/show_workshop"
           android:title="@string/show_workshop"
+          android:icon="@drawable/ic_gear_50"
+          android:orderInCategory="100"/>
+    <item android:id="@+id/show_contacts"
+          android:title="@string/show_contacts"
+          android:icon="@drawable/ic_people_50"
           android:orderInCategory="100"/>
     <item android:id="@+id/stop"
           android:title="@string/action_stop"
+          android:icon="@drawable/ic_stop"
           android:orderInCategory="100"/>
 </menu>

diff --git a/QRScanner/glass/src/main/res/values/strings.xml b/QRScanner/glass/src/main/res/values/strings.xml
index d2e8e61ba94a0bb436360935aac34abdf60b55fa..69615eb3dc9f71f454557e40c7af1a227e043659 100644 (file)
--- a/QRScanner/glass/src/main/res/values/strings.xml
+++ b/QRScanner/glass/src/main/res/values/strings.xml
@@ -25,9 +25,9 @@ limitations under the License.
     <string name="cannot_open_file_Path">Cannot open file: %1$s</string>
     <string name="cannot_open_buffer">Cannot open buffer</string>
     <string name="show_contacts">Contacts</string>
-    <string name="show_manufacturing">Manufacturing</string>
-    <string name="show_pictured_manufacturing">Pictured manuf</string>
-    <string name="show_workshop">Workshow guide</string>
+    <string name="show_manufacturing">Work intro</string>
+    <string name="show_pictured_manufacturing">Pictured intro</string>
+    <string name="show_workshop">Workshop</string>
     <string name="glass_voice_trigger">SkoMan</string>
     <string name="title_activity_pdf_view">PdfViewActivity</string>
     <string name="action_settings">Settings</string>

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 ccb1be8a32b299f7366445451c3e186c42b23edc..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,22 +51,25 @@
                     android:id="@+id/butManufactImages"
                     android:onClick="showManufactImages"
                     android:layout_gravity="center_horizontal"
-                    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_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
@@ -86,25 +89,26 @@
                 <Button
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/butContacts"
-                    android:id="@+id/butContacts"
-                    android:onClick="showContacts"
-                    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_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>
 

diff --git a/QRScanner/mobile/src/main/res/layout/activity_preview.xml b/QRScanner/mobile/src/main/res/layout/activity_preview.xml
index 984c094180f27c59262ebbe5909c870fb954741f..804a01f0618ade332af7c0997a544311491690b3 100644 (file)
--- a/QRScanner/mobile/src/main/res/layout/activity_preview.xml
+++ b/QRScanner/mobile/src/main/res/layout/activity_preview.xml
@@ -20,9 +20,9 @@
     <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"
         />
 
     <Button
@@ -36,9 +36,9 @@
     <Button
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/butManufacturing"
-        android:id="@+id/butManufacturing"
-        android:onClick="showManufacturing"
+        android:text="@string/butManufacturingGuide"
+        android:id="@+id/butManufactGuide"
+        android:onClick="showManufactGuide"
         />
 
     <Button

diff --git a/QRScanner/mobile/src/main/res/values/strings.xml b/QRScanner/mobile/src/main/res/values/strings.xml
index 7b1ed42ca3716efe06f6e96bc554b3f0f2b9e982..18f7c3d064466ef10913f0976bd07d9cf2252970 100644 (file)
--- a/QRScanner/mobile/src/main/res/values/strings.xml
+++ b/QRScanner/mobile/src/main/res/values/strings.xml
@@ -61,9 +61,9 @@
     <string name="mainScreenHeading">Skoda Auto manufacturing helper</string>
     <string name="butStartScanning">Find component</string>
     <string name="butContacts">Contacts</string>
-    <string name="butManufacturing">Manufacturing process</string>
-    <string name="butPicturedmanufacturing">Pictured manufacturing process</string>
-    <string name="butManufacturingGuide">Workshop manual</string>
+    <string name="butManufacturing">Work introduction</string>
+    <string name="butPicturedmanufacturing">Pictured work introduction</string>
+    <string name="butManufacturingGuide">Workshop</string>
     <string name="previewHeading">Select document to view</string>
     <string name="loading_page">Loading...</string>
     <string name="preview_content_desc">Component preview image</string>