Commit ee359de

committed

Minor improvements

1 parent feeed08 commit ee359deCopy full SHA for ee359de

File tree

2 files changed

+22

-16

lines changed

app/src/main/java/com/cleanarch/features/wikientry/presentation
- WikiEntryActivity.kt
- WikiEntryViewModel.kt

2 files changed

+22

-16

lines changed

`‎app/src/main/java/com/cleanarch/features/wikientry/presentation/WikiEntryActivity.kt‎`

Lines changed: 7 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,16 +39,16 @@ class WikiEntryActivity : AppCompatActivity() {`
`39`	`39`	`(application as CleanArchApp).buildWikiEntryComponent()`
`40`	`40`
`41`	`41`	`binding = ActivityMainBinding.inflate(layoutInflater)`
`42`		`- val view = binding.root`
`43`		`- setContentView(view)`
`44`		`-`
	`42`	`+ setContentView(binding.root)`
`45`	`43`	`binding.submitButton.setOnClickListener(submitButtonOnClickListener)`
`46`	`44`
`47`	`45`	`wikiEntryViewModel = ViewModelProvider(this)[WikiEntryViewModel::class.java]`
`48`		`- wikiEntryViewModel.getWikiEntry().observe(this) { wikiEntry ->`
`49`		`- Log.d(Companion.TAG, "received update for wikiEntry")`
`50`		`- binding.entryDetails.text = wikiEntry?.extract`
`51`		`- binding.progressBar.hide()`
	`46`	`+ wikiEntryViewModel.wikiEntry.observe(this) {`
	`47`	`+ Log.d(TAG, "received update for wikiEntry")`
	`48`	`+ binding.entryDetails.text = it?.extract`
	`49`	`+ }`
	`50`	`+ wikiEntryViewModel.showProgress.observe(this) {`
	`51`	`+ if (it) binding.progressBar.show() else binding.progressBar.hide()`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`@@ -59,7 +59,6 @@ class WikiEntryActivity : AppCompatActivity() {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`private val submitButtonOnClickListener = View.OnClickListener { v ->`
`62`		`- binding.progressBar.show()`
`63`	`62`	`val inputMethodManager =`
`64`	`63`	`this@WikiEntryActivity.baseContext.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager`
`65`	`64`	`inputMethodManager.hideSoftInputFromWindow(v.windowToken, 0)`

`‎app/src/main/java/com/cleanarch/features/wikientry/presentation/WikiEntryViewModel.kt‎`

Lines changed: 15 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,34 +37,41 @@ import javax.inject.Inject`
`37`	`37`
`38`	`38`	`class WikiEntryViewModel(application: Application) : AndroidViewModel(application) {`
`39`	`39`
`40`		`- private var wikiEntry: MutableLiveData<WikiEntry>`
	`40`	`+ private val _wikiEntry: MutableLiveData<WikiEntry> by lazy {`
	`41`	`+ MutableLiveData<WikiEntry>()`
	`42`	`+ }`
	`43`	`+ val wikiEntry: LiveData<WikiEntry>`
	`44`	`+ get() = _wikiEntry`
	`45`	`+`
	`46`	`+ private val _showProgress: MutableLiveData<Boolean> by lazy {`
	`47`	`+ MutableLiveData<Boolean>(false)`
	`48`	`+ }`
	`49`	`+ val showProgress: LiveData<Boolean>`
	`50`	`+ get() = _showProgress`
`41`	`51`
`42`	`52`	`@Inject`
`43`	`53`	`lateinit var getWikiEntryUseCase: Lazy<GetWikiEntryUseCase>`
`44`	`54`
`45`	`55`	`init {`
`46`	`56`	`(application as CleanArchApp).wikiEntryComponent?.inject(this)`
`47`		`- wikiEntry = MutableLiveData<WikiEntry>()`
`48`		`- }`
`49`		`-`
`50`		`- internal fun getWikiEntry(): LiveData<WikiEntry> {`
`51`		`- return wikiEntry`
`52`	`57`	`}`
`53`	`58`
`54`	`59`	`internal fun loadWikiEntry(title: String) {`
`55`	`60`	`viewModelScope.launch {`
	`61`	`+ _showProgress.value = true`
`56`	`62`	`val item = withContext(Dispatchers.IO) {`
`57`	`63`	`getWikiEntryUseCase.get()`
`58`	`64`	`.execute(GetWikiEntryUseCase.Input(title))`
`59`		`- .onCompletion { Log.d(TAG,"completed wiki query") }`
	`65`	`+ .onCompletion { Log.d(TAG,"completed wiki query") }`
`60`	`66`	`.catch { exception -> Log.d(TAG, "Received $exception") }`
`61`	`67`	`.firstOrNull()`
`62`	`68`	`}`
`63`		`- wikiEntry.value = item ?: WikiEntry(`
	`69`	`+ _wikiEntry.value = item ?: WikiEntry(`
`64`	`70`	`-1,`
`65`	`71`	`"",`
`66`	`72`	`getApplication<Application>().getString(R.string.no_results_found)`
`67`	`73`	`)`
	`74`	`+ _showProgress.value = false`
`68`	`75`	`}`
`69`	`76`	`}`
`70`	`77`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit ee359de

File tree

2 files changed

2 files changed

`‎app/src/main/java/com/cleanarch/features/wikientry/presentation/WikiEntryActivity.kt‎`

`‎app/src/main/java/com/cleanarch/features/wikientry/presentation/WikiEntryViewModel.kt‎`

0 commit comments