diff --git a/app/src/main/java/gq/kirmanak/mealie/MainActivity.kt b/app/src/main/java/gq/kirmanak/mealie/MainActivity.kt index 0896ad8..71ed863 100644 --- a/app/src/main/java/gq/kirmanak/mealie/MainActivity.kt +++ b/app/src/main/java/gq/kirmanak/mealie/MainActivity.kt @@ -1,18 +1,13 @@ package gq.kirmanak.mealie -import androidx.appcompat.app.AppCompatActivity import android.os.Bundle -import gq.kirmanak.mealie.ui.main.MainFragment +import androidx.appcompat.app.AppCompatActivity +import gq.kirmanak.mealie.databinding.MainActivityBinding class MainActivity : AppCompatActivity() { - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.main_activity) - if (savedInstanceState == null) { - supportFragmentManager.beginTransaction() - .replace(R.id.container, MainFragment.newInstance()) - .commitNow() - } + val binding = MainActivityBinding.inflate(layoutInflater) + setContentView(binding.root) } } \ No newline at end of file diff --git a/app/src/main/java/gq/kirmanak/mealie/ui/auth/AuthenticationFragment.kt b/app/src/main/java/gq/kirmanak/mealie/ui/auth/AuthenticationFragment.kt new file mode 100644 index 0000000..2d95ade --- /dev/null +++ b/app/src/main/java/gq/kirmanak/mealie/ui/auth/AuthenticationFragment.kt @@ -0,0 +1,28 @@ +package gq.kirmanak.mealie.ui.auth + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import gq.kirmanak.mealie.databinding.FragmentAuthenticationBinding + +class AuthenticationFragment : Fragment() { + private var _binding: FragmentAuthenticationBinding? = null + private val binding: FragmentAuthenticationBinding + get() = checkNotNull(_binding) { "Binding requested when fragment is off screen" } + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + _binding = FragmentAuthenticationBinding.inflate(inflater, container, false) + return binding.root + } + + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } +} \ No newline at end of file diff --git a/app/src/main/java/gq/kirmanak/mealie/ui/main/MainFragment.kt b/app/src/main/java/gq/kirmanak/mealie/ui/main/MainFragment.kt deleted file mode 100644 index 124dfdd..0000000 --- a/app/src/main/java/gq/kirmanak/mealie/ui/main/MainFragment.kt +++ /dev/null @@ -1,32 +0,0 @@ -package gq.kirmanak.mealie.ui.main - -import androidx.lifecycle.ViewModelProvider -import android.os.Bundle -import androidx.fragment.app.Fragment -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import gq.kirmanak.mealie.R - -class MainFragment : Fragment() { - - companion object { - fun newInstance() = MainFragment() - } - - private lateinit var viewModel: MainViewModel - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View { - return inflater.inflate(R.layout.main_fragment, container, false) - } - - override fun onActivityCreated(savedInstanceState: Bundle?) { - super.onActivityCreated(savedInstanceState) - viewModel = ViewModelProvider(this).get(MainViewModel::class.java) - // TODO: Use the ViewModel - } - -} \ No newline at end of file diff --git a/app/src/main/java/gq/kirmanak/mealie/ui/main/MainViewModel.kt b/app/src/main/java/gq/kirmanak/mealie/ui/main/MainViewModel.kt deleted file mode 100644 index 4d58777..0000000 --- a/app/src/main/java/gq/kirmanak/mealie/ui/main/MainViewModel.kt +++ /dev/null @@ -1,7 +0,0 @@ -package gq.kirmanak.mealie.ui.main - -import androidx.lifecycle.ViewModel - -class MainViewModel : ViewModel() { - // TODO: Implement the ViewModel -} \ No newline at end of file diff --git a/app/src/main/res/layout/main_fragment.xml b/app/src/main/res/layout/fragment_authentication.xml similarity index 69% rename from app/src/main/res/layout/main_fragment.xml rename to app/src/main/res/layout/fragment_authentication.xml index 6cf6516..8999df0 100644 --- a/app/src/main/res/layout/main_fragment.xml +++ b/app/src/main/res/layout/fragment_authentication.xml @@ -2,19 +2,19 @@ + tools:context=".ui.auth.AuthenticationFragment"> + - \ No newline at end of file diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml index b5c1943..1b06c4e 100644 --- a/app/src/main/res/layout/main_activity.xml +++ b/app/src/main/res/layout/main_activity.xml @@ -1,7 +1,20 @@ - \ No newline at end of file + tools:context=".MainActivity"> + + + \ No newline at end of file diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml new file mode 100644 index 0000000..fcb33ca --- /dev/null +++ b/app/src/main/res/navigation/nav_graph.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file