Refactoring to delete some layout-xml.

app/src/main/java/com/sockenklaus/batterytracker/ui/fragments/add_battery/AddBatteryFragment.kt

@@ -13,13 +13,14 @@ import androidx.compose.material.icons.filled.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.fragment.findNavController
 import com.sockenklaus.batterytracker.R
-import com.sockenklaus.batterytracker.databinding.FragmentAddBatteryBinding
 import com.sockenklaus.batterytracker.room.entities.Battery
 import com.sockenklaus.batterytracker.ui.composables.MyOutlinedTextFieldWithSuffix
 import com.sockenklaus.batterytracker.ui.theme.BatteryTrackerTheme
@@ -31,17 +32,13 @@ import com.sockenklaus.batterytracker.util.validateDecimal
  * create an instance of this fragment.
  */
 class AddBatteryFragment : Fragment() {
-    private var _binding: FragmentAddBatteryBinding? = null
-    private val binding get() = _binding!!
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
 
-        _binding = FragmentAddBatteryBinding.inflate(inflater, container, false)
         val model = ViewModelProvider(this)[AddBatteryViewModel::class.java]
-        val view = binding.root
 
         var batteries = emptyList<Battery>()
 
@@ -49,9 +46,11 @@ class AddBatteryFragment : Fragment() {
             batteries = it
         }
 
-        binding.root.setContent {
+        return ComposeView(requireContext()).apply {
-            BatteryTrackerTheme {
+            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
 
+            setContent {
+                BatteryTrackerTheme() {
                     val outerPadding = 24.dp
                     val innerPadding = 16.dp
 
@@ -106,9 +105,7 @@ class AddBatteryFragment : Fragment() {
                     }
                 }
             }
-
+        }
-        // Inflate the layout for this fragment
-        return view
     }
 
     /*companion object {

app/src/main/java/com/sockenklaus/batterytracker/ui/fragments/add_charge/AddChargeFragment.kt

@@ -17,6 +17,8 @@ import androidx.compose.material.icons.filled.Tag
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.input.KeyboardType
@@ -25,7 +27,6 @@ import androidx.compose.ui.unit.dp
 import androidx.navigation.fragment.findNavController
 import com.google.android.material.datepicker.MaterialDatePicker
 import com.sockenklaus.batterytracker.R
-import com.sockenklaus.batterytracker.databinding.FragmentAddChargeBinding
 import com.sockenklaus.batterytracker.room.entities.Battery
 import com.sockenklaus.batterytracker.ui.composables.MyOutlinedTextFieldWithSuffix
 import com.sockenklaus.batterytracker.ui.theme.BatteryTrackerTheme
@@ -38,9 +39,7 @@ import java.util.*
 
 class AddChargeFragment : Fragment() {
 
-    private var _binding: FragmentAddChargeBinding? = null
     private lateinit var model: AddChargeViewModel
-    private val binding get() = _binding!!
 
     @OptIn(ExperimentalMaterialApi::class)
     override fun onCreateView(
@@ -49,7 +48,6 @@ class AddChargeFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
 
-        _binding = FragmentAddChargeBinding.inflate(inflater, container, false)
         model = ViewModelProvider(this)[AddChargeViewModel::class.java]
         var batteries = emptyList<Battery>()
 
@@ -57,8 +55,11 @@ class AddChargeFragment : Fragment() {
             batteries = it
         }
 
-        binding.root.setContent{
+        return ComposeView(requireContext()).apply{
-            BatteryTrackerTheme {
+            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+
+            setContent {
+                BatteryTrackerTheme() {
                     val outerPadding = 24.dp
                     val innerPadding = 16.dp
 
@@ -170,8 +171,7 @@ class AddChargeFragment : Fragment() {
                     }
                 }
             }
-
+        }
-        return binding.root
     }
 
     @Composable
@@ -208,6 +208,5 @@ class AddChargeFragment : Fragment() {
 
     override fun onDestroyView() {
         super.onDestroyView()
-        _binding = null
     }
 }

app/src/main/java/com/sockenklaus/batterytracker/ui/fragments/home/HomeFragment.kt

@@ -5,38 +5,34 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
-import com.sockenklaus.batterytracker.databinding.FragmentHomeBinding
+import com.sockenklaus.batterytracker.ui.theme.BatteryTrackerTheme
 
 class HomeFragment : Fragment() {
 
-    private var _binding: FragmentHomeBinding? = null
-
-    // This property is only valid between onCreateView and
-    // onDestroyView.
-    private val binding get() = _binding!!
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        val homeViewModel =
-            ViewModelProvider(this).get(HomeViewModel::class.java)
 
-        _binding = FragmentHomeBinding.inflate(inflater, container, false)
+        val model = ViewModelProvider(this)[HomeViewModel::class.java]
-        val root: View = binding.root
+
+        return ComposeView(requireContext()).apply {
+            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+            
+            setContent { 
+                BatteryTrackerTheme() {
                     
-        val textView: TextView = binding.textHome
-        homeViewModel.text.observe(viewLifecycleOwner) {
-            textView.text = it
                 }
-        return root
+            }
+        }
     }
 
     override fun onDestroyView() {
         super.onDestroyView()
-        _binding = null
     }
 }

app/src/main/java/com/sockenklaus/batterytracker/ui/fragments/home/HomeViewModel.kt

@@ -1,10 +1,12 @@
 package com.sockenklaus.batterytracker.ui.fragments.home
 
+import android.app.Application
+import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 
-class HomeViewModel : ViewModel() {
+class HomeViewModel(application: Application) : AndroidViewModel(application) {
 
     private val _text = MutableLiveData<String>().apply {
         value = "This is home Fragment"

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

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<androidx.compose.ui.platform.ComposeView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    tools:context=".ui.fragments.add_battery.AddBatteryFragment"
-    />

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

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<androidx.compose.ui.platform.ComposeView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.fragments.add_charge.AddChargeFragment"
-    android:id="@+id/compose_view"
-    app:layout_constraintTop_toTopOf="parent"
-    />

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

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.fragments.home.HomeFragment">
-
-    <TextView
-        android:id="@+id/text_home"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:textAlignment="center"
-        android:textSize="20sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/navigation/mobile_navigation.xml

@@ -8,14 +8,12 @@
     <fragment
         android:id="@+id/nav_home"
         android:name="com.sockenklaus.batterytracker.ui.fragments.home.HomeFragment"
-        android:label="@string/menu_home"
+        android:label="@string/menu_home" />
-        tools:layout="@layout/fragment_home" />
 
     <fragment
         android:id="@+id/nav_add_charge"
         android:name="com.sockenklaus.batterytracker.ui.fragments.add_charge.AddChargeFragment"
-        android:label="@string/menu_add_charge"
+        android:label="@string/menu_add_charge">
-        tools:layout="@layout/fragment_add_charge" >
         <action
             android:id="@+id/action_nav_add_charge_to_nav_home"
             app:destination="@id/nav_home" />
@@ -24,8 +22,7 @@
     <fragment
         android:id="@+id/nav_add_battery"
         android:name="com.sockenklaus.batterytracker.ui.fragments.add_battery.AddBatteryFragment"
-        android:label="@string/menu_add_battery"
+        android:label="@string/menu_add_battery" >
-        tools:layout="@layout/fragment_add_battery" >
         <action
             android:id="@+id/action_nav_add_battery_to_nav_home"
             app:destination="@id/nav_home" />