added EG icon
authordrizea <danielrizea27@gmail.com>
Thu, 26 Jul 2012 09:24:22 +0000 (12:24 +0300)
committerdrizea <danielrizea27@gmail.com>
Thu, 26 Jul 2012 09:24:22 +0000 (12:24 +0300)
21 files changed:
Open-ILS/src/Android/AndroidManifest.xml
Open-ILS/src/Android/res/drawable-hdpi/evergreen_launcher_icon.png [new file with mode: 0644]
Open-ILS/src/Android/res/drawable-ldpi/evergreen_launcher_icon.png [new file with mode: 0644]
Open-ILS/src/Android/res/drawable-mdpi/evergreen_launcher_icon.png [new file with mode: 0644]
Open-ILS/src/Android/res/drawable-xhdpi/evergreen_launcher_icon.png [new file with mode: 0644]
Open-ILS/src/Android/res/drawable/evergreen_launcher_icon_48.png [new file with mode: 0644]
Open-ILS/src/Android/res/drawable/logo_button.xml [new file with mode: 0644]
Open-ILS/src/Android/res/drawable/one_header_rounded_corner.xml
Open-ILS/src/Android/res/layout/search_result_list.xml
Open-ILS/src/Android/res/layout/simple_actionbar.xml
Open-ILS/src/Android/res/values/colors.xml
Open-ILS/src/Android/res/values/styles.xml
Open-ILS/src/Android/src/org/evergreen/android/accountAccess/bookbags/BookBagDetails.java
Open-ILS/src/Android/src/org/evergreen/android/accountAccess/bookbags/BookbagsListView.java
Open-ILS/src/Android/src/org/evergreen/android/accountAccess/checkout/ItemsCheckOutListView.java
Open-ILS/src/Android/src/org/evergreen/android/accountAccess/fines/FinesActivity.java
Open-ILS/src/Android/src/org/evergreen/android/accountAccess/holds/HoldDetails.java
Open-ILS/src/Android/src/org/evergreen/android/accountAccess/holds/HoldsListView.java
Open-ILS/src/Android/src/org/evergreen/android/accountAccess/holds/PlaceHold.java
Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SampleUnderlinesNoFade.java
Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java

index 0e15105..b55c33f 100644 (file)
@@ -8,7 +8,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
        <uses-permission android:name="android.permission.INTERNET" /> 
     <application
-        android:icon="@drawable/ic_launcher"
+        android:icon="@drawable/evergreen_launcher_icon"
         android:label="@string/app_name" 
         android:theme="@style/EvergreenTheme"
         >
diff --git a/Open-ILS/src/Android/res/drawable-hdpi/evergreen_launcher_icon.png b/Open-ILS/src/Android/res/drawable-hdpi/evergreen_launcher_icon.png
new file mode 100644 (file)
index 0000000..1f2baa4
Binary files /dev/null and b/Open-ILS/src/Android/res/drawable-hdpi/evergreen_launcher_icon.png differ
diff --git a/Open-ILS/src/Android/res/drawable-ldpi/evergreen_launcher_icon.png b/Open-ILS/src/Android/res/drawable-ldpi/evergreen_launcher_icon.png
new file mode 100644 (file)
index 0000000..a8da28a
Binary files /dev/null and b/Open-ILS/src/Android/res/drawable-ldpi/evergreen_launcher_icon.png differ
diff --git a/Open-ILS/src/Android/res/drawable-mdpi/evergreen_launcher_icon.png b/Open-ILS/src/Android/res/drawable-mdpi/evergreen_launcher_icon.png
new file mode 100644 (file)
index 0000000..63adfad
Binary files /dev/null and b/Open-ILS/src/Android/res/drawable-mdpi/evergreen_launcher_icon.png differ
diff --git a/Open-ILS/src/Android/res/drawable-xhdpi/evergreen_launcher_icon.png b/Open-ILS/src/Android/res/drawable-xhdpi/evergreen_launcher_icon.png
new file mode 100644 (file)
index 0000000..2c2adb1
Binary files /dev/null and b/Open-ILS/src/Android/res/drawable-xhdpi/evergreen_launcher_icon.png differ
diff --git a/Open-ILS/src/Android/res/drawable/evergreen_launcher_icon_48.png b/Open-ILS/src/Android/res/drawable/evergreen_launcher_icon_48.png
new file mode 100644 (file)
index 0000000..63adfad
Binary files /dev/null and b/Open-ILS/src/Android/res/drawable/evergreen_launcher_icon_48.png differ
diff --git a/Open-ILS/src/Android/res/drawable/logo_button.xml b/Open-ILS/src/Android/res/drawable/logo_button.xml
new file mode 100644 (file)
index 0000000..2b13452
--- /dev/null
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <gradient android:startColor="@color/pres1"
+                android:endColor="@color/pres2" android:angle="270" />
+            <corners android:radius="5dp" />
+             <padding android:left="4dp" android:top="4dp" android:right="4dp" android:bottom="4dp" />
+        </shape>
+    </item>
+    <item android:state_focused="true">
+        <shape>
+            <gradient android:endColor="@color/focu1"
+                android:startColor="@color/focu2" android:angle="270" />
+            <corners android:radius="5dp" />
+             <padding android:left="4dp" android:top="4dp" android:right="4dp" android:bottom="4dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+
+            <gradient android:endColor="@android:color/transparent"
+                android:startColor="@android:color/transparent" android:angle="270" />
+            <corners android:radius="5dp" />
+            <padding android:left="4dp" android:top="4dp" android:right="4dp" android:bottom="4dp" />
+        </shape>
+    </item>
+
+</selector>
index f081f7b..f4da0d5 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?> 
 <shape xmlns:android="http://schemas.android.com/apk/res/android" 
      android:shape="rectangle"> 
