Skip to content

Commit 1ba9f6a

Browse files
committed
see 01/23 log
1 parent dc268f9 commit 1ba9f6a

File tree

7 files changed

+28
-29
lines changed

7 files changed

+28
-29
lines changed

launcher/app/__bus__.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"SubUtilActivity#start": "void com.blankj.subutil.pkg.feature.SubUtilActivity.start(android.content.Context)",
3-
"CoreUtilActivity#start": "void com.blankj.utilcode.pkg.feature.CoreUtilActivity.start(android.content.Context)"
3+
"CoreUtilActivity#start": "void com.blankj.utilcode.pkg.feature.CoreUtilActivity.Companion.start(android.content.Context)"
44
}

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarStatusAlphaFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class BarStatusAlphaFragment : BaseLazyFragment() {
6666

6767
override fun onWidgetClick(view: View) {
6868
when (view.id) {
69-
R.id.setTransparentBtn -> barStatusAlphaFragmentChangeAlphaSb.progress = 0
69+
R.id.barStatusAlphaSetTransparentBtn -> barStatusAlphaFragmentChangeAlphaSb.progress = 0
7070
}
7171
}
7272

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarStatusDrawerActivity.kt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ class BarStatusDrawerActivity : BaseDrawerActivity() {
5353

5454
private var mAlphaCheckedChangeListener: CompoundButton.OnCheckedChangeListener = CompoundButton.OnCheckedChangeListener { _, isChecked ->
5555
if (isChecked) {
56-
barStatusAlphaChangeAlphaSb.visibility = View.VISIBLE
57-
barStatusAlphaRandomColorBtn.visibility = View.GONE
58-
barStatusAlphaSetTransparentBtn.visibility = View.VISIBLE
56+
barStatusDrawerChangeAlphaSb.visibility = View.VISIBLE
57+
barStatusDrawerRandomColorBtn.visibility = View.GONE
58+
barStatusDrawerSetTransparentBtn.visibility = View.VISIBLE
5959

6060
mDrawerContainerView.setBackgroundResource(R.drawable.bar_status_alpha_bg)
6161
} else {
62-
barStatusAlphaChangeAlphaSb.visibility = View.GONE
63-
barStatusAlphaRandomColorBtn.visibility = View.VISIBLE
64-
barStatusAlphaSetTransparentBtn.visibility = View.GONE
62+
barStatusDrawerChangeAlphaSb.visibility = View.GONE
63+
barStatusDrawerRandomColorBtn.visibility = View.VISIBLE
64+
barStatusDrawerSetTransparentBtn.visibility = View.GONE
6565

6666
mDrawerContainerView.setBackgroundColor(Color.WHITE)
6767
}
@@ -82,12 +82,12 @@ class BarStatusDrawerActivity : BaseDrawerActivity() {
8282
override fun initView(savedInstanceState: Bundle?, contentView: View) {
8383
barStatusDrawerAlphaCb.setOnCheckedChangeListener(mAlphaCheckedChangeListener)
8484
barStatusDrawerFrontCb.setOnCheckedChangeListener(mFrontCheckedChangeListener)
85-
barStatusAlphaChangeAlphaSb.setOnSeekBarChangeListener(mColorListener)
86-
barStatusAlphaRandomColorBtn.setOnClickListener(this)
87-
barStatusAlphaSetTransparentBtn.setOnClickListener(this)
85+
barStatusDrawerChangeAlphaSb.setOnSeekBarChangeListener(mColorListener)
86+
barStatusDrawerRandomColorBtn.setOnClickListener(this)
87+
barStatusDrawerSetTransparentBtn.setOnClickListener(this)
8888

89-
barStatusAlphaChangeAlphaSb.visibility = View.GONE
90-
barStatusAlphaSetTransparentBtn.visibility = View.GONE
89+
barStatusDrawerChangeAlphaSb.visibility = View.GONE
90+
barStatusDrawerSetTransparentBtn.visibility = View.GONE
9191

9292
updateStatusBar()
9393
}
@@ -98,11 +98,11 @@ class BarStatusDrawerActivity : BaseDrawerActivity() {
9898

9999
override fun onWidgetClick(view: View) {
100100
when (view.id) {
101-
R.id.randomColorBtn -> {
101+
R.id.barStatusDrawerRandomColorBtn -> {
102102
mColor = ColorUtils.getRandomColor()
103103
updateStatusBar()
104104
}
105-
R.id.setTransparentBtn -> barStatusAlphaChangeAlphaSb.progress = 0
105+
R.id.barStatusDrawerSetTransparentBtn -> barStatusDrawerChangeAlphaSb.progress = 0
106106
}
107107
}
108108

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarStatusImageViewActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class BarStatusImageViewActivity : BaseActivity() {
6868

6969
override fun onWidgetClick(view: View) {
7070
when (view.id) {
71-
R.id.setTransparentBtn -> barStatusImageViewChangeAlphaSb.progress = 0
71+
R.id.barStatusImageViewSetTransparentBtn -> barStatusImageViewChangeAlphaSb.progress = 0
7272
}
7373
}
7474

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarStatusImageViewFragment.kt

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ import kotlinx.android.synthetic.main.fragment_bar_status_image_view.*
2020
*/
2121
class BarStatusImageViewFragment : BaseLazyFragment() {
2222

23+
companion object {
24+
fun newInstance(): BarStatusImageViewFragment {
25+
return BarStatusImageViewFragment()
26+
}
27+
}
28+
2329
private var mAlpha: Int = 0
2430

2531
private val translucentListener = object : SeekBar.OnSeekBarChangeListener {
@@ -60,18 +66,11 @@ class BarStatusImageViewFragment : BaseLazyFragment() {
6066

6167
override fun onWidgetClick(view: View) {
6268
when (view.id) {
63-
R.id.setTransparentBtn -> barStatusImageViewFragmentChangeAlphaSb.progress = 0
69+
R.id.barStatusImageViewSetTransparentBtn -> barStatusImageViewFragmentChangeAlphaSb.progress = 0
6470
}
6571
}
6672

6773
fun updateFakeStatusBar() {
6874
BarUtils.setStatusBarColor(barStatusImageViewFragmentFakeStatusBar, Color.argb(mAlpha, 0, 0, 0))
6975
}
70-
71-
companion object {
72-
73-
fun newInstance(): BarStatusImageViewFragment {
74-
return BarStatusImageViewFragment()
75-
}
76-
}
7776
}

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarStatusSwipeBackActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ class BarStatusSwipeBackActivity : BaseActivity() {
9696

9797
override fun onWidgetClick(view: View) {
9898
when (view.id) {
99-
R.id.randomColorBtn -> {
99+
R.id.barStatusSwipeBackRandomColorBtn -> {
100100
mColor = ColorUtils.getRandomColor()
101101
updateStatusBar()
102102
}
103-
R.id.setTransparentBtn -> barStatusSwipeBackChangeAlphaSb.progress = 0
103+
R.id.barStatusSwipeBackSetTransparentBtn -> barStatusSwipeBackChangeAlphaSb.progress = 0
104104
}
105105
}
106106

utilcode/pkg/src/main/res/layout/activity_bar_status_drawer.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,22 +41,22 @@
4141
android:layout_gravity="center_horizontal" />
4242

4343
<SeekBar
44-
android:id="@+id/barStatusAlphaChangeAlphaSb"
44+
android:id="@+id/barStatusDrawerChangeAlphaSb"
4545
android:layout_width="match_parent"
4646
android:layout_height="wrap_content"
4747
android:max="255"
4848
android:padding="@dimen/spacing_8"
4949
android:progress="112" />
5050

5151
<Button
52-
android:id="@+id/barStatusAlphaRandomColorBtn"
52+
android:id="@+id/barStatusDrawerRandomColorBtn"
5353
style="@style/WideBtnStyle"
5454
android:layout_width="match_parent"
5555
android:layout_height="wrap_content"
5656
android:text="@string/bar_status_random_color" />
5757

5858
<Button
59-
android:id="@+id/barStatusAlphaSetTransparentBtn"
59+
android:id="@+id/barStatusDrawerSetTransparentBtn"
6060
style="@style/WideBtnStyle"
6161
android:layout_width="match_parent"
6262
android:layout_height="wrap_content"

0 commit comments

Comments
 (0)