Permalink
Browse files

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

  • Loading branch information...
samus committed Oct 20, 2013
2 parents 6927a60 + 6895bf0 commit 2259c14be12f97059215cfdabbf085ed6ffc0cd0
Showing with 758 additions and 113 deletions.
  1. +6 −8 android/IdentitreeStarterKit/AndroidManifest.xml
  2. +1 −1 android/IdentitreeStarterKit/assets/questions.json
  3. +14 −0 android/IdentitreeStarterKit/res/anim/grow_from_bottom.xml
  4. +14 −0 android/IdentitreeStarterKit/res/anim/grow_from_bottomleft_to_topright.xml
  5. +14 −0 android/IdentitreeStarterKit/res/anim/grow_from_bottomright_to_topleft.xml
  6. +14 −0 android/IdentitreeStarterKit/res/anim/grow_from_top.xml
  7. +14 −0 android/IdentitreeStarterKit/res/anim/grow_from_topleft_to_bottomright.xml
  8. +14 −0 android/IdentitreeStarterKit/res/anim/grow_from_topright_to_bottomleft.xml
  9. +7 −0 android/IdentitreeStarterKit/res/anim/rail.xml
  10. +14 −0 android/IdentitreeStarterKit/res/anim/shrink_from_bottom.xml
  11. +14 −0 android/IdentitreeStarterKit/res/anim/shrink_from_bottomleft_to_topright.xml
  12. +14 −0 android/IdentitreeStarterKit/res/anim/shrink_from_bottomright_to_topleft.xml
  13. +14 −0 android/IdentitreeStarterKit/res/anim/shrink_from_top.xml
  14. +14 −0 android/IdentitreeStarterKit/res/anim/shrink_from_topleft_to_bottomright.xml
  15. +14 −0 android/IdentitreeStarterKit/res/anim/shrink_from_topright_to_bottomleft.xml
  16. BIN android/IdentitreeStarterKit/res/drawable-hdpi/quickaction_arrow_down.png
  17. BIN android/IdentitreeStarterKit/res/drawable-hdpi/quickaction_arrow_up.png
  18. BIN android/IdentitreeStarterKit/res/drawable-mdpi/quickaction_arrow_down.png
  19. BIN android/IdentitreeStarterKit/res/drawable-mdpi/quickaction_arrow_up.png
  20. +61 −0 android/IdentitreeStarterKit/res/layout/hot_tap_bubble.xml
  21. +38 −0 android/IdentitreeStarterKit/res/values/styles.xml
  22. +1 −1 android/IdentitreeStarterKit/src/org/campjoy/identitree/starter/activities/GlossaryActivity.java
  23. +6 −3 android/IdentitreeStarterKit/src/org/campjoy/identitree/starter/activities/SplashActivity.java
  24. +3 −0 android/IdentitreeStarterKit/src/org/campjoy/identitree/starter/fragments/QuestionFragment.java
  25. +2 −1 android/IdentitreeStarterKit/src/org/campjoy/identitree/starter/fragments/TreeInfoFragment.java
  26. +23 −2 android/IdentitreeStarterKit/src/org/campjoy/identitree/starter/model/GlossaryModel.java
  27. +21 −34 android/IdentitreeStarterKit/src/org/campjoy/identitree/starter/model/TreeModel.java
  28. +26 −34 android/IdentitreeStarterKit/src/org/campjoy/identitree/starter/popup/HotTap.java
  29. +233 −0 android/IdentitreeStarterKit/src/org/campjoy/identitree/starter/popup/HotTapBubble.java
  30. +128 −0 android/IdentitreeStarterKit/src/org/campjoy/identitree/starter/popup/PopupWindows.java
  31. BIN data/homescreenimages/images/indentitree_home.png
  32. +34 −29 ios/Camp Joy Outdoors/Base.lproj/Main_iPhone.storyboard
