diff --git a/app/src/main/java/eu/steffo/twom/MainActivity.kt b/app/src/main/java/eu/steffo/twom/MainActivity.kt index 0486616..caba5f6 100644 --- a/app/src/main/java/eu/steffo/twom/MainActivity.kt +++ b/app/src/main/java/eu/steffo/twom/MainActivity.kt @@ -13,6 +13,9 @@ import androidx.drawerlayout.widget.DrawerLayout import androidx.appcompat.app.AppCompatActivity import eu.steffo.twom.databinding.ActivityMainBinding +/** + * The main activity of the application. + */ class MainActivity : AppCompatActivity() { private lateinit var appBarConfiguration: AppBarConfiguration @@ -37,7 +40,7 @@ class MainActivity : AppCompatActivity() { // menu should be considered as top level destinations. appBarConfiguration = AppBarConfiguration( setOf( - R.id.nav_home, R.id.nav_gallery, R.id.nav_slideshow + R.id.nav_events ), drawerLayout ) setupActionBarWithNavController(navController, appBarConfiguration) diff --git a/app/src/main/java/eu/steffo/twom/ui/home/HomeFragment.kt b/app/src/main/java/eu/steffo/twom/ui/events/EventsFragment.kt similarity index 80% rename from app/src/main/java/eu/steffo/twom/ui/home/HomeFragment.kt rename to app/src/main/java/eu/steffo/twom/ui/events/EventsFragment.kt index e7e47cb..f9a7928 100644 --- a/app/src/main/java/eu/steffo/twom/ui/home/HomeFragment.kt +++ b/app/src/main/java/eu/steffo/twom/ui/events/EventsFragment.kt @@ -1,4 +1,4 @@ -package eu.steffo.twom.ui.home +package eu.steffo.twom.ui.events import android.os.Bundle import android.view.LayoutInflater @@ -9,7 +9,7 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import eu.steffo.twom.databinding.FragmentHomeBinding -class HomeFragment : Fragment() { +class EventsFragment : Fragment() { private var _binding: FragmentHomeBinding? = null @@ -22,14 +22,14 @@ class HomeFragment : Fragment() { container: ViewGroup?, savedInstanceState: Bundle? ): View { - val homeViewModel = - ViewModelProvider(this).get(HomeViewModel::class.java) + val eventsViewModel = + ViewModelProvider(this).get(EventsViewModel::class.java) _binding = FragmentHomeBinding.inflate(inflater, container, false) val root: View = binding.root val textView: TextView = binding.textHome - homeViewModel.text.observe(viewLifecycleOwner) { + eventsViewModel.text.observe(viewLifecycleOwner) { textView.text = it } return root diff --git a/app/src/main/java/eu/steffo/twom/ui/home/HomeViewModel.kt b/app/src/main/java/eu/steffo/twom/ui/events/EventsViewModel.kt similarity index 78% rename from app/src/main/java/eu/steffo/twom/ui/home/HomeViewModel.kt rename to app/src/main/java/eu/steffo/twom/ui/events/EventsViewModel.kt index 33bb739..ccc6b9b 100644 --- a/app/src/main/java/eu/steffo/twom/ui/home/HomeViewModel.kt +++ b/app/src/main/java/eu/steffo/twom/ui/events/EventsViewModel.kt @@ -1,10 +1,10 @@ -package eu.steffo.twom.ui.home +package eu.steffo.twom.ui.events import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -class HomeViewModel : ViewModel() { +class EventsViewModel : ViewModel() { private val _text = MutableLiveData().apply { value = "This is home Fragment" diff --git a/app/src/main/java/eu/steffo/twom/ui/gallery/GalleryFragment.kt b/app/src/main/java/eu/steffo/twom/ui/gallery/GalleryFragment.kt deleted file mode 100644 index 0d5a2ec..0000000 --- a/app/src/main/java/eu/steffo/twom/ui/gallery/GalleryFragment.kt +++ /dev/null @@ -1,42 +0,0 @@ -package eu.steffo.twom.ui.gallery - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.fragment.app.Fragment -import androidx.lifecycle.ViewModelProvider -import eu.steffo.twom.databinding.FragmentGalleryBinding - -class GalleryFragment : Fragment() { - - private var _binding: FragmentGalleryBinding? = 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 galleryViewModel = - ViewModelProvider(this).get(GalleryViewModel::class.java) - - _binding = FragmentGalleryBinding.inflate(inflater, container, false) - val root: View = binding.root - - val textView: TextView = binding.textGallery - galleryViewModel.text.observe(viewLifecycleOwner) { - textView.text = it - } - return root - } - - override fun onDestroyView() { - super.onDestroyView() - _binding = null - } -} \ No newline at end of file diff --git a/app/src/main/java/eu/steffo/twom/ui/gallery/GalleryViewModel.kt b/app/src/main/java/eu/steffo/twom/ui/gallery/GalleryViewModel.kt deleted file mode 100644 index 057fde9..0000000 --- a/app/src/main/java/eu/steffo/twom/ui/gallery/GalleryViewModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package eu.steffo.twom.ui.gallery - -import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.ViewModel - -class GalleryViewModel : ViewModel() { - - private val _text = MutableLiveData().apply { - value = "This is gallery Fragment" - } - val text: LiveData = _text -} \ No newline at end of file diff --git a/app/src/main/java/eu/steffo/twom/ui/slideshow/SlideshowFragment.kt b/app/src/main/java/eu/steffo/twom/ui/slideshow/SlideshowFragment.kt deleted file mode 100644 index e99b748..0000000 --- a/app/src/main/java/eu/steffo/twom/ui/slideshow/SlideshowFragment.kt +++ /dev/null @@ -1,42 +0,0 @@ -package eu.steffo.twom.ui.slideshow - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.fragment.app.Fragment -import androidx.lifecycle.ViewModelProvider -import eu.steffo.twom.databinding.FragmentSlideshowBinding - -class SlideshowFragment : Fragment() { - - private var _binding: FragmentSlideshowBinding? = 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 slideshowViewModel = - ViewModelProvider(this).get(SlideshowViewModel::class.java) - - _binding = FragmentSlideshowBinding.inflate(inflater, container, false) - val root: View = binding.root - - val textView: TextView = binding.textSlideshow - slideshowViewModel.text.observe(viewLifecycleOwner) { - textView.text = it - } - return root - } - - override fun onDestroyView() { - super.onDestroyView() - _binding = null - } -} \ No newline at end of file diff --git a/app/src/main/java/eu/steffo/twom/ui/slideshow/SlideshowViewModel.kt b/app/src/main/java/eu/steffo/twom/ui/slideshow/SlideshowViewModel.kt deleted file mode 100644 index 902b1ad..0000000 --- a/app/src/main/java/eu/steffo/twom/ui/slideshow/SlideshowViewModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package eu.steffo.twom.ui.slideshow - -import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.ViewModel - -class SlideshowViewModel : ViewModel() { - - private val _text = MutableLiveData().apply { - value = "This is slideshow Fragment" - } - val text: LiveData = _text -} \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index f3d9b08..80c0873 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.home.HomeFragment"> + tools:context=".ui.events.EventsFragment"> - - + android:title="@string/menu_events" /> \ No newline at end of file diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index e6bffe3..a7b6b70 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -3,23 +3,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/mobile_navigation" - app:startDestination="@+id/nav_home"> + app:startDestination="@+id/nav_events"> - - - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6d701de..56461f6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -7,7 +7,5 @@ Navigation header Settings - Home - Gallery - Slideshow + Events \ No newline at end of file