Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of https://github.com/btelintelo/campjoy

  • Loading branch information...
commit d8ca00ff0b721efa0b5c1830b06b5cfb8f5c30b7 2 parents 0f1f741 + f7eb563
@samus samus authored
View
192 android/IdentitreeStarterKit/assets/glossary.json
@@ -1,99 +1,99 @@
{
"terms":[
- {
- "name": "Acorn",
- "description": "Small nut that is produced by oak trees. Has a cap on top resembling a beanie",
- "image": "acorn.png"
- },
- {
- "name": "Alternate",
- "description": "Leaves or buds staggered along the twigs or branches",
- "image": "alternate.png"
- },
- {
- "name": "Bud",
- "description": "A small protrusion found either on the end or sides of the trees twigs, this is the point from which the trees leaves or flowers will grow",
- "image": "bud.png"
- },
- {
- "name": "Bundle scar",
- "description": "The dots inside a leaf scar",
- "image": "bundle_scar.png"
- },
- {
- "name": "End bud",
- "description": "Buds which grow at the very tip of the twig growing straight out; sometimes referred to as true end buds",
- "image": "end_bud.png"
- },
- {
- "name": "False end bud",
- "description": "Do not have a true end bud, end buds appear to be bent, small or set off to the side",
- "image": "false_end_bud.png"
- },
- {
- "name": "Flower Bud",
- "description": "A bud that will turn into a flower as opposed to a leaf",
- "image": "flower_bud.png"
- },
- {
- "name": "Fruit",
- "description": "The seed containing a pod, nut, samara, berry, or more traditional fleshy fruit (ie. apple or orange)",
- "image": "fruit.png"
- },
- {
- "name": "Furrows",
- "description": "The grooves or channels in the trees bark",
- "image": "furrows.png"
- },
- {
- "name": "Inner bark",
- "description": "Inner most part of the bark attached to the tree’s trunk",
- "image": "inner_bark.png"
- },
- {
- "name": "Leaf scar",
- "description": "The mark left on a twig when the leaf is removed",
- "image": "leaf_scar.png"
- },
- {
- "name": "Lobed",
- "description": "A leaf with multiple rounded portions along the edge (ie. hand with fingers spread apart)",
- "image": "lobed.png"
- },
- {
- "name": "Opposite",
- "description": "Leaves and twigs which grow out exactly across from one another",
- "image": "opposite.png"
- },
- {
- "name": "Paired thorn",
- "description": "Two thorns grouped together side-by-side",
- "image": "paired_thorn.png"
- },
- {
- "name": "Samara",
- "description": "A dry, seeded, 'winged' fruit. The fruit of maples, ashes, and elms",
- "image": "samara.png"
- },
- {
- "name": "Scale",
- "description": "Minute leaves that are needle-like or flat and overlapping like reptilian skin",
- "image": "scale.png"
- },
- {
- "name": "Thorn",
- "description": "A sharp-pointed, woody outgrowth of the internal vascular system of the plant",
- "image": "thorn.png"
- },
- {
- "name": "Twig",
- "description": "The newer growth off a branch, varies in colors different than the branch’s bark where the buds are found",
- "image": "twig.png"
- },
- {
- "name": "Un-lobed",
- "description": "A leaf without lobes (ie. hand with fingers NOT spread apart)",
- "image": "un-lobed.png"
- }
+ {
+ "name": "Acorn",
+ "description": "Small nut that is produced by oak trees. Has a cap on top resembling a beanie",
+ "image": "acorn.png"
+ },
+ {
+ "name": "Alternate",
+ "description": "Leaves or buds staggered along the twigs or branches",
+ "image": "alternate.png"
+ },
+ {
+ "name": "Bud",
+ "description": "A small protrusion found either on the end or sides of the trees twigs, this is the point from which the trees leaves or flowers will grow",
+ "image": "bud.png"
+ },
+ {
+ "name": "Bundle scar",
+ "description": "The dots inside a leaf scar",
+ "image": "bundle_scar.png"
+ },
+ {
+ "name": "End bud",
+ "description": "Buds which grow at the very tip of the twig growing straight out; sometimes referred to as true end buds",
+ "image": "end_bud.png"
+ },
+ {
+ "name": "False end bud",
+ "description": "Do not have a true end bud, end buds appear to be bent, small or set off to the side",
+ "image": "false_end_bud.png"
+ },
+ {
+ "name": "Flower Bud",
+ "description": "A bud that will turn into a flower as opposed to a leaf",
+ "image": "flower_bud.png"
+ },
+ {
+ "name": "Fruit",
+ "description": "The seed containing a pod, nut, samara, berry, or more traditional fleshy fruit (ie. apple or orange)",
+ "image": "fruit_group.png"
+ },
+ {
+ "name": "Furrows",
+ "description": "The grooves or channels in the trees bark",
+ "image": "furrows.png"
+ },
+ {
+ "name": "Inner bark",
+ "description": "Inner most part of the bark attached to the treeÕs trunk",
+ "image": "inner_bark.png"
+ },
+ {
+ "name": "Leaf scar",
+ "description": "The mark left on a twig when the leaf is removed",
+ "image": "leaf_scar.png"
+ },
+ {
+ "name": "Lobed",
+ "description": "A leaf with multiple rounded portions along the edge (ie. hand with fingers spread apart)",
+ "image": "lobed.png"
+ },
+ {
+ "name": "Opposite",
+ "description": "Leaves and twigs which grow out exactly across from one another",
+ "image": "opposite.png"
+ },
+ {
+ "name": "Paired thorn",
+ "description": "Two thorns grouped together side-by-side",
+ "image": "paired_thorn.png"
+ },
+ {
+ "name": "Samara",
+ "description": "A dry, seeded, 'winged' fruit. The fruit of maples, ashes, and elms",
+ "image": "samara.png"
+ },
+ {
+ "name": "Scale",
+ "description": "Minute leaves that are needle-like or flat and overlapping like reptilian skin",
+ "image": "scale.png"
+ },
+ {
+ "name": "Thorn",
+ "description": "A sharp-pointed, woody outgrowth of the internal vascular system of the plant",
+ "image": "thorn.png"
+ },
+ {
+ "name": "Twig",
+ "description": "The newer growth off a branch, varies in colors different than the branchÕs bark where the buds are found",
+ "image": "twig.png"
+ },
+ {
+ "name": "Un-lobed",
+ "description": "A leaf without lobes (ie. hand with fingers NOT spread apart)",
+ "image": "un-lobed_leaf.png"
+ }
]
-}
+}
View
11 android/IdentitreeStarterKit/assets/questions.json
@@ -42,14 +42,14 @@
{
"id": "4",
"choices":[{
- "text": "Green twigs with short buds, with few scales, a shade of pink at the base with a white tip; Bark has a slight orange color to it.  Has paired samara",
+ "text": "Green twigs with short buds, with few scales, a shade of pink at the base with a white tip; Bark has a slight orange color to it. Has paired samara",
"nextid": "",
"treeid": "box_elder"
},
{
"text": "Twigs have one side that’s flat with the other side sometimes purplish; leaf buds are 2 scaled and paintbrush shape, flower buds have a white onion shape with 4 scales; twigs are largest where the buds come out and get skinnier; as the tree gets older the bark gets a more scale like pattern. Often has a red fruit.",
"nextid": "",
- "treeid": "flowering_dogwwod"
+ "treeid": "flowering_dogwood"
}]
},
{
@@ -354,7 +354,7 @@
{
"id": "28",
"choices":[{
- "text": "Buds small, yellow and brown; twigs thin, with a strong smell of almonds when split; newer trees  contain horizontal white bumps on a rusty-brown bark, older trees with bumps splitting into black or burnt looking plates.",
+ "text": "Buds small, yellow and brown; twigs thin, with a strong smell of almonds when split; newer trees contain horizontal white bumps on a rusty-brown bark, older trees with bumps splitting into black or burnt looking plates.",
"nextid": "",
"treeid": "black_cherry"
},
@@ -375,7 +375,4 @@
"text": "Trunk not as above; larger trees with long strips of shaggy bark",
"nextid": "",
"treeid": "shagbark_hickory"
- }]
- }
- ]
-}
+ }]
View
4 android/IdentitreeStarterKit/assets/trees.json
@@ -120,8 +120,8 @@
]
},
{
- "id": "black",
- "name": "Black",
+ "id": "black_cherry",
+ "name": "Black Cherry",
"description": "The sun-loving Black Cherry is a pioneer invader tree that quickly establishes in previously harvested forests and open fields thanks to its abundant fruit production. Its black flaky bark is easy to spot in the forest, especially in the winter. The wood of this tree is sold as ÒcherryÓ and is highly prized in woodworking due to its strong red color and fine-grained heartwood.",
"sciname": "Prunus serotina",
"family": "Rose Family (Cherry)",
View
BIN  android/IdentitreeStarterKit/ic_launcher-web.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  android/IdentitreeStarterKit/res/drawable-hdpi/ic_launcher.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  android/IdentitreeStarterKit/res/drawable-mdpi/ic_launcher.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  android/IdentitreeStarterKit/res/drawable-xhdpi/ic_launcher.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  android/IdentitreeStarterKit/res/drawable-xxhdpi/ic_launcher.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
4 android/IdentitreeStarterKit/res/layout/activity_about.xml
@@ -9,12 +9,12 @@
tools:context=".MainActivity" >
<TextView
- android:layout_width="wrap_content"
android:id="@+id/about_text"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginTop="36dp"
- android:text="The IdentiTree was lovingly developed for Camp Joy by volunteer software engineers at the 2013 Southwest Ohio Give Camp. Special thanks to Nate Hirt, Alex Argo, Jeremy Spitzig, Sam Corder, Brian Telintelo, Parag Joshi, Mark Mathis, Neil Giridharan" />
+ android:text="The IdentiTree was lovingly developed for Camp Joy by volunteer software engineers at the 2013 Southwest Ohio Give Camp. Special thanks to Nate Hirt, Alex Argo, Jeremy Spitzig, Sam Corder, Brian Telintelo, Parag Joshi, Mark Mathis, Neil Giridharan, Jill Griffin, Jenny Beruscha " />
<ImageView
android:layout_width="200dp"
View
2  data/json/questions.json
@@ -49,7 +49,7 @@
{
"text": "Twigs have one side that’s flat with the other side sometimes purplish; leaf buds are 2 scaled and paintbrush shape, flower buds have a white onion shape with 4 scales; twigs are largest where the buds come out and get skinnier; as the tree gets older the bark gets a more scale like pattern. Often has a red fruit.",
"nextid": "",
- "treeid": "flowering_dogwwod"
+ "treeid": "flowering_dogwood"
}]
},
{
Please sign in to comment.
Something went wrong with that request. Please try again.