From dc20067bb61e9e26862c341e4c821403254b0bd8 Mon Sep 17 00:00:00 2001 From: Baptiiiiste Date: Sun, 2 Apr 2023 22:19:10 +0200 Subject: [PATCH] adding vm to mainactivity --- .../geocaching/ui/activity/MainWindow.kt | 12 +++++++++--- ...ewModelFactory.kt => RoadTripViewModelFactory.kt} | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) rename app/src/main/java/uca/baptistearthur/geocaching/viewModels/{ViewModelFactory.kt => RoadTripViewModelFactory.kt} (83%) diff --git a/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt b/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt index 73c4971..4e122d9 100644 --- a/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt +++ b/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt @@ -2,22 +2,28 @@ package uca.baptistearthur.geocaching.ui.activity import android.annotation.SuppressLint import android.os.Bundle +import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.navigation.findNavController import androidx.navigation.ui.NavigationUI import androidx.navigation.ui.setupWithNavController import com.google.android.material.bottomnavigation.BottomNavigationView import uca.baptistearthur.geocaching.R -import uca.baptistearthur.geocaching.services.FragmentService +import uca.baptistearthur.geocaching.application.RTApplication import uca.baptistearthur.geocaching.ui.fragment.Map +import uca.baptistearthur.geocaching.viewModels.RoadTripViewModel +import uca.baptistearthur.geocaching.viewModels.RoadTripViewModelFactory class MainWindow: AppCompatActivity() { + + private val roadTripViewModel: RoadTripViewModel by viewModels { + RoadTripViewModelFactory((this.application as RTApplication).db.roadTripDAO()) + } + @SuppressLint("MissingInflatedId") override fun onCreate(savedInstanceState: Bundle?) { - val map = Map() - super.onCreate(savedInstanceState) setContentView(R.layout.main_window) diff --git a/app/src/main/java/uca/baptistearthur/geocaching/viewModels/ViewModelFactory.kt b/app/src/main/java/uca/baptistearthur/geocaching/viewModels/RoadTripViewModelFactory.kt similarity index 83% rename from app/src/main/java/uca/baptistearthur/geocaching/viewModels/ViewModelFactory.kt rename to app/src/main/java/uca/baptistearthur/geocaching/viewModels/RoadTripViewModelFactory.kt index 7d4c1d8..0680471 100644 --- a/app/src/main/java/uca/baptistearthur/geocaching/viewModels/ViewModelFactory.kt +++ b/app/src/main/java/uca/baptistearthur/geocaching/viewModels/RoadTripViewModelFactory.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import uca.baptistearthur.geocaching.data.RoadTripDAO -class ViewModelFactory(private val dao: RoadTripDAO): ViewModelProvider.Factory{ +class RoadTripViewModelFactory(private val dao: RoadTripDAO): ViewModelProvider.Factory{ override fun create(modelClass: Class): T { if (modelClass.isAssignableFrom(RoadTripViewModel::class.java)){