Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TIMOB-13610] correctly handle scrollableView inside tableview/listview and scrollview AGAIN #4748

Merged
merged 6 commits into from Oct 10, 2013

Conversation

farfromrefug
Copy link
Contributor

test case inside the jira ticket

Conflicts:
	android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIScrollableView.java
@@ -100,6 +105,8 @@ public boolean onInterceptTouchEvent(MotionEvent event) {
@Override
public void onPageScrollStateChanged(int scrollState)
{
mPager.requestDisallowInterceptTouchEvent(state != ViewPager.SCROLL_STATE_IDLE);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean "scrollState" here?

@farfromrefug
Copy link
Contributor Author

I am sorry @pingwang2011 the merge did not go well. Will clean all that up!

Thanks

@farfromrefug
Copy link
Contributor Author

@pingwang2011 i have cleaned up the code. Thanks for your comments.
BTW i have applied the same technique(in my branch) for scrollview, listview and tableview. It is a good to handle scroll widgets. I dont want to add it in this PR because i want it to pass for sure ;)
But in the future you can think about adding it to all scroll widgets

Thanks

@@ -75,6 +75,7 @@
import android.view.Gravity;
import android.view.View;
import android.view.View.MeasureSpec;
import android.view.ViewParent;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unnecessary import.

@pingwang2011
Copy link
Contributor

Ran the three test cases in my comments in JIRA. It works fine for ScrollableView inside ScrollView. It exposes some issues on ScrollableView inside TableView/ListView. Those issues are not caused by this PR. Already filed TIMOB-15408 to follow up.
Ran kitchensink and Anvil as a sanity check. All passed.
FR passed. Please remove the unnecessary import in the above comments. Then it's ready to merge.

@pingwang2011
Copy link
Contributor

farfromrefug, you still missed two unnecessary imports. One is line 19 in TiUIScrollableView.java and the other is in TiUIHelper.java.

@farfromrefug
Copy link
Contributor Author

@pingwang2011 first i want to apologise. My problem is that i cant run those PR branches in my TiStudio. It breaks my metadata folder. I should create another workspace just for that but i dont really have the time right now. I am really sorry!

@pingwang2011
Copy link
Contributor

CR passed. Request Accepted

pingwang2011 added a commit that referenced this pull request Oct 10, 2013
[TIMOB-13610] correctly handle scrollableView inside tableview/listview and scrollview AGAIN
@pingwang2011 pingwang2011 merged commit 8dd5445 into tidev:master Oct 10, 2013
@farfromrefug farfromrefug deleted the TC-2123 branch October 11, 2013 06:49
@farfromrefug farfromrefug restored the TC-2123 branch February 14, 2014 15:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants