From f8ba9b7d3a4d309e337d61f85906127312dc37f1 Mon Sep 17 00:00:00 2001 From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com> Date: Fri, 21 Jul 2023 16:10:40 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E5=91=BD=E5=90=8D=20`crea?= =?UTF-8?q?teContent`=20=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/huanchengfly/tieba/post/MainActivityV2.kt | 2 +- .../tieba/post/arch/BaseComposeActivity.kt | 10 +++++----- .../tieba/post/ui/page/photoview/PhotoViewActivity.kt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/huanchengfly/tieba/post/MainActivityV2.kt b/app/src/main/java/com/huanchengfly/tieba/post/MainActivityV2.kt index c65fd765..70b765fc 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/MainActivityV2.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/MainActivityV2.kt @@ -232,7 +232,7 @@ class MainActivityV2 : BaseComposeActivity() { @OptIn(ExperimentalAnimationApi::class, ExperimentalMaterialNavigationApi::class) @Composable - override fun createContent() { + override fun Content() { val okSignAlertDialogState = rememberDialogState() AlertDialog( dialogState = okSignAlertDialogState, diff --git a/app/src/main/java/com/huanchengfly/tieba/post/arch/BaseComposeActivity.kt b/app/src/main/java/com/huanchengfly/tieba/post/arch/BaseComposeActivity.kt index c02eb107..e924e65a 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/arch/BaseComposeActivity.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/arch/BaseComposeActivity.kt @@ -41,12 +41,12 @@ abstract class BaseComposeActivityWithData : BaseComposeActivity() { } @Composable - final override fun createContent() { - createContent(data!!) + final override fun Content() { + Content(data!!) } @Composable - abstract fun createContent(data: DATA) + abstract fun Content(data: DATA) } abstract class BaseComposeActivity : BaseActivity() { @@ -83,7 +83,7 @@ abstract class BaseComposeActivity : BaseActivity() { CompositionLocalProvider( LocalWindowSizeClass provides calculateWindowSizeClass(activity = this) ) { - createContent() + Content() } } } @@ -100,7 +100,7 @@ abstract class BaseComposeActivity : BaseActivity() { ) {} @Composable - abstract fun createContent() + abstract fun Content() fun handleCommonEvent(event: CommonUiEvent) { when (event) { diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/photoview/PhotoViewActivity.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/photoview/PhotoViewActivity.kt index 32e3c02d..982b3298 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/photoview/PhotoViewActivity.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/photoview/PhotoViewActivity.kt @@ -142,7 +142,7 @@ class PhotoViewActivity : BaseComposeActivityWithParcelable() { @OptIn(ExperimentalFoundationApi::class) @Composable - override fun createContent(data: PhotoViewData) { + override fun Content(data: PhotoViewData) { LazyLoad(loaded = viewModel.initialized) { viewModel.send(PhotoViewUiIntent.Init(data)) viewModel.initialized = true