srctree

Robin Linden parent 2c64ac6f 1ab9771f
Make the late setup of bindings in dialogs nicer

(ktlint didn't like our non-public properties.)
inlinesplit
atox/src/main/kotlin/ui/ReceiveShareDialogFragment.kt added: 14, removed: 17, total 0
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2021-2022 Robin Lindén <dev@robinlinden.eu>
// SPDX-FileCopyrightText: 2021-2023 Robin Lindén <dev@robinlinden.eu>
//
// SPDX-License-Identifier: GPL-3.0-only
 
@@ -49,13 +49,12 @@ private class ReceiveShareDialog(
private val sharePreview: String,
private val contactSelectedFunc: (Contact) -> Unit,
) : Dialog(ctx, R.style.DialogSlideAnimation) {
private var _binding: DialogReceiveShareBinding? = null
private val binding get() = _binding!!
private lateinit var binding: DialogReceiveShareBinding
 
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
requestWindowFeature(Window.FEATURE_NO_TITLE)
_binding = DialogReceiveShareBinding.inflate(layoutInflater)
binding = DialogReceiveShareBinding.inflate(layoutInflater)
setContentView(binding.root)
window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
 
 
atox/src/main/kotlin/ui/StatusDialog.kt added: 14, removed: 17, total 0
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2020 aTox contributors
// SPDX-FileCopyrightText: 2020-2023 Robin Lindén <dev@robinlinden.eu>
//
// SPDX-License-Identifier: GPL-3.0-only
 
@@ -27,8 +27,7 @@ class StatusDialog(
@Inject
lateinit var userManager: UserManager
 
private var _binding: DialogStatusBinding? = null
private val binding get() = _binding!!
private lateinit var binding: DialogStatusBinding
 
private fun viewByStatus(status: UserStatus): TransitionDrawable = when (status) {
UserStatus.None -> binding.statusAvailable.background as TransitionDrawable
@@ -39,7 +38,7 @@ class StatusDialog(
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
requestWindowFeature(Window.FEATURE_NO_TITLE)
_binding = DialogStatusBinding.inflate(layoutInflater)
binding = DialogStatusBinding.inflate(layoutInflater)
setContentView(binding.root)
window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
 
 
atox/src/main/kotlin/ui/contactlist/ContactListFragment.kt added: 14, removed: 17, total 0
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2019-2022 Robin Lindén <dev@robinlinden.eu>
// SPDX-FileCopyrightText: 2019-2023 Robin Lindén <dev@robinlinden.eu>
// SPDX-FileCopyrightText: 2021-2022 aTox contributors
//
// SPDX-License-Identifier: GPL-3.0-only
@@ -64,8 +64,7 @@ class ContactListFragment :
 
private val viewModel: ContactListViewModel by viewModels { vmFactory }
 
private var _navHeader: NavHeaderContactListBinding? = null
private val navHeader get() = _navHeader!!
private var navHeader: NavHeaderContactListBinding? = null
 
private val requestPermissionLauncher = registerForActivityResult(
ActivityResultContracts.RequestPermission(),
@@ -83,7 +82,7 @@ class ContactListFragment :
 
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
val v = super.onCreateView(inflater, container, savedInstanceState)
_navHeader = NavHeaderContactListBinding.bind(binding.navView.getHeaderView(0))
navHeader = NavHeaderContactListBinding.bind(binding.navView.getHeaderView(0))
return v
}
 
@@ -110,7 +109,7 @@ class ContactListFragment :
 
backupFileNameHint = user.name + ".tox"
 
navHeader.apply {
navHeader!!.apply {
profileName.text = user.name
profileStatusMessage.text = user.statusMessage
 
@@ -201,7 +200,7 @@ class ContactListFragment :
}
 
override fun onDestroyView() {
_navHeader = null
navHeader = null
super.onDestroyView()
}