diff --git a/app/src/main/java/net/vonforst/evmap/fragment/FilterFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/FilterFragment.kt index 36cf5fdc..c3cec11d 100644 --- a/app/src/main/java/net/vonforst/evmap/fragment/FilterFragment.kt +++ b/app/src/main/java/net/vonforst/evmap/fragment/FilterFragment.kt @@ -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, diff --git a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt index 773530b1..439d796f 100644 --- a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt +++ b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt @@ -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 diff --git a/app/src/main/java/net/vonforst/evmap/viewmodel/FilterViewModel.kt b/app/src/main/java/net/vonforst/evmap/viewmodel/FilterViewModel.kt index af4db511..cd9a2fec 100644 --- a/app/src/main/java/net/vonforst/evmap/viewmodel/FilterViewModel.kt +++ b/app/src/main/java/net/vonforst/evmap/viewmodel/FilterViewModel.kt @@ -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 = createApi(prefs.dataSource, application)