Moving stuff around. Not working yet.

app/src/androidTest/java/com/flacksta/chef/journeygpstracker/ExampleInstrumentedTest.java

@@ -1,26 +0,0 @@
-package com.flacksta.chef.journeygpstracker;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("com.flacksta.chef.journeygpstracker", appContext.getPackageName());
-    }
-}

app/src/main/AndroidManifest.xml

@@ -28,7 +28,7 @@
         </service>
 
         <activity
-            android:name=".MainScreenActivity"
+            android:name=".MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/com/flacksta/chef/journeygpstracker/JourneyGpsTrackerApplication.kt

@@ -1,6 +1,10 @@
 package com.flacksta.chef.journeygpstracker
 
 import android.app.Application
+import android.util.Log
+import com.flacksta.chef.journeygpstracker.database.GpsData
+import com.flacksta.chef.journeygpstracker.database.GpsPosRepository
+import com.flacksta.chef.journeygpstracker.database.GpsPosRoomDatabase
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 
@@ -12,4 +16,11 @@ class JourneyGpsTrackerApplication : Application() {
     val database by lazy { GpsPosRoomDatabase.getDatabase(this, applicationScope) }
     val repository by lazy { GpsPosRepository(database.gpsDataDao()) }
 
+    override fun onCreate() {
+        super.onCreate()
+        Log.i("JourneyGpsTrackerApplication","onCreate()")
+        //var d = GpsData(0,0,0.0,0.0,2.0)
+        //repository.insert(d)
+    }
+
 }

app/src/main/java/com/flacksta/chef/journeygpstracker/MainScreenActivity.kt

@@ -12,14 +12,14 @@ import androidx.fragment.app.Fragment
 import com.flacksta.chef.journeygpstracker.databinding.ActivityMainScreenBinding
 import com.google.android.gms.location.*
 
-class MainScreenActivity : AppCompatActivity() {
+class MainActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityMainScreenBinding
     private var mPermApproved: Boolean = false
     private lateinit var mTrackingServiceIntent: Intent
     private lateinit var mTrackingService: TrackingService
 
-    private val mTag: String = "MainScreenActivity"
+    private val mTag: String = "MainActivity"
 
     private lateinit var mFusedLocationClient: FusedLocationProviderClient
 
@@ -32,6 +32,8 @@ class MainScreenActivity : AppCompatActivity() {
 
         setContentView(binding.root)
 
+        val trackApp : JourneyGpsTrackerApplication = JourneyGpsTrackerApplication()
+
         binding.bottomNavigationView.setOnItemSelectedListener {
             val fragment = when (it.itemId) {
                 R.id.map -> {

app/src/main/java/com/flacksta/chef/journeygpstracker/TrackingService.kt

@@ -85,7 +85,7 @@ class TrackingService : Service() {
     private val mNotificationId = 123
 
     private fun generateForegroundNotification() {
-        val intentMainLanding = Intent(this, MainScreenActivity::class.java)
+        val intentMainLanding = Intent(this, MainActivity::class.java)
         val pendingIntent =
                 PendingIntent.getActivity(this, 0, intentMainLanding, PendingIntent.FLAG_IMMUTABLE)
         iconNotification = BitmapFactory.decodeResource(resources, R.mipmap.ic_launcher)

app/src/main/java/com/flacksta/chef/journeygpstracker/GpsData.kt

@@ -1,4 +1,4 @@
-package com.flacksta.chef.journeygpstracker
+package com.flacksta.chef.journeygpstracker.database
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

app/src/main/java/com/flacksta/chef/journeygpstracker/GpsDataDao.kt

@@ -1,4 +1,4 @@
-package com.flacksta.chef.journeygpstracker
+package com.flacksta.chef.journeygpstracker.database
 
 import androidx.room.Dao
 import androidx.room.Insert

app/src/main/java/com/flacksta/chef/journeygpstracker/GpsPosRepository.kt

@@ -1,4 +1,4 @@
-package com.flacksta.chef.journeygpstracker
+package com.flacksta.chef.journeygpstracker.database
 
 import androidx.annotation.WorkerThread
 import kotlinx.coroutines.flow.Flow

app/src/main/java/com/flacksta/chef/journeygpstracker/GpsPosRoomDatabase.kt

@@ -1,6 +1,7 @@
-package com.flacksta.chef.journeygpstracker
+package com.flacksta.chef.journeygpstracker.database
 
 import android.content.Context
+import android.util.Log
 import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
@@ -12,16 +13,19 @@ import kotlinx.coroutines.launch
 @Database(entities = [GpsData::class], version = 1, exportSchema = false)
 public abstract class GpsPosRoomDatabase : RoomDatabase() {
 
+
     abstract fun gpsDataDao(): GpsDataDao
 
     companion object {
         @Volatile
         private var INSTANCE: GpsPosRoomDatabase? = null
+        private const val mTag:String = "GpsPosRoomDatabase"
 
         fun getDatabase(
                 context: Context,
                 scope: CoroutineScope
         ): GpsPosRoomDatabase {
+            Log.i(mTag,"getDatabase()")
             // if the INSTANCE is not null, then return it,
             // if it is, then create the database
             return INSTANCE ?: synchronized(this) {
@@ -60,10 +64,10 @@ public abstract class GpsPosRoomDatabase : RoomDatabase() {
         }
 
         suspend fun populateDatabase(gpsDataDao: GpsDataDao) {
-            // Start the app with a clean database every time.
-            // Not needed if you only populate on creation.
+            Log.i(mTag,"populateDatabase()")
             gpsDataDao.deleteAll()
-
+            var d = GpsData(0,0,0.0,0.0,2.0)
+            gpsDataDao.insert(d)
         }
     }
 }

app/src/main/res/layout/activity_main_screen.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainScreenActivity">
+    tools:context=".MainActivity">
 
     <FrameLayout
         android:id="@+id/main_frame_layout"

app/src/test/java/com/flacksta/chef/journeygpstracker/ExampleUnitTest.java

@@ -1,17 +0,0 @@
-package com.flacksta.chef.journeygpstracker;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}