Skip to content

Commit b18ced5

Browse files
committed
Remove Extensions
1 parent 2efc1f3 commit b18ced5

File tree

3 files changed

+7
-15
lines changed

3 files changed

+7
-15
lines changed

app/src/main/java/com/haoge/sample/easyandroid/activities/EasyReflectActivity.kt

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package com.haoge.sample.easyandroid.activities
22

33
import android.annotation.SuppressLint
44
import butterknife.OnClick
5+
import com.haoge.easyandroid.easy.EasyFormatter
56
import com.haoge.easyandroid.easy.EasyLog
67
import com.haoge.easyandroid.easy.EasyReflect
7-
import com.haoge.easyandroid.easyFormat
88
import com.haoge.sample.easyandroid.BaseActivity
99
import com.haoge.sample.easyandroid.R
1010
import java.util.*
@@ -179,4 +179,6 @@ interface TestProxy {
179179

180180
data class A(var b:B?)
181181

182-
data class B(var a:A?)
182+
data class B(var a:A?)
183+
184+
private fun Any.easyFormat() = EasyFormatter.DEFAULT.format(this)

app/src/main/java/com/haoge/sample/easyandroid/activities/mvp/base/MVPViewImpl.kt

+3-4
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ import android.app.Dialog
55
import android.app.ProgressDialog
66
import com.haoge.easyandroid.easy.EasyToast
77
import com.haoge.easyandroid.mvp.MVPView
8-
import com.haoge.easyandroid.safeDismiss
9-
import com.haoge.easyandroid.safeShow
8+
import com.haoge.easyandroid.safe.SafeDialogHandle
109

1110
/**
1211
* 为了使Activity与其绑定的所有Fragment均享有同样的基础展示逻辑。
@@ -25,8 +24,8 @@ class MVPViewImpl(private val activity:Activity):MVPView {
2524

2625
// 基础实现。
2726
override fun getHostActivity() = activity
28-
override fun showLoadingDialog() = progressDialog.safeShow()
29-
override fun hideLoadingDialog() = progressDialog.safeDismiss()
27+
override fun showLoadingDialog() = SafeDialogHandle.safeShowDialog(progressDialog)
28+
override fun hideLoadingDialog() = SafeDialogHandle.safeDismissDialog(progressDialog)
3029
override fun toastMessage(message: String) = toast.show(message)
3130
override fun toastMessage(resId: Int) = toast.show(resId)
3231
}

utils/src/main/java/com/haoge/easyandroid/Extensions.kt

-9
This file was deleted.

0 commit comments

Comments
 (0)