Standardizing ou.xml elements, removing unused ones. Removing unpleasant red bold...
authorkenstir <kenstir@gmail.com>
Wed, 18 Dec 2013 01:53:08 +0000 (20:53 -0500)
committerkenstir <kenstir@gmail.com>
Wed, 18 Dec 2013 01:53:08 +0000 (20:53 -0500)
20 files changed:
Open-ILS/src/Android/core/AndroidManifest.xml
Open-ILS/src/Android/core/res/drawable/list_view_separator.xml [deleted file]
Open-ILS/src/Android/core/res/layout-land/dashbord_account.xml
Open-ILS/src/Android/core/res/layout-land/search_result_list.xml
Open-ILS/src/Android/core/res/layout/activity_splash.xml
Open-ILS/src/Android/core/res/layout/bookbag_list.xml
Open-ILS/src/Android/core/res/layout/bookbagitem_list.xml
Open-ILS/src/Android/core/res/layout/dashbord_account.xml
Open-ILS/src/Android/core/res/layout/fines.xml
Open-ILS/src/Android/core/res/layout/fines_list_item.xml
Open-ILS/src/Android/core/res/layout/holds_list.xml
Open-ILS/src/Android/core/res/layout/search_result_list.xml
Open-ILS/src/Android/core/res/layout/simple_actionbar.xml
Open-ILS/src/Android/core/res/values/ou.xml
Open-ILS/src/Android/core/res/values/strings.xml
Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/fines/FinesActivity.java
Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
Open-ILS/src/Android/cwmars_app/res/values/ou.xml
Open-ILS/src/Android/demo_app/AndroidManifest.xml
Open-ILS/src/Android/demo_app/res/values/ou.xml

index d2f9f6d..f6d03ff 100644 (file)
@@ -32,7 +32,7 @@
     <application\r
         android:allowBackup="true"\r
         android:icon="@drawable/evergreen_launcher_icon"\r
-        android:label="@string/ou_app_name"\r
+        android:label="@string/ou_app_label"\r
         android:theme="@style/EvergreenTheme" >\r
 \r
         <!-- Notification receiver -->\r
@@ -57,7 +57,7 @@
 \r
         <activity\r
             android:name="org.evergreen.android.views.splashscreen.SplashActivity"\r
-            android:label="@string/ou_app_label">\r
+            >\r
             <!--  android:theme="@android:style/Theme.Light.NoTitleBar"  -->\r
             <intent-filter>\r
                 <action android:name="android.intent.action.MAIN" />\r
 \r
         <!-- Search -->\r
 \r
-        <activity\r
-            android:name="org.evergreen.android.searchCatalog.SampleUnderlinesNoFade"\r
-            android:label="Underlines/No Fade" >\r
+        <activity android:name="org.evergreen.android.searchCatalog.SampleUnderlinesNoFade">\r
         </activity>\r
         <activity android:name="org.evergreen.android.searchCatalog.MoreCopyInformation" >\r
         </activity>\r
-        <activity\r
-            android:name="org.evergreen.android.searchCatalog.SearchCatalogListView"\r
-            android:label="@string/ou_app_label" >\r
+        <activity android:name="org.evergreen.android.searchCatalog.SearchCatalogListView">\r
         </activity>\r
         <activity android:name="org.evergreen.android.searchCatalog.AdvancedSearchActivity" >\r
         </activity>\r
         <activity\r
             android:name="org.evergreen.android.barcodescan.CaptureActivity"\r
-            android:label="@string/ou_app_label"\r
             android:screenOrientation="landscape"\r
             android:theme="@android:style/Theme.NoTitleBar"\r
             android:windowSoftInputMode="stateAlwaysHidden" >\r
diff --git a/Open-ILS/src/Android/core/res/drawable/list_view_separator.xml b/Open-ILS/src/Android/core/res/drawable/list_view_separator.xml
deleted file mode 100644 (file)
index 1ed1ae0..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Bottom 2dp Shadow -->
-    <item>
-        <shape android:shape="rectangle">
-            <gradient 
-                android:startColor="#000"
-                android:centerColor="#42b8cd"
-                android:endColor="#000"
-                />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
index 18bd518..15a3159 100644 (file)
@@ -23,7 +23,7 @@
             android:layout_marginLeft="5dip"
             android:drawableLeft="@drawable/evergreen_launcher_icon_48"
             android:paddingLeft="5dip"
-            android:text="@string/ou_action_bar_text"
+            android:text="@string/ou_app_label"
             android:textColor="@color/white"
             android:textSize="16sp"
             />
