Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Dave Griffiths
mongoose-2000
Commits
c2098595
Commit
c2098595
authored
Dec 09, 2013
by
Dave Griffiths
Browse files
post lunch checkin, bigger text for galaxy note etc
parent
72d82fea
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
167 additions
and
113 deletions
+167
-113
android/AndroidManifest.xml
android/AndroidManifest.xml
+1
-1
android/assets/eavdb.scm
android/assets/eavdb.scm
+22
-6
android/assets/starwisp.scm
android/assets/starwisp.scm
+142
-105
android/res/values/styles.xml
android/res/values/styles.xml
+1
-0
android/src/foam/mongoose/StarwispBuilder.java
android/src/foam/mongoose/StarwispBuilder.java
+1
-1
No files found.
android/AndroidManifest.xml
View file @
c2098595
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"foam.mongoose"
android:versionCode=
"
6
"
android:versionCode=
"
7
"
android:versionName=
"1.0"
>
<application
android:label=
"@string/app_name"
android:icon=
"@drawable/logo"
...
...
android/assets/eavdb.scm
View file @
c2098595
...
...
@@ -265,6 +265,24 @@
(
vector-ref
i
0
))
(
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
)
(
let
((
s
(
db-select
db
(
string-append
...
...
@@ -326,8 +344,6 @@
(
vector-ref
i
0
))
(
cdr
s
)))))
(
define
(
validate
db
)
;; check attribute for duplicate entity-id/attribute-ids
0
)
...
...
@@ -389,13 +405,13 @@
(
prof-end
"db-all-where2"
)
r
))
(
define
(
db-all-where2
db
table
type
ktv
ktv2
)
(
prof-start
"db-all-where2"
)
(
define
(
db-all-where2
or
db
table
type
ktv
ktv2
or-value
)
(
prof-start
"db-all-where2
or
"
)
(
let
((
r
(
map
(
lambda
(
i
)
(
get-entity
db
table
i
))
(
all-entities-where2
db
table
type
ktv
ktv2
))))
(
prof-end
"db-all-where2"
)
(
all-entities-where2
or
db
table
type
ktv
ktv2
or-value
))))
(
prof-end
"db-all-where2
or
"
)
r
))
(
define
(
db-all-newer
db
table
type
ktv
ktv2
)
...
...
android/assets/starwisp.scm
View file @
c2098595
This diff is collapsed.
Click to expand it.
android/res/values/styles.xml
View file @
c2098595
...
...
@@ -33,6 +33,7 @@
<style
name=
"StarwispSpinner"
parent=
"android:style/Widget.Spinner"
>
<item
name=
"android:textColor"
>
@color/text
</item>
<item
name=
"android:textSize"
>
50sp
</item>
<item
name=
"android:background"
>
@drawable/swarmspinner
</item>
</style>
...
...
android/src/foam/mongoose/StarwispBuilder.java
View file @
c2098595
...
...
@@ -537,7 +537,7 @@ public class StarwispBuilder
ArrayAdapter
spinnerArrayAdapter
=
new
ArrayAdapter
<
String
>(
ctx
,
android
.
R
.
layout
.
simple_
spinner_item
,
R
.
layout
.
spinner_item
,
spinnerArray
)
{
public
View
getView
(
int
position
,
View
convertView
,
ViewGroup
parent
)
{
View
v
=
super
.
getView
(
position
,
convertView
,
parent
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment