From: kenstir <kenstir@gmail.com>
Date: Sun, 29 Dec 2013 04:20:53 +0000 (-0500)
Subject: Main and items-checked-out activities now using action bar.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=aa21a2c09e6af090a3b2a2340a9a3d48d58bedf3;p=working%2FEvergreen.git

Main and items-checked-out activities now using action bar.
---

diff --git a/Open-ILS/src/Android/core/AndroidManifest.xml b/Open-ILS/src/Android/core/AndroidManifest.xml
index 6fa134f72b..2434468bc6 100644
--- a/Open-ILS/src/Android/core/AndroidManifest.xml
+++ b/Open-ILS/src/Android/core/AndroidManifest.xml
@@ -5,128 +5,12 @@
     android:versionCode="1"
     android:versionName="1.0" >
 
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="18" />
-
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.FLASHLIGHT" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.autofocus" />
-
-    <!--
-    <uses-permission android:name="android.permission.READ_CALENDAR" />
-    <uses-permission android:name="android.permission.WRITE_CALENDAR" />
-    -->
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/evergreen_launcher_icon"
-        android:label="@string/ou_app_label" >
-
-        <!-- Notification receiver -->
-        <receiver
-            android:name="org.evergreen_ils.services.NotificationReceiver"
-            android:process=":remote" >
-        </receiver>
-        <!-- Receiver to reinit notifications on reboot -->
-        <receiver android:name="org.evergreen_ils.services.RebootReceiver" >
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
-        </receiver>
-        <receiver android:name="org.evergreen_ils.services.PeriodicServiceBroadcastReceiver" >
-            <intent-filter>
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
-            </intent-filter>
-        </receiver>
-
-        <service android:name="org.evergreen_ils.services.ScheduledIntentService" >
-        </service>
-
-        <activity
-            android:name="org.evergreen_ils.views.splashscreen.SplashActivity"
-            >
-            <!--  android:theme="@android:style/Theme.Light.NoTitleBar"  -->
+    <application>
+        <activity android:name=".views.MainActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name="org.evergreen_ils.views.AccountScreenDashboard"
-            android:theme="@android:style/Theme.Light.NoTitleBar" >
-        </activity>
-        <activity android:name="org.evergreen_ils.views.ApplicationPreferences" >
-        </activity>
-
-        <!-- Search -->
-
-        <activity android:name="org.evergreen_ils.searchCatalog.SampleUnderlinesNoFade">
-        </activity>
-        <activity android:name="org.evergreen_ils.searchCatalog.MoreCopyInformation" >
-        </activity>
-        <activity android:name="org.evergreen_ils.searchCatalog.SearchCatalogListView">
-        </activity>
-        <activity android:name="org.evergreen_ils.searchCatalog.AdvancedSearchActivity" >
-        </activity>
-        <activity
-            android:name="org.evergreen_ils.barcodescan.CaptureActivity"
-            android:screenOrientation="landscape"
-            android:theme="@android:style/Theme.NoTitleBar"
-            android:windowSoftInputMode="stateAlwaysHidden" >
-        </activity>
-
-        <!-- Checkout Activities -->
-        <activity android:name="org.evergreen_ils.accountAccess.checkout.ItemsCheckOutListView" >
-        </activity>
-
-        <!-- Holds Activities -->
-        <activity android:name="org.evergreen_ils.accountAccess.holds.HoldsListView" >
-        </activity>
-        <activity android:name="org.evergreen_ils.accountAccess.holds.PlaceHold" >
-        </activity>
-        <activity android:name="org.evergreen_ils.accountAccess.holds.HoldDetails" >
-        </activity>
-
-        <!-- Fines Activities -->
-        <activity android:name="org.evergreen_ils.accountAccess.fines.FinesActivity" >
-        </activity>
-
-        <!-- Bookbags -->
-        <activity android:name="org.evergreen_ils.accountAccess.bookbags.BookbagsListView" >
-        </activity>
-        <activity android:name="org.evergreen_ils.accountAccess.bookbags.BookBagDetails" >
-        </activity>
-
-        <activity
-            android:name="org.evergreen_ils.auth.AuthenticatorActivity"
-            android:label="@string/ou_account_label"
-            android:theme="@android:style/Theme.Light" >
-        </activity>
-
-        <service
-            android:name="org.evergreen_ils.auth.AuthenticatorService"
-            android:exported="false" >
-            <intent-filter>
-                <action android:name="android.accounts.AccountAuthenticator" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.accounts.AccountAuthenticator"
-                android:resource="@xml/authenticator" />
-        </service>
     </application>
-
 </manifest>
