mirror/EVMap
1
0
Fork 0
mirror of https://github.com/ev-map/EVMap.git synced 2026-04-23 15:47:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

simplify ViewModel creation

Browse Source
This commit is contained in:
johan12345
2021-07-09 17:40:28 +02:00
parent aab816db32
commit f2a18b7677
3 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/net/vonforst/evmap/fragment/FilterFragment.kt
View File

@@ -19,19 +19,11 @@ import net.vonforst.evmap.adapter.FiltersAdapter
import net.vonforst.evmap.databinding.FragmentFilterBinding
import net.vonforst.evmap.ui.showEditTextDialog
import net.vonforst.evmap.viewmodel.FilterViewModel
import net.vonforst.evmap.viewmodel.viewModelFactory
class FilterFragment : Fragment() {
private lateinit var binding: FragmentFilterBinding
private val vm: FilterViewModel by viewModels(factoryProducer = {
viewModelFactory {
FilterViewModel(
requireActivity().application,
getString(R.string.goingelectric_key)
)
}
})
private val vm: FilterViewModel by viewModels()
override fun onCreateView(
inflater: LayoutInflater,

8
app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
View File

@@ -90,13 +90,7 @@ const val ARG_LOCATION_NAME = "locationName"
class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallback,
LostApiClient.ConnectionCallbacks, LocationListener {
private lateinit var binding: FragmentMapBinding
private val vm: MapViewModel by viewModels(factoryProducer = {
viewModelFactory {
MapViewModel(
requireActivity().application
)
}
})
private val vm: MapViewModel by viewModels()
private val galleryVm: GalleryViewModel by activityViewModels()
private var mapFragment: MapFragment? = null
private var map: AnyMap? = null

3
app/src/main/java/net/vonforst/evmap/viewmodel/FilterViewModel.kt
View File

@@ -30,8 +30,7 @@ internal fun filtersWithValue(
}
}
class FilterViewModel(application: Application, geApiKey: String) :
AndroidViewModel(application) {
class FilterViewModel(application: Application) : AndroidViewModel(application) {
private var db = AppDatabase.getInstance(application)
private var prefs = PreferenceDataSource(application)
private var api: ChargepointApi<ReferenceData> = createApi(prefs.dataSource, application)