Permalink
Browse files

Merge remote-tracking branch 'origin/master'

  • Loading branch information...
2 parents 0dc1587 + daddec6 commit 21d6915f156d4410ef795e333cf2d0462f4531a4 @samus samus committed Oct 20, 2013
Showing 345 changed files with 3,810 additions and 568 deletions.
@@ -14,12 +14,18 @@
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme" >
- <activity android:name=".activities.SplashActivity" >
+ <activity android:name="org.campjoy.identitree.starter.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.MainTabActivity" android:label="@string/title_activity_main_tab">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
</activity>
<activity android:name="org.campjoy.identitree.starter.MainActivity" >
</activity>
@@ -37,6 +43,7 @@
</activity>
<activity android:name="org.campjoy.identitree.starter.activities.GlossaryActivity" >
</activity>
+
</application>
</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.
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.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
@@ -42,12 +42,12 @@
{
"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.",
+ "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"
}]
@@ -112,7 +112,7 @@
"treeid": "honey_locust"
},
{
- "text": "Plants with thorns, singular, smooth, slightly curved; thorns vary, but normally ½ to ¾ inch long; end buds false; twigs with a milky sap; fruit is green-yellow in color, grapefruit sized; whole tree in winter has a yellowish-orange tint.",
+ "text": "Plants with thorns, singular, smooth, slightly curved; thorns vary, but normally ½ to ¾ inch long; end buds false; twigs with a milky sap; fruit is green-yellow in color, grapefruit sized; whole tree in winter has a yellowish-orange tint.",
"nextid": "",
"treeid": "osage_orange"
}]
@@ -263,7 +263,7 @@
{
"id": "21",
"choices":[{
- "text": "Two bud scales, come together like a ducks bill; shallow furrowed bark; trunk grows tall and straight.",
+ "text": "Two bud scales, come together like a duck's bill; shallow furrowed bark; trunk grows tall and straight.",
"nextid": "",
"treeid": "tuliptree"
},
@@ -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"
},
@@ -368,8 +368,8 @@
"id": "29",
"choices":[{
"text": "Trunk muscular; bark smooth, gray; buds angle, bud scales in definite rows.",
- "nextid": "musclewood",
- "treeid": ""
+ "nextid": "",
+ "treeid": "musclewood"
},
{
"text": "Trunk not as above; larger trees with long strips of shaggy bark",
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
@@ -0,0 +1,28 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ 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:layout_width="wrap_content"
+ android:id="@+id/about_text"
+ 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" />
+
+ <ImageView
+ android:layout_width="200dp"
+ android:layout_height="200dp"
+ android:layout_below="@+id/about_text"
+ android:layout_marginTop="20dp"
+ android:src="@drawable/campjoy"
+ android:layout_centerHorizontal="true"
+ android:text="@string/text_question" />
+
+</RelativeLayout>
@@ -8,38 +8,31 @@
android:paddingTop="@dimen/activity_vertical_margin"
tools:context=".MainActivity" >
- <Button
+ <TextView
+ android:id="@+id/textView1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_marginTop="36dp"
+ android:text="Since 1938, we have been focused on making a difference in people&apos;s lives. That&apos;s why even today our mission is to &quot;Help people grow and succeed through life-long, experience-based learning.&quot; " />
+
+ <TextView
+ android:id="@+id/textView2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/textView1"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="17dp"
+ android:text="Click the tree below to start your quest!" />
+
+ <ImageView
android:id="@+id/button_question"
android:layout_width="200dp"
android:layout_height="200dp"
- android:layout_alignParentTop="true"
+ android:layout_below="@+id/textView2"
android:layout_centerHorizontal="true"
- android:layout_marginTop="59dp"
+ android:layout_marginTop="20dp"
+ android:src="@drawable/campjoy"
android:text="@string/text_question" />
- <LinearLayout
- android:orientation="horizontal"
- android:layout_alignParentBottom="true"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <ImageButton
- android:id="@+id/imageTreeBrowser"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@android:drawable/btn_star" />
-
- <ImageButton
- android:id="@+id/imageGlossary"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@android:drawable/btn_star" />
-
- <ImageButton
- android:id="@+id/imageAbout"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@android:drawable/btn_star" />
- </LinearLayout>
-
-</RelativeLayout>
+</RelativeLayout>
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical" >
+<TabHost
+ android:id="@android:id/tabhost"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_gravity="bottom"
+ android:layout_weight="1"
+ android:background="#00000000"
+ android:orientation="vertical" >
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical"
+ android:padding="0dp" >
+
+ <FrameLayout
+ android:id="@android:id/tabcontent"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:padding="0dp" />
+
+
+ <TabWidget
+ android:id="@android:id/tabs"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:gravity="bottom"
+ android:padding="0dp" />
+
+
+
+ </LinearLayout>
+ </TabHost>
+</LinearLayout>
@@ -1,43 +1,95 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical" >
-
- <TextView
- android:id="@+id/text_first_question"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="133dp"
- android:text="@string/text_first" />
-
- <ImageView
- android:id="@+id/image_first_question"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="52dp"
- android:src="@drawable/ic_launcher" android:contentDescription="@string/image"/>
-
- <TextView
- android:id="@+id/text_second_question"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@+id/image_second_question"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="32dp"
- android:text="@string/text_second" />
-
- <ImageView
- android:id="@+id/image_second_question"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignLeft="@+id/image_first_question"
- android:layout_centerVertical="true"
- android:contentDescription="@string/image"
- android:src="@drawable/ic_launcher" />
-
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView android:id="@+id/tree_details_scroll_layout"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_marginBottom="10dp" android:paddingBottom="@dimen/activity_vertical_margin"
+ android:paddingLeft="@dimen/activity_horizontal_margin"
+ android:paddingRight="@dimen/activity_horizontal_margin"
+ android:paddingTop="@dimen/activity_vertical_margin"
+ >
+
+<RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ android:orientation="vertical" >
+
+ <RelativeLayout
+ android:id="@+id/relativeLayout1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:background="@color/lightgray"
+ android:layout_centerHorizontal="true" >
+
+ <ImageView
+ android:id="@+id/image_first_question"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="40dp"
+ android:contentDescription="@string/image"
+ android:src="@drawable/ic_launcher" />
+
+ <TextView
+ android:id="@+id/text_first_question"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:paddingLeft="20dp"
+ android:paddingRight="10dp"
+ android:layout_below="@+id/image_first_question"
+ android:layout_marginTop="29dp"
+ android:text="@string/text_first"
+ android:textSize="20sp" />
+ </RelativeLayout>
+
+ <RelativeLayout
+ android:id="@+id/relativeLayout2"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/lightgray"
+ android:layout_alignLeft="@+id/relativeLayout1"
+ android:layout_below="@+id/relativeLayout1"
+ android:layout_marginTop="21dp" >
+
+ <ImageView
+ android:id="@+id/image_second_question"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="40dp"
+ android:contentDescription="@string/image"
+ android:src="@drawable/ic_launcher" />
+
+ <TextView
+ android:id="@+id/text_second_question"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_below="@+id/image_second_question"
+ android:layout_marginTop="29dp"
+ android:paddingLeft="20dp"
+ android:paddingRight="10dp"
+ android:text="@string/text_first"
+ android:textSize="20sp" />
+ </RelativeLayout>
+
+ <TextView
+ android:id="@+id/text_path"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_below="@+id/relativeLayout2"
+ android:layout_marginLeft="48dp"
+ android:layout_marginTop="76dp"
+ android:text="@string/image"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+</RelativeLayout>
+</ScrollView>
Oops, something went wrong.

0 comments on commit 21d6915

Please sign in to comment.