From: drizea <danielrizea27@gmail.com>
Date: Tue, 12 Jun 2012 18:30:48 +0000 (+0300)
Subject: dashboard split in 2 : main dasjboard and my account dashboard
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e81d0759d7c237164dc882904cd1ae762459d826;p=working%2FEvergreen.git

dashboard split in 2 : main dasjboard and my account dashboard
---

diff --git a/Open-ILS/src/Android/AndroidManifest.xml b/Open-ILS/src/Android/AndroidManifest.xml
index e0e7e2147c..e28eec553b 100644
--- a/Open-ILS/src/Android/AndroidManifest.xml
+++ b/Open-ILS/src/Android/AndroidManifest.xml
@@ -23,6 +23,9 @@
             </intent-filter>
         </activity>
         
+        <activity android:name=".views.AccountScreenDashboard"
+            		android:theme="@android:style/Theme.Light.NoTitleBar"
+            ></activity>
         <activity
             android:name=".searchCatalog.SearchCatalogListView"
             android:label="@string/app_name" >
diff --git a/Open-ILS/src/Android/bin/EvergreenApp.apk b/Open-ILS/src/Android/bin/EvergreenApp.apk
index 51172c804e..ae787c0402 100644
Binary files a/Open-ILS/src/Android/bin/EvergreenApp.apk and b/Open-ILS/src/Android/bin/EvergreenApp.apk differ
diff --git a/Open-ILS/src/Android/bin/classes.dex b/Open-ILS/src/Android/bin/classes.dex
index 18354fffe8..bfe04b971c 100644
Binary files a/Open-ILS/src/Android/bin/classes.dex and b/Open-ILS/src/Android/bin/classes.dex differ
diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$drawable.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$drawable.class
index e19bc0d9b3..e8b77ce7a9 100644
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$drawable.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$drawable.class differ
diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$id.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$id.class
index 040779d69f..8f66c3c00f 100644
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$id.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$id.class differ
diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$layout.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$layout.class
index bd324e9517..893b9cd9d6 100644
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$layout.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$layout.class differ
diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$string.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$string.class
index c88bcae007..a1a3bcb9cf 100644
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$string.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$string.class differ
diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$style.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$style.class
index 286087356d..f09654d124 100644
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$style.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/R$style.class differ
diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Info.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Info.class
index 804753b311..dcc34841c1 100644
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Info.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Info.class differ
diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Simple.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Simple.class
index 26025e2183..b7b579bbda 100644
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Simple.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Simple.class differ
diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$SearchArrayAdapter.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$SearchArrayAdapter.class
index 06fb3f47f0..695ab3ee02 100644
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$SearchArrayAdapter.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$SearchArrayAdapter.class differ
diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView.class
index 90e5cb058c..02cd8f93fb 100644
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView.class differ
diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/views/AccountScreenDashboard.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/views/AccountScreenDashboard.class
new file mode 100644
index 0000000000..f2b2ad7838
Binary files /dev/null and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/views/AccountScreenDashboard.class differ
diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/views/MainScreenDashboard.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/views/MainScreenDashboard.class
index 8f32ef1052..dbb1c30409 100644
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/views/MainScreenDashboard.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/views/MainScreenDashboard.class differ
diff --git a/Open-ILS/src/Android/bin/res/drawable-hdpi/settings.png b/Open-ILS/src/Android/bin/res/drawable-hdpi/settings.png
new file mode 100644
index 0000000000..26028dc55f
Binary files /dev/null and b/Open-ILS/src/Android/bin/res/drawable-hdpi/settings.png differ
diff --git a/Open-ILS/src/Android/bin/resources.ap_ b/Open-ILS/src/Android/bin/resources.ap_
index 9568ba7c4f..7ae709bdbd 100644
Binary files a/Open-ILS/src/Android/bin/resources.ap_ and b/Open-ILS/src/Android/bin/resources.ap_ differ
diff --git a/Open-ILS/src/Android/gen/org/evergreen/android/R.java b/Open-ILS/src/Android/gen/org/evergreen/android/R.java
index f94be63ce2..002d0d46d6 100644
--- a/Open-ILS/src/Android/gen/org/evergreen/android/R.java
+++ b/Open-ILS/src/Android/gen/org/evergreen/android/R.java
@@ -43,50 +43,54 @@ public final class R {
         public static final int fines=0x7f020006;
         public static final int holds=0x7f020007;
         public static final int ic_launcher=0x7f020008;
+        public static final int settings=0x7f020009;
     }
     public static final class id {
-        public static final int chose_organisation=0x7f080017;
-        public static final int home_btn_feature1=0x7f080000;
-        public static final int home_btn_feature2=0x7f080001;
-        public static final int home_btn_feature3=0x7f080002;
-        public static final int home_btn_feature4=0x7f080003;
-        public static final int home_btn_feature5=0x7f080004;
-        public static final int home_btn_feature6=0x7f080005;
-        public static final int record_details_info_author=0x7f080007;
-        public static final int record_details_info_publisher=0x7f080008;
-        public static final int record_details_info_title=0x7f080006;
-        public static final int record_details_simple_author=0x7f08000a;
-        public static final int record_details_simple_isbn=0x7f08000f;
-        public static final int record_details_simple_publisher=0x7f08000b;
-        public static final int record_details_simple_series=0x7f08000d;
-        public static final int record_details_simple_subject=0x7f08000c;
-        public static final int record_details_simple_synopsis=0x7f08000e;
-        public static final int record_details_simple_title=0x7f080009;
-        public static final int searchButton=0x7f080015;
-        public static final int searchText=0x7f080014;
-        public static final int search_record_author=0x7f080012;
-        public static final int search_record_img=0x7f080010;
-        public static final int search_record_publishing=0x7f080013;
-        public static final int search_record_title=0x7f080011;
-        public static final int search_results_list=0x7f080016;
+        public static final int account_btn_book_bags=0x7f080003;
+        public static final int account_btn_check_out=0x7f080000;
+        public static final int account_btn_fines=0x7f080002;
+        public static final int account_btn_holds=0x7f080001;
+        public static final int chose_organisation=0x7f080018;
+        public static final int main_btn_account=0x7f080005;
+        public static final int main_btn_app_settings=0x7f080006;
+        public static final int main_btn_search=0x7f080004;
+        public static final int record_details_info_author=0x7f080008;
+        public static final int record_details_info_publisher=0x7f080009;
+        public static final int record_details_info_title=0x7f080007;
+        public static final int record_details_simple_author=0x7f08000b;
+        public static final int record_details_simple_isbn=0x7f080010;
+        public static final int record_details_simple_publisher=0x7f08000c;
+        public static final int record_details_simple_series=0x7f08000e;
+        public static final int record_details_simple_subject=0x7f08000d;
+        public static final int record_details_simple_synopsis=0x7f08000f;
+        public static final int record_details_simple_title=0x7f08000a;
+        public static final int searchButton=0x7f080016;
+        public static final int searchText=0x7f080015;
+        public static final int search_record_author=0x7f080013;
+        public static final int search_record_img=0x7f080011;
+        public static final int search_record_publishing=0x7f080014;
+        public static final int search_record_title=0x7f080012;
+        public static final int search_results_list=0x7f080017;
     }
     public static final class layout {
-        public static final int dashbord_main=0x7f030000;
-        public static final int main=0x7f030001;
-        public static final int record_details_info=0x7f030002;
-        public static final int record_details_simple=0x7f030003;
-        public static final int search_result_item=0x7f030004;
-        public static final int search_result_list=0x7f030005;
+        public static final int dashbord_account=0x7f030000;
+        public static final int dashbord_main=0x7f030001;
+        public static final int main=0x7f030002;
+        public static final int record_details_info=0x7f030003;
+        public static final int record_details_simple=0x7f030004;
+        public static final int search_result_item=0x7f030005;
+        public static final int search_result_list=0x7f030006;
     }
     public static final class string {
         public static final int app_name=0x7f060001;
         public static final int hello=0x7f060000;
-        public static final int title_feature1=0x7f060002;
-        public static final int title_feature2=0x7f060003;
-        public static final int title_feature3=0x7f060004;
-        public static final int title_feature4=0x7f060005;
-        public static final int title_feature5=0x7f060006;
-        public static final int title_feature6=0x7f060007;
+        public static final int title_application_settings=0x7f060004;
+        public static final int title_book_bags=0x7f060008;
+        public static final int title_check_out=0x7f060005;
+        public static final int title_fines=0x7f060007;
+        public static final int title_holds=0x7f060006;
+        public static final int title_my_account=0x7f060003;
+        public static final int title_search=0x7f060002;
     }
     public static final class style {
         public static final int EvergreenTheme=0x7f070004;
diff --git a/Open-ILS/src/Android/res/drawable-hdpi/settings.png b/Open-ILS/src/Android/res/drawable-hdpi/settings.png
new file mode 100644
index 0000000000..d2a9bbd28e
Binary files /dev/null and b/Open-ILS/src/Android/res/drawable-hdpi/settings.png differ
diff --git a/Open-ILS/src/Android/res/layout/dashbord_account.xml b/Open-ILS/src/Android/res/layout/dashbord_account.xml
new file mode 100644
index 0000000000..fa399f2834
--- /dev/null
+++ b/Open-ILS/src/Android/res/layout/dashbord_account.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="6dip"
+    android:layout_weight="1"
+     >
+       <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1">
+        <Button android:id="@+id/account_btn_check_out"
+            style="@style/HomeButton"
+            android:onClick="onClickFeature"
+            android:text="@string/title_check_out"
+            android:drawableTop="@drawable/check_out"/>
+        <Button android:id="@+id/account_btn_holds"
+            style="@style/HomeButton"
+            android:onClick="onClickFeature"
+            android:text="@string/title_holds"
+            android:drawableTop="@drawable/holds"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1">
+        <Button android:id="@+id/account_btn_fines"
+            style="@style/HomeButton"
+            android:onClick="onClickFeature"
+            android:text="@string/title_fines"
+            android:drawableTop="@drawable/fines"/>
+        <Button android:id="@+id/account_btn_book_bags"
+            style="@style/HomeButton"
+            android:onClick="onClickFeature"
+            android:text="@string/title_book_bags"
+            android:drawableTop="@drawable/book_bag"/>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/res/layout/dashbord_main.xml b/Open-ILS/src/Android/res/layout/dashbord_main.xml
index c847997992..9c5075f412 100644
--- a/Open-ILS/src/Android/res/layout/dashbord_main.xml
+++ b/Open-ILS/src/Android/res/layout/dashbord_main.xml
@@ -11,15 +11,15 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1">
-        <Button android:id="@+id/home_btn_feature1"
+        <Button android:id="@+id/main_btn_search"
             style="@style/HomeButton"
             android:onClick="onClickFeature"
-            android:text="@string/title_feature1"
+            android:text="@string/title_search"
             android:drawableTop="@drawable/find_96"/>
-        <Button android:id="@+id/home_btn_feature2"
+        <Button android:id="@+id/main_btn_account"
             style="@style/HomeButton"
             android:onClick="onClickFeature"
-            android:text="@string/title_feature2"
+            android:text="@string/title_my_account"
             android:drawableTop="@drawable/account_pref"/>
     </LinearLayout>
 
@@ -28,33 +28,13 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1">
-        <Button android:id="@+id/home_btn_feature3"
+        <Button android:id="@+id/main_btn_app_settings"
             style="@style/HomeButton"
             android:onClick="onClickFeature"
-            android:text="@string/title_feature3"
-            android:drawableTop="@drawable/check_out"/>
-        <Button android:id="@+id/home_btn_feature4"
-            style="@style/HomeButton"
-            android:onClick="onClickFeature"
-            android:text="@string/title_feature4"
-            android:drawableTop="@drawable/holds"/>
+            android:text="@string/title_application_settings"
+            android:drawableTop="@drawable/settings"/>
+        
     </LinearLayout>
 
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1">
-        <Button android:id="@+id/home_btn_feature5"
-            style="@style/HomeButton"
-            android:onClick="onClickFeature"
-            android:text="@string/title_feature5"
-            android:drawableTop="@drawable/fines"/>
-        <Button android:id="@+id/home_btn_feature6"
-            style="@style/HomeButton"
-            android:onClick="onClickFeature"
-            android:text="@string/title_feature6"
-            android:drawableTop="@drawable/book_bag"/>
-    </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/res/values/strings.xml b/Open-ILS/src/Android/res/values/strings.xml
index 82d2ff0ba3..9ea23bdc42 100644
--- a/Open-ILS/src/Android/res/values/strings.xml
+++ b/Open-ILS/src/Android/res/values/strings.xml
@@ -4,11 +4,12 @@
     <string name="hello">Hello World, EvergreenAppActivity!</string>
     <string name="app_name">EvergreenApp</string>
 
-    <string name="title_feature1">Search</string>
-    <string name="title_feature2">Account</string>
-    <string name="title_feature3">Check out items</string>
-    <string name="title_feature4">Holds</string>
-    <string name="title_feature5">Fines</string>
-    <string name="title_feature6">Book bags</string>
+    <string name="title_search">Search</string>
+    <string name="title_my_account">My Account</string>
+    <string name="title_application_settings">App. Settings </string>
+    <string name="title_check_out">Check out items</string>
+    <string name="title_holds">Holds</string>
+    <string name="title_fines">Fines</string>
+    <string name="title_book_bags">Book bags</string>
     
 </resources>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/views/AccountScreenDashboard.java b/Open-ILS/src/Android/src/org/evergreen/android/views/AccountScreenDashboard.java
new file mode 100644
index 0000000000..c5dd27d2fb
--- /dev/null
+++ b/Open-ILS/src/Android/src/org/evergreen/android/views/AccountScreenDashboard.java
@@ -0,0 +1,131 @@
+
+package org.evergreen.android.views;
+
+import org.evergreen.android.R;
+import org.evergreen.android.globals.GlobalConfigs;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+
+
+public class AccountScreenDashboard extends Activity {
+
+	/**
+	 * onCreate - called when the activity is first created.
+	 * 
+	 * Called when the activity is first created. This is where you should do
+	 * all of your normal static set up: create views, bind data to lists, etc.
+	 * This method also provides you with a Bundle containing the activity's
+	 * previously frozen state, if there was one.
+	 * 
+	 * Always followed by onStart().
+	 * 
+	 */
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.dashbord_account);
+		
+	}
+
+	/**
+	 * onDestroy The final call you receive before your activity is destroyed.
+	 * This can happen either because the activity is finishing (someone called
+	 * finish() on it, or because the system is temporarily destroying this
+	 * instance of the activity to save space. You can distinguish between these
+	 * two scenarios with the isFinishing() method.
+	 * 
+	 */
+
+	protected void onDestroy() {
+		super.onDestroy();
+	}
+
+	/**
+	 * onPause Called when the system is about to start resuming a previous
+	 * activity. This is typically used to commit unsaved changes to persistent
+	 * data, stop animations and other things that may be consuming CPU, etc.
+	 * Implementations of this method must be very quick because the next
+	 * activity will not be resumed until this method returns. Followed by
+	 * either onResume() if the activity returns back to the front, or onStop()
+	 * if it becomes invisible to the user.
+	 * 
+	 */
+
+	protected void onPause() {
+		super.onPause();
+	}
+
+	/**
+	 * onRestart Called after your activity has been stopped, prior to it being
+	 * started again. Always followed by onStart().
+	 * 
+	 */
+
+	protected void onRestart() {
+		super.onRestart();
+	}
+
+	/**
+	 * onResume Called when the activity will start interacting with the user.
+	 * At this point your activity is at the top of the activity stack, with
+	 * user input going to it. Always followed by onPause().
+	 * 
+	 */
+
+	protected void onResume() {
+		super.onResume();
+	}
+
+	/**
+	 * onStart Called when the activity is becoming visible to the user.
+	 * Followed by onResume() if the activity comes to the foreground, or
+	 * onStop() if it becomes hidden.
+	 * 
+	 */
+
+	protected void onStart() {
+		super.onStart();
+	}
+
+	/**
+	 * onStop Called when the activity is no longer visible to the user because
+	 * another activity has been resumed and is covering this one. This may
+	 * happen either because a new activity is being started, an existing one is
+	 * being brought in front of this one, or this one is being destroyed.
+	 * 
+	 * Followed by either onRestart() if this activity is coming back to
+	 * interact with the user, or onDestroy() if this activity is going away.
+	 */
+
+	protected void onStop() {
+		super.onStop();
+	}
+	
+	public void onClickFeature (View v)
+	{
+	    int id = v.getId ();
+	    switch (id) {
+	   
+	      case R.id.account_btn_check_out :
+	           //startActivity (new Intent(getApplicationContext(), F3Activity.class));
+	           break;
+	      case R.id.account_btn_holds:
+	           //startActivity (new Intent(getApplicationContext(), F4Activity.class));
+	           break;
+	      case R.id.account_btn_fines :
+	           //startActivity (new Intent(getApplicationContext(), F5Activity.class));
+	           break;
+	      case R.id.account_btn_book_bags :
+	           //startActivity (new Intent(getApplicationContext(), F6Activity.class));
+	           break;
+	      default: 
+	    	   break;
+	    
+	    }
+	    
+	}
+
+} 
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/views/MainScreenDashboard.java b/Open-ILS/src/Android/src/org/evergreen/android/views/MainScreenDashboard.java
index b117d6f08f..d687c767f8 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/views/MainScreenDashboard.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/views/MainScreenDashboard.java
@@ -5,6 +5,7 @@ import org.evergreen.android.R;
 import org.evergreen.android.globals.GlobalConfigs;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 
