Skip to content

Commit f125463

Browse files
committed
style: Rename lifecycle compat ext
Signed-off-by: Hu Shenghao <dede.hu@qq.com>
1 parent bd9aa18 commit f125463

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

app/src/main/java/com/dede/android_eggs/util/actions/WarningDialogAction.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ import androidx.savedstate.setViewTreeSavedStateRegistryOwner
3535
import com.dede.android_eggs.R
3636
import com.dede.android_eggs.util.ActivityActionDispatcher
3737
import com.dede.android_eggs.views.theme.EasterEggsTheme
38-
import com.dede.basic.androidLifecycleOwner
39-
import com.dede.basic.androidSavedStateOwner
4038
import com.dede.basic.getBoolean
39+
import com.dede.basic.lifecycleOwnerCompat
4140
import com.dede.basic.putBoolean
41+
import com.dede.basic.savedStateOwnerCompat
4242

4343
class WarningDialogAction : ActivityActionDispatcher.ActivityAction {
4444

@@ -68,9 +68,9 @@ class WarningDialogAction : ActivityActionDispatcher.ActivityAction {
6868
if (activity.getBoolean(info.key, false)) return
6969

7070
val composeView = ComposeView(activity)
71-
composeView.setViewTreeLifecycleOwner(activity.androidLifecycleOwner)
71+
composeView.setViewTreeLifecycleOwner(activity.lifecycleOwnerCompat)
7272
// composeView.setViewTreeViewModelStoreOwner()
73-
composeView.setViewTreeSavedStateRegistryOwner(activity.androidSavedStateOwner)
73+
composeView.setViewTreeSavedStateRegistryOwner(activity.savedStateOwnerCompat)
7474
activity.window.decorView.post {
7575
activity.addContentView(
7676
composeView,

basic/src/main/java/com/dede/basic/LifecycleExt.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,23 @@ private val handler = Handler(Looper.getMainLooper()) { msg ->
3535
true
3636
}
3737

38-
val Activity.androidLifecycleOwner: LifecycleOwner
38+
val Activity.lifecycleOwnerCompat: LifecycleOwner
3939
get() {
4040
if (this is ComponentActivity) {
4141
return this
4242
}
4343
return LifecycleFragment.injectIfNeededIn(this)
4444
}
4545

46-
val Activity.androidSavedStateOwner: SavedStateRegistryOwner
46+
val Activity.savedStateOwnerCompat: SavedStateRegistryOwner
4747
get() {
4848
if (this is ComponentActivity) {
4949
return this
5050
}
5151
return LifecycleFragment.injectIfNeededIn(this)
5252
}
5353

54-
val Activity.androidLifecycle: Lifecycle
54+
val Activity.lifecycleCompat: Lifecycle
5555
get() {
5656
if (this is ComponentActivity) {
5757
return lifecycle

basic/src/main/java/com/dede/basic/utils/ShareCatUtils.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import android.graphics.Bitmap
99
import android.net.Uri
1010
import android.util.Log
1111
import com.dede.basic.MIME_PNG
12-
import com.dede.basic.androidLifecycle
1312
import com.dede.basic.launch
13+
import com.dede.basic.lifecycleCompat
1414
import com.dede.basic.saveToAlbum
1515
import kotlinx.coroutines.Dispatchers
1616
import kotlinx.coroutines.withContext
@@ -36,7 +36,7 @@ object ShareCatUtils {
3636

3737
@JvmStatic
3838
fun share(activity: Activity, bitmap: Bitmap, catName: String) {
39-
activity.androidLifecycle.launch {
39+
activity.lifecycleCompat.launch {
4040
val uri = saveCat(activity, bitmap, catName) ?: return@launch
4141
Log.v("Neko", "cat uri: $uri")
4242

0 commit comments

Comments
 (0)