-     <gradient android:startColor="@color/header_gradient_start" android:endColor="@color/header_gradient_stop" 
+     <gradient android:startColor="@color/header_gradient_stop" android:endColor="@color/header_gradient_stop" 
             android:angle="270"/> 
 
     <corners android:bottomLeftRadius="8dp"/> 
index 7f283f0..79dfb7d 100644 (file)
         android:paddingTop="3dip"
         >
         
-        <Button 
+        <ImageButton 
             android:id="@+id/library_logo"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/library_text_logo"
             style="@style/LibraryLogoText"
             android:layout_alignParentLeft="true"
-            android:padding="10dip"
+            android:src="@drawable/evergreen_launcher_icon_48"
+            android:layout_marginLeft="5dip"
             />
 
         <Button
@@ -29,6 +29,7 @@
             android:text="@string/my_account_button_text"
             android:layout_alignParentRight="true"
             android:padding="10dip"
+            android:layout_marginTop="5dip"
             />
 
 
index 18aa0fb..f8c8a2f 100644 (file)
         android:paddingBottom="3dip"
         >
         
-        <Button 
+                <ImageButton 
             android:id="@+id/library_logo"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/library_text_logo"
             style="@style/LibraryLogoText"
             android:layout_alignParentLeft="true"
-            android:padding="10dip"
+            android:src="@drawable/evergreen_launcher_icon_48"
+            android:layout_marginLeft="5dip"
             />
-        
+
         <Button
             android:id="@+id/my_acount_button"
             android:layout_width="wrap_content"
@@ -33,6 +33,7 @@
             android:text="@string/my_account_button_text"
             android:layout_alignParentRight="true"
             android:padding="10dip"
+            android:layout_marginTop="5dip"
             />
     </RelativeLayout>
     
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:layout_below="@id/header"
-            android:paddingLeft="5dip"
-            android:paddingTop="2dip"
-            android:paddingBottom="2dip"
-            android:textStyle="bold"
-            android:gravity="center"
             android:layout_alignParentLeft="true"
-            android:background="@drawable/header_rounded_corners"
+            style="@style/HeaderTitle"
             />
         
 </RelativeLayout>
\ No newline at end of file
index f10abcc..b3818a3 100644 (file)
     <color name="norm2">#00ccde</color>
     
        <!-- Header portion -->
-    <color name="header_gradient_start">#a10000</color>
-    <color name="header_gradient_stop">#aA0000</color>
+    <color name="header_gradient_start">#E0F6E0</color>
+    <color name="header_gradient_stop">#6F9669</color>
     <color name="library_logo_text_coor">#000</color>
     
+    <color name="header_title">#ffffff</color>
     
     <!-- Search Details -->
     <color name="dark">#000</color>
index 232af06..d52bc2c 100644 (file)
    </style>
    
    
+   <style name="HeaderTitle">
+       <item name="android:background">@drawable/header_rounded_corners</item>
+       <item name="android:textSize">16dip</item>
+       <item name="android:textStyle">bold</item>
+       <item name="android:gravity">center</item>
+       <item name="android:paddingTop">2dip</item>
+       <item name="android:paddingLeft">5dip</item>
+       <item name="android:paddingBottom">2dip</item>
+       <item name="android:textColor">@color/header_title</item>
+   </style>
+   
    <style name="Content">
        <item name="android:layout_marginTop">5dip</item>
    </style>
        <!-- Header portion start -->
        
        <style name="LibraryLogoText">
-        <item name="android:textColor">@color/library_logo_text_coor</item>
-        <item name="android:textSize">@dimen/library_logo_text_size</item>
-        <item name="android:textStyle">bold</item>
+               <item name="android:background">@drawable/logo_button</item>
     </style>
        
        <!-- Header portion end -->
