Skip to content

Commit b35e78a

Browse files
committed
see 07/09 log
1 parent e1a4a1a commit b35e78a

File tree

6 files changed

+16
-13
lines changed

6 files changed

+16
-13
lines changed

Diff for: app/src/main/java/com/blankj/androidutilcode/activity/PinyinActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import com.blankj.androidutilcode.R;
99
import com.blankj.androidutilcode.base.BaseBackActivity;
10-
import com.blankj.utilcode.util.PinyinUtils;
10+
import com.blankj.subutil.util.PinyinUtils;
1111

1212
/**
1313
* <pre>

Diff for: app/src/main/java/com/blankj/androidutilcode/activity/StatusBarFragmentActivity.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import com.blankj.androidutilcode.fragment.StatusBarAlphaFragment;
1616
import com.blankj.androidutilcode.fragment.StatusBarColorFragment;
1717
import com.blankj.androidutilcode.fragment.StatusBarImageViewFragment;
18-
import com.blankj.utilcode.util.BarUtils;
1918

2019
import java.util.ArrayList;
2120

@@ -29,9 +28,10 @@
2928
*/
3029
public class StatusBarFragmentActivity extends BaseActivity {
3130

32-
private ViewPager mVpHome;
31+
private ViewPager mVpHome;
3332
private BottomNavigationView navigation;
3433
private ArrayList<Fragment> mFragmentList = new ArrayList<>();
34+
private int[] itemIds = new int[]{R.id.navigation_color, R.id.navigation_alpha, R.id.navigation_image_view};
3535

3636
@Override
3737
public void initData(Bundle bundle) {
@@ -72,7 +72,7 @@ public void onPageScrolled(int position, float positionOffset, int positionOffse
7272

7373
@Override
7474
public void onPageSelected(int position) {
75-
navigation.setSelectedItemId(position);
75+
navigation.setSelectedItemId(itemIds[position]);
7676
}
7777

7878
@Override
@@ -82,8 +82,6 @@ public void onPageScrollStateChanged(int state) {
8282
});
8383

8484
navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
85-
86-
BarUtils.setStatusBar4ImageViewInFragment(StatusBarFragmentActivity.this, null);
8785
}
8886

8987
@Override

Diff for: app/src/main/java/com/blankj/androidutilcode/fragment/StatusBarImageViewFragment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public int bindLayout() {
2828

2929
@Override
3030
public void initView(Bundle savedInstanceState, View view) {
31-
31+
// BarUtils.setStatusBar4ImageViewInFragment(mActivity, null);
3232
}
3333

3434
@Override

Diff for: app/src/main/res/layout/activity_status_bar_fragment.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@
1212
android:layout_width="match_parent"
1313
android:layout_height="0dp"
1414
android:layout_weight="1"
15-
android:orientation="vertical"/>
15+
android:orientation="vertical"
16+
android:overScrollMode="never" />
1617

1718
<android.support.design.widget.BottomNavigationView
1819
android:id="@+id/navigation"
1920
android:layout_width="match_parent"
2021
android:layout_height="wrap_content"
2122
android:layout_gravity="bottom"
2223
android:background="?android:attr/windowBackground"
23-
app:menu="@menu/navigation"/>
24+
app:menu="@menu/navigation" />
2425

2526
</LinearLayout>

Diff for: subutil/proguard-rules.pro

+4
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,7 @@
2323
# If you keep the line number information, uncomment this to
2424
# hide the original source file name.
2525
#-renamesourcefileattribute SourceFile
26+
27+
-keep class com.blankj.subutil.** { *; }
28+
-keepclassmembers class com.blankj.subutil.** { *; }
29+
-dontwarn com.blankj.subutil.**

Diff for: utilcode/src/main/java/com/blankj/utilcode/util/BarUtils.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ public final class BarUtils {
3838
// status bar
3939
///////////////////////////////////////////////////////////////////////////
4040

41-
private static final int DEFAULT_STATUS_BAR_ALPHA = 112;
41+
private static final int DEFAULT_STATUS_BAR_ALPHA = 112;
4242
private static final String FAKE_STATUS_BAR_VIEW_TAG = "FAKE_STATUS_BAR_VIEW_TAG";
43-
private static final String FAKE_TOP_VIEW_TAG = "FAKE_TOP_VIEW_TAG";
44-
private static final int TAG_KEY_HAVE_SET_OFFSET = -123;
43+
private static final String FAKE_TOP_VIEW_TAG = "FAKE_TOP_VIEW_TAG";
44+
private static final int TAG_KEY_HAVE_SET_OFFSET = -123;
4545

4646
private BarUtils() {
4747
throw new UnsupportedOperationException("u can't instantiate me...");
@@ -265,7 +265,7 @@ public static void setStatusBar4ImageViewInFragment(@NonNull final Activity acti
265265
if (fakeStatusBarView != null) {
266266
decorView.removeView(fakeStatusBarView);
267267
ViewGroup rootView = (ViewGroup) ((ViewGroup) activity.findViewById(android.R.id.content)).getChildAt(0);
268-
rootView.setPadding(0, 0, 0, 0);
268+
rootView.setPadding(rootView.getPaddingLeft(), 0, rootView.getPaddingRight(), rootView.getPaddingBottom());
269269
}
270270
}
271271
}

0 commit comments

Comments
 (0)