@@ -14,18 +14,17 @@
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme" >
- <activity android:name="org.campjoy.identitree.starter.activities.SplashActivity" >
+ <activity android:name=".activities.SplashActivity"
+ android:noHistory="true">
<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.MainTabActivity"
+ android:label="@string/title_activity_main_tab" >
</activity>
<activity android:name="org.campjoy.identitree.starter.MainActivity" >
</activity>
@@ -43,7 +42,6 @@
</activity>
<activity android:name="org.campjoy.identitree.starter.activities.GlossaryActivity" >
</activity>
-
</application>
</manifest>
@@ -135,7 +135,7 @@
"choices":[{
"text": "Leaf scars below bud; buds are yellowish in color.",
"nextid": "",
- "treeid": "butternut_hickory"
+ "treeid": "bitternut_hickory"
},
{
"text": "Buds not yellowish in color.",
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+ <scale
+ android:fromXScale="0.3" android:toXScale="1.0"
+ android:fromYScale="0.3" android:toYScale="1.0"
+ android:pivotX="50%" android:pivotY="100%"
+ android:duration="@android:integer/config_shortAnimTime"
+ />
+ <alpha
+ android:interpolator="@android:anim/decelerate_interpolator"
+ android:fromAlpha="0.0" android:toAlpha="1.0"
+ android:duration="@android:integer/config_shortAnimTime"
+ />
+</set>
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+ <scale
+ android:fromXScale="0.3" android:toXScale="1.0"
+ android:fromYScale="0.3" android:toYScale="1.0"
+ android:pivotX="0%" android:pivotY="50%"
+ android:duration="@android:integer/config_shortAnimTime"
+ />
+ <alpha
+ android:interpolator="@android:anim/decelerate_interpolator"
+ android:fromAlpha="0.0" android:toAlpha="1.0"
+ android:duration="@android:integer/config_shortAnimTime"
+ />
+</set>
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+ <scale
+ android:fromXScale="0.3" android:toXScale="1.0"
+ android:fromYScale="0.3" android:toYScale="1.0"
+ android:pivotX="100%" android:pivotY="50%"
+ android:duration="@android:integer/config_shortAnimTime"
+ />
+ <alpha
+ android:interpolator="@android:anim/decelerate_interpolator"
+ android:fromAlpha="0.0" android:toAlpha="1.0"
+ android:duration="@android:integer/config_shortAnimTime"
+ />
+</set>
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+ <scale
+ android:fromXScale="0.3" android:toXScale="1.0"
+ android:fromYScale="0.3" android:toYScale="1.0"
+ android:pivotX="50%" android:pivotY="0%"
+ android:duration="@android:integer/config_shortAnimTime"
+ />
+ <alpha
+ android:interpolator="@android:anim/decelerate_interpolator"
+ android:fromAlpha="0.0" android:toAlpha="1.0"
+ android:duration="@android:integer/config_shortAnimTime"
+ />
+</set>
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+ <scale
+ android:fromXScale="0.3" android:toXScale="1.0"
+ android:fromYScale="0.3" android:toYScale="1.0"
+ android:pivotX="0%" android:pivotY="0%"
+ android:duration="@android:integer/config_shortAnimTime"
+ />
+ <alpha
+ android:interpolator="@android:anim/decelerate_interpolator"
+ android:fromAlpha="0.0" android:toAlpha="1.0"
+ android:duration="@android:integer/config_shortAnimTime"
+ />
+</set>
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+ <scale
+ android:fromXScale="0.3" android:toXScale="1.0"
+ android:fromYScale="0.3" android:toYScale="1.0"
+ android:pivotX="100%" android:pivotY="0%"
+ android:duration="@android:integer/config_shortAnimTime"
+ />
+ <alpha
+ android:interpolator="@android:anim/decelerate_interpolator"
+ android:fromAlpha="0.0" android:toAlpha="1.0"
+ android:duration="@android:integer/config_shortAnimTime"
+ />
+</set>
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<translate
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:fromXDelta="100%p"
+ android:toXDelta="0"
+ android:duration="325" />
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+ <scale
+ android:fromXScale="1.0" android:toXScale="0.3"
+ android:fromYScale="1.0" android:toYScale="0.3"
+ android:pivotX="50%" android:pivotY="0%"
+ android:duration="@android:integer/config_shortAnimTime"
+ />
+ <alpha
+ android:interpolator="@android:anim/accelerate_interpolator"
+ android:fromAlpha="1.0" android:toAlpha="0.0"
+ android:duration="@android:integer/config_shortAnimTime"
+ />
+</set>
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+ <scale
+ android:fromXScale="1.0" android:toXScale="0.3"
+ android:fromYScale="1.0" android:toYScale="0.3"
+ android:pivotX="100%" android:pivotY="0%"
+ android:duration="@android:integer/config_shortAnimTime"
+ />
+ <alpha
+ android:interpolator="@android:anim/accelerate_interpolator"
+ android:fromAlpha="1.0" android:toAlpha="0.0"
+ android:duration="@android:integer/config_shortAnimTime"
+ />
+</set>
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+ <scale
+ android:fromXScale="1.0" android:toXScale="0.3"
+ android:fromYScale="1.0" android:toYScale="0.3"
+ android:pivotX="0%" android:pivotY="0%"
+ android:duration="@android:integer/config_shortAnimTime"
+ />
+ <alpha
+ android:interpolator="@android:anim/accelerate_interpolator"
+ android:fromAlpha="1.0" android:toAlpha="0.0"
+ android:duration="@android:integer/config_shortAnimTime"
+ />
+</set>
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+ <scale
+ android:fromXScale="1.0" android:toXScale="0.3"
+ android:fromYScale="1.0" android:toYScale="0.3"
+ android:pivotX="50%" android:pivotY="100%"
+ android:duration="@android:integer/config_shortAnimTime"
+ />
+ <alpha
+ android:interpolator="@android:anim/accelerate_interpolator"
+ android:fromAlpha="1.0" android:toAlpha="0.0"
+ android:duration="@android:integer/config_shortAnimTime"
+ />
+</set>
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+ <scale
+ android:fromXScale="1.0" android:toXScale="0.3"
+ android:fromYScale="1.0" android:toYScale="0.3"
+ android:pivotX="100%" android:pivotY="100%"
+ android:duration="@android:integer/config_shortAnimTime"
+ />
+ <alpha
+ android:interpolator="@android:anim/accelerate_interpolator"
+ android:fromAlpha="1.0" android:toAlpha="0.0"
+ android:duration="@android:integer/config_shortAnimTime"
+ />
+</set>
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+ <scale
+ android:fromXScale="1.0" android:toXScale="0.3"
+ android:fromYScale="1.0" android:toYScale="0.3"
+ android:pivotX="0%" android:pivotY="100%"
+ android:duration="@android:integer/config_shortAnimTime"
+ />
+ <alpha
+ android:interpolator="@android:anim/accelerate_interpolator"
+ android:fromAlpha="1.0" android:toAlpha="0.0"
+ android:duration="@android:integer/config_shortAnimTime"
+ />
+</set>
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** /res/layout/quickaction.xml
+**
+** Author: Lorensius W. L. T <lorenz@londatiga.net>
+**
+*/
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+
+ <FrameLayout
+ android:layout_marginTop="10dip"
+ android:id="@+id/header2"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"/>
+
+ <ImageView
+ android:id="@+id/arrow_up"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/quickaction_arrow_up" />
+
+ <LinearLayout
+ android:id="@+id/popuptext"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:background="@android:drawable/screen_background_light_transparent">
+
+ <TextView
+ android:id="@+id/bubbletitle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>
+
+ <TextView
+ android:id="@+id/bubbledescription"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>
+
+ </LinearLayout>
+
+ <FrameLayout
+ android:id="@+id/footer"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/popuptext" />
+
+ <ImageView
+ android:id="@+id/arrow_down"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="-1dip"
+ android:layout_below="@id/footer"
+ android:src="@drawable/quickaction_arrow_down" />
+
+</RelativeLayout>
@@ -35,5 +35,43 @@
</style>
<style name="ButtonBarButton" />
+
+ <style name="Animations" />
+
+ <!-- PopDownMenu -->
+ <style name="Animations.PopDownMenu" />
+
+ <style name="Animations.PopDownMenu.Left">
+ <item name="@android:windowEnterAnimation">@anim/grow_from_topleft_to_bottomright</item>
+ <item name="@android:windowExitAnimation">@anim/shrink_from_bottomright_to_topleft</item>
+ </style>
+
+ <style name="Animations.PopDownMenu.Right">
+ <item name="@android:windowEnterAnimation">@anim/grow_from_topright_to_bottomleft</item>
+ <item name="@android:windowExitAnimation">@anim/shrink_from_bottomleft_to_topright</item>
+ </style>
+
+ <style name="Animations.PopDownMenu.Center">
+ <item name="@android:windowEnterAnimation">@anim/grow_from_top</item>
+ <item name="@android:windowExitAnimation">@anim/shrink_from_bottom</item>
+ </style>
+
+ <!-- PopUpMenu -->
+ <style name="Animations.PopUpMenu" />
+
+ <style name="Animations.PopUpMenu.Left">
+ <item name="@android:windowEnterAnimation">@anim/grow_from_bottomleft_to_topright</item>
+ <item name="@android:windowExitAnimation">@anim/shrink_from_topright_to_bottomleft</item>
+ </style>
+
+ <style name="Animations.PopUpMenu.Right">
+ <item name="@android:windowEnterAnimation">@anim/grow_from_bottomright_to_topleft</item>
+ <item name="@android:windowExitAnimation">@anim/shrink_from_topleft_to_bottomright</item>
+ </style>
+
+ <style name="Animations.PopUpMenu.Center">
+ <item name="@android:windowEnterAnimation">@anim/grow_from_bottom</item>
+ <item name="@android:windowExitAnimation">@anim/shrink_from_top</item>
+ </style>
</resources>
@@ -16,7 +16,7 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_glossary);
- GlossaryModel glossary = new GlossaryModel(getApplicationContext());
+ GlossaryModel glossary = GlossaryModel.loadInstance(getApplicationContext());
GlossaryAdapter adapter = new GlossaryAdapter(getApplicationContext(), glossary);
ListView termListView = (ListView) findViewById(R.id.glossary_list);
@@ -6,6 +6,8 @@
import org.campjoy.identitree.starter.MainActivity;
import org.campjoy.identitree.starter.MainTabActivity;
import org.campjoy.identitree.starter.R;
+import org.campjoy.identitree.starter.model.GlossaryModel;
+import org.campjoy.identitree.starter.model.TreeModel;
import android.app.Activity;
import android.content.Intent;
@@ -36,7 +38,9 @@ protected void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.activity_splash);
splashLayoutImg = (ImageView)findViewById(R.id.splash_activity_image);
-
+ TreeModel.loadInstance(getApplicationContext());
+ GlossaryModel.loadInstance(getApplicationContext());
+
try {
splashLayoutImg.setBackgroundDrawable(Drawable.createFromStream(getAssets().open("american_basswood_img_0107.jpg"), null));
} catch (IOException e) {
@@ -53,8 +57,7 @@ protected void onCreate(Bundle savedInstanceState) {
@Override
public void onAnimationEnd(Animation animation) {
- // TODO Auto-generated method stub
- startActivity(new Intent(SplashActivity.this, MainTabActivity.class));
+ startActivity(new Intent(this, MainTabActivity.class));
}
@Override
Oops, something went wrong.

0 comments on commit 2259c14

Please sign in to comment.