From: drizea <danielrizea27@gmail.com>
Date: Mon, 6 Aug 2012 16:20:07 +0000 (+0300)
Subject: UI changes (dashboard image button + my account background image)
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=1cd3c0dcbf8fda5ef086788a9e00122ea9fc5f2c;p=working%2FEvergreen.git

UI changes (dashboard image button + my account background image)
---

diff --git a/Open-ILS/src/Android/res/drawable/background_grey_image.xml b/Open-ILS/src/Android/res/drawable/background_grey_image.xml
new file mode 100644
index 0000000000..a44cd5951a
--- /dev/null
+++ b/Open-ILS/src/Android/res/drawable/background_grey_image.xml
@@ -0,0 +1,3 @@
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/evergreen_1_256x256x32_grey"
+    android:gravity="center"/>
diff --git a/Open-ILS/src/Android/res/drawable/bottom_rounded_menu_background.xml b/Open-ILS/src/Android/res/drawable/bottom_rounded_menu_background.xml
new file mode 100644
index 0000000000..edb6b9109e
--- /dev/null
+++ b/Open-ILS/src/Android/res/drawable/bottom_rounded_menu_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<shape xmlns:android="http://schemas.android.com/apk/res/android" 
+     android:shape="rectangle"> 
+     <gradient 
+         
+         android:startColor="@color/menu_bottom_start" android:endColor="@color/menu_bottom_stop" 
+
+            android:angle="270"/> 
+
+    <corners android:topLeftRadius="8dp" android:topRightRadius="8dp" /> 
+</shape> 
\ No newline at end of file
diff --git a/Open-ILS/src/Android/res/drawable/evergreen_1_256x256x32_grey.png b/Open-ILS/src/Android/res/drawable/evergreen_1_256x256x32_grey.png
new file mode 100644
index 0000000000..fe7aace97d
Binary files /dev/null and b/Open-ILS/src/Android/res/drawable/evergreen_1_256x256x32_grey.png differ
diff --git a/Open-ILS/src/Android/res/drawable/header_rounded_corners.xml b/Open-ILS/src/Android/res/drawable/header_rounded_corners.xml
index 171d96735e..a6c339c8a9 100644
--- a/Open-ILS/src/Android/res/drawable/header_rounded_corners.xml
+++ b/Open-ILS/src/Android/res/drawable/header_rounded_corners.xml
@@ -3,7 +3,7 @@
      android:shape="rectangle"> 
      <gradient 
          
-         android:startColor="@color/header_gradient_start" android:endColor="@color/header_gradient_stop" 
+         android:startColor="@color/header_gradient_stop" android:endColor="@color/header_gradient_stop" 
 
             android:angle="270"/> 
 
diff --git a/Open-ILS/src/Android/res/drawable/menu_buttons_background.xml b/Open-ILS/src/Android/res/drawable/menu_buttons_background.xml
new file mode 100644
index 0000000000..4c1b068b05
--- /dev/null
+++ b/Open-ILS/src/Android/res/drawable/menu_buttons_background.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<shape xmlns:android="http://schemas.android.com/apk/res/android" 
+     android:shape="rectangle"> 
+     <gradient android:startColor="@color/menu_background_start" android:endColor="@color/menu_background_stop" 
+            android:angle="180"/> 
+
+    <corners android:radius="8dp"/> 
+</shape> 
\ No newline at end of file
diff --git a/Open-ILS/src/Android/res/layout/advanced_search.xml b/Open-ILS/src/Android/res/layout/advanced_search.xml
index 75a8dcbf54..36807b4068 100644
--- a/Open-ILS/src/Android/res/layout/advanced_search.xml
+++ b/Open-ILS/src/Android/res/layout/advanced_search.xml
@@ -1,104 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-    
-    
-   	<include android:id="@+id/header_actionbar" layout="@layout/simple_actionbar"/>
-    
+    android:layout_height="fill_parent">
 
-        <Spinner 
+    <include
+        android:id="@+id/header_actionbar"
+        layout="@layout/simple_actionbar" />
+
+    <Spinner
         android:id="@+id/advanced_spinner_index"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/header_actionbar"
-        android:entries="@array/advanced_search_index"
         android:layout_marginTop="10dip"
-        />
-            
-        <Spinner 
+        android:entries="@array/advanced_search_index" />
+
+    <Spinner
         android:id="@+id/advanced_spinner_option"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/header_actionbar"
         android:layout_marginTop="10dip"
-        android:entries="@array/advanced_search_options"
-        android:layout_toRightOf="@id/advanced_spinner_index" 
-        />
-        
-        <LinearLayout 
-            android:id="@+id/advanced_search_filter_container"
-            android:layout_below="@id/advanced_spinner_index"
-            android:layout_width="fill_parent"
+        android:layout_toRightOf="@id/advanced_spinner_index"
+        android:entries="@array/advanced_search_options" />
+
+    <LinearLayout
+        android:id="@+id/advanced_search_filter_container"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/advanced_spinner_index"
+        android:orientation="horizontal" >
+
+        <EditText
+            android:id="@+id/advanced_search_text"
+            android:layout_width="0dip"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            >
-            
-        	<EditText 
-        	android:id="@+id/advanced_search_text"
-        	android:layout_width="0dip"
-        	android:layout_height="wrap_content"
-        	android:layout_weight="1"
-        	android:hint="@string/advanced_search_hint"
-        	android:singleLine="true"
-        	/>
+            android:layout_weight="1"
+            android:hint="@string/advanced_search_hint"
+            android:singleLine="true" />
 
