Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/btelintelo/campjoy
Browse files Browse the repository at this point in the history
  • Loading branch information
@samus
samus committed Oct 20, 2013
2 parents b208866 + da447b4 commit 23d79c1
Show file tree
Hide file tree
Showing 12 changed files with 129 additions and 112 deletions.
190 changes: 95 additions & 95 deletions android/IdentitreeStarterKit/assets/glossary.json
View file
Original file line number Diff line number Diff line change
@@ -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_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"
}
{
"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"
}
]
}
11 changes: 7 additions & 4 deletions android/IdentitreeStarterKit/assets/questions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
{
"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"
},
Expand Down Expand Up @@ -226,7 +226,7 @@
"choices":[{
"text": "Bark of tree white and can be chipped away easily.",
"nextid": "",
"treeid": "chinkapin_oak"
"treeid": "chinquapin_oak"
},
{
"text": "Bark of tree darker in color and firm.",
Expand Down Expand Up @@ -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"
},
Expand All @@ -375,4 +375,7 @@
"text": "Trunk not as above; larger trees with long strips of shaggy bark",
"nextid": "",
"treeid": "shagbark_hickory"
}]
}]
}
]
}
14 changes: 7 additions & 7 deletions android/IdentitreeStarterKit/assets/trees.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"id": "shingle_oak",
"name": "Shingle Oak",
"description": "Unlike most oaks the Shingle OakÕs leaves are unlobed, instead they are oval shaped. Common name originates from its use to make shingles for houses.",
"description": "Unlike most oaks the Shingle Oak’s leaves are unlobed, instead they are oval shaped. Common name originates from its use to make shingles for houses.",
"sciname": "Quercus imbricaria",
"family": "Beech Family (Fagaceae)",
"tableData":[
Expand Down Expand Up @@ -54,7 +54,7 @@
{
"id": "american_beech",
"name": "American Beech",
"description": "This tree has smooth, light gray bark throughout its lifeÑwhich can extend well over 300 years! The roots of the American Beech remain close to the surface whiles its spread makes it difficult for anything to grow beneath its shady canopy. Some trunks are partially hollow, making it a great home for wildlife!",
"description": "This tree has smooth, light gray bark throughout its life—which can extend well over 300 years! The roots of the American Beech remain close to the surface whiles its spread makes it difficult for anything to grow beneath its shady canopy. Some trunks are partially hollow, making it a great home for wildlife!",
"sciname": "Fagus grandifolia",
"family": "Beech Family",
"tableData":[
Expand Down Expand Up @@ -88,7 +88,7 @@
{
"id": "box_elder",
"name": "Box Elder",
"description": "This is the only maple tree native to Ohio containing compound leaves. These trees are common in areas that have experienced human influence, such as flood plains, hedges, and vacant lots. Their short lifespan (²30 years) and rapid growth allow them to quickly establish. While they are native to North America, they are considered an invasive species in Australia.",
"description": "This is the only maple tree native to Ohio containing compound leaves. These trees are common in areas that have experienced human influence, such as flood plains, hedges, and vacant lots. Their short lifespan (≤30 years) and rapid growth allow them to quickly establish. While they are native to North America, they are considered an invasive species in Australia.",
"sciname": "Acer negundo",
"family": "Maple Family (Acer)",
"tableData":[
Expand Down Expand Up @@ -122,7 +122,7 @@
{
"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.",
"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)",
"tableData":[
Expand Down Expand Up @@ -156,7 +156,7 @@
{
"id": "american_elm",
"name": "American Elm",
"description": "The American ElmÕs iconic arching limbs graced city sidewalks in years past, forming leafy canopies over the roadway. Sadly, many mature members of this species have fallen victim to Dutch Elm disease; the spread of this disease by the elm bark beetle has made older specimens increasingly rare. Fortunately, young trees are immune to this disease and may even reach reproductive age before succumbing to the fungus.",
"description": "The American Elm’s iconic arching limbs graced city sidewalks in years past, forming leafy canopies over the roadway. Sadly, many mature members of this species have fallen victim to Dutch Elm disease; the spread of this disease by the elm bark beetle has made older specimens increasingly rare. Fortunately, young trees are immune to this disease and may even reach reproductive age before succumbing to the fungus.",
"sciname": "Ulmus americana",
"family": "Elm Family (Ulmaceae)",
"tableData":[
Expand Down Expand Up @@ -241,7 +241,7 @@
{
"id": "red_maple",
"name": "Red Maple",
"description": "Red Maple is one of the top ten most common trees in the United States. The treeÕs distinct red winter buds develop into samaras in late winter to early spring; Sometimes this fruit is commonly referred to as Òhelicopter seeds.Ó The wood of this tree is soft, therefore it is not a great choice for woodworking. However, not as widely used as other maples, a Red Maple can be tapped for syrup production.",
"description": "Red Maple is one of the top ten most common trees in the United States. The tree’s distinct red winter buds develop into samaras in late winter to early spring; Sometimes this fruit is commonly referred to as “helicopter seeds.” The wood of this tree is soft, therefore it is not a great choice for woodworking. However, not as widely used as other maples, a Red Maple can be tapped for syrup production.",
"sciname": "Acer rubrum",
"family": "Maple Family (Aceraceae)",
"tableData":[
Expand Down Expand Up @@ -360,7 +360,7 @@
{
"id": "osage_orange",
"name": "Osage Orange",
"description": "The Osage Orange tree gets its name from the Osage tribe and the orange-sized, green fruit it produces. It is also known as the ÒhedgeappleÓ because they were commonly used as a hedge tree in rows of planting on farms. Its fruit can be used as a natural insect repellent. ",
"description": "The Osage Orange tree gets its name from the Osage tribe and the orange-sized, green fruit it produces. It is also known as the “hedgeapple” because they were commonly used as a hedge tree in rows of planting on farms. Its fruit can be used as a natural insect repellent. ",
"sciname": "Maclura pomifera",
"family": "Mulberry Family (Moraceae)",
"tableData":[
Expand Down
Binary file modified android/IdentitreeStarterKit/ic_launcher-web.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added android/IdentitreeStarterKit/res/drawable-hdpi/homebackground.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/IdentitreeStarterKit/res/drawable-hdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added android/IdentitreeStarterKit/res/drawable-hdpi/identitreelogo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/IdentitreeStarterKit/res/drawable-mdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/IdentitreeStarterKit/res/drawable-xhdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/IdentitreeStarterKit/res/drawable-xxhdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 19 additions & 5 deletions android/IdentitreeStarterKit/res/layout/activity_main.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,26 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
tools:context=".MainActivity"
android:layout_height="match_parent">
<ImageView android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/homebackground"
android:alpha="0.5"
/>

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"

android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context=".MainActivity" >
>


<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
Expand All @@ -32,7 +45,8 @@
android:layout_below="@+id/textView2"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dp"
android:src="@drawable/campjoy"
android:src="@drawable/identitreelogo"
android:text="@string/text_question" />

</RelativeLayout>
</RelativeLayout>
</FrameLayout>
2 changes: 1 addition & 1 deletion data/json/questions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
"choices":[{
"text": "Bark of tree white and can be chipped away easily.",
"nextid": "",
"treeid": "chinkapin_oak"
"treeid": "chinquapin_oak"
},
{
"text": "Bark of tree darker in color and firm.",
Expand Down

0 comments on commit 23d79c1

Please sign in to comment.