Move Add a meal to a new activity

android/app/build.gradle

@@ -13,4 +13,11 @@ dependencies {
     // Feature modules
     implementation project(":android:feature:find-meal")
     implementation project(':android:feature:add-meal')
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    kotlinOptions {
+        jvmTarget = "1.8"
+        freeCompilerArgs += ["-Xallow-jvm-ir-dependencies", "-Xskip-prerelease-check"]
+    }
 }

android/app/src/main/java/com/kcc/kmmhackathon/androidHackathonApp/view/AddMealActivity.kt

@@ -0,0 +1,19 @@
+package com.kcc.kmmhackathon.androidHackathonApp.view
+
+import android.os.Bundle
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import com.kinandcarta.lib.add.meal.view.AddMealFragment
+
+class AddMealActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (savedInstanceState == null) {
+            supportFragmentManager.beginTransaction()
+                .replace(android.R.id.content, AddMealFragment.newInstance())
+                .commit()
+        }
+    }
+
+}

android/app/src/main/java/com/kcc/kmmhackathon/androidHackathonApp/view/FindMealContainerFragment.kt

@@ -0,0 +1,54 @@
+package com.kcc.kmmhackathon.androidHackathonApp.view
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.*
+import androidx.fragment.app.Fragment
+import com.kcc.kmmhackathon.androidHackathonApp.R
+import com.kinandcarta.lib.add.meal.view.AddMealFragment
+import kotlinx.coroutines.Dispatchers.Main
+
+class FindMealContainerFragment : Fragment() {
+
+    companion object {
+        fun newInstance() = FindMealContainerFragment()
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setHasOptionsMenu(true)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val view = inflater.inflate(R.layout.find_meal_container_fragment, container, false)
+        val fragment = com.kinandcarta.feature.find.meal.view.MapsFragment()
+        childFragmentManager.beginTransaction().apply {
+            add(R.id.child_fragment_container, fragment)
+            commit()
+        }
+        return view
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        super.onCreateOptionsMenu(menu, inflater)
+
+        inflater.inflate(R.menu.find_meal_container_menu, menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            R.id.add_an_item -> {
+                val intent = Intent(activity, AddMealActivity::class.java)
+                startActivity(intent)
+                true
+            }
+            else -> {
+                super.onOptionsItemSelected(item)
+            }
+        }
+    }
+
+}

android/app/src/main/res/layout/add_meal_activity.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/add_meal_view"
+    android:label="Test"
+    tools:context=".view.AddMealActivity">
+</androidx.constraintlayout.widget.ConstraintLayout>

android/app/src/main/res/layout/find_meal_container_fragment.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/child_fragment_container"
+    tools:context=".view.FindMealContainerFragment">
+</FrameLayout>

android/app/src/main/res/menu/bottom_nav_menu.xml

@@ -3,19 +3,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:id="@+id/mapsFragment"
+        android:id="@+id/findMealFragment"
         android:icon="@drawable/ic_baseline_map_24"
         android:title="@string/map_tab_label" />
 
-    <item
-        android:id="@+id/addMealFragment"
-        android:icon="@drawable/ic_baseline_add_24"
-        android:title="@string/add_meal_tab_label" />
-
-    <item android:id="@+id/findMealFragment"
-        android:icon="@drawable/ic_baseline_list_24"
-        android:title="@string/title_switch_to_list"/>
-
     <item
         android:id="@+id/settingsFragment"
         android:icon="@drawable/ic_baseline_settings_24"

android/app/src/main/res/menu/find_meal_container_menu.xml

@@ -0,0 +1,8 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:yourapp="http://schemas.android.com/apk/res-auto" >
+
+    <item android:id="@+id/add_an_item"
+        android:title="Add"
+        android:orderInCategory="100"
+        yourapp:showAsAction="always" />
+</menu>

android/app/src/main/res/navigation/main_nav_graph.xml

@@ -7,20 +7,13 @@
 
     <fragment
         android:id="@+id/mapsFragment"
-        android:name="com.kinandcarta.feature.find.meal.view.MapsFragment"
+        android:name="com.kcc.kmmhackathon.androidHackathonApp.view.FindMealContainerFragment"
         android:label="fragment_maps"
-        tools:layout="@layout/fragment_maps" />
+        tools:layout="@layout/find_meal_container_fragment" />
     <fragment
         android:id="@+id/settingsFragment"
         android:name="com.kcc.kmmhackathon.androidHackathonApp.view.SettingsFragment"
         android:label="settings_fragment"
         tools:layout="@layout/settings_fragment" />
-    <fragment
-        android:id="@+id/findMealFragment"
-        android:name="com.kinandcarta.feature.find.meal.view.FindMealFragment"
-        android:label="FindMealFragment" />
-    <fragment
-        android:id="@+id/addMealFragment"
-        android:name="com.kinandcarta.lib.add.meal.view.AddMealFragment"
-        android:label="AddMealFragment" />
+
 </navigation>

android/app/src/main/res/values/strings.xml

@@ -23,7 +23,7 @@
     <string name="hint_password">Enter Password</string>
 
     //Headers
-    <string name="add_meal_activity_header">This is the add meal activity screen</string>
+    <string name="add_meal_activity_header">Add a meal</string>
     <string name="find_meal_activity_header">This is the find meal activity screen</string>
     <string name="subheading_main">Add a meal to help out someone in your local community or browse the meals that others have added</string>
 

android/feature/find-meal/src/main/java/com/kinandcarta/feature/find/meal/viewmodel/DisplayMealsViewModel.kt

@@ -55,9 +55,11 @@ class DisplayMealsViewModel @ViewModelInject constructor(
     @RequiresPermission("android.permission.ACCESS_FINE_LOCATION")
     fun startUpdatingLocation() {
         fusedLocationProviderClient.lastLocation.addOnSuccessListener {
-            val latLng = LatLng(it.latitude, it.longitude)
-            updateUserLocation(latLng)
-            updateMeals(latLng)
+            if (it != null) {
+                val latLng = LatLng(it.latitude, it.longitude)
+                updateUserLocation(latLng)
+                updateMeals(latLng)
+            }
         }
         fusedLocationProviderClient.requestLocationUpdates(
             createLocationRequest(),