dashboard split in 2 : main dasjboard and my account dashboard
authordrizea <danielrizea27@gmail.com>
Tue, 12 Jun 2012 18:30:48 +0000 (21:30 +0300)
committerdrizea <danielrizea27@gmail.com>
Tue, 12 Jun 2012 18:30:48 +0000 (21:30 +0300)
23 files changed:
Open-ILS/src/Android/AndroidManifest.xml
Open-ILS/src/Android/bin/EvergreenApp.apk
Open-ILS/src/Android/bin/classes.dex
Open-ILS/src/Android/bin/classes/org/evergreen/android/R$drawable.class
Open-ILS/src/Android/bin/classes/org/evergreen/android/R$id.class
Open-ILS/src/Android/bin/classes/org/evergreen/android/R$layout.class
Open-ILS/src/Android/bin/classes/org/evergreen/android/R$string.class
Open-ILS/src/Android/bin/classes/org/evergreen/android/R$style.class
Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Info.class
Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/RecordDetails_Simple.class
Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$SearchArrayAdapter.class
Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView.class
Open-ILS/src/Android/bin/classes/org/evergreen/android/views/AccountScreenDashboard.class [new file with mode: 0644]
Open-ILS/src/Android/bin/classes/org/evergreen/android/views/MainScreenDashboard.class
Open-ILS/src/Android/bin/res/drawable-hdpi/settings.png [new file with mode: 0644]
Open-ILS/src/Android/bin/resources.ap_
Open-ILS/src/Android/gen/org/evergreen/android/R.java
Open-ILS/src/Android/res/drawable-hdpi/settings.png [new file with mode: 0644]
Open-ILS/src/Android/res/layout/dashbord_account.xml [new file with mode: 0644]
Open-ILS/src/Android/res/layout/dashbord_main.xml
Open-ILS/src/Android/res/values/strings.xml
Open-ILS/src/Android/src/org/evergreen/android/views/AccountScreenDashboard.java [new file with mode: 0644]
Open-ILS/src/Android/src/org/evergreen/android/views/MainScreenDashboard.java

index e0e7e21..e28eec5 100644 (file)
@@ -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" >
index 51172c8..ae787c0 100644 (file)
Binary files a/Open-ILS/src/Android/bin/EvergreenApp.apk and b/Open-ILS/src/Android/bin/EvergreenApp.apk differ
index 18354ff..bfe04b9 100644 (file)
Binary files a/Open-ILS/src/Android/bin/classes.dex and b/Open-ILS/src/Android/bin/classes.dex differ
index e19bc0d..e8b77ce 100644 (file)
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
index 040779d..8f66c3c 100644 (file)
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
index bd324e9..893b9cd 100644 (file)
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
index c88bcae..a1a3bcb 100644 (file)
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
index 2860873..f09654d 100644 (file)
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
index 804753b..dcc3484 100644 (file)
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
index 26025e2..b7b579b 100644 (file)
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
index 06fb3f4..695ab3e 100644 (file)
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
index 90e5cb0..02cd8f9 100644 (file)
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 (file)
index 0000000..f2b2ad7
Binary files /dev/null and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/views/AccountScreenDashboard.class differ
index 8f32ef1..dbb1c30 100644 (file)
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 (file)
index 0000000..26028dc
Binary files /dev/null and b/Open-ILS/src/Android/bin/res/drawable-hdpi/settings.png differ
index 9568ba7..7ae709b 100644 (file)
Binary files a/Open-ILS/src/Android/bin/resources.ap_ and b/Open-ILS/src/Android/bin/resources.ap_ differ
index f94be63..002d0d4 100644 (file)
@@ -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 (file)
index 0000000..d2a9bbd
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 (file)
index 0000000..fa399f2
--- /dev/null
@@ -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
index c847997..9c5075f 100644 (file)
         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>
 
         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
index 82d2ff0..9ea23bd 100644 (file)
@@ -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 (file)
index 0000000..c5dd27d
--- /dev/null
@@ -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;
+           
+           }
+           
+       }
+
+} 
index b117d6f..d687c76 100644 (file)
@@ -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;
-           */
+           
            }
            
        }