@@ -112,28 +113,20 @@ public class MainScreenDashboard extends Activity {
 	{
 	    int id = v.getId ();
 	    switch (id) {
-	    /*
-	      case R.id.home_btn_feature1 :
-	           startActivity (new Intent(getApplicationContext(), F1Activity.class));
-	           break;
-	      case R.id.home_btn_feature2 :
-	           startActivity (new Intent(getApplicationContext(), F2Activity.class));
-	           break;
-	      case R.id.home_btn_feature3 :
-	           startActivity (new Intent(getApplicationContext(), F3Activity.class));
-	           break;
-	      case R.id.home_btn_feature4 :
-	           startActivity (new Intent(getApplicationContext(), F4Activity.class));
+	    
+	      case R.id.main_btn_search :
+	           //startActivity (new Intent(getApplicationContext(), F1Activity.class));
 	           break;
-	      case R.id.home_btn_feature5 :
-	           startActivity (new Intent(getApplicationContext(), F5Activity.class));
+	      case R.id.main_btn_account:
+	           startActivity (new Intent(getApplicationContext(), AccountScreenDashboard.class));
 	           break;
-	      case R.id.home_btn_feature6 :
-	           startActivity (new Intent(getApplicationContext(), F6Activity.class));
+	      case R.id.main_btn_app_settings :
+	           //startActivity (new Intent(getApplicationContext(), F3Activity.class));
 	           break;
+
 	      default: 
 	    	   break;
-	    */
+	    
 	    }
 	    
 	}