Commit c2098595 authored by Dave Griffiths's avatar Dave Griffiths
Browse files

post lunch checkin, bigger text for galaxy note etc

parent 72d82fea
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="foam.mongoose" package="foam.mongoose"
android:versionCode="6" android:versionCode="7"
android:versionName="1.0"> android:versionName="1.0">
<application android:label="@string/app_name" <application android:label="@string/app_name"
android:icon="@drawable/logo" android:icon="@drawable/logo"
......
...@@ -265,6 +265,24 @@ ...@@ -265,6 +265,24 @@
(vector-ref i 0)) (vector-ref i 0))
(cdr s))))) (cdr s)))))
(define (all-entities-where2or db table type ktv ktv2 or-value)
(let ((s (db-select
db (string-append
"select e.entity_id from " table "_entity as e "
"join " table "_value_" (ktv-type ktv)
" as a on a.entity_id = e.entity_id "
"join " table "_value_" (ktv-type ktv2)
" as b on b.entity_id = e.entity_id "
"where e.entity_type = ? and a.attribute_id = ? and b.attribute_id =? and a.value = ? and (b.value = ? or b.value = ?) ")
type (ktv-key ktv) (ktv-key ktv2) (ktv-value ktv) (ktv-value ktv2) or-value)))
(msg (db-status db))
(if (null? s)
'()
(map
(lambda (i)
(vector-ref i 0))
(cdr s)))))
(define (all-entities-where-newer db table type ktv ktv2) (define (all-entities-where-newer db table type ktv ktv2)
(let ((s (db-select (let ((s (db-select
db (string-append db (string-append
...@@ -326,8 +344,6 @@ ...@@ -326,8 +344,6 @@
(vector-ref i 0)) (vector-ref i 0))
(cdr s))))) (cdr s)))))
(define (validate db) (define (validate db)
;; check attribute for duplicate entity-id/attribute-ids ;; check attribute for duplicate entity-id/attribute-ids
0) 0)
...@@ -389,13 +405,13 @@ ...@@ -389,13 +405,13 @@
(prof-end "db-all-where2") (prof-end "db-all-where2")
r)) r))
(define (db-all-where2 db table type ktv ktv2) (define (db-all-where2or db table type ktv ktv2 or-value)
(prof-start "db-all-where2") (prof-start "db-all-where2or")
(let ((r (map (let ((r (map
(lambda (i) (lambda (i)
(get-entity db table i)) (get-entity db table i))
(all-entities-where2 db table type ktv ktv2)))) (all-entities-where2or db table type ktv ktv2 or-value))))
(prof-end "db-all-where2") (prof-end "db-all-where2or")
r)) r))
(define (db-all-newer db table type ktv ktv2) (define (db-all-newer db table type ktv ktv2)
......
This diff is collapsed.
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
<style name="StarwispSpinner" parent="android:style/Widget.Spinner"> <style name="StarwispSpinner" parent="android:style/Widget.Spinner">
<item name="android:textColor">@color/text</item> <item name="android:textColor">@color/text</item>
<item name="android:textSize">50sp</item>
<item name="android:background">@drawable/swarmspinner</item> <item name="android:background">@drawable/swarmspinner</item>
</style> </style>
......
...@@ -537,7 +537,7 @@ public class StarwispBuilder ...@@ -537,7 +537,7 @@ public class StarwispBuilder
ArrayAdapter spinnerArrayAdapter = ArrayAdapter spinnerArrayAdapter =
new ArrayAdapter<String>(ctx, new ArrayAdapter<String>(ctx,
android.R.layout.simple_spinner_item, R.layout.spinner_item,
spinnerArray) { spinnerArray) {
public View getView(int position, View convertView,ViewGroup parent) { public View getView(int position, View convertView,ViewGroup parent) {
View v = super.getView(position, convertView, parent); View v = super.getView(position, convertView, parent);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment