From f62a4e9072229a3acff051b47a6d81fe1823ec13 Mon Sep 17 00:00:00 2001 From: KRMKGOLD Date: Wed, 4 Aug 2021 17:39:02 +0900 Subject: [PATCH 1/4] =?UTF-8?q?AOS-654=20BaseViewModel=20Template=20V2?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/ViewModelTemplate.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/templates/ViewModelTemplate.txt b/src/main/resources/templates/ViewModelTemplate.txt index 6920007..40a5ba2 100644 --- a/src/main/resources/templates/ViewModelTemplate.txt +++ b/src/main/resources/templates/ViewModelTemplate.txt @@ -1,8 +1,8 @@ package $PACKAGE$ -import kr.co.finda.finda.coreComponent.ui.base.BaseViewModel +import kr.co.finda.finda.ui.base.v2.BaseViewModelV2 -class $NAME$ViewModel : BaseViewModel() { +class $NAME$ViewModel : BaseViewModelV2() { } \ No newline at end of file From 75d37b96ac0b55fe204e386f0553a00cc98bc809 Mon Sep 17 00:00:00 2001 From: KRMKGOLD Date: Wed, 4 Aug 2021 17:40:34 +0900 Subject: [PATCH 2/4] =?UTF-8?q?AOS-654=20BaseActivityTemplate=20V2?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/ActivityTemplate.txt | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/main/resources/templates/ActivityTemplate.txt b/src/main/resources/templates/ActivityTemplate.txt index 2be1bc7..7d4bc23 100644 --- a/src/main/resources/templates/ActivityTemplate.txt +++ b/src/main/resources/templates/ActivityTemplate.txt @@ -1,15 +1,28 @@ package $PACKAGE$ +import androidx.lifecycle.LifecycleOwner import kr.co.finda.finda.R import kr.co.finda.finda.databinding.Activity$NAME$Binding -import kr.co.finda.finda.ui.base.BaseActivity +import kr.co.finda.finda.ui.base.v2.BaseActivityV2 +import org.koin.androidx.viewmodel.ext.android.viewModel -class $NAME$Activity : BaseActivity( - R.layout.$LAYOUT_NAME$, - $NAME$ViewModel::class.java + +class $NAME$Activity : BaseActivityV2( + R.layout.$LAYOUT_NAME$ ) { - override fun setBindingVariables() { + override val viewModel: $NAME$ViewModel by viewModel() + + override fun onInitialize(lifecycleOwner: LifecycleOwner) { + super.onInitialize(lifecycleOwner) binding.viewModel = viewModel } + + override fun setupUiComponent() { + + } + + override fun observeLiveData() { + + } } \ No newline at end of file From 6894d32db8ae5b8a99730aa5f3f30ea25528a69f Mon Sep 17 00:00:00 2001 From: KRMKGOLD Date: Wed, 4 Aug 2021 17:42:10 +0900 Subject: [PATCH 3/4] =?UTF-8?q?AOS-654=20LayoutTemplate=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/LayoutTemplate.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/LayoutTemplate.txt b/src/main/resources/templates/LayoutTemplate.txt index fb85698..c9f2e6c 100644 --- a/src/main/resources/templates/LayoutTemplate.txt +++ b/src/main/resources/templates/LayoutTemplate.txt @@ -9,7 +9,7 @@ type="$VM_PACKAGE$" /> - From 00057addbcd23885fb70757514d126910d330da4 Mon Sep 17 00:00:00 2001 From: KRMKGOLD Date: Wed, 4 Aug 2021 17:48:35 +0900 Subject: [PATCH 4/4] =?UTF-8?q?AOS-654=20FragmentTemplate=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/FragmentTemplate.txt | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/main/resources/templates/FragmentTemplate.txt b/src/main/resources/templates/FragmentTemplate.txt index 6abcc3d..653369b 100644 --- a/src/main/resources/templates/FragmentTemplate.txt +++ b/src/main/resources/templates/FragmentTemplate.txt @@ -1,15 +1,27 @@ package $PACKAGE$ +import androidx.lifecycle.LifecycleOwner import kr.co.finda.finda.R import kr.co.finda.finda.databinding.Fragment$NAME$Binding -import kr.co.finda.finda.ui.base.BaseFragment +import kr.co.finda.finda.ui.base.v2.BaseFragmentV2 +import org.koin.androidx.viewmodel.ext.android.sharedViewModel -class $NAME$Fragment : BaseFragment( - R.layout.$LAYOUT_NAME$, - $NAME$ViewModel::class.java +class $NAME$Fragment : BaseFragment( + R.layout.$LAYOUT_NAME$ ) { - override fun setBindingVariables() { - binding.viewModel = viewModel - } + override val viewModel: $NAME$ViewModel by sharedViewModel() + + override fun onInitialize(lifecycleOwner: LifecycleOwner) { + super.onInitialize(lifecycleOwner) + binding.viewModel = viewModel + } + + override fun setupUiComponent() { + + } + + override fun observeLiveData() { + + } } \ No newline at end of file