From 3495d630626b30a99628de788e062d59be411189 Mon Sep 17 00:00:00 2001
From: Helena Rodriguez <hrgijon@gmail.com>
Date: Fri, 14 Dec 2012 00:42:55 +0100
Subject: [PATCH] Changed navigation bar in Download Module, now path text,
 home and parent button are together

---
 SWADroid/res/layout/navigation.xml     | 15 +------------
 SWADroid/res/layout/navigation_bar.xml | 31 +++++++++++++-------------
 2 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/SWADroid/res/layout/navigation.xml b/SWADroid/res/layout/navigation.xml
index 500272eb..9f16b4eb 100644
--- a/SWADroid/res/layout/navigation.xml
+++ b/SWADroid/res/layout/navigation.xml
@@ -8,20 +8,7 @@
 
     <include layout="@layout/action_bar" />
     <include layout="@layout/course_or_group_name"/>
-	
-    <TextView
-		android:id="@+id/path"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:padding="8dp"
-		android:background="@color/title_background"
-		android:textColor="@android:color/white"
-		android:textSize="18sp"
-		android:textStyle="bold" 
-		android:ellipsize="start"
-		android:singleLine="true">
-	</TextView>
-    
+ 
 	<include layout="@layout/navigation_bar" />
 	
 	<GridView xmlns:android="http://schemas.android.com/apk/res/android" 
diff --git a/SWADroid/res/layout/navigation_bar.xml b/SWADroid/res/layout/navigation_bar.xml
index 52e2247e..4641a984 100644
--- a/SWADroid/res/layout/navigation_bar.xml
+++ b/SWADroid/res/layout/navigation_bar.xml
@@ -3,7 +3,7 @@
     android:id="@+id/actionBarLayout"
     android:layout_width="match_parent"
     android:layout_height="40dip"
-    android:background="@color/title_background"
+    android:background="@android:color/white"
     android:orientation="horizontal" >
 
     <!-- Home -->    
@@ -31,23 +31,22 @@
         android:contentDescription="@string/parent_icon"
         android:background="@drawable/navigation_button"
         android:onClick="onRefreshClick"
-        android:paddingLeft="20dip"
+        android:paddingLeft="5dip"
         android:paddingRight="5dip"
         android:scaleType="centerCrop"
         android:src="@drawable/parent" />
     
-	<!-- Refresh -->
-    <ImageButton
-        android:id="@+id/refresh_button"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_alignParentTop="true"
-        android:background="@drawable/navigation_button"
-        android:contentDescription="@string/refresh_icon"
-        android:onClick="onRefreshClick"
-        android:layout_alignParentRight="true"
-        android:paddingLeft="5dip"
-        android:paddingRight="5dip"
-        android:scaleType="centerCrop"
-        android:src="@drawable/refresh" />
+    <TextView
+		android:id="@+id/path"
+		android:layout_toRightOf="@id/parent_button"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:padding="8dp"
+		android:textColor="@android:color/black"
+		android:textSize="18sp"
+		android:textStyle="bold" 
+		android:ellipsize="start"
+		android:singleLine="true">
+	</TextView>
+
 </RelativeLayout>