From 3b27e02434c35bd90805e568cb3ec03132be3253 Mon Sep 17 00:00:00 2001 From: Alex Argo Date: Sun, 20 Oct 2013 12:37:52 -0400 Subject: [PATCH 1/2] =?UTF-8?q?Change=20deceleration=20rate=20of=20carouse?= =?UTF-8?q?l=20so=20swipes=20don=E2=80=99t=20take=20you=20really=20far?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Camp Joy Outdoors/CJOTreeInfoViewController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Camp Joy Outdoors/CJOTreeInfoViewController.m b/ios/Camp Joy Outdoors/CJOTreeInfoViewController.m index 6d43306..23069b5 100644 --- 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; From 5585d7da3005a04c08905dc6e775cbeeceef1cfc Mon Sep 17 00:00:00 2001 From: Mark Mathis Date: Sun, 20 Oct 2013 13:22:00 -0400 Subject: [PATCH 2/2] Stop highlighting on hot tap --- .../src/org/campjoy/identitree/starter/popup/HotTap.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/android/IdentitreeStarterKit/src/org/campjoy/identitree/starter/popup/HotTap.java b/android/IdentitreeStarterKit/src/org/campjoy/identitree/starter/popup/HotTap.java index 84aab3d..c7bffb9 100644 --- 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) {