Apex/res/layout/activity_function_select.xml

@@ -2,53 +2,59 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
     tools:context=".FunctionSelectActivity" >
 
-    <GridLayout
-        android:layout_width="wrap_content"
+    <TableLayout
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:columnCount="3"
-         >
-
-        <ImageButton
-            android:id="@+id/ibtn_booking"
-            android:layout_gravity="left"
-            android:src="@drawable/ic_oceanbooking" />
-
-        <ImageButton
-            android:id="@+id/ibtn_info"
-            android:layout_gravity="left"
-            android:src="@drawable/ic_ocean_blinfo" />
-
-        <ImageButton
-            android:id="@+id/ibtn_detail"
-            android:layout_gravity="left"
-            android:src="@drawable/ic_container_detail" />
-
-        <ImageButton
-            android:id="@+id/ibtn_cargo"
-            android:layout_gravity="left"
-            android:src="@drawable/ic_cargo_tracking" />
-
-        <ImageButton
-            android:id="@+id/ibtn_doc"
-            android:layout_gravity="left"
-            android:src="@drawable/ic_down_doc" />
-
-        <ImageButton
-            android:id="@+id/ibtn_password"
-            android:layout_gravity="left"
-            android:src="@drawable/ic_password" />
-
-        <ImageButton
-            android:id="@+id/ibtn_exit"
-            android:layout_gravity="left"
-            android:src="@drawable/ic_exit" />
-
-    </GridLayout>
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true" >
+
+        <TableRow
+            android:id="@+id/tableRow3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" >
+
+            <ImageButton
+                android:id="@+id/ibtn_booking"
+                android:src="@drawable/ic_oceanbooking" />
+
+            <ImageButton
+                android:id="@+id/ibtn_info"
+                android:src="@drawable/ic_ocean_blinfo" />
+
+            <ImageButton
+                android:id="@+id/ibtn_detail"
+                android:src="@drawable/ic_container_detail" />
+        </TableRow>
+
+        <TableRow
+            android:id="@+id/tableRow4"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" >
+
+            <ImageButton
+                android:id="@+id/ibtn_cargo"
+                android:src="@drawable/ic_cargo_tracking" />
+
+            <ImageButton
+                android:id="@+id/ibtn_doc"
+                android:src="@drawable/ic_down_doc" />
+
+            <ImageButton
+                android:id="@+id/ibtn_password"
+                android:src="@drawable/ic_password" />
+        </TableRow>
+
+        <TableRow
+            android:id="@+id/tableRow1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" >
+
+            <ImageButton
+                android:id="@+id/ibtn_exit"
+                android:src="@drawable/ic_exit" />
+        </TableRow>
+    </TableLayout>
 
 </RelativeLayout>

Apex/res/layout/activity_result.xml

@@ -25,7 +25,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
-            android:fontFamily="sans-serif-light"
             android:text="Loading..."
             android:textAppearance="?android:attr/textAppearanceMedium" />
     </LinearLayout>
@@ -37,6 +36,7 @@
         android:layout_below="@+id/tv_head" >
 
         <TableLayout
+            android:id="@+id/result_table"
             android:layout_width="wrap_content"
             android:layout_height="fill_parent" >
 

Apex/res/layout/fragment_login.xml

@@ -1,81 +1,3 @@
-<!--
- <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/login_form"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".LoginFragment" >
-
-    <LinearLayout
-        style="@style/LoginFormContainer"
-        android:orientation="vertical" >
-
-        <EditText
-            android:id="@+id/user"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/prompt_email"
-            android:maxLines="1"
-            android:singleLine="true" />
-
-        <EditText
-            android:id="@+id/password"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/prompt_password"
-            android:imeActionId="@+id/login"
-            android:imeActionLabel="@string/action_sign_in_short"
-            android:imeOptions="actionUnspecified"
-            android:inputType="textPassword"
-            android:maxLines="1"
-            android:singleLine="true" />
-
-        <CheckBox
-            android:id="@+id/chk_savepass"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="right"
-            android:text="Remember Password" />
-
-        <Button
-            android:id="@+id/sign_in_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="right"
-            android:layout_marginTop="16dp"
-            android:paddingLeft="32dp"
-            android:paddingRight="32dp"
-            android:text="Sign in" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/login_status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center_horizontal"
-        android:orientation="vertical"
-        android:visibility="invisible" >
-
-        <ProgressBar
-            style="?android:attr/progressBarStyleLarge"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp" />
-
-        <TextView
-            android:id="@+id/login_status_message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:fontFamily="sans-serif-light"
-            android:text="@string/login_progress_signing_in"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-    </LinearLayout>
-
-</RelativeLayout>
--->
-
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
@@ -105,7 +27,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
-            android:fontFamily="sans-serif-light"
             android:text="@string/login_progress_signing_in"
             android:textAppearance="?android:attr/textAppearanceMedium" />
     </LinearLayout>