diff --git a/Open-ILS/src/Android/core/res/layout-land/dashbord_account.xml b/Open-ILS/src/Android/core/res/layout-land/dashbord_account.xml
index 15a3159bdb..c96eabcb8e 100644
--- a/Open-ILS/src/Android/core/res/layout-land/dashbord_account.xml
+++ b/Open-ILS/src/Android/core/res/layout-land/dashbord_account.xml
@@ -47,7 +47,7 @@
                 style="@style/HomeButton"
                 android:layout_weight="1"
                 android:drawableTop="@drawable/check_out"
-                android:onClick="onClickFeature"
+                android:onClick="onButtonClick"
                 android:text="@string/title_check_out" />
 
             <Button
@@ -55,7 +55,7 @@
                 style="@style/HomeButton"
                 android:layout_weight="1"
                 android:drawableTop="@drawable/holds"
-                android:onClick="onClickFeature"
+                android:onClick="onButtonClick"
                 android:text="@string/title_holds" />
 
             <Button
@@ -63,7 +63,7 @@
                 style="@style/HomeButton"
                 android:layout_weight="1"
                 android:drawableTop="@drawable/fines"
-                android:onClick="onClickFeature"
+                android:onClick="onButtonClick"
                 android:text="@string/title_fines" />
 
             <Button
@@ -71,7 +71,7 @@
                 style="@style/HomeButton"
                 android:layout_weight="1"
                 android:drawableTop="@drawable/book_bag"
-                android:onClick="onClickFeature"
+                android:onClick="onButtonClick"
                 android:text="@string/title_book_bags" />
         </LinearLayout>
 
diff --git a/Open-ILS/src/Android/core/res/layout/activity_main.xml b/Open-ILS/src/Android/core/res/layout/activity_main.xml
new file mode 100644
index 0000000000..ad7f1f6e94
--- /dev/null
+++ b/Open-ILS/src/Android/core/res/layout/activity_main.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:background="@drawable/background_grey_image">
+
+    <TextView
+            android:layout_width="20px"
+            android:layout_height="18dp"
+            />
+
+    <Button
+            android:layout_width="match_parent"
+            android:layout_height="56dp"
+            style="@style/BigActionButton"
+            android:text="@string/title_check_out"
+            android:id="@+id/account_btn_check_out"
+            android:onClick="onButtonClick"
+            android:drawableStart="@drawable/check_out"/>
+
+    <Button
+            android:layout_width="match_parent"
+            android:layout_height="56dp"
+            style="@style/BigActionButton"
+            android:text="@string/title_holds"
+            android:id="@+id/account_btn_holds"
+            android:onClick="onButtonClick"
+            android:drawableStart="@drawable/holds"/>
+
+    <Button
+            android:layout_width="match_parent"
+            android:layout_height="56dp"
+            style="@style/BigActionButton"
+            android:text="@string/title_fines"
+            android:id="@+id/account_btn_fines"
+            android:onClick="onButtonClick"
+            android:drawableStart="@drawable/fines"/>
+
+    <TextView
+            android:layout_width="20px"
+            android:layout_height="12dp"
+            />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/core/res/layout/checkout_list.xml b/Open-ILS/src/Android/core/res/layout/checkout_list.xml
index 1a8fd9a4d0..2f4ce5806a 100644
--- a/Open-ILS/src/Android/core/res/layout/checkout_list.xml
+++ b/Open-ILS/src/Android/core/res/layout/checkout_list.xml
@@ -6,8 +6,6 @@
     android:background="@color/background"
      >
 
-   	<include android:id="@+id/header_actionbar" layout="@layout/simple_actionbar"/>
-
     <TableLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/Open-ILS/src/Android/core/res/layout/dashbord_account.xml b/Open-ILS/src/Android/core/res/layout/dashbord_account.xml
index 2688d54e52..a3d977a1b0 100644
--- a/Open-ILS/src/Android/core/res/layout/dashbord_account.xml
+++ b/Open-ILS/src/Android/core/res/layout/dashbord_account.xml
@@ -41,12 +41,12 @@
         >
         <Button android:id="@+id/account_btn_check_out"
             style="@style/HomeButton"
-            android:onClick="onClickFeature"
+            android:onClick="onButtonClick"
             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:onClick="onButtonClick"
             android:text="@string/title_holds"
             android:drawableTop="@drawable/holds"/>
     </LinearLayout>
@@ -59,12 +59,12 @@
         android:layout_weight="1">
         <Button android:id="@+id/account_btn_fines"
             style="@style/HomeButton"
-            android:onClick="onClickFeature"
+            android:onClick="onButtonClick"
             android:text="@string/title_fines"
             android:drawableTop="@drawable/fines"/>
         <Button android:id="@+id/account_btn_book_bags"
             style="@style/HomeButton"
-            android:onClick="onClickFeature"
+            android:onClick="onButtonClick"
             android:text="@string/title_book_bags"
             android:drawableTop="@drawable/book_bag"/>
     </LinearLayout>
diff --git a/Open-ILS/src/Android/core/res/values/styles.xml b/Open-ILS/src/Android/core/res/values/styles.xml
index 8d9fe4354f..cc5988a2f1 100644
--- a/Open-ILS/src/Android/core/res/values/styles.xml
+++ b/Open-ILS/src/Android/core/res/values/styles.xml
@@ -34,11 +34,6 @@
         <item name="android:layout_height">14dip</item>
     </style>
 
-    <!--
-    <style name="EvergreenTheme" parent="@style/Theme.AppCompat.Light.">
-    </style>
-    -->
-
     <style name="HomeButton">
         <item name="android:layout_gravity">center_vertical</item>
         <item name="android:layout_width">130dip</item>
@@ -51,6 +46,17 @@
         <item name="android:background">@drawable/menu_background_button</item>
     </style>
 
+    <style name="BigActionButton">
+        <item name="android:layout_marginLeft">24dp</item>
+        <item name="android:layout_marginTop">18dp</item>
+        <item name="android:layout_marginRight">24dp</item>
+        <item name="android:layout_marginBottom">18dp</item>
+        <item name="android:textSize">@dimen/text_size_medium</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textColor">@color/dark</item>
+        <item name="android:background">@drawable/menu_background_button</item>
+    </style>
+
     <style name="TitleSearchStyleList">
         <item name="android:textSize">18sp</item>
         <item name="android:gravity">left</item>
diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/checkout/ItemsCheckOutListView.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/checkout/ItemsCheckOutListView.java
index 312effff44..bb5d43ae5c 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/checkout/ItemsCheckOutListView.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/checkout/ItemsCheckOutListView.java
@@ -24,6 +24,8 @@ import java.util.Date;
 import java.util.List;
 
 import android.opengl.Visibility;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarActivity;
 import org.evergreen_ils.R;
 import org.evergreen_ils.accountAccess.AccountAccess;
 import org.evergreen_ils.accountAccess.MaxRenewalsException;
@@ -52,7 +54,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-public class ItemsCheckOutListView extends Activity {
+public class ItemsCheckOutListView extends ActionBarActivity {
 
     private final String TAG = ItemsCheckOutListView.class.getName();
 
@@ -68,16 +70,8 @@ public class ItemsCheckOutListView extends Activity {
 
     private ProgressDialog progressDialog;
 
-    private Button homeButton;
-
-    private Button myAccountButton;
-
-    private TextView headerTitle;
-
     private TextView itemsNo;
 
-    private Activity thisActivity;
-
     private TextView overdueItems;
 
     private Date currentDate;
@@ -90,34 +84,13 @@ public class ItemsCheckOutListView extends Activity {
             return;
         }
 
-        thisActivity = this;
         setContentView(R.layout.checkout_list);
-        setTitle(R.string.checkout_items_title);
 
-        currentDate = new Date(System.currentTimeMillis());
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setSubtitle(AccountAccess.userName);
+        actionBar.setDisplayHomeAsUpEnabled(true);
 
-        // header portion actions
-        myAccountButton = (Button) findViewById(R.id.my_account_button);
-        myAccountButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(getApplicationContext(),
-                        AccountScreenDashboard.class);
-                startActivity(intent);
-            }
-        });
-
-        homeButton = (Button) findViewById(R.id.action_bar_home_button);
-        homeButton.setText(R.string.checkout_items_title);
-        homeButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(getApplicationContext(),
-                        SearchCatalogListView.class);
-                startActivity(intent);
-            }
-        });
-        // end header portion actions
+        currentDate = new Date(System.currentTimeMillis());
 
         context = this;
         itemsNo = (TextView) findViewById(R.id.checkout_items_number);
diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/AccountScreenDashboard.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/AccountScreenDashboard.java
index e55b42d518..db862061ac 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/AccountScreenDashboard.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/AccountScreenDashboard.java
@@ -157,7 +157,7 @@ public class AccountScreenDashboard extends Activity {
         super.onStop();
     }
 
-    public void onClickFeature(View v) {
+    public void onButtonClick(View v) {
         int id = v.getId();
         if (id == R.id.account_btn_check_out) {
             startActivity(new Intent(getApplicationContext(),
diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/MainActivity.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/MainActivity.java
new file mode 100644
index 0000000000..54c3049bc0
--- /dev/null
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/MainActivity.java
@@ -0,0 +1,61 @@
+package org.evergreen_ils.views;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarActivity;
+import android.view.View;
+import android.widget.Button;
+import org.evergreen_ils.R;
+import org.evergreen_ils.accountAccess.AccountAccess;
+import org.evergreen_ils.accountAccess.bookbags.BookbagsListView;
+import org.evergreen_ils.accountAccess.checkout.ItemsCheckOutListView;
+import org.evergreen_ils.accountAccess.fines.FinesActivity;
+import org.evergreen_ils.accountAccess.holds.HoldsListView;
+import org.evergreen_ils.globals.GlobalConfigs;
+import org.evergreen_ils.views.splashscreen.SplashActivity;
+
+/**
+ * Created by kenstir on 12/28/13.
+ */
+public class MainActivity extends ActionBarActivity {
+
+    private Button checkedOutButton;
+    private Button holdsButton;
+    private Button finesButton;
+    private GlobalConfigs globalConfigs;
+
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (!SplashActivity.isAppInitialized()) {
+            SplashActivity.restartApp(this);
+            return;
+        }
+
+        setContentView(R.layout.activity_main);
+
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setSubtitle(AccountAccess.userName);
+
+        // singleton initialize necessary IDL and Org data
+        globalConfigs = GlobalConfigs.getGlobalConfigs(this);
+    }
+
+    public void onButtonClick(View v) {
+        int id = v.getId();
+        if (id == R.id.account_btn_check_out) {
+            startActivity(new Intent(getApplicationContext(), ItemsCheckOutListView.class));
+
+        } else if (id == R.id.account_btn_holds) {
+            startActivity(new Intent(getApplicationContext(), HoldsListView.class));
+
+        } else if (id == R.id.account_btn_fines) {
+            startActivity(new Intent(getApplicationContext(), FinesActivity.class));
+
+        } else if (id == R.id.account_btn_book_bags) {
+            startActivity(new Intent(getApplicationContext(), BookbagsListView.class));
+
+        }
+    }
+}
diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/splashscreen/SplashActivity.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/splashscreen/SplashActivity.java
index 75092e3e4e..32c8bc61f7 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/splashscreen/SplashActivity.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/splashscreen/SplashActivity.java
@@ -23,6 +23,7 @@ import org.evergreen_ils.R;
 import org.evergreen_ils.globals.GlobalConfigs;
 import org.evergreen_ils.searchCatalog.SearchCatalogListView;
 import org.evergreen_ils.views.ApplicationPreferences;
+import org.evergreen_ils.views.MainActivity;
 import org.evergreen_ils.views.splashscreen.LoadingTask.LoadingTaskListener;
 
 import android.app.Activity;
@@ -128,7 +129,7 @@ public class SplashActivity extends Activity implements LoadingTaskListener {
 
     private void startApp() {
         mInitialized = true;
-        Intent intent = new Intent(SplashActivity.this, SearchCatalogListView.class);
+        Intent intent = new Intent(SplashActivity.this, MainActivity.class);
         startActivity(intent);
         finish();
     }
diff --git a/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml b/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
index c5dfa00b5b..d8c7952241 100644
--- a/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
+++ b/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
@@ -28,7 +28,7 @@
         android:allowBackup="true"
         android:icon="@drawable/evergreen_launcher_icon"
         android:label="@string/ou_app_label"
-        android:theme="@style/Theme.AppCompat.Light.DarkActionBar" >
+        android:theme="@style/Theme.AppCompat" >
 
         <!-- Notification receiver -->
         <receiver
@@ -50,11 +50,11 @@
         <service android:name="org.evergreen_ils.services.ScheduledIntentService" >
         </service>
 
-        <activity android:name="org.evergreen_ils.views.splashscreen.SplashActivity">
-            <!--  android:theme="@android:style/Theme.Light.NoTitleBar"  -->
+        <activity
+                android:name="org.evergreen_ils.views.splashscreen.SplashActivity"
+                android:theme="@android:style/Theme.NoTitleBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -85,7 +85,13 @@
         </activity>
 
         <!-- Checkout Activities -->
-        <activity android:name="org.evergreen_ils.accountAccess.checkout.ItemsCheckOutListView" >
+        <activity
+                android:name="org.evergreen_ils.accountAccess.checkout.ItemsCheckOutListView"
+                android:label="@string/checkout_items_title"
+                android:parentActivityName="org.evergreen_ils.views.MainActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.evergreen_ils.views.MainActivity"/>
         </activity>
 
         <!-- Holds Activities -->
@@ -112,6 +118,9 @@
             android:theme="@android:style/Theme.Light" >
         </activity>
 
+        <activity android:name="org.evergreen_ils.views.MainActivity">
+        </activity>
+
         <service
             android:name="org.evergreen_ils.auth.AuthenticatorService"
             android:exported="false" >