Skip to content

Commit 357b243

Browse files
committed
Merge branch 'master' into androidx
2 parents 57bd0c7 + 66a4c04 commit 357b243

Some content is hidden

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

45 files changed

+1034
-409
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
* `21/02/22` [add] Fix ToastUtils rtl bug. Publish v1.30.6.
2+
* `20/11/16` [add] Add ImageUtils#save2Album support param of dirName.
13
* `20/11/13` [add] Fix MessengerUtils ANR. Add NetworkUtils#getWifiScanResult, [add|remove]OnWifiChangedConsumer. Publish v1.30.5.
24
* `20/10/29` [add] Fix MessengerUtils startService IllegalStateException. Publish v1.30.4.
35
* `20/10/28` [add] Fix BusUtils ConcurrentModificationException. Publish v1.30.3.

buildSrc/src/main/groovy/Config.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ class Config {
1414
static compileSdkVersion = 29
1515
static minSdkVersion = 14
1616
static targetSdkVersion = 29
17-
static versionCode = 1_030_005
18-
static versionName = '1.30.5'// E.g. 1.9.72 => 1,009,072
17+
static versionCode = 1_030_006
18+
static versionName = '1.30.6'// E.g. 1.9.72 => 1,009,072
1919

2020
// lib version
2121
static gradlePluginVersion = '3.5.2'

feature/launcher/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
android:allowBackup="false"
88
android:icon="@mipmap/ic_launcher"
99
android:label="@string/app_name"
10+
android:supportsRtl="true"
1011
android:theme="@style/AppTheme">
1112

1213
<activity

feature/main/pkg/src/main/java/com/blankj/main/pkg/MainActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ class MainActivity : CommonActivity() {
4747
super.initView(savedInstanceState, contentView)
4848
setCommonItems(mainRv, CollectionUtils.newArrayList<CommonItem<*>>(
4949
CommonItemClick(R.string.core_util, true) {
50-
ApiUtils.getApi(UtilCodeApi::class.java).startUtilCodeActivity(this)
50+
ApiUtils.getApi(UtilCodeApi::class.java)?.startUtilCodeActivity(this)
5151
},
5252
CommonItemClick(R.string.sub_util, true) {
53-
ApiUtils.getApi(SubUtilApi::class.java).startSubUtilActivity(this)
53+
ApiUtils.getApi(SubUtilApi::class.java)?.startSubUtilActivity(this)
5454
}
5555
))
5656

feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/api/ApiActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ class ApiActivity : CommonActivity() {
3535
override fun bindItems(): MutableList<CommonItem<*>> {
3636
return CollectionUtils.newArrayList(
3737
CommonItemClick(R.string.api_invoke_with_params) {
38-
ApiUtils.getApi(OtherModuleApi::class.java).invokeWithParams(OtherModuleApi.ApiBean("params"))
38+
ApiUtils.getApi(OtherModuleApi::class.java)?.invokeWithParams(OtherModuleApi.ApiBean("params"))
3939
},
4040
CommonItemClick(R.string.api_invoke_with_return_value) {
41-
ToastUtils.showShort(ApiUtils.getApi(OtherModuleApi::class.java).invokeWithReturnValue().name)
41+
ToastUtils.showShort(ApiUtils.getApi(OtherModuleApi::class.java)?.invokeWithReturnValue()?.name)
4242
}
4343
);
4444
}

feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/clean/CleanActivity.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ package com.blankj.utilcode.pkg.feature.clean
33
import android.content.Context
44
import android.content.Intent
55
import com.blankj.common.activity.CommonActivity
6-
import com.blankj.common.activity.CommonActivityItemsView
7-
import com.blankj.common.activity.CommonActivityTitleView
86
import com.blankj.common.item.CommonItem
97
import com.blankj.common.item.CommonItemClick
108
import com.blankj.utilcode.pkg.R
@@ -54,6 +52,11 @@ class CleanActivity : CommonActivity() {
5452
showSnackbar(CleanUtils.cleanExternalCache(), externalCacheDir?.absolutePath)
5553
})
5654
}
55+
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
56+
add(CommonItemClick(R.string.clean_app_user_data) {
57+
CleanUtils.cleanAppUserData()
58+
})
59+
}
5760
}
5861
}
5962

feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/keyboard/KeyboardActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ import com.blankj.common.item.CommonItemClick
1010
import com.blankj.common.item.CommonItemTitle
1111
import com.blankj.utilcode.pkg.R
1212
import com.blankj.utilcode.pkg.helper.DialogHelper
13-
import com.blankj.utilcode.util.CollectionUtils
14-
import com.blankj.utilcode.util.KeyboardUtils
13+
import com.blankj.utilcode.util.*
1514
import kotlinx.android.synthetic.main.keyboard_activity.*
1615

1716
/**

feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/language/LanguageActivity.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ class LanguageActivity : CommonActivity() {
6060
CommonItemClick(R.string.language_apply_english) {
6161
LanguageUtils.applyLanguage(Locale.ENGLISH, isRelaunchApp())
6262
},
63+
CommonItemClick(R.string.language_apply_arabic) {
64+
LanguageUtils.applyLanguage(Locale("ar"), isRelaunchApp())
65+
},
6366
CommonItemClick(R.string.language_apply_system) {
6467
LanguageUtils.applySystemLanguage(isRelaunchApp())
6568
}

feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/phone/PhoneActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ class PhoneActivity : CommonActivity() {
5454
CommonItemTitle("getSimOperatorName", PhoneUtils.getSimOperatorName()),
5555
CommonItemTitle("getSimOperatorByMnc", PhoneUtils.getSimOperatorByMnc()),
5656

57-
CommonItemClick(R.string.phone_dial) { PhoneUtils.dial("10000") },
58-
CommonItemClick(R.string.phone_call) { PhoneUtils.call("10000") },
57+
CommonItemClick(R.string.phone_dial) { PhoneUtils.dial("*10000#haha") },
58+
CommonItemClick(R.string.phone_call) { PhoneUtils.call("*10000#haha") },
5959
CommonItemClick(R.string.phone_send_sms) { PhoneUtils.sendSms("10000", "sendSms") }
6060
)
6161
}

feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/toast/ToastActivity.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ class ToastActivity : CommonActivity() {
8080
CommonItemClick(R.string.toast_show_middle) {
8181
ToastUtils.make().setGravity(Gravity.CENTER, 0, 0).show(R.string.toast_middle)
8282
},
83+
CommonItemClick(R.string.toast_show_top) {
84+
ToastUtils.make().setGravity(Gravity.TOP or Gravity.CENTER_HORIZONTAL, 0, 0).show(R.string.toast_top)
85+
},
8386
CommonItemClick(R.string.toast_show_custom_view) {
8487
Thread(Runnable { CustomToast.showLong(R.string.toast_custom_view) }).start()
8588
},

0 commit comments

Comments
 (0)