Refactor server fragments

This commit is contained in:
Gaurav Ujjwal 2021-01-05 20:32:05 +05:30
parent a57e4898d8
commit ff1db2a648
5 changed files with 14 additions and 14 deletions

View file

@ -26,7 +26,6 @@ class DiscoveryFragment : Fragment() {
val viewModel by activityViewModels<HomeViewModel>()
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
}
}

View file

@ -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<HomeViewModel>()
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

View file

@ -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.

View file

@ -19,7 +19,8 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:clipChildren="false">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/discovered_rv"
@ -36,10 +37,10 @@
android:animateLayoutChanges="true">
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/discover_fab"
style="@style/Widget.Design.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="@{()-> viewModel.startDiscovery()}"
android:src="@drawable/ic_refresh"
app:isInVisible="@{viewModel.discovery.isRunning}" />

View file

@ -18,7 +18,8 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:clipChildren="false">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/servers_rv"
@ -28,12 +29,12 @@
tools:listitem="@layout/item_server" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/new_profile_fab"
style="@style/Widget.Design.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/margin_normal"
android:onClick="@{()-> viewModel.onNewProfile()}"
android:src="@drawable/ic_plus" />
</FrameLayout>
</layout>