Skip to content

Commit 6276f69

Browse files
author
Blankj
committed
see 02/20 log
1 parent dde7b21 commit 6276f69

1 file changed

Lines changed: 14 additions & 13 deletions

File tree

‎utilcode/src/main/java/com/blankj/utilcode/utils/FragmentUtils.java‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import android.os.Bundle;
66
import android.support.annotation.ColorInt;
77
import android.support.annotation.DrawableRes;
8+
import android.support.annotation.IdRes;
89
import android.support.annotation.NonNull;
910
import android.support.v4.app.Fragment;
1011
import android.support.v4.app.FragmentManager;
@@ -52,7 +53,7 @@ private FragmentUtils() {
5253
*/
5354
public static Fragment addFragment(@NonNull FragmentManager fragmentManager,
5455
@NonNull Fragment fragment,
55-
int containerId) {
56+
@IdRes int containerId) {
5657
return addFragment(fragmentManager, fragment, containerId, false);
5758
}
5859

@@ -62,12 +63,12 @@ public static Fragment addFragment(@NonNull FragmentManager fragmentManager,
6263
* @param fragmentManager fragment管理器
6364
* @param containerId 布局Id
6465
* @param fragment fragment
65-
* @param isHide 是否显示
66+
* @param isHide 是否隐藏
6667
* @return fragment
6768
*/
6869
public static Fragment addFragment(@NonNull FragmentManager fragmentManager,
6970
@NonNull Fragment fragment,
70-
int containerId,
71+
@IdRes int containerId,
7172
boolean isHide) {
7273
return addFragment(fragmentManager, fragment, containerId, isHide, false);
7374
}
@@ -78,13 +79,13 @@ public static Fragment addFragment(@NonNull FragmentManager fragmentManager,
7879
* @param fragmentManager fragment管理器
7980
* @param containerId 布局Id
8081
* @param fragment fragment
81-
* @param isHide 是否显示
82+
* @param isHide 是否隐藏
8283
* @param isAddStack 是否入回退栈
8384
* @return fragment
8485
*/
8586
public static Fragment addFragment(@NonNull FragmentManager fragmentManager,
8687
@NonNull Fragment fragment,
87-
int containerId,
88+
@IdRes int containerId,
8889
boolean isHide,
8990
boolean isAddStack) {
9091
putArgs(fragment, new Args(containerId, isHide, isAddStack));
@@ -103,7 +104,7 @@ public static Fragment addFragment(@NonNull FragmentManager fragmentManager,
103104
*/
104105
public static Fragment addFragment(@NonNull FragmentManager fragmentManager,
105106
@NonNull Fragment fragment,
106-
int containerId,
107+
@IdRes int containerId,
107108
boolean isAddStack,
108109
SharedElement... sharedElement) {
109110
putArgs(fragment, new Args(containerId, false, isAddStack));
@@ -115,14 +116,14 @@ public static Fragment addFragment(@NonNull FragmentManager fragmentManager,
115116
*
116117
* @param fragmentManager fragment管理器
117118
* @param fragments fragments
118-
* @param showIndex 要显示的fragment索引
119119
* @param containerId 布局Id
120+
* @param showIndex 要显示的fragment索引
120121
* @return 要显示的fragment
121122
*/
122123
public static Fragment addFragments(@NonNull FragmentManager fragmentManager,
123124
@NonNull List<Fragment> fragments,
124-
int showIndex,
125-
int containerId) {
125+
@IdRes int containerId,
126+
int showIndex) {
126127
for (int i = 0, size = fragments.size(); i < size; ++i) {
127128
Fragment fragment = fragments.get(i);
128129
if (fragment != null) {
@@ -192,7 +193,7 @@ public static Fragment replaceFragment(@NonNull Fragment srcFragment,
192193
if (srcFragment.getArguments() == null) return null;
193194
int containerId = srcFragment.getArguments().getInt(ARGS_ID);
194195
if (containerId == 0) return null;
195-
return replaceFragment(srcFragment.getFragmentManager(), containerId, destFragment, isAddStack);
196+
return replaceFragment(srcFragment.getFragmentManager(), destFragment, containerId, isAddStack);
196197
}
197198

198199
/**
@@ -205,8 +206,8 @@ public static Fragment replaceFragment(@NonNull Fragment srcFragment,
205206
* @return fragment
206207
*/
207208
public static Fragment replaceFragment(@NonNull FragmentManager fragmentManager,
208-
int containerId,
209209
@NonNull Fragment fragment,
210+
@IdRes int containerId,
210211
boolean isAddStack) {
211212
putArgs(fragment, new Args(containerId, false, isAddStack));
212213
return operateFragment(fragmentManager, null, fragment, TYPE_REPLACE_FRAGMENT);
@@ -274,8 +275,8 @@ public static void popAllFragments(@NonNull FragmentManager fragmentManager) {
274275
* @return fragment
275276
*/
276277
public static Fragment popAddFragment(@NonNull FragmentManager fragmentManager,
277-
int containerId,
278278
@NonNull Fragment fragment,
279+
@IdRes int containerId,
279280
boolean isAddStack,
280281
SharedElement... sharedElement) {
281282
putArgs(fragment, new Args(containerId, false, isAddStack));
@@ -292,8 +293,8 @@ public static Fragment popAddFragment(@NonNull FragmentManager fragmentManager,
292293
* @return fragment
293294
*/
294295
public static Fragment popAddFragment(@NonNull FragmentManager fragmentManager,
295-
int containerId,
296296
@NonNull Fragment fragment,
297+
@IdRes int containerId,
297298
boolean isAddStack) {
298299
putArgs(fragment, new Args(containerId, false, isAddStack));
299300
return operateFragment(fragmentManager, null, fragment, TYPE_POP_ADD_FRAGMENT);

0 commit comments

Comments
 (0)