index a0ce343..07f0293 100644 (file)
@@ -22,7 +22,7 @@
             android:layout_alignParentLeft="true"
             android:layout_marginLeft="5dip"
             android:drawableLeft="@drawable/evergreen_launcher_icon_48"
-            android:text="@string/ou_action_bar_text"
+            android:text="@string/ou_app_label"
             android:textColor="@color/white"
             android:textSize="16sp"
             android:paddingLeft="5dip"
index 4df99cb..0fe10c2 100644 (file)
@@ -14,7 +14,7 @@
             android:layout_centerHorizontal="true"
             android:layout_marginTop="106dp"
             android:src="@drawable/evergreen_logo_sm072"
-            android:contentDescription="@string/ou_action_bar_text" />
+            android:contentDescription="@string/ou_app_label" />
     
         <TextView
             android:id="@+id/action_in_progress"
index c8e1bc6..02ff45e 100644 (file)
@@ -88,7 +88,6 @@
          android:layout_width="fill_parent"
          android:layout_height="wrap_content"  
          android:paddingTop="10dip"
-         android:divider="@drawable/list_view_separator"
       android:dividerHeight="1dp"
          ></ListView>
 
index 1cb0634..e4d1ca0 100644 (file)
@@ -46,7 +46,6 @@
          android:layout_height="wrap_content"  
          android:paddingTop="10dip"
          android:background="@drawable/listview_background"
-         android:divider="@drawable/list_view_separator"
       android:dividerHeight="1dp"
          ></ListView>
 
index 78e5516..2688d54 100644 (file)
@@ -24,7 +24,7 @@
             android:layout_alignParentLeft="true"
             android:layout_marginLeft="5dip"
             android:drawableLeft="@drawable/evergreen_launcher_icon_48"
-            android:text="@string/ou_action_bar_text"
+            android:text="@string/ou_app_label"
             android:textColor="@color/white"
             android:textSize="16sp"
             android:paddingLeft="5dip"
index b45ce9c..f3e799b 100644 (file)
@@ -7,81 +7,80 @@
      >
 
        <include android:id="@+id/header_actionbar" layout="@layout/simple_actionbar"/>
-    
-         <TableLayout 
-             android:layout_width="fill_parent"
-             android:layout_height="wrap_content"
-             android:padding="5dip"
-             >
-            <TableRow 
+
+    <TableLayout
+         android:layout_width="fill_parent"
+         android:layout_height="wrap_content"
+         android:padding="5dip"
+         >
+        <TableRow
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            >
+
+            <TextView
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                >
-                
-                <TextView 
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/total_owned"
-                    />
-                <TextView 
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/total_paid"
-                    />
-                
-                <TextView 
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/balance_owed"
-                    />
-                
-            </TableRow>
-             <TableRow 
+                android:layout_weight="1"
+                android:text="@string/total_owned"
+                />
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/total_paid"
+                />
+
+            <TextView
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                >
-                <TextView 
-                    android:id="@+id/fines_total_owned"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    />
-                <TextView 
-                    android:id="@+id/fines_total_paid"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    />
-                <TextView 
-                    android:id="@+id/fined_balance_owed"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    />
-            </TableRow>
+                android:layout_weight="1"
+                android:text="@string/balance_owed"
+                />
+
+        </TableRow>
+        <TableRow
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            >
+            <TextView
+                android:id="@+id/fines_total_owned"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                />
+            <TextView
+                android:id="@+id/fines_total_paid"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                />
+            <TextView
+                android:id="@+id/fined_balance_owed"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                />
+        </TableRow>
+
+     </TableLayout>
 
-         </TableLayout>
 
-        
-         <TextView 
-             android:layout_width="fill_parent"
-             android:layout_height="wrap_content"
-             android:text="@string/overdue_materials"
-             android:textSize="18sp"
-             android:paddingTop="10dip"
-             android:paddingBottom="5dip"
-             android:layout_marginLeft="10dip"
-             />
+    <TextView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/overdue_materials"
+        android:textSize="18sp"
+        android:paddingTop="10dip"
+        android:paddingBottom="5dip"
+        android:layout_marginLeft="5dip"
+        />
 
        <ListView 
-         android:id="@+id/fines_overdue_materials_list"
-         android:layout_width="fill_parent"
-         android:layout_height="wrap_content"
-         android:divider="@drawable/list_view_separator"
-      android:dividerHeight="1dp"  
-       ></ListView>
+        android:id="@+id/fines_overdue_materials_list"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:dividerHeight="1dp"
+        />
 
 </LinearLayout>
