Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't drop content warning when replying (#1631)

This commit is contained in:
Levi Bard 2020-01-13 15:18:55 +01:00 committed by Konrad Pozniak
parent 7cb76aad97
commit 6a2c9bdbe4
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
View File

@ -166,8 +166,7 @@ class ComposeActivity : BaseActivity(),
setupContentWarningField(composeOptions?.contentWarning) setupContentWarningField(composeOptions?.contentWarning)
setupPollView() setupPollView()
applyShareIntent(intent, savedInstanceState) applyShareIntent(intent, savedInstanceState)
viewModel.setupComplete.value = true
composeEditField.requestFocus()
} }
private fun applyShareIntent(intent: Intent?, savedInstanceState: Bundle?) { private fun applyShareIntent(intent: Intent?, savedInstanceState: Bundle?) {
@ -331,6 +330,10 @@ class ComposeActivity : BaseActivity(),
viewModel.uploadError.observe { viewModel.uploadError.observe {
displayTransientError(R.string.error_media_upload_sending) displayTransientError(R.string.error_media_upload_sending)
} }
viewModel.setupComplete.observe {
// Focus may have changed during view model setup, ensure initial focus is on the edit field
composeEditField.requestFocus()
}
} }
} }

2
app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt
View File

@ -82,6 +82,7 @@ class ComposeViewModel
val statusVisibility = mutableLiveData(Status.Visibility.UNKNOWN) val statusVisibility = mutableLiveData(Status.Visibility.UNKNOWN)
val showContentWarning = mutableLiveData(false) val showContentWarning = mutableLiveData(false)
val setupComplete = mutableLiveData(false)
val poll: MutableLiveData<NewPoll?> = mutableLiveData(null) val poll: MutableLiveData<NewPoll?> = mutableLiveData(null)
val scheduledAt: MutableLiveData<String?> = mutableLiveData(null) val scheduledAt: MutableLiveData<String?> = mutableLiveData(null)
@ -367,6 +368,7 @@ class ComposeViewModel
if (contentWarning != null) { if (contentWarning != null) {
startingContentWarning = contentWarning startingContentWarning = contentWarning
} }
showContentWarning.value = !contentWarning.isNullOrBlank()
// recreate media list // recreate media list
// when coming from SavedTootActivity // when coming from SavedTootActivity