Changes of com.discord v889
This commit is contained in:
root
parent
978663884f
commit
dc8b0b8647
7005 changed files with 392258 additions and 379599 deletions
|
|
@ -512,19 +512,19 @@
|
|||
|
||||
if-ne p1, p2, :cond_1
|
||||
|
||||
const-string p1, "GridLayoutManager"
|
||||
invoke-static {p3}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
|
||||
|
||||
move-result-object p1
|
||||
|
||||
const-string p2, "Cannot find span size for pre layout position. "
|
||||
|
||||
invoke-static {p3}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
|
||||
invoke-virtual {p2, p1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
|
||||
|
||||
move-result-object p3
|
||||
move-result-object p1
|
||||
|
||||
invoke-virtual {p2, p3}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
|
||||
const-string p2, "GridLayoutManager"
|
||||
|
||||
move-result-object p2
|
||||
|
||||
invoke-static {p1, p2}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
|
||||
invoke-static {p2, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
|
||||
|
||||
const/4 p1, 0x0
|
||||
|
||||
|
|
@ -581,19 +581,19 @@
|
|||
|
||||
if-ne p1, v0, :cond_2
|
||||
|
||||
const-string p1, "GridLayoutManager"
|
||||
invoke-static {p3}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
|
||||
|
||||
move-result-object p1
|
||||
|
||||
const-string p2, "Cannot find span size for pre layout position. It is not cached, not in the adapter. Pos:"
|
||||
|
||||
invoke-static {p3}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
|
||||
invoke-virtual {p2, p1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
|
||||
|
||||
move-result-object p3
|
||||
move-result-object p1
|
||||
|
||||
invoke-virtual {p2, p3}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
|
||||
const-string p2, "GridLayoutManager"
|
||||
|
||||
move-result-object p2
|
||||
|
||||
invoke-static {p1, p2}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
|
||||
invoke-static {p2, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
|
||||
|
||||
const/4 p1, 0x0
|
||||
|
||||
|
|
@ -648,19 +648,19 @@
|
|||
|
||||
if-ne p1, v0, :cond_2
|
||||
|
||||
const-string p1, "GridLayoutManager"
|
||||
invoke-static {p3}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
|
||||
|
||||
move-result-object p1
|
||||
|
||||
const-string p2, "Cannot find span size for pre layout position. It is not cached, not in the adapter. Pos:"
|
||||
|
||||
invoke-static {p3}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
|
||||
invoke-virtual {p2, p1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
|
||||
|
||||
move-result-object p3
|
||||
move-result-object p1
|
||||
|
||||
invoke-virtual {p2, p3}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
|
||||
const-string p2, "GridLayoutManager"
|
||||
|
||||
move-result-object p2
|
||||
|
||||
invoke-static {p1, p2}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
|
||||
invoke-static {p2, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
|
||||
|
||||
const/4 p1, 0x1
|
||||
|
||||
|
|
@ -868,8 +868,6 @@
|
|||
|
||||
move-result v1
|
||||
|
||||
sub-int/2addr v0, v1
|
||||
|
||||
goto :goto_0
|
||||
|
||||
:cond_0
|
||||
|
|
@ -887,9 +885,9 @@
|
|||
|
||||
move-result v1
|
||||
|
||||
:goto_0
|
||||
sub-int/2addr v0, v1
|
||||
|
||||
:goto_0
|
||||
invoke-direct {p0, v0}, Landroidx/recyclerview/widget/GridLayoutManager;->calculateItemBorders(I)V
|
||||
|
||||
return-void
|
||||
|
|
@ -1363,12 +1361,6 @@
|
|||
|
||||
add-int/2addr v0, v3
|
||||
|
||||
const/4 v4, 0x0
|
||||
|
||||
const/4 v5, 0x0
|
||||
|
||||
goto :goto_3
|
||||
|
||||
:cond_4
|
||||
const/4 v4, 0x0
|
||||
|
||||
|
|
@ -1678,36 +1670,36 @@
|
|||
|
||||
iget v3, v3, Landroidx/recyclerview/widget/GridLayoutManager$LayoutParams;->width:I
|
||||
|
||||
const/4 v10, 0x0
|
||||
const/high16 v10, 0x40000000 # 2.0f
|
||||
|
||||
const/high16 v13, 0x40000000 # 2.0f
|
||||
const/4 v13, 0x0
|
||||
|
||||
invoke-static {v4, v13, v9, v3, v10}, Landroidx/recyclerview/widget/GridLayoutManager;->getChildMeasureSpec(IIIIZ)I
|
||||
invoke-static {v4, v10, v9, v3, v13}, Landroidx/recyclerview/widget/GridLayoutManager;->getChildMeasureSpec(IIIIZ)I
|
||||
|
||||
move-result v3
|
||||
|
||||
sub-int v4, v1, v5
|
||||
|
||||
invoke-static {v4, v13}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
|
||||
invoke-static {v4, v10}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
|
||||
|
||||
move-result v4
|
||||
|
||||
goto :goto_8
|
||||
|
||||
:cond_10
|
||||
const/4 v10, 0x0
|
||||
const/high16 v10, 0x40000000 # 2.0f
|
||||
|
||||
const/high16 v13, 0x40000000 # 2.0f
|
||||
const/4 v13, 0x0
|
||||
|
||||
sub-int v9, v1, v9
|
||||
|
||||
invoke-static {v9, v13}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
|
||||
invoke-static {v9, v10}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I
|
||||
|
||||
move-result v9
|
||||
|
||||
iget v3, v3, Landroidx/recyclerview/widget/GridLayoutManager$LayoutParams;->height:I
|
||||
|
||||
invoke-static {v4, v13, v5, v3, v10}, Landroidx/recyclerview/widget/GridLayoutManager;->getChildMeasureSpec(IIIIZ)I
|
||||
invoke-static {v4, v10, v5, v3, v13}, Landroidx/recyclerview/widget/GridLayoutManager;->getChildMeasureSpec(IIIIZ)I
|
||||
|
||||
move-result v4
|
||||
|
||||
|
|
@ -1719,9 +1711,9 @@
|
|||
goto :goto_9
|
||||
|
||||
:cond_11
|
||||
const/4 v10, 0x0
|
||||
const/high16 v10, 0x40000000 # 2.0f
|
||||
|
||||
const/high16 v13, 0x40000000 # 2.0f
|
||||
const/4 v13, 0x0
|
||||
|
||||
:goto_9
|
||||
add-int/lit8 v0, v0, 0x1
|
||||
|
|
@ -1729,7 +1721,7 @@
|
|||
goto :goto_7
|
||||
|
||||
:cond_12
|
||||
const/4 v10, 0x0
|
||||
const/4 v13, 0x0
|
||||
|
||||
iput v1, v8, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutChunkResult;->mConsumed:I
|
||||
|
||||
|
|
@ -1751,10 +1743,6 @@
|
|||
|
||||
move v2, v1
|
||||
|
||||
const/4 v0, 0x0
|
||||
|
||||
const/4 v1, 0x0
|
||||
|
||||
goto :goto_a
|
||||
|
||||
:cond_13
|
||||
|
|
@ -1766,11 +1754,12 @@
|
|||
|
||||
move v3, v1
|
||||
|
||||
:goto_a
|
||||
const/4 v0, 0x0
|
||||
|
||||
const/4 v1, 0x0
|
||||
|
||||
goto :goto_a
|
||||
goto :goto_b
|
||||
|
||||
:cond_14
|
||||
iget v0, v7, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mLayoutDirection:I
|
||||
|
|
@ -1791,7 +1780,7 @@
|
|||
|
||||
move/from16 v0, v17
|
||||
|
||||
goto :goto_a
|
||||
goto :goto_b
|
||||
|
||||
:cond_15
|
||||
iget v0, v7, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;->mOffset:I
|
||||
|
|
@ -1802,12 +1791,12 @@
|
|||
|
||||
const/4 v3, 0x0
|
||||
|
||||
:goto_a
|
||||
if-ge v10, v12, :cond_1a
|
||||
:goto_b
|
||||
if-ge v13, v12, :cond_1a
|
||||
|
||||
iget-object v4, v6, Landroidx/recyclerview/widget/GridLayoutManager;->mSet:[Landroid/view/View;
|
||||
|
||||
aget-object v7, v4, v10
|
||||
aget-object v7, v4, v13
|
||||
|
||||
invoke-virtual {v7}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
|
||||
|
||||
|
|
@ -1853,13 +1842,9 @@
|
|||
|
||||
move v15, v0
|
||||
|
||||
move v13, v1
|
||||
move v10, v1
|
||||
|
||||
move v14, v2
|
||||
|
||||
move/from16 v16, v3
|
||||
|
||||
goto :goto_b
|
||||
goto :goto_d
|
||||
|
||||
:cond_16
|
||||
invoke-virtual/range {p0 .. p0}, Landroidx/recyclerview/widget/GridLayoutManager;->getPaddingLeft()I
|
||||
|
|
@ -1882,15 +1867,7 @@
|
|||
|
||||
add-int/2addr v1, v0
|
||||
|
||||
move v13, v0
|
||||
|
||||
move v15, v1
|
||||
|
||||
move v14, v2
|
||||
|
||||
move/from16 v16, v3
|
||||
|
||||
goto :goto_b
|
||||
goto :goto_c
|
||||
|
||||
:cond_17
|
||||
invoke-virtual/range {p0 .. p0}, Landroidx/recyclerview/widget/GridLayoutManager;->getPaddingTop()I
|
||||
|
|
@ -1913,20 +1890,21 @@
|
|||
|
||||
add-int/2addr v3, v2
|
||||
|
||||
move v13, v0
|
||||
:goto_c
|
||||
move v10, v0
|
||||
|
||||
move v15, v1
|
||||
|
||||
:goto_d
|
||||
move v14, v2
|
||||
|
||||
move/from16 v16, v3
|
||||
|
||||
:goto_b
|
||||
move-object/from16 v0, p0
|
||||
|
||||
move-object v1, v7
|
||||
|
||||
move v2, v13
|
||||
move v2, v10
|
||||
|
||||
move v3, v14
|
||||
|
||||
|
|
@ -1962,9 +1940,9 @@
|
|||
|
||||
iput-boolean v0, v8, Landroidx/recyclerview/widget/LinearLayoutManager$LayoutChunkResult;->mFocusable:Z
|
||||
|
||||
add-int/lit8 v10, v10, 0x1
|
||||
add-int/lit8 v13, v13, 0x1
|
||||
|
||||
move v0, v13
|
||||
move v0, v10
|
||||
|
||||
move v2, v14
|
||||
|
||||
|
|
@ -1972,7 +1950,7 @@
|
|||
|
||||
move/from16 v3, v16
|
||||
|
||||
goto/16 :goto_a
|
||||
goto/16 :goto_b
|
||||
|
||||
:cond_1a
|
||||
iget-object v0, v6, Landroidx/recyclerview/widget/GridLayoutManager;->mSet:[Landroid/view/View;
|
||||
|
|
@ -2145,7 +2123,7 @@
|
|||
const/16 v17, -0x1
|
||||
|
||||
:goto_4
|
||||
if-eq v5, v11, :cond_18
|
||||
if-eq v5, v11, :cond_17
|
||||
|
||||
invoke-direct {v0, v1, v2, v5}, Landroidx/recyclerview/widget/GridLayoutManager;->getSpanGroupIndex(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;I)I
|
||||
|
||||
|
|
@ -2155,7 +2133,7 @@
|
|||
|
||||
move-result-object v1
|
||||
|
||||
if-eq v1, v3, :cond_18
|
||||
if-eq v1, v3, :cond_17
|
||||
|
||||
invoke-virtual {v1}, Landroid/view/View;->hasFocusable()Z
|
||||
|
||||
|
|
@ -2167,7 +2145,7 @@
|
|||
|
||||
if-eqz v4, :cond_6
|
||||
|
||||
goto/16 :goto_a
|
||||
goto/16 :goto_d
|
||||
|
||||
:cond_6
|
||||
move-object/from16 v18, v3
|
||||
|
|
@ -2182,7 +2160,7 @@
|
|||
|
||||
move/from16 v11, v17
|
||||
|
||||
goto/16 :goto_8
|
||||
goto/16 :goto_a
|
||||
|
||||
:cond_7
|
||||
invoke-virtual {v1}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
|
||||
|
|
@ -2234,6 +2212,7 @@
|
|||
if-nez v10, :cond_b
|
||||
|
||||
:cond_a
|
||||
:goto_5
|
||||
move/from16 v20, v8
|
||||
|
||||
move/from16 p1, v14
|
||||
|
|
@ -2242,9 +2221,10 @@
|
|||
|
||||
move/from16 v11, v17
|
||||
|
||||
:goto_6
|
||||
const/4 v14, 0x1
|
||||
|
||||
goto/16 :goto_7
|
||||
goto :goto_9
|
||||
|
||||
:cond_b
|
||||
invoke-static {v2, v6}, Ljava/lang/Math;->max(II)I
|
||||
|
|
@ -2261,136 +2241,93 @@
|
|||
|
||||
move-result v20
|
||||
|
||||
if-eqz v20, :cond_f
|
||||
if-eqz v20, :cond_e
|
||||
|
||||
if-le v11, v15, :cond_c
|
||||
|
||||
move/from16 v20, v8
|
||||
|
||||
move/from16 p1, v14
|
||||
|
||||
move/from16 v8, v16
|
||||
|
||||
move/from16 v11, v17
|
||||
|
||||
const/4 v14, 0x1
|
||||
|
||||
goto :goto_7
|
||||
goto :goto_5
|
||||
|
||||
:cond_c
|
||||
if-ne v11, v15, :cond_e
|
||||
if-ne v11, v15, :cond_11
|
||||
|
||||
if-le v2, v8, :cond_d
|
||||
|
||||
const/4 v11, 0x1
|
||||
|
||||
goto :goto_5
|
||||
goto :goto_7
|
||||
|
||||
:cond_d
|
||||
const/4 v11, 0x0
|
||||
|
||||
:goto_5
|
||||
if-ne v13, v11, :cond_e
|
||||
:goto_7
|
||||
if-ne v13, v11, :cond_11
|
||||
|
||||
goto :goto_5
|
||||
|
||||
:cond_e
|
||||
if-nez v4, :cond_11
|
||||
|
||||
move/from16 v20, v8
|
||||
|
||||
move/from16 p1, v14
|
||||
|
||||
move/from16 v8, v16
|
||||
|
||||
move/from16 v11, v17
|
||||
const/4 v8, 0x0
|
||||
|
||||
const/4 v14, 0x1
|
||||
|
||||
goto :goto_7
|
||||
|
||||
:cond_e
|
||||
move/from16 v20, v8
|
||||
|
||||
move/from16 p1, v14
|
||||
|
||||
move/from16 v8, v16
|
||||
|
||||
move/from16 v11, v17
|
||||
|
||||
goto :goto_6
|
||||
|
||||
:cond_f
|
||||
if-nez v4, :cond_14
|
||||
|
||||
move/from16 v20, v8
|
||||
|
||||
move/from16 p1, v14
|
||||
|
||||
const/4 v8, 0x1
|
||||
|
||||
const/4 v14, 0x0
|
||||
|
||||
invoke-virtual {v0, v1, v14, v8}, Landroidx/recyclerview/widget/GridLayoutManager;->isViewPartiallyVisible(Landroid/view/View;ZZ)Z
|
||||
invoke-virtual {v0, v1, v8, v14}, Landroidx/recyclerview/widget/GridLayoutManager;->isViewPartiallyVisible(Landroid/view/View;ZZ)Z
|
||||
|
||||
move-result v21
|
||||
|
||||
if-eqz v21, :cond_13
|
||||
if-eqz v21, :cond_12
|
||||
|
||||
move/from16 v8, v16
|
||||
|
||||
if-le v11, v8, :cond_10
|
||||
if-le v11, v8, :cond_f
|
||||
|
||||
move/from16 v11, v17
|
||||
|
||||
const/4 v14, 0x1
|
||||
goto :goto_9
|
||||
|
||||
goto :goto_7
|
||||
:cond_f
|
||||
if-ne v11, v8, :cond_13
|
||||
|
||||
move/from16 v11, v17
|
||||
|
||||
if-le v2, v11, :cond_10
|
||||
|
||||
goto :goto_8
|
||||
|
||||
:cond_10
|
||||
if-ne v11, v8, :cond_12
|
||||
const/4 v14, 0x0
|
||||
|
||||
move/from16 v11, v17
|
||||
:goto_8
|
||||
if-ne v13, v14, :cond_14
|
||||
|
||||
if-le v2, v11, :cond_11
|
||||
|
||||
const/4 v14, 0x1
|
||||
goto :goto_6
|
||||
|
||||
:cond_11
|
||||
if-ne v13, v14, :cond_15
|
||||
|
||||
const/4 v14, 0x1
|
||||
|
||||
goto :goto_7
|
||||
|
||||
:cond_12
|
||||
move/from16 v11, v17
|
||||
|
||||
goto :goto_6
|
||||
|
||||
:cond_13
|
||||
move/from16 v8, v16
|
||||
|
||||
move/from16 v11, v17
|
||||
|
||||
goto :goto_6
|
||||
|
||||
:cond_14
|
||||
move/from16 v20, v8
|
||||
|
||||
move/from16 p1, v14
|
||||
|
||||
:cond_12
|
||||
move/from16 v8, v16
|
||||
|
||||
:cond_13
|
||||
move/from16 v11, v17
|
||||
|
||||
:cond_15
|
||||
:goto_6
|
||||
:cond_14
|
||||
const/4 v14, 0x0
|
||||
|
||||
:goto_7
|
||||
if-eqz v14, :cond_17
|
||||
:goto_9
|
||||
if-eqz v14, :cond_16
|
||||
|
||||
invoke-virtual {v1}, Landroid/view/View;->hasFocusable()Z
|
||||
|
||||
move-result v14
|
||||
|
||||
if-eqz v14, :cond_16
|
||||
if-eqz v14, :cond_15
|
||||
|
||||
iget v4, v9, Landroidx/recyclerview/widget/GridLayoutManager$LayoutParams;->mSpanIndex:I
|
||||
|
||||
|
|
@ -2406,15 +2343,17 @@
|
|||
|
||||
move v15, v3
|
||||
|
||||
move/from16 v20, v4
|
||||
move/from16 v16, v8
|
||||
|
||||
move/from16 v17, v11
|
||||
|
||||
move v8, v4
|
||||
|
||||
move-object v4, v1
|
||||
|
||||
goto :goto_9
|
||||
goto :goto_c
|
||||
|
||||
:cond_16
|
||||
:cond_15
|
||||
iget v8, v9, Landroidx/recyclerview/widget/GridLayoutManager$LayoutParams;->mSpanIndex:I
|
||||
|
||||
invoke-static {v3, v7}, Ljava/lang/Math;->min(II)I
|
||||
|
|
@ -2429,44 +2368,45 @@
|
|||
|
||||
move-object v10, v1
|
||||
|
||||
move/from16 v16, v3
|
||||
|
||||
move/from16 v17, v8
|
||||
|
||||
move v8, v3
|
||||
goto :goto_b
|
||||
|
||||
goto :goto_9
|
||||
:cond_16
|
||||
:goto_a
|
||||
move/from16 v16, v8
|
||||
|
||||
:cond_17
|
||||
:goto_8
|
||||
move/from16 v17, v11
|
||||
|
||||
:goto_9
|
||||
:goto_b
|
||||
move/from16 v8, v20
|
||||
|
||||
:goto_c
|
||||
add-int/2addr v5, v12
|
||||
|
||||
move/from16 v14, p1
|
||||
|
||||
move/from16 v16, v8
|
||||
|
||||
move-object/from16 v3, v18
|
||||
|
||||
move/from16 v11, v19
|
||||
|
||||
move/from16 v8, v20
|
||||
|
||||
move-object/from16 v1, p3
|
||||
|
||||
move-object/from16 v2, p4
|
||||
|
||||
move-object/from16 v3, v18
|
||||
|
||||
move/from16 v11, v19
|
||||
|
||||
const/4 v9, 0x1
|
||||
|
||||
goto/16 :goto_4
|
||||
|
||||
:cond_18
|
||||
:goto_a
|
||||
if-eqz v4, :cond_19
|
||||
:cond_17
|
||||
:goto_d
|
||||
if-eqz v4, :cond_18
|
||||
|
||||
return-object v4
|
||||
|
||||
:cond_19
|
||||
:cond_18
|
||||
return-object v10
|
||||
.end method
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue