Fixed "place hold" button.

Changed demo_app manifest to match activity structure of cwmars_app.

diff --git a/Open-ILS/src/Android/core/AndroidManifest.xml b/Open-ILS/src/Android/core/AndroidManifest.xml
index 0e900bb..2a49f76 100644 (file)
--- a/Open-ILS/src/Android/core/AndroidManifest.xml
+++ b/Open-ILS/src/Android/core/AndroidManifest.xml
@@ -10,11 +10,5 @@
             android:targetSdkVersion="18" />\r
 \r
     <application>\r
-        <activity android:name=".views.MainActivity">\r
-            <intent-filter>\r
-                <action android:name="android.intent.action.MAIN"/>\r
-                <category android:name="android.intent.category.LAUNCHER"/>\r
-            </intent-filter>\r
-        </activity>\r
     </application>\r
 </manifest>\r

diff --git a/Open-ILS/src/Android/core/res/layout/place_hold.xml b/Open-ILS/src/Android/core/res/layout/place_hold.xml
index 08c7000..22360a3 100644 (file)
--- a/Open-ILS/src/Android/core/res/layout/place_hold.xml
+++ b/Open-ILS/src/Android/core/res/layout/place_hold.xml
@@ -17,7 +17,7 @@
                >
                <Button
                    android:id="@+id/cancel_hold"
-                   android:layout_width="100dip"
+                   android:layout_width="120dip"
                    android:layout_height="wrap_content"
                    android:text="@string/cancel"
                    style="@style/ApplicationButton"
@@ -26,7 +26,7 @@
                
                <Button 
                    android:id="@+id/place_hold"
-                   android:layout_width="100dip"
+                   android:layout_width="120dip"
                    android:layout_height="wrap_content"
                    android:text="@string/button_place_hold"
                    style="@style/ApplicationButton"

diff --git a/Open-ILS/src/Android/core/res/values/styles.xml b/Open-ILS/src/Android/core/res/values/styles.xml
index 92f353e..4bffa6b 100644 (file)
--- a/Open-ILS/src/Android/core/res/values/styles.xml
+++ b/Open-ILS/src/Android/core/res/values/styles.xml
@@ -136,13 +136,13 @@
     <style name="HeaderButton">
         <item name="android:textColor">@color/white</item>
         <item name="android:background">@drawable/header_button</item>
-        <item name="android:layout_marginRight">5dip</item>
+        <item name="android:layout_marginRight">5dp</item>
     </style>
 
     <style name="ApplicationButton">
         <item name="android:textColor">@color/white</item>
         <item name="android:background">@drawable/application_button</item>
-        <item name="android:padding">10dip</item>
+        <item name="android:padding">5dp</item>
     </style>
 
     <!-- Menu List Buttons -->

diff --git a/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml b/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
index 77620db..f89ba8c 100644 (file)
--- a/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
+++ b/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
@@ -58,10 +58,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name="org.evergreen_ils.views.AccountScreenDashboard"
-            android:theme="@android:style/Theme.NoTitleBar" >
-        </activity>
         <activity android:name="org.evergreen_ils.views.ApplicationPreferences" >
         </activity>
 

diff --git a/Open-ILS/src/Android/demo_app/.idea/libraries/libs.xml b/Open-ILS/src/Android/demo_app/.idea/libraries/libs.xml
index b502593..b59422d 100644 (file)
--- a/Open-ILS/src/Android/demo_app/.idea/libraries/libs.xml
+++ b/Open-ILS/src/Android/demo_app/.idea/libraries/libs.xml
@@ -8,4 +8,4 @@
     <JAVADOC />
     <SOURCES />
   </library>
-</component>
+</component>
\ No newline at end of file

diff --git a/Open-ILS/src/Android/demo_app/.idea/modules.xml b/Open-ILS/src/Android/demo_app/.idea/modules.xml
index c98ca80..fe9bb58 100644 (file)
--- a/Open-ILS/src/Android/demo_app/.idea/modules.xml
+++ b/Open-ILS/src/Android/demo_app/.idea/modules.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/../support/v7/appcompat/appcompat.iml" filepath="$PROJECT_DIR$/../support/v7/appcompat/appcompat.iml" />
       <module fileurl="file://$PROJECT_DIR$/../core/core.iml" filepath="$PROJECT_DIR$/../core/core.iml" />
       <module fileurl="file://$PROJECT_DIR$/demo_app.iml" filepath="$PROJECT_DIR$/demo_app.iml" />
     </modules>

diff --git a/Open-ILS/src/Android/demo_app/AndroidManifest.xml b/Open-ILS/src/Android/demo_app/AndroidManifest.xml
index 053c9c2..c78446f 100644 (file)
--- a/Open-ILS/src/Android/demo_app/AndroidManifest.xml
+++ b/Open-ILS/src/Android/demo_app/AndroidManifest.xml
@@ -6,29 +6,29 @@
           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.AUTHENTICATE_ACCOUNTS"/>
-    <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-permission android:name="android.permission.FLASHLIGHT"/>
-    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-    <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
-    <uses-permission android:name="android.permission.VIBRATE"/>
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
-
-    <uses-feature android:name="android.hardware.camera"/>
-    <uses-feature android:name="android.hardware.camera.autofocus"/>
+        android:minSdkVersion="8"
+        android:targetSdkVersion="18" />
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.FLASHLIGHT" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+    <uses-feature android:name="android.hardware.camera" />
+    <uses-feature android:name="android.hardware.camera.autofocus" />
 
     <application
         android:allowBackup="true"
         android:icon="@drawable/evergreen_launcher_icon"
         android:label="@string/ou_app_label"
-        android:theme="@style/EvergreenTheme" >
+        android:theme="@style/Theme.AppCompat" >
 
         <!-- Notification receiver -->
         <receiver
@@ -50,78 +50,108 @@
         <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"/>
+                <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 android:name="org.evergreen_ils.views.ApplicationPreferences" >
         </activity>
 
         <!-- Search -->
 
         <activity
                 android:name="org.evergreen_ils.searchCatalog.SampleUnderlinesNoFade"
-                android:label="Underlines/No Fade">
+                android:label="@string/search_details_title">
         </activity>
-        <activity android:name="org.evergreen_ils.searchCatalog.MoreCopyInformation">
+        <activity
+                android:name="org.evergreen_ils.searchCatalog.MoreCopyInformation"
+                android:label="@string/copy_information_title">
         </activity>
-        <activity android:name="org.evergreen_ils.searchCatalog.SearchCatalogListView">
+        <activity
+                android:name="org.evergreen_ils.searchCatalog.SearchCatalogListView"
+                android:label="@string/title_search"
+                android:parentActivityName="org.evergreen_ils.views.MainActivity">
+            <meta-data
+                    android:name="android.support.PARENT_ACTIVITY"
+                    android:value="org.evergreen_ils.views.MainActivity"/>
         </activity>
-        <activity android:name="org.evergreen_ils.searchCatalog.AdvancedSearchActivity">
+        <activity
+                android:name="org.evergreen_ils.searchCatalog.AdvancedSearchActivity"
+                android:label="@string/advanced_search">
         </activity>
         <activity
-                android:name="org.evergreen_ils.barcodescan.CaptureActivity"
-                android:screenOrientation="landscape"
-                android:theme="@android:style/Theme.NoTitleBar"
-                android:windowSoftInputMode="stateAlwaysHidden">
+            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
+                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 -->
-        <activity android:name="org.evergreen_ils.accountAccess.holds.HoldsListView">
+        <activity
+                android:name="org.evergreen_ils.accountAccess.holds.HoldsListView"
+                android:label="@string/hold_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>
-        <activity android:name="org.evergreen_ils.accountAccess.holds.PlaceHold">
+        <activity
+                android:name="org.evergreen_ils.accountAccess.holds.PlaceHold"
+                android:label="@string/hold_place_title">
         </activity>
-        <activity android:name="org.evergreen_ils.accountAccess.holds.HoldDetails">
+        <activity
+                android:name="org.evergreen_ils.accountAccess.holds.HoldDetails"
+                android:label="@string/hold_details_title">
         </activity>
 
         <!-- Fines Activities -->
-        <activity android:name="org.evergreen_ils.accountAccess.fines.FinesActivity">
+        <activity
+                android:name="org.evergreen_ils.accountAccess.fines.FinesActivity"
+                android:label="@string/title_fines"
+                android:parentActivityName="org.evergreen_ils.views.MainActivity">
+            <meta-data
+                    android:name="android.support.PARENT_ACTIVITY"
+                    android:value="org.evergreen_ils.views.MainActivity"/>
         </activity>
 
         <!-- Bookbags -->
-        <activity android:name="org.evergreen_ils.accountAccess.bookbags.BookbagsListView">
+        <activity android:name="org.evergreen_ils.accountAccess.bookbags.BookbagsListView" >
         </activity>
-        <activity android:name="org.evergreen_ils.accountAccess.bookbags.BookBagDetails">
+        <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">
+            android:name="org.evergreen_ils.auth.AuthenticatorActivity"
+            android:label="@string/ou_account_label">
+        </activity>
+
+        <activity android:name="org.evergreen_ils.views.MainActivity">
         </activity>
 
         <service
-                android:name="org.evergreen_ils.auth.AuthenticatorService"
-                android:exported="false">
+            android:name="org.evergreen_ils.auth.AuthenticatorService"
+            android:exported="false" >
             <intent-filter>
-                <action android:name="android.accounts.AccountAuthenticator"/>
+                <action android:name="android.accounts.AccountAuthenticator" />
             </intent-filter>
 
             <meta-data
-                    android:name="android.accounts.AccountAuthenticator"
-                    android:resource="@xml/authenticator"/>
+                android:name="android.accounts.AccountAuthenticator"
+                android:resource="@xml/authenticator" />
         </service>
     </application>
 </manifest>