index 41d617d..9047a0f 100644 (file)
@@ -8,7 +8,6 @@ import org.evergreen.android.accountAccess.AccountAccess;
 import org.evergreen.android.accountAccess.SessionNotFoundException;
 import org.evergreen.android.globals.NoAccessToServer;
 import org.evergreen.android.globals.NoNetworkAccessException;
-import org.evergreen.android.globals.Utils;
 import org.evergreen.android.searchCatalog.RecordInfo;
 import org.evergreen.android.searchCatalog.SearchCatalog;
 import org.evergreen.android.searchCatalog.SearchCatalogListView;
@@ -16,9 +15,9 @@ import org.evergreen.android.views.AccountScreenDashboard;
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.AlertDialog.Builder;
 import android.app.ProgressDialog;
 import android.app.Service;
-import android.app.AlertDialog.Builder;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -33,6 +32,7 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -63,7 +63,7 @@ private String TAG = "BookBags";
        
        private Button delete_bookbag_button;
        
-       private Button homeButton;
+       private ImageButton homeButton;
        
        private Button myAccountButton;
        
@@ -77,7 +77,7 @@ private String TAG = "BookBags";
                
                setContentView(R.layout.bookbagitem_list);
                 //header portion actions
-        homeButton = (Button) findViewById(R.id.library_logo);
+        homeButton = (ImageButton) findViewById(R.id.library_logo);
         myAccountButton = (Button) findViewById(R.id.my_acount_button);
         headerTitle = (TextView) findViewById(R.id.header_title);
         headerTitle.setText(R.string.bookbag_details_title);
