Permalink
Browse files

Merge remote-tracking branch 'origin/master'

  • Loading branch information...
2 parents ca85ed1 + 998860e commit 908f8b39390aabbf6e43cd0c1174d3a87bb5d697 @samus samus committed Oct 19, 2013
Showing with 1,160 additions and 159 deletions.
  1. +8 −10 android/IdentitreeStarterKit/AndroidManifest.xml
  2. BIN android/IdentitreeStarterKit/assets/american_basswood_map.jpg
  3. BIN android/IdentitreeStarterKit/assets/american_beech_map.jpg
  4. BIN android/IdentitreeStarterKit/assets/american_elm_map.jpg
  5. BIN android/IdentitreeStarterKit/assets/bitternut_hickory_map.jpg
  6. BIN android/IdentitreeStarterKit/assets/black_cherry_map.jpg
  7. BIN android/IdentitreeStarterKit/assets/black_locust_map.jpg
  8. BIN android/IdentitreeStarterKit/assets/black_walnut_map.jpg
  9. BIN android/IdentitreeStarterKit/assets/black_willow_map.jpg
  10. BIN android/IdentitreeStarterKit/assets/box_elder_map.jpg
  11. BIN android/IdentitreeStarterKit/assets/chinquapin_oak_map.jpg
  12. BIN android/IdentitreeStarterKit/assets/flowering_dogwood_map.jpg
  13. +92 −7 android/IdentitreeStarterKit/assets/glossary.json
  14. BIN android/IdentitreeStarterKit/assets/honey_locust_map.jpg
  15. BIN android/IdentitreeStarterKit/assets/musclewood_map.jpg
  16. BIN android/IdentitreeStarterKit/assets/ohio_buckeye_map.jpg
  17. BIN android/IdentitreeStarterKit/assets/osage_orange_map.jpg
  18. BIN android/IdentitreeStarterKit/assets/pawpaw_map.jpg
  19. BIN android/IdentitreeStarterKit/assets/pin_oak_map.jpg
  20. BIN android/IdentitreeStarterKit/assets/red_maple_map.jpg
  21. BIN android/IdentitreeStarterKit/assets/red_mulberry_map.jpg
  22. BIN android/IdentitreeStarterKit/assets/red_oak_map.jpg
  23. BIN android/IdentitreeStarterKit/assets/redbud_map.jpg
  24. BIN android/IdentitreeStarterKit/assets/sassafras_map.jpg
  25. BIN android/IdentitreeStarterKit/assets/shagbark_hickory_map.jpg
  26. BIN android/IdentitreeStarterKit/assets/shingle_oak_map.jpg
  27. BIN android/IdentitreeStarterKit/assets/sugar_maple_map.jpg
  28. BIN android/IdentitreeStarterKit/assets/sweetgum_map.jpg
  29. BIN android/IdentitreeStarterKit/assets/sycamore_map.jpg
  30. +508 −14 android/IdentitreeStarterKit/assets/trees.json
  31. BIN android/IdentitreeStarterKit/assets/tuliptree_map.jpg
  32. BIN android/IdentitreeStarterKit/assets/white_ash_map.jpg
  33. BIN android/IdentitreeStarterKit/assets/white_oak_map.jpg
  34. +11 −0 android/IdentitreeStarterKit/res/layout/activity_glossary.xml
  35. +23 −16 android/IdentitreeStarterKit/res/layout/activity_main.xml
  36. +210 −3 android/IdentitreeStarterKit/res/layout/fragment_tree_info.xml
  37. +30 −0 android/IdentitreeStarterKit/res/layout/glossary_term.xml
  38. +12 −0 android/IdentitreeStarterKit/src/org/campjoy/identitree/starter/MainActivity.java
  39. +24 −0 android/IdentitreeStarterKit/src/org/campjoy/identitree/starter/activities/GlossaryActivity.java
  40. +7 −6 android/IdentitreeStarterKit/src/org/campjoy/identitree/starter/fragments/QuestionFragment.java
  41. +29 −3 android/IdentitreeStarterKit/src/org/campjoy/identitree/starter/fragments/TreeInfoFragment.java
  42. +9 −15 android/IdentitreeStarterKit/src/org/campjoy/identitree/starter/model/BaseModel.java
  43. +0 −38 android/IdentitreeStarterKit/src/org/campjoy/identitree/starter/model/Choice.java
  44. +82 −0 android/IdentitreeStarterKit/src/org/campjoy/identitree/starter/model/GlossaryAdapter.java
  45. +37 −24 android/IdentitreeStarterKit/src/org/campjoy/identitree/starter/model/GlossaryModel.java
  46. +49 −17 android/IdentitreeStarterKit/src/org/campjoy/identitree/starter/model/Question.java
  47. +19 −1 android/IdentitreeStarterKit/src/org/campjoy/identitree/starter/model/QuestionModel.java
  48. +8 −3 android/IdentitreeStarterKit/src/org/campjoy/identitree/starter/model/TreeModel.java
  49. BIN data/images/thumb/american_basswood_thumb.jpg
  50. BIN data/images/thumb/american_beech_thumb.jpg
  51. BIN data/images/thumb/american_elm_thumb.jpg
  52. BIN data/images/thumb/bitternut_hickory_thumb.jpg
  53. BIN data/images/thumb/black_cherry_thumb.jpg
  54. BIN data/images/thumb/black_locust_thumb.jpg
  55. BIN data/images/thumb/black_walnut_thumb.jpg
  56. BIN data/images/thumb/black_willow_thumb.jpg
  57. BIN data/images/thumb/box_elder_thumb.jpg
  58. BIN data/images/thumb/chinquapin_oak_thumb.jpg
  59. BIN data/images/thumb/flowering_dogwood_thumb.jpg
  60. BIN data/images/thumb/honey_locust_thumb.jpg
  61. BIN data/images/thumb/musclewood_thumb.jpg
  62. BIN data/images/thumb/osage_orange_thumb.jpg
  63. BIN data/images/thumb/pawpaw_thumb.jpg
  64. BIN data/images/thumb/pin_oak_thumb.jpg
  65. BIN data/images/thumb/red_maple_thumb.jpg
  66. BIN data/images/thumb/red_mulberry_thumb.jpg
  67. BIN data/images/thumb/red_oak_thumb.jpg
  68. BIN data/images/thumb/redbud_thumb.jpg
  69. BIN data/images/thumb/sassafras_thumb.jpg
  70. BIN data/images/thumb/shagbark_hickory_thumb.jpg
  71. BIN data/images/thumb/shingle_oak_thumb.jpg
  72. BIN data/images/thumb/sugar_maple_thumb.jpg
  73. BIN data/images/thumb/sweetgum_thumb.jpg
  74. BIN data/images/thumb/sycamore_thumb.jpg
  75. BIN data/images/thumb/tuliptree_thumb.jpg
  76. BIN data/images/thumb/white_ash_thumb.jpg
  77. BIN data/images/thumb/white_oak_thumb.jpg
  78. +2 −2 data/json/trees.json
