From 02709aebe6c45602f313dd569167b5930382724b Mon Sep 17 00:00:00 2001 From: zoothezoo Date: Mon, 14 Sep 2020 23:49:36 +0900 Subject: [PATCH 1/2] add base dialog --- .../wantum/wannado/WannaDoDialogFragment.kt | 27 +++++++++++++++++ .../wantum/wannado/WannadoFragment.kt | 6 ++++ .../res/layout/dialog_wannado_add_item.xml | 30 +++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 features/wannado/src/main/java/com/techcafe/wantum/wannado/WannaDoDialogFragment.kt create mode 100644 features/wannado/src/main/res/layout/dialog_wannado_add_item.xml diff --git a/features/wannado/src/main/java/com/techcafe/wantum/wannado/WannaDoDialogFragment.kt b/features/wannado/src/main/java/com/techcafe/wantum/wannado/WannaDoDialogFragment.kt new file mode 100644 index 0000000..411a53f --- /dev/null +++ b/features/wannado/src/main/java/com/techcafe/wantum/wannado/WannaDoDialogFragment.kt @@ -0,0 +1,27 @@ +package com.techcafe.wantum.wannado + +import android.app.Dialog +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.view.Window +import androidx.fragment.app.DialogFragment + +internal class WannaDoDialogFragment : DialogFragment() { + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + return inflater.inflate(R.layout.dialog_wannado_add_item, container, false) + } + + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { + val dialog = super.onCreateDialog(savedInstanceState) + dialog.requestWindowFeature(Window.FEATURE_NO_TITLE) + + return dialog + } +} diff --git a/features/wannado/src/main/java/com/techcafe/wantum/wannado/WannadoFragment.kt b/features/wannado/src/main/java/com/techcafe/wantum/wannado/WannadoFragment.kt index 2540d6d..e8ce764 100644 --- a/features/wannado/src/main/java/com/techcafe/wantum/wannado/WannadoFragment.kt +++ b/features/wannado/src/main/java/com/techcafe/wantum/wannado/WannadoFragment.kt @@ -45,6 +45,12 @@ class WannadoFragment : Fragment(R.layout.fragment_wannado) { } } + binding.fabWannado.setOnClickListener { + val fragmentManager = requireActivity().supportFragmentManager + val newFragment = WannaDoDialogFragment() + newFragment.show(fragmentManager, "wannado_dialog") + } + wishListDataBindingViewController.setData(toDoList) } } diff --git a/features/wannado/src/main/res/layout/dialog_wannado_add_item.xml b/features/wannado/src/main/res/layout/dialog_wannado_add_item.xml new file mode 100644 index 0000000..0f65187 --- /dev/null +++ b/features/wannado/src/main/res/layout/dialog_wannado_add_item.xml @@ -0,0 +1,30 @@ + + + + + + + + + + From c7147f9951ae6b855047ee43cfb3ee8224d027a8 Mon Sep 17 00:00:00 2001 From: zoothezoo Date: Tue, 15 Sep 2020 00:46:36 +0900 Subject: [PATCH 2/2] refactor wanna do using with(binding){} --- .../wantum/wannado/WannadoFragment.kt | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/features/wannado/src/main/java/com/techcafe/wantum/wannado/WannadoFragment.kt b/features/wannado/src/main/java/com/techcafe/wantum/wannado/WannadoFragment.kt index e8ce764..1fc232e 100644 --- a/features/wannado/src/main/java/com/techcafe/wantum/wannado/WannadoFragment.kt +++ b/features/wannado/src/main/java/com/techcafe/wantum/wannado/WannadoFragment.kt @@ -31,24 +31,23 @@ class WannadoFragment : Fragment(R.layout.fragment_wannado) { binding = FragmentWannadoBinding.bind(view) val wishListDataBindingViewController = WannadoDataBindingViewController(object : - WannadoDataBindingViewController.ClickListener { - override fun onClicked(item: String) { - val action = WannadoFragmentDirections.actionWannadoToWannadoDetail(item) - findNavController().navigate(action) - } - }) - - binding.recyclerViewWannado.apply { - adapter = wishListDataBindingViewController.adapter - layoutManager = LinearLayoutManager(context).apply { - orientation = LinearLayoutManager.VERTICAL + WannadoDataBindingViewController.ClickListener { + override fun onClicked(item: String) { + val action = WannadoFragmentDirections.actionWannadoToWannadoDetail(item) + findNavController().navigate(action) } - } + }) - binding.fabWannado.setOnClickListener { - val fragmentManager = requireActivity().supportFragmentManager - val newFragment = WannaDoDialogFragment() - newFragment.show(fragmentManager, "wannado_dialog") + with(binding){ + recyclerViewWannado.apply { + adapter = wishListDataBindingViewController.adapter + layoutManager = LinearLayoutManager(context).apply { + orientation = LinearLayoutManager.VERTICAL + } + } + fabWannado.setOnClickListener { + WannaDoDialogFragment().show(requireActivity().supportFragmentManager, "wannado_dialog") + } } wishListDataBindingViewController.setData(toDoList)