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

btelintelo · Oct 20, 2013 · 2b5d56e · 2b5d56e
2 parents cd373d0 + 5585d7d
commit 2b5d56e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/android/IdentitreeStarterKit/src/org/campjoy/identitree/starter/popup/HotTap.java b/android/IdentitreeStarterKit/src/org/campjoy/identitree/starter/popup/HotTap.java
@@ -8,6 +8,7 @@
 import org.campjoy.identitree.starter.model.Term;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.text.Spannable;
 import android.text.TextPaint;
@@ -38,6 +39,8 @@ public HotTap(Context activityContext, View v) {
 		glossary = GlossaryModel.getInstance();
 		v.setOnTouchListener(this);
 		createSpans(v);
+		TextView tv = (TextView)v;
+		tv.setHighlightColor(Color.TRANSPARENT);
 	}
 
 	private void createSpans(View v) {

diff --git a/ios/Camp Joy Outdoors/CJOTreeInfoViewController.m b/ios/Camp Joy Outdoors/CJOTreeInfoViewController.m
@@ -56,7 +56,7 @@ - (IBAction)done:(id)sender {
 }
 
 - (void) configureCarousel {
-
+    self.carousel.decelerationRate = 0.5;
 }
 
 #pragma mark - UITableViewDataSource;