Skip to content

Commit 28a0b46

Browse files
BlankjBlankj
committed
see 09/30 log
1 parent cca3150 commit 28a0b46

File tree

21 files changed

+1089
-768
lines changed

21 files changed

+1089
-768
lines changed

‎README-CN.md‎

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -237,37 +237,30 @@ getFileExtension : 根据全路径获取文件拓展名
237237

238238
* ### Fragment相关→[FragmentUtils.java][fragment.java]→[Demo][fragment.demo]
239239
```
240-
addFragment : 新增fragment
241-
hideAddFragment : 先隐藏后新增fragment
242-
addFragments : 新增多个fragment
243-
removeFragment : 移除fragment
244-
removeToFragment : 移除到指定fragment
245-
removeFragments : 移除同级别fragment
246-
removeAllFragments : 移除所有fragment
247-
replaceFragment : 替换fragment
248-
popFragment : 出栈fragment
249-
popToFragment : 出栈到指定fragment
250-
popFragments : 出栈同级别fragment
251-
popAllFragments : 出栈所有fragment
252-
popAddFragment : 先出栈后新增fragment
253-
hideFragment : 隐藏fragment
254-
hideFragments : 隐藏同级别fragment
255-
showFragment : 显示fragment
256-
hideShowFragment : 先隐藏后显示fragment
257-
getLastAddFragment : 获取同级别最后加入的fragment
258-
getLastAddFragmentInStack: 获取栈中同级别最后加入的fragment
259-
getTopShowFragment : 获取顶层可见fragment
260-
getTopShowFragmentInStack: 获取栈中顶层可见fragment
261-
getFragments : 获取同级别fragment
262-
getFragmentsInStack : 获取栈中同级别fragment
263-
getAllFragments : 获取所有fragment
264-
getAllFragmentsInStack : 获取栈中所有fragment
265-
getPreFragment : 获取目标fragment的前一个fragment
266-
findFragment : 查找fragment
267-
dispatchBackPress : 处理fragment回退键
268-
setBackgroundColor : 设置背景色
269-
setBackgroundResource : 设置背景资源
270-
setBackground : 设置背景
240+
add : 新增fragment
241+
show : 显示fragment
242+
hide : 隐藏fragment
243+
showHide : 先显示后隐藏fragment
244+
replace : 替换fragment
245+
pop : 出栈fragment
246+
popTo : 出栈到指定fragment
247+
popAll : 出栈所有fragment
248+
remove : 移除fragment
249+
removeTo : 移除到指定fragment
250+
removeAll : 移除所有fragment
251+
getTop : 获取顶部fragment
252+
getTopInStack : 获取栈中顶部fragment
253+
getTopShow : 获取顶部可见fragment
254+
getTopShowInStack : 获取栈中顶部可见fragment
255+
getFragments : 获取同级别的fragment
256+
getFragmentsInStack : 获取同级别栈中的fragment
257+
getAllFragments : 获取所有fragment
258+
getAllFragmentsInStack: 获取栈中所有fragment
259+
findFragment : 查找fragment
260+
dispatchBackPress : 处理fragment回退键
261+
setBackgroundColor : 设置背景色
262+
setBackgroundResource : 设置背景资源
263+
setBackground : 设置背景
271264
```
272265

273266
* ### 图片相关→[ImageUtils.java][image.java]→[Demo][image.demo]
@@ -617,7 +610,7 @@ getComments : 获取压缩文件中的注释链表
617610

618611
Gradle:
619612
``` groovy
620-
compile 'com.blankj:utilcode:1.9.1'
613+
compile 'com.blankj:utilcode:1.9.2'
621614
```
622615

623616

@@ -640,7 +633,7 @@ Utils.init(application);
640633

641634
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
642635

643-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.1-brightgreen.svg
636+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.2-brightgreen.svg
644637
[auc]: https://github.com/Blankj/AndroidUtilCode
645638