-        
-        	<Button 
+        <Button
             android:id="@+id/advanced_search_add_filter_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/advanced_search_add_filter_button"
-            />  
-            
-            
-        </LinearLayout>
-        
-        <ScrollView
-            android:id="@+id/advanced_search_scrollview"
+            android:text="@string/advanced_search_add_filter_button" />
+    </LinearLayout>
+
+    <ScrollView
+        android:id="@+id/advanced_search_scrollview"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/advanced_search_filter_container"
+        android:background="@drawable/rounded_contentbox" >
+
+        <LinearLayout
+            android:id="@+id/advanced_search_filters"
             android:layout_width="fill_parent"
-            android:layout_height="100dip"
-            android:layout_below="@id/advanced_search_filter_container"
-            android:background="@drawable/rounded_contentbox"
-            >
-            
-            <LinearLayout 
-                android:id="@+id/advanced_search_filters"
-                android:orientation="vertical"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                >
-				
-				<TextView 
-			    android:layout_height="wrap_content"
-			    android:layout_width="wrap_content"
-			    android:text="@string/advanced_search_filter_text"
-			    />
-			 
-            </LinearLayout>
-        </ScrollView>
-        
+            android:layout_height="fill_parent"
+            android:orientation="vertical" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/advanced_search_filter_text" />
+        </LinearLayout>
+    </ScrollView>
 
-        <Button 
+
+    <LinearLayout
+        android:layout_width="200dip"
+        android:layout_height="60dip"
+        android:layout_centerHorizontal="true"
+        android:background="@drawable/bottom_rounded_menu_background"
+        android:layout_alignParentBottom="true"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:padding="10dip"
+         >
+
+        <Button
             android:id="@+id/advanced_search_cancel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/advanced_search_scrollview"
-            android:text="@string/cancel"
-            />
-        
-        
+            android:text="@string/cancel" />
+
         <Button
             android:id="@+id/advanced_search_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/advanced_search_scrollview"
-            android:layout_toRightOf="@id/advanced_search_cancel"
-            android:text="@string/advanced_search"
-            
-            />
-   	
+            android:text="@string/advanced_search" />
+    </LinearLayout>
 
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/res/layout/dashbord_account.xml b/Open-ILS/src/Android/res/layout/dashbord_account.xml
index fa399f2834..05a1940756 100644
--- a/Open-ILS/src/Android/res/layout/dashbord_account.xml
+++ b/Open-ILS/src/Android/res/layout/dashbord_account.xml
@@ -5,6 +5,7 @@
     android:orientation="vertical"
     android:padding="6dip"
     android:layout_weight="1"
+    android:background="@drawable/background_grey_image"
      >
        <LinearLayout
         android:orientation="horizontal"
diff --git a/Open-ILS/src/Android/res/layout/search_result_list.xml b/Open-ILS/src/Android/res/layout/search_result_list.xml
index b170788934..97ebec7cc1 100644
--- a/Open-ILS/src/Android/res/layout/search_result_list.xml
+++ b/Open-ILS/src/Android/res/layout/search_result_list.xml
@@ -92,13 +92,14 @@
 
     <LinearLayout
         android:id="@+id/search_preference_options"
-        android:layout_width="fill_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/search_text_container"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="5dip"
         android:gravity="center"
         android:orientation="vertical"
+        
          >
 
         <LinearLayout
diff --git a/Open-ILS/src/Android/res/values/colors.xml b/Open-ILS/src/Android/res/values/colors.xml
index ef9737beca..aebc5cf758 100644
--- a/Open-ILS/src/Android/res/values/colors.xml
+++ b/Open-ILS/src/Android/res/values/colors.xml
@@ -68,6 +68,12 @@
     
     <color name="background">#333</color>
     
+    <color name="menu_background_start">#585858</color>
+    <color name="menu_background_stop">#c8c8c8</color>
+    
+    <color name="menu_bottom_start">#636363</color>
+    <color name="menu_bottom_stop">#636363</color>
+    
     <!-- Search Details -->
     <color name="dark">#000</color>
 </resources>
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/AdvancedSearchActivity.java b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/AdvancedSearchActivity.java
index 70fe36ba08..6ebc585514 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/AdvancedSearchActivity.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/AdvancedSearchActivity.java
@@ -28,7 +28,7 @@ public class AdvancedSearchActivity extends Activity{
 	
 	private Context context;
 
-	private ImageButton homeButton;
+	private Button homeButton;
 	
 	private Button myAccountButton;
 	
@@ -46,7 +46,7 @@ public class AdvancedSearchActivity extends Activity{
 		
 		
 		 //header portion actions
-        homeButton = (ImageButton) findViewById(R.id.library_logo);
+        homeButton = (Button) findViewById(R.id.library_logo);
         myAccountButton = (Button) findViewById(R.id.my_account_button);
         headerTitle = (TextView) findViewById(R.id.header_title);
         headerTitle.setText(R.string.advanced_search);
@@ -130,7 +130,7 @@ public class AdvancedSearchActivity extends Activity{
         cancel.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				
+				finish();
 			}
 		});