\ No newline at end of file
index 8daeab5..de57622 100644 (file)
@@ -23,7 +23,6 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="right"
                 android:layout_weight="0"
-                android:textColor="@color/red"
                 android:textStyle="bold" />
         </LinearLayout>
 
index f7974c6..99c9c77 100644 (file)
@@ -33,8 +33,7 @@
          android:id="@+id/holds_item_list"
          android:layout_width="fill_parent"
          android:layout_height="fill_parent"
-         android:divider="@drawable/list_view_separator"
-      android:dividerHeight="1dp"  
+      android:dividerHeight="1dp"
        ></ListView>
 
 </LinearLayout>
\ No newline at end of file
index bc82ae2..09b21b1 100644 (file)
@@ -23,7 +23,7 @@
             android:layout_alignParentLeft="true"
             android:layout_marginLeft="5dip"
             android:drawableLeft="@drawable/evergreen_launcher_icon_48"
-            android:text="@string/ou_action_bar_text"
+            android:text="@string/ou_app_label"
             android:textColor="@color/white"
             android:textSize="16sp"
             android:paddingLeft="5dip"/>
         android:id="@+id/search_results_list"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:divider="@drawable/list_view_separator"
         android:dividerHeight="1dp"
         android:layout_below="@id/search_text" >
     </ListView>
index 9e0880e..d25829b 100644 (file)
@@ -24,7 +24,7 @@
             android:layout_alignParentLeft="true"
             android:layout_marginLeft="5dip"
             android:drawableLeft="@drawable/evergreen_launcher_icon_48"
-            android:text="@string/ou_action_bar_text"
+            android:text="@string/ou_app_label"
             android:textColor="@color/white"
             android:textSize="16sp"
             android:paddingLeft="5dip"
index 4f514d0..a722551 100644 (file)
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- ou_cwmars.xml - C/W MARS organizational unit -->
 <resources>
+    <string name="ou_account_label">Evergreen Library</string>
+    <string name="ou_account_sign_in_message">Sign in to your\nEvergreen Library Account</string>
     <!-- Each evergreen-derived app should have its own ou_account_type. This will enable
          a user to have multiple evergreen-derived apps working simultaneously. -->
     <string name="ou_account_type">org.evergreen_ils</string>
-    <!--  TODO: make URLs HTTPS -->
-    <string name="ou_library_url">http://bark.cwmars.org</string>
-    <string name="ou_app_name">C/W Mars Library</string>
-    <string name="ou_app_label">C/W Mars Library</string>
-    <string name="ou_app_welcome_label">Welcome</string>
-    <string name="ou_account_label">C/W Mars Library</string>
-    <string name="ou_account_sign_in_message">Sign in to your\nC/W Mars Library Account</string>
-    <string name="ou_action_bar_text">C/W Mars</string>
+    <string name="ou_app_label">Evergreen Library</string>
+    <string name="ou_app_name">Evergreen Library</string>
+    <string name="ou_library_url">https://demo.evergreencatalog.com</string>
 </resources>
index 5df7398..71160bf 100644 (file)
     <string name="preference_notifications_title">Notification settings</string>
 
     <plurals name="number_of_copies">
-        <item quantity="one">one copy</item>
+        <item quantity="one">1 copy</item>
         <item quantity="other">%d copies</item>
     </plurals>
     <plurals name="number_of_holds">
-        <item quantity="one">One hold</item>
+        <item quantity="one">1 hold</item>
         <item quantity="other">%d holds</item>
     </plurals>
     <plurals name="number_of_items">
-        <item quantity="one">one item</item>
+        <item quantity="one">1 item</item>
         <item quantity="other">%d items</item>
     </plurals>
 
index ddb4d75..7312a2a 100644 (file)
@@ -235,11 +235,6 @@ public class FinesActivity extends Activity {
             // status.setText(record.getHoldStatus());
             fineStatus.setText(record.getStatus());
 
-            if (record.getStatus().equals("returned")) {
-                fineStatus.setTextColor(Color.argb(255, 0, 255, 0));
-            } else
-                fineStatus.setTextColor(Color.argb(255, 255, 0, 0));
-
             return row;
         }
     }
index e325857..bb99a1c 100644 (file)
@@ -27,7 +27,7 @@
     <application
         android:allowBackup="true"
         android:icon="@drawable/evergreen_launcher_icon"
-        android:label="@string/ou_app_name"
+        android:label="@string/ou_app_label"
         android:theme="@style/EvergreenTheme" >
 
         <!-- Notification receiver -->
@@ -50,9 +50,7 @@
         <service android:name="org.evergreen.android.services.ScheduledIntentService" >
         </service>
 
-        <activity
-            android:name="org.evergreen.android.views.splashscreen.SplashActivity"
-            android:label="@string/ou_app_label">
+        <activity android:name="org.evergreen.android.views.splashscreen.SplashActivity">
             <!--  android:theme="@android:style/Theme.Light.NoTitleBar"  -->
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
         </activity>
         <activity android:name="org.evergreen.android.searchCatalog.MoreCopyInformation" >
         </activity>
-        <activity
-            android:name="org.evergreen.android.searchCatalog.SearchCatalogListView"
-            android:label="@string/ou_app_label" >
+        <activity android:name="org.evergreen.android.searchCatalog.SearchCatalogListView">
         </activity>
         <activity android:name="org.evergreen.android.searchCatalog.AdvancedSearchActivity" >
         </activity>
         <activity
             android:name="org.evergreen.android.barcodescan.CaptureActivity"
-            android:label="@string/ou_app_label"
             android:screenOrientation="landscape"
             android:theme="@android:style/Theme.NoTitleBar"
             android:windowSoftInputMode="stateAlwaysHidden" >
index 9b5b79f..b5833cf 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- ou_cwmars.xml - C/W MARS organizational unit -->
 <resources>
-    <!--  TODO: make URLs HTTPS -->
-    <string name="ou_library_url">http://bark.cwmars.org</string>
-    <string name="ou_app_name">C/W Mars Library</string>
-    <string name="ou_app_label">C/W Mars</string>
-    <string name="ou_app_welcome_label">Welcome</string>
     <string name="ou_account_label">C/W Mars Library</string>
     <string name="ou_account_sign_in_message">Sign in to your\nC/W Mars Library Account</string>
+    <string name="ou_account_type">org.cwmars</string>
+    <string name="ou_app_label">C/W Mars</string>
+    <string name="ou_app_name">C/W Mars Library Free</string>
+    <string name="ou_library_url">http://bark.cwmars.org</string> <!--  TODO: make HTTPS -->
 </resources>
index e23ed14..d4a0f5e 100644 (file)
@@ -27,7 +27,7 @@
     <application
         android:allowBackup="true"
         android:icon="@drawable/evergreen_launcher_icon"
-        android:label="@string/ou_app_name"
+        android:label="@string/ou_app_label"
         android:theme="@style/EvergreenTheme" >
 
         <!-- Notification receiver -->
@@ -50,9 +50,7 @@
         <service android:name="org.evergreen.android.services.ScheduledIntentService">
         </service>
 
-        <activity
-                android:name="org.evergreen.android.views.splashscreen.SplashActivity"
-                android:label="@string/ou_app_label">
+        <activity android:name="org.evergreen.android.views.splashscreen.SplashActivity">
             <!--  android:theme="@android:style/Theme.Light.NoTitleBar"  -->
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
         </activity>
         <activity android:name="org.evergreen.android.searchCatalog.MoreCopyInformation">
         </activity>
-        <activity
-                android:name="org.evergreen.android.searchCatalog.SearchCatalogListView"
-                android:label="@string/ou_app_label">
+        <activity android:name="org.evergreen.android.searchCatalog.SearchCatalogListView">
         </activity>
         <activity android:name="org.evergreen.android.searchCatalog.AdvancedSearchActivity">
         </activity>
         <activity
                 android:name="org.evergreen.android.barcodescan.CaptureActivity"
-                android:label="@string/ou_app_label"
                 android:screenOrientation="landscape"
                 android:theme="@android:style/Theme.NoTitleBar"
                 android:windowSoftInputMode="stateAlwaysHidden">
index b7a85c2..a5261d7 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- ou.xml - organizational unit app customization -->
 <resources>
-    <string name="ou_account_type">com.evergreencatalog.demo</string>
-    <string name="ou_library_url">http://demo.evergreencatalog.com</string>
-    <string name="ou_app_name">Evergreen Demo Library</string>
-    <string name="ou_app_label">Evergreen Demo</string>
-    <string name="ou_app_welcome_label">Welcome</string>
     <string name="ou_account_label">Evergreen Demo Library</string>
     <string name="ou_account_sign_in_message">Sign in to your\nEvergreen Demo Library Account</string>
+    <string name="ou_account_type">com.evergreencatalog.demo</string>
+    <string name="ou_app_label">Evergreen Demo</string>
+    <string name="ou_app_name">Evergreen Demo Library</string>
+    <string name="ou_library_url">http://demo.evergreencatalog.com</string>
 </resources>