646639
[apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

‎README.md‎

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -237,32 +237,25 @@ getFileExtension
237237

238238
* ### About Fragment→[FragmentUtils.java][fragment.java]→[Demo][fragment.demo]
239239
```
240-
addFragment
241-
hideAddFragment
242-
addFragments
243-
removeFragment
244-
removeToFragment
245-
removeFragments
246-
removeAllFragments
247-
replaceFragment
248-
popFragment
249-
popToFragment
250-
popFragments
251-
popAllFragments
252-
popAddFragment
253-
hideFragment
254-
hideFragments
255-
showFragment
256-
hideShowFragment
257-
getLastAddFragment
258-
getLastAddFragmentInStack
259-
getTopShowFragment
260-
getTopShowFragmentInStack
240+
add
241+
show
242+
hide
243+
showHide
244+
replace
245+
pop
246+
popTo
247+
popAll
248+
remove
249+
removeTo
250+
removeAll
251+
getTop
252+
getTopInStack
253+
getTopShow
254+
getTopShowInStack
261255
getFragments
262256
getFragmentsInStack
263257
getAllFragments
264258
getAllFragmentsInStack
265-
getPreFragment
266259
findFragment
267260
dispatchBackPress
268261
setBackgroundColor
@@ -617,7 +610,7 @@ getComments
617610

618611
Gradle:
619612
``` groovy
620-
compile 'com.blankj:utilcode:1.9.1'
613+
compile 'com.blankj:utilcode:1.9.2'
621614
```
622615

623616

@@ -640,7 +633,7 @@ Utils.init(application);
640633

641634
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
642635

643-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.1-brightgreen.svg
636+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.2-brightgreen.svg
644637
[auc]: https://github.com/Blankj/AndroidUtilCode
645638

646639
[apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

‎app/src/main/java/com/blankj/androidutilcode/core/activity/SubActivityActivity.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.graphics.Color;
44
import android.os.Build;
55
import android.os.Bundle;
6+
import android.support.v4.app.ActivityCompat;
67
import android.view.View;
78
import android.view.Window;
89

@@ -33,7 +34,7 @@ public int bindLayout() {
3334
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
3435
getWindow().requestFeature(Window.FEATURE_CONTENT_TRANSITIONS);
3536
}
36-
return R.layout.activity_activity_shared_element;
37+
return R.layout.activity_activity_sub;
3738
}
3839

3940
@Override
@@ -55,4 +56,10 @@ public void onWidgetClick(View view) {
5556
protected void onDestroy() {
5657
super.onDestroy();
5758
}
59+
60+
@Override
61+
public void onBackPressed() {
62+
super.onBackPressed();
63+
ActivityCompat.finishAfterTransition(this);
64+
}
5865
}

‎app/src/main/java/com/blankj/androidutilcode/core/bar/BarStatusFragmentActivity.java‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,13 @@
2626
*/
2727
public class BarStatusFragmentActivity extends BaseActivity {
2828

29-
private int[] itemIds = new int[]{R.id.navigation_color, R.id.navigation_alpha, R.id.navigation_image_view};
29+
private int[] itemIds = new int[]{
30+
R.id.navigation_color,
31+
R.id.navigation_alpha,
32+
R.id.navigation_image_view
33+
};
3034

31-
private ViewPager mVpHome;
35+
private ViewPager mVpStatusBar;
3236
private BottomNavigationView navigation;
3337
private ArrayList<Fragment> mFragmentList = new ArrayList<>();
3438

@@ -54,15 +58,15 @@ public int bindLayout() {
5458

5559
@Override
5660
public void initView(Bundle savedInstanceState, View view) {
57-
mVpHome = (ViewPager) findViewById(R.id.vp_home);
58-
navigation = (BottomNavigationView) findViewById(R.id.navigation);
61+
mVpStatusBar = (ViewPager) findViewById(R.id.vp_status_bar);
62+
navigation = (BottomNavigationView) findViewById(R.id.navigation_status_bar);
5963

6064
mFragmentList.add(BarStatusColorFragment.newInstance());
6165
mFragmentList.add(BarStatusAlphaFragment.newInstance());
6266
mFragmentList.add(BarStatusImageViewFragment.newInstance());
6367

6468

65-
mVpHome.setAdapter(new FragmentPagerAdapter(getSupportFragmentManager()) {
69+
mVpStatusBar.setAdapter(new FragmentPagerAdapter(getSupportFragmentManager()) {
6670
@Override
6771
public Fragment getItem(int position) {
6872
return mFragmentList.get(position);
@@ -74,7 +78,7 @@ public int getCount() {
7478
}
7579
});
7680

77-
mVpHome.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
81+
mVpStatusBar.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
7882
@Override
7983
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
8084

@@ -112,13 +116,13 @@ public void onWidgetClick(View view) {
112116
public boolean onNavigationItemSelected(@NonNull MenuItem item) {
113117
switch (item.getItemId()) {
114118
case R.id.navigation_color:
115-
mVpHome.setCurrentItem(0);
119+
mVpStatusBar.setCurrentItem(0);
116120
return true;
117121
case R.id.navigation_alpha:
118-
mVpHome.setCurrentItem(1);
122+
mVpStatusBar.setCurrentItem(1);
119123
return true;
120124
case R.id.navigation_image_view:
121-
mVpHome.setCurrentItem(2);
125+
mVpStatusBar.setCurrentItem(2);
122126
return true;
123127
}
124128
return false;

‎app/src/main/java/com/blankj/androidutilcode/core/fragment/Demo0Fragment.java‎

Lines changed: 63 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.blankj.androidutilcode.core.fragment;
22

3-
import android.content.Context;
43
import android.graphics.Color;
54
import android.os.Build;
65
import android.os.Bundle;
@@ -14,7 +13,6 @@
1413
import com.blankj.androidutilcode.R;
1514
import com.blankj.androidutilcode.base.BaseFragment;
1615
import com.blankj.utilcode.util.FragmentUtils;
17-
import com.blankj.utilcode.util.ToastUtils;
1816

1917
import java.util.Random;
2018

@@ -29,8 +27,7 @@
2927
public class Demo0Fragment extends BaseFragment
3028
implements FragmentUtils.OnBackClickListener {
3129

32-
private Demo0Fragment demo0Fragment;
33-
private FragmentUtils.SharedElement sharedElement;
30+
private Demo0Fragment demo0Fragment;
3431
Button btnShowAboutFragment;
3532
ImageView ivSharedElement;
3633
TextView tvAboutFragment;
@@ -68,7 +65,6 @@ public void initView(Bundle savedInstanceState, View view) {
6865
ivSharedElement = (ImageView) view.findViewById(R.id.iv_shared_element);
6966
tvAboutFragment = (TextView) view.findViewById(R.id.tv_about_fragment);
7067
demo0Fragment = this;
71-
sharedElement = new FragmentUtils.SharedElement(ivSharedElement, getString(R.string.fragment_transition));
7268
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
7369
setExitTransition(new Fade());
7470
}
@@ -82,68 +78,68 @@ public void doBusiness() {
8278
@Override
8379
public void onWidgetClick(View view) {
8480
tvAboutFragment.setText("");
85-
switch (view.getId()) {
86-
case R.id.btn_show_about_fragment:
87-
tvAboutFragment.setText("lastAdd: " + FragmentUtils.getLastAddFragment(getFragmentManager()).getClass().getSimpleName()
88-
+ "\nlastAddInStack: " + (FragmentUtils.getLastAddFragmentInStack(getFragmentManager()) != null ? FragmentUtils.getLastAddFragmentInStack(getFragmentManager()).getClass().getSimpleName() : "null")
89-
+ "\ntopShow: " + (FragmentUtils.getTopShowFragment(getFragmentManager()) != null ? FragmentUtils.getTopShowFragment(getFragmentManager()).getClass().getSimpleName() : "null")
90-
+ "\ntopShowInStack: " + (FragmentUtils.getTopShowFragmentInStack(getFragmentManager()) != null ? FragmentUtils.getTopShowFragmentInStack(getFragmentManager()).getClass().getSimpleName() : "null")
91-
+ "\n---all of fragments---\n"
92-
+ FragmentUtils.getAllFragments(getFragmentManager()).toString()
93-
+ "\n----------------------\n\n"
94-
+ "---stack top---\n"
95-
+ FragmentUtils.getAllFragmentsInStack(getFragmentManager()).toString()
96-
+ "\n---stack bottom---\n\n"
97-
);
98-
break;
99-
case R.id.btn_add_hide:
100-
FragmentUtils.hideAddFragment(getFragmentManager(),
101-
demo0Fragment,
102-
addSharedElement(Demo1Fragment.newInstance()),
103-
R.id.fragment_container,
104-
false,
105-
true,
106-
sharedElement);
107-
break;
108-
case R.id.btn_add_show:
109-
FragmentUtils.addFragment(getFragmentManager(),
110-
addSharedElement(Demo1Fragment.newInstance()),
111-
R.id.fragment_container,
112-
false,
113-
false,
114-
sharedElement);
115-
break;
116-
case R.id.btn_add_child:
117-
FragmentUtils.addFragment(getChildFragmentManager(),
118-
Demo2Fragment.newInstance(),
119-
R.id.child_fragment_container,
120-
false,
121-
true);
122-
break;
123-
case R.id.btn_pop_to_root:
124-
FragmentUtils.popToFragment(getFragmentManager(),
125-
Demo1Fragment.class,
126-
true);
127-
break;
128-
case R.id.btn_pop_add:
129-
FragmentUtils.popAddFragment(getFragmentManager(),
130-
addSharedElement(Demo2Fragment.newInstance()),
131-
R.id.fragment_container,
132-
true,
133-
sharedElement);
134-
break;
135-
case R.id.btn_hide_show:
136-
Fragment fragment1 = FragmentUtils.findFragment(getFragmentManager(), Demo1Fragment.class);
137-
if (fragment1 != null) {
138-
FragmentUtils.hideShowFragment(this, fragment1);
139-
} else {
140-
ToastUtils.showLong("please add demo1 first!");
141-
}
142-
break;
143-
case R.id.btn_replace:
144-
((FragmentActivity) getActivity()).rootFragment = FragmentUtils.replaceFragment(this, addSharedElement(Demo3Fragment.newInstance()), false, sharedElement);
145-
break;
146-
}
81+
// switch (view.getId()) {
82+
// case R.id.btn_show_about_fragment:
83+
// tvAboutFragment.setText("lastAdd: " + FragmentUtils.getTop(getFragmentManager()).getClass().getSimpleName()
84+
// + "\nlastAddInStack: " + (FragmentUtils.getTopInStack(getFragmentManager()) != null ? FragmentUtils.getTopInStack(getFragmentManager()).getClass().getSimpleName() : "null")
85+
// + "\ntopShow: " + (FragmentUtils.getTopShow(getFragmentManager()) != null ? FragmentUtils.getTopShow(getFragmentManager()).getClass().getSimpleName() : "null")
86+
// + "\ntopShowInStack: " + (FragmentUtils.getTopShowInStack(getFragmentManager()) != null ? FragmentUtils.getTopShowInStack(getFragmentManager()).getClass().getSimpleName() : "null")
87+
// + "\n---all of fragments---\n"
88+
// + FragmentUtils.getAllFragments(getFragmentManager()).toString()
89+
// + "\n----------------------\n\n"
90+
// + "---stack top---\n"
91+
// + FragmentUtils.getAllFragmentsInStack(getFragmentManager()).toString()
92+
// + "\n---stack bottom---\n\n"
93+
// );
94+
// break;
95+
// case R.id.btn_add_hide:
96+
// FragmentUtils.addHide(getFragmentManager(),
97+
// demo0Fragment,
98+
// addSharedElement(Demo1Fragment.newInstance()),
99+
// R.id.fragment_container,
100+
// false,
101+
// true,
102+
// sharedElement);
103+
// break;
104+
// case R.id.btn_add_show:
105+
// FragmentUtils.add(getFragmentManager(),
106+
// addSharedElement(Demo1Fragment.newInstance()),
107+
// R.id.fragment_container,
108+
// false,
109+
// false,
110+
// sharedElement);
111+
// break;
112+
// case R.id.btn_add_child:
113+
// FragmentUtils.add(getChildFragmentManager(),
114+
// Demo2Fragment.newInstance(),
115+
// R.id.child_fragment_container,
116+
// false,
117+
// true);
118+
// break;
119+
// case R.id.btn_pop_to_root:
120+
// FragmentUtils.popToFragment(getFragmentManager(),
121+
// Demo1Fragment.class,
122+
// true);
123+
// break;
124+
// case R.id.btn_pop_add:
125+
// FragmentUtils.popAddFragment(getFragmentManager(),
126+
// addSharedElement(Demo2Fragment.newInstance()),
127+
// R.id.fragment_container,
128+
// true,
129+
// sharedElement);
130+
// break;
131+
// case R.id.btn_hide_show:
132+
// Fragment fragment1 = FragmentUtils.findFragment(getFragmentManager(), Demo1Fragment.class);
133+
// if (fragment1 != null) {
134+
// FragmentUtils.showHideFragment(this, fragment1);
135+
// } else {
136+
// ToastUtils.showLong("please add demo1 first!");
137+
// }
138+
// break;
139+
// case R.id.btn_replace:
140+
// ((FragmentActivity) getActivity()).rootFragment = FragmentUtils.replaceFragment(this, addSharedElement(Demo3Fragment.newInstance()), false, sharedElement);
141+
// break;
142+
// }
147143
}
148144

149145
private Fragment addSharedElement(Fragment fragment) {

0 commit comments

Comments
 (0)