@@ -14,18 +14,15 @@
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme" >
- <activity android:name=".activities.SplashActivity">
+ <activity android:name=".activities.SplashActivity" >
<intent-filter>
- <category android:name="android.intent.category.LAUNCHER"/>
- <action android:name="android.intent.action.MAIN"/>
- </intent-filter>
- </activity><activity android:name="org.campjoy.identitree.starter.MainActivity" >
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
-
<category android:name="android.intent.category.LAUNCHER" />
+
+ <action android:name="android.intent.action.MAIN" />
</intent-filter>
</activity>
+ <activity android:name="org.campjoy.identitree.starter.MainActivity" >
+ </activity>
<activity android:name="org.campjoy.identitree.starter.activities.TreeInfoActivity" >
</activity>
<activity
@@ -38,7 +35,8 @@
android:label="@string/title_activity_about"
android:theme="@style/FullscreenTheme" >
</activity>
-
+ <activity android:name="org.campjoy.identitree.starter.activities.GlossaryActivity" >
+ </activity>
</application>
-</manifest>
+</manifest>
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -1,14 +1,99 @@
{
"terms":[
{
- "name": "Glossary Term 1",
- "description": "Description 1",
- "image": "image1.jpg"
+ "name": "Acorn",
+ "description": "Small nut that is produced by oak trees. Has a cap on top resembling a beanie",
+ "image": "acorn.png"
},
{
- "name": "Glossary Term 2",
- "description": "Description 2",
- "image": "image1.jpg"
+ "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"
}
]
-}
+}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Diff not rendered.
Diff not rendered.
Oops, something went wrong.

0 comments on commit 908f8b3

Please sign in to comment.