Skip to content

Commit 7542d44

Browse files
authored
Merge pull request #794 from YoKeyword/dev
v1.3.1
2 parents f326640 + f7f1156 commit 7542d44

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ The first demo shows the basic usage of the library. The second one shows the wa
4646
**1、build.gradle**
4747
````gradle
4848
// appcompat-v7 is required
49-
compile 'me.yokeyword:fragmentation:1.3.0'
49+
compile 'me.yokeyword:fragmentation:1.3.1'
5050
5151
// If you don't want to extends SupportActivity/Fragment and would like to customize your own support, just rely on fragmentation-core
52-
// compile 'me.yokeyword:fragmentation-core:1.3.0'
52+
// compile 'me.yokeyword:fragmentation-core:1.3.1'
5353
5454
// To get SwipeBack feature, rely on both fragmentation & fragmentation-swipeback
55-
compile 'me.yokeyword:fragmentation:1.3.0'
55+
compile 'me.yokeyword:fragmentation:1.3.1'
5656
// Swipeback is based on fragmentation. Refer to SwipeBackActivity/Fragment for your Customized SupportActivity/Fragment
57-
compile 'me.yokeyword:fragmentation-swipeback:1.3.0'
57+
compile 'me.yokeyword:fragmentation-swipeback:1.3.1'
5858
5959
// To simplify the communication between Fragments.
6060
compile 'me.yokeyword:eventbus-activity-scope:1.1.0'

README_CN.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ A powerful library that manage Fragment for Android!
5252
**1. 项目下app的build.gradle中依赖:**
5353
````gradle
5454
// appcompat-v7包是必须的
55-
compile 'me.yokeyword:fragmentation:1.3.0'
55+
compile 'me.yokeyword:fragmentation:1.3.1'
5656
5757
// 如果不想继承SupportActivity/Fragment,自己定制Support,可仅依赖:
58-
// compile 'me.yokeyword:fragmentation-core:1.3.0'
58+
// compile 'me.yokeyword:fragmentation-core:1.3.1'
5959
6060
// 如果想使用SwipeBack 滑动边缘退出Fragment/Activity功能,完整的添加规则如下:
61-
compile 'me.yokeyword:fragmentation:1.3.0'
61+
compile 'me.yokeyword:fragmentation:1.3.1'
6262
// swipeback基于fragmentation, 如果是自定制SupportActivity/Fragment,则参照SwipeBackActivity/Fragment实现即可
63-
compile 'me.yokeyword:fragmentation-swipeback:1.3.0'
63+
compile 'me.yokeyword:fragmentation-swipeback:1.3.1'
6464
6565
// Activity作用域的EventBus,更安全,可有效避免after onSavenInstanceState()异常
6666
compile 'me.yokeyword:eventbus-activity-scope:1.1.0'

fragmentation_core/src/main/java/me/yokeyword/fragmentation/TransactionDelegate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ private void doPopTo(final String targetFragmentTag, boolean includeTargetFragme
562562
List<Fragment> willPopFragments = SupportHelper.getWillPopFragments(fm, targetFragmentTag, includeTargetFragment);
563563
if (willPopFragments.size() <= 0) return;
564564

565-
Fragment top = willPopFragments.get(willPopFragments.size() - 1);
565+
Fragment top = willPopFragments.get(0);
566566
mockPopToAnim(top, targetFragmentTag, fm, flag, willPopFragments, popAnim);
567567
}
568568

fragmentation_swipeback/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ Activity内Fragment数大于1时,滑动返回的是Fragment,否则滑动返
1010
1、项目下app的build.gradle中依赖:
1111
````gradle
1212
// appcompat v7包是必须的
13-
compile 'me.yokeyword:fragmentation:1.3.0'
14-
compile 'me.yokeyword:fragmentation-swipeback:1.3.0'
13+
compile 'me.yokeyword:fragmentation:1.3.1'
14+
compile 'me.yokeyword:fragmentation-swipeback:1.3.1'
1515
````
1616
2、如果Activity也需要支持SwipeBack,则继承SwipeBackActivity:
1717
````java

0 commit comments

Comments
 (0)