Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[둘리] 1단계 자동 DI 미션 제출합니다 #5

Merged
merged 18 commits into from
Sep 5, 2023
Merged

[둘리] 1단계 자동 DI 미션 제출합니다 #5

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
029b9ca
feat: Repository 추상화
hyemdooly Sep 3, 2023
66591f0
feat: 공통으로 사용할 RepositoryModules 추가
hyemdooly Sep 3, 2023
2472367
feat: ViewModelFactory 구현
hyemdooly Sep 3, 2023
8fa65de
feat: 커스텀 ViewModelFactory 적용
hyemdooly Sep 3, 2023
cf756b3
rename: Module 네이밍 변경, 디렉토리 이동
hyemdooly Sep 3, 2023
e75d7cc
docs: 문서 수정
hyemdooly Sep 3, 2023
aab65d6
rename: 변수 네이밍 수정
hyemdooly Sep 3, 2023
3f39cc3
feat: kotlin reflection 임포트
hyemdooly Sep 5, 2023
072ac94
refactor: RepositoryModule Container로 수정 및 재사용 리팩터링
hyemdooly Sep 5, 2023
6fd5134
feat: Application 생성하여 Container에 인스턴스 추가
hyemdooly Sep 5, 2023
984ab03
refactor: requireNotNull 적용
hyemdooly Sep 5, 2023
ddfe49a
refactor: java reflection -> kotlin reflection으로 수정
hyemdooly Sep 5, 2023
53b47d0
refactor: 함수 분리
hyemdooly Sep 5, 2023
b84e79d
refactor: 분리한 함수 적용
hyemdooly Sep 5, 2023
ee21ff5
rename: 필요없는 파일 삭제 및 패키지 이동
hyemdooly Sep 5, 2023
abb5186
test: CartActivityTest 추가
hyemdooly Sep 5, 2023
42ad01c
test: ViewModelInjector test 추가
hyemdooly Sep 5, 2023
254e9bc
docs: README.md 수정
hyemdooly Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor: 분리한 함수 적용
  • Loading branch information
@hyemdooly
hyemdooly committed Sep 5, 2023
commit b84e79dbe60c9f4d46bb1dc5d010a83805c33d23
4 changes: 2 additions & 2 deletions app/src/main/java/woowacourse/shopping/ui/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ import androidx.activity.viewModels
import androidx.appcompat.app.AppCompatActivity
import woowacourse.shopping.R
import woowacourse.shopping.databinding.ActivityMainBinding
import woowacourse.shopping.di.ViewModelInjector
import woowacourse.shopping.ui.cart.CartActivity
import woowacourse.shopping.ui.common.ViewModelFactory

class MainActivity : AppCompatActivity() {

private val binding by lazy { ActivityMainBinding.inflate(layoutInflater) }

private val viewModel by viewModels<MainViewModel>(factoryProducer = { ViewModelFactory() })
private val viewModel by viewModels<MainViewModel> { ViewModelInjector.getInjectedViewModelFactory<MainViewModel>() }

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/woowacourse/shopping/ui/cart/CartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import androidx.activity.viewModels
import androidx.appcompat.app.AppCompatActivity
import woowacourse.shopping.R
import woowacourse.shopping.databinding.ActivityCartBinding
import woowacourse.shopping.ui.common.ViewModelFactory
import woowacourse.shopping.di.ViewModelInjector

class CartActivity : AppCompatActivity() {

private val binding by lazy { ActivityCartBinding.inflate(layoutInflater) }

private val viewModel by viewModels<CartViewModel>(factoryProducer = { ViewModelFactory() })
private val viewModel by viewModels<CartViewModel> { ViewModelInjector.getInjectedViewModelFactory<CartViewModel>() }

private lateinit var dateFormatter: DateFormatter

Expand Down