@@ -5,40 +5,32 @@ import android.view.LayoutInflater
5
5
import android.view.View
6
6
import android.view.ViewGroup
7
7
import android.view.WindowManager
8
+ import androidx.core.os.bundleOf
8
9
import androidx.fragment.app.DialogFragment
9
- import fr.free.nrw.commons.R
10
- import kotlinx.android.synthetic.main.dialog_add_to_wikipedia_instructions.*
10
+ import fr.free.nrw.commons.databinding.DialogAddToWikipediaInstructionsBinding
11
11
12
12
/* *
13
13
* Dialog fragment for displaying instructions for editing wikipedia
14
14
*/
15
15
class WikipediaInstructionsDialogFragment : DialogFragment () {
16
16
17
- var contribution: Contribution ? = null
18
17
var callback: Callback ? = null
19
18
20
19
override fun onCreateView (
21
- inflater : LayoutInflater , container : ViewGroup ? ,
20
+ inflater : LayoutInflater ,
21
+ container : ViewGroup ? ,
22
22
savedInstanceState : Bundle ?
23
- ): View ? {
24
- return inflater.inflate(R .layout.dialog_add_to_wikipedia_instructions, container)
25
- }
26
-
27
- override fun onViewCreated (
28
- view : View ,
29
- savedInstanceState : Bundle ?
30
- ) {
31
- super .onViewCreated(view, savedInstanceState)
32
- contribution = arguments!! .getParcelable(ARG_CONTRIBUTION )
33
- tv_wikicode.setText(contribution?.media?.wikiCode)
34
- instructions_cancel.setOnClickListener {
35
- dismiss()
36
- }
37
-
38
- instructions_confirm.setOnClickListener {
39
- callback?.onConfirmClicked(contribution, checkbox_copy_wikicode.isChecked)
23
+ ) = DialogAddToWikipediaInstructionsBinding .inflate(inflater, container, false ).apply {
24
+ val contribution: Contribution ? = arguments!! .getParcelable(ARG_CONTRIBUTION )
25
+ tvWikicode.setText(contribution?.media?.wikiCode)
26
+ instructionsCancel.setOnClickListener { dismiss() }
27
+ instructionsConfirm.setOnClickListener {
28
+ callback?.onConfirmClicked(contribution, checkboxCopyWikicode.isChecked)
40
29
}
30
+ }.root
41
31
32
+ override fun onViewCreated (view : View , savedInstanceState : Bundle ? ) {
33
+ super .onViewCreated(view, savedInstanceState)
42
34
dialog!! .window?.setSoftInputMode(
43
35
WindowManager .LayoutParams .SOFT_INPUT_STATE_ALWAYS_HIDDEN
44
36
)
@@ -52,16 +44,11 @@ class WikipediaInstructionsDialogFragment : DialogFragment() {
52
44
}
53
45
54
46
companion object {
55
-
56
- val ARG_CONTRIBUTION = " contribution"
47
+ const val ARG_CONTRIBUTION = " contribution"
57
48
58
49
@JvmStatic
59
- fun newInstance (contribution : Contribution ): WikipediaInstructionsDialogFragment {
60
- val frag = WikipediaInstructionsDialogFragment ()
61
- val args = Bundle ()
62
- args.putParcelable(ARG_CONTRIBUTION , contribution)
63
- frag.arguments = args
64
- return frag
50
+ fun newInstance (contribution : Contribution ) = WikipediaInstructionsDialogFragment ().apply {
51
+ arguments = bundleOf(ARG_CONTRIBUTION to contribution)
65
52
}
66
53
}
67
54
}
0 commit comments