index 7cc1226..7466dd5 100644 (file)
@@ -28,6 +28,7 @@ import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
+import android.widget.ImageButton;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -54,7 +55,7 @@ public class BookbagsListView extends Activity{
        
        private Runnable getBookbagsRunnable;
        
-       private Button homeButton;
+       private ImageButton homeButton;
        
        private Button myAccountButton;
        
@@ -68,7 +69,7 @@ public class BookbagsListView extends Activity{
                setContentView(R.layout.bookbag_list);
                
                 //header portion actions
-        homeButton = (Button) findViewById(R.id.library_logo);
+        homeButton = (ImageButton) findViewById(R.id.library_logo);
         myAccountButton = (Button) findViewById(R.id.my_acount_button);
         headerTitle = (TextView) findViewById(R.id.header_title);
         headerTitle.setText(R.string.bookbag_items_title);
index 54cb29e..d42b72d 100644 (file)
@@ -28,6 +28,7 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -48,7 +49,7 @@ public class ItemsCheckOutListView extends Activity{
        
        private ProgressDialog progressDialog;
        
-       private Button homeButton;
+       private ImageButton homeButton;
        
        private Button myAccountButton;
        
@@ -63,7 +64,7 @@ public class ItemsCheckOutListView extends Activity{
                setTitle("Checkout items");
                
                 //header portion actions
-        homeButton = (Button) findViewById(R.id.library_logo);
+        homeButton = (ImageButton) findViewById(R.id.library_logo);
         myAccountButton = (Button) findViewById(R.id.my_acount_button);
         headerTitle = (TextView) findViewById(R.id.header_title);
         headerTitle.setText(R.string.checkout_items_title);
index 1e46121..add7fd9 100644 (file)
@@ -21,10 +21,11 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.View.OnClickListener;
+import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.ListView;
 import android.widget.TextView;
 
@@ -47,7 +48,7 @@ public class FinesActivity extends Activity{
        
        private OverdueMaterialsArrayAdapter  listAdapter;
        
-       private Button homeButton;
+       private ImageButton homeButton;
        
        private Button myAccountButton;
        
@@ -61,7 +62,7 @@ public class FinesActivity extends Activity{
                setContentView(R.layout.fines);
                
                 //header portion actions
-        homeButton = (Button) findViewById(R.id.library_logo);
+        homeButton = (ImageButton) findViewById(R.id.library_logo);
         myAccountButton = (Button) findViewById(R.id.my_acount_button);
         headerTitle = (TextView) findViewById(R.id.header_title);
         headerTitle.setText(R.string.fines_title);
index 52526af..c8cfce9 100644 (file)
@@ -36,6 +36,7 @@ import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.DatePicker;
 import android.widget.EditText;
+import android.widget.ImageButton;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -98,7 +99,7 @@ public class HoldDetails extends Activity {
 
        private GlobalConfigs globalConfigs;
 
-       private Button homeButton;
+       private ImageButton homeButton;
        
        private Button myAccountButton;
        
@@ -112,7 +113,7 @@ public class HoldDetails extends Activity {
                globalConfigs = GlobalConfigs.getGlobalConfigs(this);
 
                
-               homeButton = (Button) findViewById(R.id.library_logo);
+               homeButton = (ImageButton) findViewById(R.id.library_logo);
                myAccountButton = (Button) findViewById(R.id.my_acount_button);
                headerTitle = (TextView) findViewById(R.id.header_title);
                headerTitle.setText(R.string.hold_details_title);
index 36b6221..c8c5742 100644 (file)
@@ -26,6 +26,7 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -46,7 +47,7 @@ public class HoldsListView extends Activity{
        
        Runnable getHoldsRunnable= null;
        
-       private Button homeButton;
+       private ImageButton homeButton;
        
        private Button myAccountButton;
        
@@ -60,7 +61,7 @@ public class HoldsListView extends Activity{
                setContentView(R.layout.holds_list);
                
                 //header portion actions
-        homeButton = (Button) findViewById(R.id.library_logo);
+        homeButton = (ImageButton) findViewById(R.id.library_logo);
         myAccountButton = (Button) findViewById(R.id.my_acount_button);
         headerTitle = (TextView) findViewById(R.id.header_title);
         headerTitle.setText(R.string.hold_items_title);
index d5c762b..680190f 100644 (file)
@@ -12,11 +12,14 @@ import org.evergreen.android.globals.NoAccessToServer;
 import org.evergreen.android.globals.NoNetworkAccessException;
 import org.evergreen.android.globals.Utils;
 import org.evergreen.android.searchCatalog.RecordInfo;
+import org.evergreen.android.searchCatalog.SearchCatalogListView;
+import org.evergreen.android.views.AccountScreenDashboard;
 
 import android.app.Activity;
 import android.app.DatePickerDialog;
 import android.app.ProgressDialog;
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.text.format.DateFormat;
@@ -31,6 +34,7 @@ import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.DatePicker;
 import android.widget.EditText;
+import android.widget.ImageButton;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -82,8 +86,15 @@ public class PlaceHold extends Activity{
        
        private int selectedOrgPos = 0;
        
+       private ImageButton homeButton;
+       
+       private Button myAccountButton;
+       
+       private TextView headerTitle;
+       
        private ProgressDialog progressDialog;
        
+       
        private Context context;
        @Override
        protected void onCreate(Bundle savedInstanceState) {
@@ -93,6 +104,27 @@ public class PlaceHold extends Activity{
                globalConfigs = GlobalConfigs.getGlobalConfigs(this);
                RecordInfo record = (RecordInfo) getIntent().getSerializableExtra("recordInfo");
                
+               homeButton = (ImageButton) findViewById(R.id.library_logo);
+               myAccountButton = (Button) findViewById(R.id.my_acount_button);
+               headerTitle = (TextView) findViewById(R.id.header_title);
+               headerTitle.setText(R.string.hold_place_title);
+               
+               myAccountButton.setOnClickListener(new OnClickListener() {
+                       @Override
+                       public void onClick(View v) {
+                               Intent intent = new Intent(getApplicationContext(),AccountScreenDashboard.class);
+                               startActivity(intent);
+                       }
+               });
+               
+               homeButton.setOnClickListener(new OnClickListener() {
+                       @Override
+                       public void onClick(View v) {
+                               Intent intent = new Intent(getApplicationContext(),SearchCatalogListView.class);
+                               startActivity(intent);
+                       }
+               });
+               
                context = this;
                
                accountAccess = AccountAccess.getAccountAccess();
index 13b1ac4..822d4f9 100644 (file)
@@ -17,6 +17,7 @@ import android.support.v4.view.ViewPager;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.TextView;
 
 public class SampleUnderlinesNoFade extends BaseSampleActivity {
@@ -25,7 +26,7 @@ public class SampleUnderlinesNoFade extends BaseSampleActivity {
        
        private Button myAccountButton;
        
-       private Button homeButton;
+       private ImageButton homeButton;
        
        private TextView headerTitle;
        
@@ -37,7 +38,7 @@ public class SampleUnderlinesNoFade extends BaseSampleActivity {
         records = (List<RecordInfo>)getIntent().getSerializableExtra("recordList");
         
         //header portion actions
-        homeButton = (Button) findViewById(R.id.library_logo);
+        homeButton = (ImageButton) findViewById(R.id.library_logo);
         myAccountButton = (Button) findViewById(R.id.my_acount_button);
         headerTitle = (TextView) findViewById(R.id.header_title);
         headerTitle.setText(R.string.search_details_title);
index d7cc5b9..11add84 100644 (file)
@@ -101,7 +101,7 @@ public class SearchCatalogListView extends Activity{
        
        private Button preferenceButton = null;
        
-       private Button homeButton = null;
+       private ImageButton homeButton = null;
        
        private Button myAccountButton = null;
        
@@ -123,7 +123,7 @@ public class SearchCatalogListView extends Activity{
                        }
                });
 
-        homeButton = (Button) findViewById(R.id.library_logo);
+        homeButton = (ImageButton) findViewById(R.id.library_logo);
         
         homeButton.setOnClickListener(new OnClickListener() {
                        @Override