diff --git a/app/src/main/java/com/gaurav/avnc/ui/home/DiscoveryFragment.kt b/app/src/main/java/com/gaurav/avnc/ui/home/DiscoveryFragment.kt index 9800f02..ef39f66 100644 --- a/app/src/main/java/com/gaurav/avnc/ui/home/DiscoveryFragment.kt +++ b/app/src/main/java/com/gaurav/avnc/ui/home/DiscoveryFragment.kt @@ -26,7 +26,6 @@ class DiscoveryFragment : Fragment() { val viewModel by activityViewModels() - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { val binding = FragmentDiscoveryBinding.inflate(inflater, container, false) binding.lifecycleOwner = viewLifecycleOwner @@ -38,8 +37,6 @@ class DiscoveryFragment : Fragment() { binding.discoveredRv.setHasFixedSize(true) viewModel.discovery.servers.observe(viewLifecycleOwner) { adapter.submitList(it) } - - binding.discoverFab.setOnClickListener { viewModel.startDiscovery() } return binding.root } } \ No newline at end of file diff --git a/app/src/main/java/com/gaurav/avnc/ui/home/ServersFragment.kt b/app/src/main/java/com/gaurav/avnc/ui/home/ServersFragment.kt index aedb688..72ad3ae 100644 --- a/app/src/main/java/com/gaurav/avnc/ui/home/ServersFragment.kt +++ b/app/src/main/java/com/gaurav/avnc/ui/home/ServersFragment.kt @@ -12,11 +12,9 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.databinding.DataBindingUtil import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager -import com.gaurav.avnc.R import com.gaurav.avnc.databinding.FragmentServersBinding import com.gaurav.avnc.ui.home.adapter.ServersAdapter import com.gaurav.avnc.viewmodel.HomeViewModel @@ -25,11 +23,11 @@ import com.gaurav.avnc.viewmodel.HomeViewModel * Fragment for displaying list of known servers. */ class ServersFragment : Fragment() { + val viewModel by activityViewModels() - private lateinit var binding: FragmentServersBinding override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - binding = DataBindingUtil.inflate(inflater, R.layout.fragment_servers, container, false) + val binding = FragmentServersBinding.inflate(inflater, container, false) binding.lifecycleOwner = viewLifecycleOwner binding.viewModel = viewModel @@ -38,8 +36,6 @@ class ServersFragment : Fragment() { binding.serversRv.adapter = adapter binding.serversRv.setHasFixedSize(true) - binding.newProfileFab.setOnClickListener { viewModel.onNewProfile() } - viewModel.serverProfiles.observe(viewLifecycleOwner) { adapter.submitList(it) } return binding.root diff --git a/app/src/main/java/com/gaurav/avnc/viewmodel/HomeViewModel.kt b/app/src/main/java/com/gaurav/avnc/viewmodel/HomeViewModel.kt index e7eaec0..1924a80 100644 --- a/app/src/main/java/com/gaurav/avnc/viewmodel/HomeViewModel.kt +++ b/app/src/main/java/com/gaurav/avnc/viewmodel/HomeViewModel.kt @@ -52,7 +52,12 @@ class HomeViewModel(app: Application) : BaseViewModel(app) { /** * Starts creating a new server profile. */ - fun onNewProfile(source: ServerProfile = ServerProfile()) = onEditProfile(source) + fun onNewProfile() = onNewProfile(ServerProfile()) + + /** + * Starts creating a new profile using [source] as starting point. + */ + fun onNewProfile(source: ServerProfile) = onEditProfile(source) /** * Starts editing given profile. diff --git a/app/src/main/res/layout/fragment_discovery.xml b/app/src/main/res/layout/fragment_discovery.xml index 58dfa8d..addb125 100644 --- a/app/src/main/res/layout/fragment_discovery.xml +++ b/app/src/main/res/layout/fragment_discovery.xml @@ -19,7 +19,8 @@ + android:layout_height="match_parent" + android:clipChildren="false"> diff --git a/app/src/main/res/layout/fragment_servers.xml b/app/src/main/res/layout/fragment_servers.xml index e121da7..d19fa7e 100644 --- a/app/src/main/res/layout/fragment_servers.xml +++ b/app/src/main/res/layout/fragment_servers.xml @@ -18,7 +18,8 @@ + android:layout_height="match_parent" + android:clipChildren="false"> \ No newline at end of file