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

fix crash when rotating caption dialog #4123

Merged
merged 3 commits into from
Nov 29, 2023
Merged

fix crash when rotating caption dialog #4123

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2937808
fix crash when rotating caption dialog
connyduck Nov 25, 2023
5d050b5
fix ktlint
connyduck Nov 25, 2023
86bdb69
use get/putCharSequence instead of get/putString
connyduck Nov 25, 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
24 changes: 9 additions & 15 deletions app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/CaptionDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.view.WindowManager
import android.widget.EditText
import android.widget.LinearLayout
import androidx.core.os.BundleCompat
import androidx.core.os.bundleOf
Expand All @@ -43,7 +42,6 @@ private const val MEDIA_DESCRIPTION_CHARACTER_LIMIT = 1500

class CaptionDialog : DialogFragment() {
private lateinit var listener: Listener
private lateinit var input: EditText

private val binding by viewBinding(DialogImageDescriptionBinding::bind)

Expand All @@ -56,33 +54,29 @@ class CaptionDialog : DialogFragment() {
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
savedInstanceState?.getString(DESCRIPTION_KEY)?.let {
input.setText(it)
}

return inflater.inflate(R.layout.dialog_image_description, container, false)
}
) = inflater.inflate(R.layout.dialog_image_description, container, false)

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
input = binding.imageDescriptionText
val imageView = binding.imageDescriptionView
imageView.maxZoom = 6f

input.hint = resources.getQuantityString(
binding.imageDescriptionText.hint = resources.getQuantityString(
R.plurals.hint_describe_for_visually_impaired,
MEDIA_DESCRIPTION_CHARACTER_LIMIT,
MEDIA_DESCRIPTION_CHARACTER_LIMIT
)
input.filters = arrayOf(InputFilter.LengthFilter(MEDIA_DESCRIPTION_CHARACTER_LIMIT))
input.setText(arguments?.getString(EXISTING_DESCRIPTION_ARG))
binding.imageDescriptionText.filters = arrayOf(InputFilter.LengthFilter(MEDIA_DESCRIPTION_CHARACTER_LIMIT))
binding.imageDescriptionText.setText(arguments?.getString(EXISTING_DESCRIPTION_ARG))
savedInstanceState?.getCharSequence(DESCRIPTION_KEY)?.let {
binding.imageDescriptionText.setText(it)
}

binding.cancelButton.setOnClickListener {
dismiss()
}
val localId = arguments?.getInt(LOCAL_ID_ARG) ?: error("Missing localId")
binding.okButton.setOnClickListener {
listener.onUpdateDescription(localId, input.text.toString())
listener.onUpdateDescription(localId, binding.imageDescriptionText.text.toString())
dismiss()
}

Expand Down Expand Up @@ -125,7 +119,7 @@ class CaptionDialog : DialogFragment() {
}

override fun onSaveInstanceState(outState: Bundle) {
outState.putString(DESCRIPTION_KEY, input.text.toString())
outState.putCharSequence(DESCRIPTION_KEY, binding.imageDescriptionText.text)
super.onSaveInstanceState(outState)
}

Expand Down