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.

Sign up for GitHub

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

feat(react,vue,ios,android): add waterfall component for hippy #933

Merged
merged 21 commits into from
Aug 18, 2021
Merged

feat(react,vue,ios,android): add waterfall component for hippy #933

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9e40775
feat: add waterfall component for hippy
JerryChu May 25, 2021
0480238
feat(android): make WaterfallView extends HippyListView
Jul 5, 2021
4881538
feat(android): support 'animated' for scrollToXXX
Jul 12, 2021
595a30a
feat: 瀑布流demo增加跳转到指定位置
Jul 13, 2021
46b3c84
feat(android): add onScroll event params
Jul 13, 2021
f34bfb2
feat(ios):fix scrollToIndex bug
Jul 13, 2021
75a2d34
feat(android): fix scrollToIndex with anim
Jul 13, 2021
77447f5
feat(vue): perf vue waterfall component&demo
zoomchan-cxj Jul 30, 2021
4a03a6b
feat(react): add waterfall component
zoomchan-cxj Aug 3, 2021
8450428
feat(react): add waterfall component
zoomchan-cxj Aug 3, 2021
6676fa1
refactor(core): build example
zoomchan-cxj Aug 4, 2021
c1b1738
fix(android): water fall view reuse error
Aug 11, 2021
3559b20
feat(android): change the onEndReached event send time
Aug 11, 2021
3d46aa2
feat(android): change the water fall view padding logic
Aug 11, 2021
244e945
feat(android): change the water fall view padding logic
Aug 11, 2021
635f593
feat(react): add react waterfall document
zoomchan-cxj Aug 16, 2021
2b0ff91
feat(ios): improve waterfall item reuse proxy (#1)
sweetPotatoZheng Aug 18, 2021
87b5ddc
feat(ios): fix bug that HippyWaterfallView's bridge isn't assigned
Aug 18, 2021
cad8cc5
docs(waterfall): add waterfall doc
zoomchan-cxj Aug 18, 2021
9190409
docs(waterfall): add waterfall doc
zoomchan-cxj Aug 18, 2021
e8e03af
chore(build): build react example
zoomchan-cxj Aug 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat(android): change the water fall view padding logic
  • Loading branch information
@zoomchan-cxj
hengyangji authored and zoomchan-cxj committed Aug 18, 2021
commit 3d46aa221c8766ccf7ad198ec77cadfcfd8343a1
15 changes: 14 additions & 1 deletion android/sdk/src/main/java/com/tencent/mtt/hippy/views/waterfalllist/HippyWaterfallView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,16 @@ public class HippyWaterfallView extends HippyListView implements HippyViewBase,
private boolean mHasRemovePreDraw = false;
private ViewTreeObserver.OnPreDrawListener mPreDrawListener = null;
private ViewTreeObserver mViewTreeObserver = null;
private WaterfallEndChecker mEndChecker = new WaterfallEndChecker();
private int mItemViewPaddingLeft;
private int mItemViewPaddingRight;

// for auto test >>>
private boolean mHasLoadMore = false;
private boolean mHasScrollToIndex = false;
private boolean mHasScrollToContentOffset = false;
private boolean mHasStartRefresh = false;
private boolean mHasCompeleteRefresh = false;
private WaterfallEndChecker mEndChecker = new WaterfallEndChecker();
// for auto test <<<

public HippyWaterfallView(Context context) {
Expand Down Expand Up @@ -165,6 +168,7 @@ public void run() {
}

public void startLoadMore() {
mHasLoadMore = true;
mAdapter.setLoadingStatus(IRecyclerViewFooter.LOADING_STATUS_LOADING);
}

Expand All @@ -175,6 +179,11 @@ public void handleInTraversal(int traversalPurpose, int position, View contentVi
}
}

public void setItemViewPadding(int paddingLeft, int paddingRight) {
mItemViewPaddingLeft = paddingLeft;
mItemViewPaddingRight = paddingRight;
}

private void traversalChildViewForSkinChange(View view) {
if (view instanceof ViewGroup) {
int childCount = ((ViewGroup) view).getChildCount();
Expand Down Expand Up @@ -463,6 +472,10 @@ public ContentHolder onCreateContentViewWithPos(ViewGroup parent, int position,

contentHolder.mBindNode = contentViewRenderNode;
contentHolder.isCreated = true;
if (viewType != ViewHolder.TYPE_CUSTOM_FOOTER) {
contentHolder.mItemPaddingLeft = mItemViewPaddingLeft;
contentHolder.mItemPaddingRight = mItemViewPaddingRight;
}
return contentHolder;
}

Expand Down
4 changes: 1 addition & 3 deletions ...src/main/java/com/tencent/mtt/hippy/views/waterfalllist/HippyWaterfallViewController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,9 @@ public void setContainBannerView(HippyWaterfallView listview, boolean containBan
@HippyControllerProps(name = WaterFallComponentName.PROPERTY_CONTENT_INSET, defaultType = HippyControllerProps.NUMBER, defaultNumber = 0)
public void setContentInset(HippyWaterfallView listview, HippyMap data) {
int left = dpToPx(data.getInt("left"));
int top = dpToPx(data.getInt("top"));
int right = dpToPx(data.getInt("right"));
int bottom = dpToPx(data.getInt("bottom"));

listview.setPadding(left, top, right, bottom);
listview.setItemViewPadding(left, right);
}

protected int dpToPx(int dp) {
Expand Down