Skip to content

Commit 8b52c31

Browse files
BlankjBlankj
committed
see 01/24 log
1 parent 720cace commit 8b52c31

File tree

66 files changed

+787
-832
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+787
-832
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
{
2-
"SubUtilActivity#start": "void com.blankj.subutil.pkg.feature.SubUtilActivity.start(android.content.Context)",
2+
"SubUtilActivity#start": "void com.blankj.subutil.pkg.feature.SubUtilActivity.Companion.start(android.content.Context)",
33
"CoreUtilActivity#start": "void com.blankj.utilcode.pkg.feature.CoreUtilActivity.Companion.start(android.content.Context)"
44
}

‎launcher/pkg/src/main/java/com/blankj/launcher/pkg/MainActivity.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ class MainActivity : BaseDrawerActivity() {
3636
launcherMainCtl.setExpandedTitleColor(Color.TRANSPARENT)
3737
setSupportActionBar(launcherMainToolbar)
3838
val toggle = ActionBarDrawerToggle(this,
39-
mDrawerRootLayout,
39+
mBaseDrawerRootLayout,
4040
launcherMainToolbar,
4141
R.string.navigation_drawer_open,
4242
R.string.navigation_drawer_close)
43-
mDrawerRootLayout.addDrawerListener(toggle)
43+
mBaseDrawerRootLayout.addDrawerListener(toggle)
4444
toggle.syncState()
4545

46-
BarUtils.setStatusBarColor4Drawer(mDrawerRootLayout, launcherMainFakeStatusBar, Color.TRANSPARENT, false)
46+
BarUtils.setStatusBarColor4Drawer(mBaseDrawerRootLayout, launcherMainFakeStatusBar, Color.TRANSPARENT, false)
4747
BarUtils.addMarginTopEqualStatusBarHeight(launcherMainToolbar)
4848

4949
launcherMainCoreUtilBtn.setOnClickListener {

‎lib/base/src/main/java/com/blankj/lib/base/BaseBackActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ abstract class BaseBackActivity : BaseActivity() {
2323
super.setRootLayout(R.layout.activity_back)
2424
Slidr.attach(this)
2525
if (layoutId > 0) {
26-
LayoutInflater.from(this).inflate(layoutId, drawerContainerView)
26+
LayoutInflater.from(this).inflate(layoutId, baseBackContainerView)
2727
}
2828
setSupportActionBar(baseBackToolbar)
2929
supportActionBar?.setDisplayHomeAsUpEnabled(true)
3030

3131
BarUtils.setStatusBarColor(this, ContextCompat.getColor(Utils.getApp(), R.color.colorPrimary))
32-
BarUtils.addMarginTopEqualStatusBarHeight(backRootLayout)
32+
BarUtils.addMarginTopEqualStatusBarHeight(baseBackRootLayout)
3333
}
3434

3535
override fun onOptionsItemSelected(item: MenuItem): Boolean {

‎lib/base/src/main/java/com/blankj/lib/base/BaseDrawerActivity.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,23 @@ import kotlinx.android.synthetic.main.activity_drawer.*
2020
*/
2121
abstract class BaseDrawerActivity : BaseActivity() {
2222

23-
protected lateinit var mDrawerRootLayout: DrawerLayout
24-
protected lateinit var mDrawerContainerView: FrameLayout
23+
protected lateinit var mBaseDrawerRootLayout: DrawerLayout
24+
protected lateinit var mBaseDrawerContainerView: FrameLayout
2525

2626
override fun setRootLayout(layoutId: Int) {
2727
super.setRootLayout(R.layout.activity_drawer)
2828
if (layoutId > 0) {
29-
LayoutInflater.from(this).inflate(layoutId, drawerContainerView)
29+
LayoutInflater.from(this).inflate(layoutId, baseDrawerContainerView)
3030
}
31-
drawerNavView.setNavigationItemSelectedListener l@{ item ->
31+
baseDrawerNavView.setNavigationItemSelectedListener l@{ item ->
3232
when (item.itemId) {
33-
R.id.action_git_hub -> return@l goWeb(R.string.github)
34-
R.id.action_blog -> return@l goWeb(R.string.blog)
33+
R.id.baseDrawerActionGitHub -> return@l goWeb(R.string.github)
34+
R.id.baseDrawerActionBlog -> return@l goWeb(R.string.blog)
3535
}
3636
false
3737
}
38-
mDrawerRootLayout = drawerRootLayout
39-
mDrawerContainerView = drawerContainerView
38+
mBaseDrawerRootLayout = baseDrawerRootLayout
39+
mBaseDrawerContainerView = baseDrawerContainerView
4040
}
4141

4242
private fun goWeb(@StringRes id: Int): Boolean {

‎lib/base/src/main/res/layout/activity_back.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
4-
android:id="@+id/backRootLayout"
4+
android:id="@+id/baseBackRootLayout"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
77
android:background="@color/white">
@@ -26,7 +26,7 @@
2626
app:layout_behavior="@string/appbar_scrolling_view_behavior">
2727

2828
<FrameLayout
29-
android:id="@+id/drawerContainerView"
29+
android:id="@+id/baseBackContainerView"
3030
android:layout_width="match_parent"
3131
android:layout_height="match_parent" />
3232
</android.support.v4.widget.NestedScrollView>

‎lib/base/src/main/res/layout/activity_drawer.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:app="http://schemas.android.com/apk/res-auto"
55
xmlns:tools="http://schemas.android.com/tools"
6-
android:id="@+id/drawerRootLayout"
6+
android:id="@+id/baseDrawerRootLayout"
77
android:layout_width="match_parent"
88
android:layout_height="match_parent"
99
android:background="@color/white"
@@ -12,12 +12,12 @@
1212
tools:openDrawer="start">
1313

1414
<FrameLayout
15-
android:id="@+id/drawerContainerView"
15+
android:id="@+id/baseDrawerContainerView"
1616
android:layout_width="match_parent"
1717
android:layout_height="wrap_content" />
1818

1919
<android.support.design.widget.NavigationView
20-
android:id="@+id/drawerNavView"
20+
android:id="@+id/baseDrawerNavView"
2121
android:layout_width="wrap_content"
2222
android:layout_height="match_parent"
2323
android:layout_gravity="start"

‎lib/base/src/main/res/layout/activity_drawer_nav_header.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
android:src="@drawable/main_bg_header" />
1313

1414
<ImageView
15-
android:id="@+id/avatarIv"
15+
android:id="@+id/baseDrawerNavHeaderAvatarIv"
1616
android:layout_width="80dp"
1717
android:layout_height="80dp"
1818
android:layout_above="@+id/descTv"
@@ -24,7 +24,7 @@
2424
android:layout_height="80dp"
2525
android:layout_above="@+id/descTv"
2626
android:layout_marginLeft="@dimen/spacing_16"
27-
android:layout_toRightOf="@id/avatarIv"
27+
android:layout_toRightOf="@id/baseDrawerNavHeaderAvatarIv"
2828
android:gravity="center_vertical"
2929
android:text="@string/author"
3030
android:textColor="@color/white"

‎lib/base/src/main/res/menu/main_drawer.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<menu xmlns:android="http://schemas.android.com/apk/res/android">
22

33
<item
4-
android:id="@+id/action_git_hub"
4+
android:id="@+id/baseDrawerActionGitHub"
55
android:icon="@drawable/main_menu_github"
66
android:title="GitHub" />
77

88
<item
9-
android:id="@+id/action_blog"
9+
android:id="@+id/baseDrawerActionBlog"
1010
android:icon="@drawable/main_menu_blog"
1111
android:title="Blog" />
1212
</menu>

‎lib/base/src/main/res/values-v26/styles.xml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,4 @@
1212
<item name="android:windowIsTranslucent">false</item>
1313
<item name="android:windowBackground">@android:color/transparent</item>
1414
</style>
15-
16-
<style name="TextStyle">
17-
<item name="android:textSize">@dimen/font_24</item>
18-
<item name="android:textColor">@color/light_black</item>
19-
</style>
20-
21-
<style name="WideBtnStyle">
22-
<item name="android:textSize">@dimen/font_24</item>
23-
<item name="android:textColor">@color/light_black</item>
24-
<item name="android:textAllCaps">false</item>
25-
</style>
26-
27-
<style name="AnimationActivity" parent="@android:style/Animation.Translucent">
28-
<item name="android:activityOpenEnterAnimation">@anim/slide_in_left</item>
29-
<item name="android:activityOpenExitAnimation">@anim/slide_out_left</item>
30-
<item name="android:activityCloseEnterAnimation">@anim/slide_in_right</item>
31-
<item name="android:activityCloseExitAnimation">@anim/slide_out_right</item>
32-
</style>
3315
</resources>

‎lib/base/src/main/res/values-v27/styles.xml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,4 @@
1212
<item name="android:windowIsTranslucent">true</item>
1313
<item name="android:windowBackground">@android:color/transparent</item>
1414
</style>
15-
16-
<style name="TextStyle">
17-
<item name="android:textSize">@dimen/font_24</item>
18-
<item name="android:textColor">@color/light_black</item>
19-
</style>
20-
21-
<style name="WideBtnStyle">
22-
<item name="android:textSize">@dimen/font_24</item>
23-
<item name="android:textColor">@color/light_black</item>
24-
<item name="android:textAllCaps">false</item>
25-
</style>
26-
27-
<style name="AnimationActivity" parent="@android:style/Animation.Translucent">
28-
<item name="android:activityOpenEnterAnimation">@anim/slide_in_left</item>
29-
<item name="android:activityOpenExitAnimation">@anim/slide_out_left</item>
30-
<item name="android:activityCloseEnterAnimation">@anim/slide_in_right</item>
31-
<item name="android:activityCloseExitAnimation">@anim/slide_out_right</item>
32-
</style>
3315
</resources>

‎lib/base/src/main/res/values/styles.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@
1818
<item name="android:textColor">@color/light_black</item>
1919
</style>
2020

21-
<style name="WideBtnStyle">
22-
<item name="android:textSize">@dimen/font_24</item>
23-
<item name="android:textColor">@color/light_black</item>
21+
<style name="WideBtnStyle" parent="TextStyle">
2422
<item name="android:textAllCaps">false</item>
2523
</style>
2624

25+
<style name="CbStyle" parent="TextStyle">
26+
27+
</style>
28+
2729
<style name="AnimationActivity" parent="@android:style/Animation.Translucent">
2830
<item name="android:activityOpenEnterAnimation">@anim/slide_in_left</item>
2931
<item name="android:activityOpenExitAnimation">@anim/slide_out_left</item>

‎subutil/app/src/main/java/com/blankj/subutil/app/SubUtilApp.java

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎subutil/app/src/main/java/com/blankj/subutil/app/SubUtilApp.kt

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package com.blankj.subutil.app
2+
3+
import android.content.Context
4+
5+
import com.blankj.lib.base.BaseApplication
6+
7+
8+
/**
9+
* ```
10+
* author: Blankj
11+
* blog : http://blankj.com
12+
* time : 2016/10/12
13+
* desc : app about utils
14+
* ```
15+
*/
16+
class SubUtilApp : BaseApplication() {
17+
18+
companion object {
19+
var instance: SubUtilApp? = null
20+
private set
21+
}
22+
23+
override fun attachBaseContext(base: Context) {
24+
super.attachBaseContext(base)
25+
}
26+
27+
override fun onCreate() {
28+
super.onCreate()
29+
instance = this
30+
}
31+
}
32+
33+

‎subutil/lib/src/main/java/com/blankj/subutil/util/FlashlightUtils.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
*/
2121
public final class FlashlightUtils {
2222

23-
private static final String TAG = "FlashlightUtils";
24-
2523
private Camera mCamera;
2624

2725
private FlashlightUtils() {
@@ -45,11 +43,11 @@ public boolean register() {
4543
try {
4644
mCamera = Camera.open(0);
4745
} catch (Throwable t) {
48-
Log.e(TAG, "register: ", t);
46+
Log.e("FlashlightUtils", "register: ", t);
4947
return false;
5048
}
5149
if (mCamera == null) {
52-
Log.e(TAG, "register: open camera failed!");
50+
Log.e("FlashlightUtils", "register: open camera failed!");
5351
return false;
5452
}
5553
try {
@@ -76,7 +74,7 @@ public void unregister() {
7674
*/
7775
public void setFlashlightOn() {
7876
if (mCamera == null) {
79-
Log.e(TAG, "setFlashlightOn: the utils of flashlight register failed!");
77+
Log.e("FlashlightUtils", "setFlashlightOn: the utils of flashlight register failed!");
8078
return;
8179
}
8280
Camera.Parameters parameters = mCamera.getParameters();
@@ -91,7 +89,7 @@ public void setFlashlightOn() {
9189
*/
9290
public void setFlashlightOff() {
9391
if (mCamera == null) {
94-
Log.e(TAG, "setFlashlightOn: the utils of flashlight register failed!");
92+
Log.e("FlashlightUtils", "setFlashlightOn: the utils of flashlight register failed!");
9593
return;
9694
}
9795
Camera.Parameters parameters = mCamera.getParameters();
@@ -108,7 +106,7 @@ public void setFlashlightOff() {
108106
*/
109107
public boolean isFlashlightOn() {
110108
if (mCamera == null) {
111-
Log.e(TAG, "setFlashlightOn: the utils of flashlight register failed!");
109+
Log.e("FlashlightUtils", "setFlashlightOn: the utils of flashlight register failed!");
112110
return false;
113111
}
114112
Camera.Parameters parameters = mCamera.getParameters();

‎subutil/pkg/src/main/AndroidManifest.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@
1717
<activity
1818
android:name=".feature.SubUtilActivity"
1919
android:launchMode="singleTop" />
20-
<activity
21-
android:name=".feature.brightness.BrightnessActivity"
22-
android:launchMode="singleTop" />
23-
<activity
24-
android:name=".feature.flashlight.FlashlightActivity"
25-
android:launchMode="singleTop" />
2620
<activity
2721
android:name=".feature.location.LocationActivity"
2822
android:launchMode="singleTop" />

0 commit comments

Comments
 (0)