From 9302068836a6baa96f7f4cdc51d0786afb35908e Mon Sep 17 00:00:00 2001
From: Gertjan Bosteels <gertjan.bosteels@hogent.be>
Date: Tue, 2 Nov 2021 15:55:56 +0100
Subject: [PATCH 01/10] refactors to viewModel class

---
 JokeApp/app/build.gradle                      |  2 +-
 .../main/java/com/example/jokeapp/Comedian.kt | 28 --------------
 .../{ => screens/jokes}/JokeFragment.kt       | 37 +++++++++++--------
 .../jokes/JokeViewModel.kt}                   | 32 +++++++++++++---
 .../app/src/main/res/layout/fragment_joke.xml |  2 +-
 .../src/main/res/navigation/navigation.xml    |  2 +-
 6 files changed, 51 insertions(+), 52 deletions(-)
 delete mode 100644 JokeApp/app/src/main/java/com/example/jokeapp/Comedian.kt
 rename JokeApp/app/src/main/java/com/example/jokeapp/{ => screens/jokes}/JokeFragment.kt (81%)
 rename JokeApp/app/src/main/java/com/example/jokeapp/{JokeBook.kt => screens/jokes/JokeViewModel.kt} (67%)

diff --git a/JokeApp/app/build.gradle b/JokeApp/app/build.gradle
index e709117..993e99e 100644
--- a/JokeApp/app/build.gradle
+++ b/JokeApp/app/build.gradle
@@ -56,7 +56,7 @@ dependencies {
     implementation "android.arch.navigation:navigation-fragment-ktx:$version_navigation"
     implementation "android.arch.navigation:navigation-ui-ktx:$version_navigation"
     implementation 'com.jakewharton.timber:timber:5.0.1'
-
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
 
 }
 
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/Comedian.kt b/JokeApp/app/src/main/java/com/example/jokeapp/Comedian.kt
deleted file mode 100644
index ef38f2b..0000000
--- a/JokeApp/app/src/main/java/com/example/jokeapp/Comedian.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.example.jokeapp
-
-class Comedian (var happyJokes:Int = 0, var badJokes: Int = 0) {
-    /**
-     * A Comedian tells joke using a Jokebook
-     * The comedian can get good and bad points. Every three jokes there is an evaluation
-     */
-    fun isHappy() = happyJokes > 2
-    fun shouldEvaluate() = happyJokes+badJokes > 2
-
-    var totalJokesTold = 0
-
-    fun startOver() {
-        happyJokes = 0
-        badJokes = 0
-
-    }
-
-    fun goodJoke() {
-        happyJokes++
-    }
-
-    fun badJoke() {
-        badJokes++
-    }
-
-
-}
\ No newline at end of file
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/JokeFragment.kt b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt
similarity index 81%
rename from JokeApp/app/src/main/java/com/example/jokeapp/JokeFragment.kt
rename to JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt
index a9f1f9b..c3c12a2 100644
--- a/JokeApp/app/src/main/java/com/example/jokeapp/JokeFragment.kt
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt
@@ -1,15 +1,13 @@
-package com.example.jokeapp
+package com.example.jokeapp.screens.jokes
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Toast
 import androidx.databinding.DataBindingUtil
-import androidx.navigation.Navigation
 import androidx.navigation.findNavController
-import com.example.jokeapp.databinding.FragmentHomeBinding
+import com.example.jokeapp.R
 import com.example.jokeapp.databinding.FragmentJokeBinding
 import kotlin.random.Random
 
@@ -26,10 +24,7 @@ class JokeFragment : Fragment() {
     }
 
     lateinit var binding: FragmentJokeBinding
-
-
-    private val myJokeBook = JokeBook("")
-    private val myComedian = Comedian()
+    lateinit var viewModel : JokeViewModel
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -40,7 +35,12 @@ class JokeFragment : Fragment() {
 
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_joke, container, false)
 
-        binding.jokes = myJokeBook
+        viewModel = JokeViewModel()
+
+        binding.jokes = viewModel
+
+
+
         changeJoke() //setting an initial joke
 
         setOnClickListeners()
@@ -67,18 +67,23 @@ class JokeFragment : Fragment() {
          * If no evaluation is needed, go to next joke
          * If evaluation needed, go to next screen depending on score.
          */
-        if(myComedian.shouldEvaluate()){
-            if(myComedian.isHappy()){
+        if(viewModel.shouldEvaluate()){
+            if(viewModel.isHappy()){
                 //navigate to happy fragment
                 //Toast.makeText(activity, "Comedian is Happy!", Toast.LENGTH_SHORT).show()
-                view?.findNavController()?.navigate(JokeFragmentDirections.actionJokeFragmentToHappyComedian(myComedian.happyJokes, myComedian.badJokes))
+                view?.findNavController()?.navigate(
+                    JokeFragmentDirections.actionJokeFragmentToHappyComedian(
+                        viewModel.happyJokes,
+                        viewModel.badJokes
+                    )
+                )
             }
             else{
                 //navigate to unhappy fragment
                 //Toast.makeText(activity, "Comedian is Unhappy", Toast.LENGTH_SHORT).show()
                 view?.findNavController()?.navigate(JokeFragmentDirections.actionJokeFragmentToSadComedian())
             }
-            myComedian.startOver()
+            viewModel.startOver()
         }
         else{
             changeJoke()
@@ -95,17 +100,17 @@ class JokeFragment : Fragment() {
         }
         binding.happyImage.setImageResource(drawableResource)
 
-        myComedian.goodJoke()
+        viewModel.goodJoke()
     }
 
     private fun changeJoke() {
         //binding.jokeTextview.text = myJokeBook.getRandomJoke()
-        myJokeBook.changeCurrentJoke()
+        viewModel.changeCurrentJoke()
         binding.invalidateAll() //important! this binds the new data.
     }
 
     private fun countUnhappy(){
-        myComedian.badJoke()
+        viewModel.badJoke()
     }
 
 
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/JokeBook.kt b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModel.kt
similarity index 67%
rename from JokeApp/app/src/main/java/com/example/jokeapp/JokeBook.kt
rename to JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModel.kt
index 592d7b0..f474897 100644
--- a/JokeApp/app/src/main/java/com/example/jokeapp/JokeBook.kt
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModel.kt
@@ -1,12 +1,14 @@
-package com.example.jokeapp
+package com.example.jokeapp.screens.jokes
 
-import android.util.Log
+import androidx.lifecycle.ViewModel
 import kotlin.random.Random
 
-data class JokeBook (var currentJoke: String = ""){
+class JokeViewModel: ViewModel() {
+    var currentJoke = ""
+    var happyJokes = 0
+    var badJokes = 0
 
-
-    val jokes = listOf(
+    private val jokes = listOf(
         "My wife said I should do lunges to stay in shape. That would be a big step forward.",
         "I thought the dryer was shrinking my clothes. Turns out it was the refrigerator all along",
         "I only know 25 letters of the alphabet. I don't know y.",
@@ -27,4 +29,24 @@ data class JokeBook (var currentJoke: String = ""){
         //use mod to stay in the correct range
         currentJoke = jokes[randomListNumber]
     }
+
+    fun isHappy() = happyJokes > 2
+    fun shouldEvaluate() = happyJokes+badJokes > 2
+
+    var totalJokesTold = 0
+
+    fun startOver() {
+        happyJokes = 0
+        badJokes = 0
+
+    }
+
+    fun goodJoke() {
+        happyJokes++
+    }
+
+    fun badJoke() {
+        badJokes++
+    }
+
 }
\ No newline at end of file
diff --git a/JokeApp/app/src/main/res/layout/fragment_joke.xml b/JokeApp/app/src/main/res/layout/fragment_joke.xml
index 6e1df34..3751561 100644
--- a/JokeApp/app/src/main/res/layout/fragment_joke.xml
+++ b/JokeApp/app/src/main/res/layout/fragment_joke.xml
@@ -6,7 +6,7 @@
     <data>
         <variable
             name="jokes"
-            type="com.example.jokeapp.JokeBook" />
+            type="com.example.jokeapp.screens.jokes.JokeViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/JokeApp/app/src/main/res/navigation/navigation.xml b/JokeApp/app/src/main/res/navigation/navigation.xml
index df8d7d4..073d5dd 100644
--- a/JokeApp/app/src/main/res/navigation/navigation.xml
+++ b/JokeApp/app/src/main/res/navigation/navigation.xml
@@ -17,7 +17,7 @@
     </fragment>
     <fragment
         android:id="@+id/jokeFragment"
-        android:name="com.example.jokeapp.JokeFragment"
+        android:name="com.example.jokeapp.screens.jokes.JokeFragment"
         android:label="JokeFragment"
         tools:layout="@layout/fragment_joke">
         <action

From c5f454c464ad33ec9cd0cc922022e96ded7a5045 Mon Sep 17 00:00:00 2001
From: Gertjan Bosteels <gertjan.bosteels@hogent.be>
Date: Tue, 2 Nov 2021 16:06:48 +0100
Subject: [PATCH 02/10] refactors current joke as liveData

---
 .../jokeapp/screens/jokes/JokeFragment.kt        | 15 +++++++--------
 .../jokeapp/screens/jokes/JokeViewModel.kt       | 16 +++++++++-------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt
index c3c12a2..6bc27f0 100644
--- a/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt
@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.databinding.DataBindingUtil
+import androidx.lifecycle.Observer
 import androidx.navigation.findNavController
 import com.example.jokeapp.R
 import com.example.jokeapp.databinding.FragmentJokeBinding
@@ -39,9 +40,11 @@ class JokeFragment : Fragment() {
 
         binding.jokes = viewModel
 
+        viewModel.currentJoke.observe(viewLifecycleOwner, Observer {
+            newJoke -> binding.jokeTextview.text = newJoke
+        })
 
-
-        changeJoke() //setting an initial joke
+        viewModel.changeCurrentJoke() //setting an initial joke
 
         setOnClickListeners()
         return binding.root
@@ -86,7 +89,7 @@ class JokeFragment : Fragment() {
             viewModel.startOver()
         }
         else{
-            changeJoke()
+            viewModel.changeCurrentJoke()
         }
 
     }
@@ -103,11 +106,7 @@ class JokeFragment : Fragment() {
         viewModel.goodJoke()
     }
 
-    private fun changeJoke() {
-        //binding.jokeTextview.text = myJokeBook.getRandomJoke()
-        viewModel.changeCurrentJoke()
-        binding.invalidateAll() //important! this binds the new data.
-    }
+
 
     private fun countUnhappy(){
         viewModel.badJoke()
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModel.kt b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModel.kt
index f474897..8a74c7d 100644
--- a/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModel.kt
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModel.kt
@@ -1,10 +1,12 @@
 package com.example.jokeapp.screens.jokes
 
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import kotlin.random.Random
 
 class JokeViewModel: ViewModel() {
-    var currentJoke = ""
+
     var happyJokes = 0
     var badJokes = 0
 
@@ -18,16 +20,16 @@ class JokeViewModel: ViewModel() {
         "I used to be addicted to soap, but I'm clean now."
     )
 
-    fun getRandomJoke() : String {
-        var randomListNumber = Random.nextInt(jokes.size)
-        return jokes[randomListNumber];
-    }
+    private val _currentJoke = MutableLiveData<String>()
+    val currentJoke: LiveData<String>
+        get() = _currentJoke
+
 
     fun changeCurrentJoke() {
         var randomListNumber = Random.nextInt(jokes.size)
-        if(currentJoke == jokes[randomListNumber]) randomListNumber = randomListNumber.plus(1).mod(jokes.size)
+        if(_currentJoke.value == jokes[randomListNumber]) randomListNumber = randomListNumber.plus(1).mod(jokes.size)
         //use mod to stay in the correct range
-        currentJoke = jokes[randomListNumber]
+        _currentJoke.value = jokes[randomListNumber]
     }
 
     fun isHappy() = happyJokes > 2

From 97134d101d6452a74125185d3403ac80a1520905 Mon Sep 17 00:00:00 2001
From: Gertjan Bosteels <gertjan.bosteels@hogent.be>
Date: Tue, 2 Nov 2021 20:12:07 +0100
Subject: [PATCH 03/10] refactors all logic to viewModel

---
 .../jokeapp/screens/jokes/JokeFragment.kt     | 67 ++++++-------------
 .../jokeapp/screens/jokes/JokeViewModel.kt    | 21 +++++-
 2 files changed, 39 insertions(+), 49 deletions(-)

diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt
index 6bc27f0..1f3726f 100644
--- a/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt
@@ -35,7 +35,6 @@ class JokeFragment : Fragment() {
         //Step 1, use databinding to inflate the xml
 
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_joke, container, false)
-
         viewModel = JokeViewModel()
 
         binding.jokes = viewModel
@@ -44,9 +43,24 @@ class JokeFragment : Fragment() {
             newJoke -> binding.jokeTextview.text = newJoke
         })
 
-        viewModel.changeCurrentJoke() //setting an initial joke
+
+        viewModel.shouldEvaluate.observe(viewLifecycleOwner, Observer { shouldEveluate ->
+            if(shouldEveluate){
+                if(viewModel.isHappy()){
+                    //navigate to happy fragment
+                    view?.findNavController()?.navigate(JokeFragmentDirections.actionJokeFragmentToHappyComedian(viewModel.happyJokes, viewModel.badJokes))
+                }
+                else{
+                    //navigate to unhappy fragment
+                    view?.findNavController()?.navigate(JokeFragmentDirections.actionJokeFragmentToSadComedian())
+                }
+                viewModel.evaluationComplete()
+            }
+        })
+
 
         setOnClickListeners()
+
         return binding.root
     }
 
@@ -58,63 +72,20 @@ class JokeFragment : Fragment() {
         )
         for (item in clickableElements){
             when(item.id){
-                R.id.nextjoke_button -> item.setOnClickListener { countUnhappy(); next() }
-                R.id.happy_button -> item.setOnClickListener { happy(); next() }
+                R.id.nextjoke_button -> item.setOnClickListener { viewModel.badJoke(); viewModel.changeCurrentJoke()}
+                R.id.happy_button -> item.setOnClickListener { showHappySmiley(); viewModel.goodJoke(); viewModel.changeCurrentJoke()}
             }
         }
     }
 
-    private fun next() {
-        //Condional navigation
-        /**
-         * If no evaluation is needed, go to next joke
-         * If evaluation needed, go to next screen depending on score.
-         */
-        if(viewModel.shouldEvaluate()){
-            if(viewModel.isHappy()){
-                //navigate to happy fragment
-                //Toast.makeText(activity, "Comedian is Happy!", Toast.LENGTH_SHORT).show()
-                view?.findNavController()?.navigate(
-                    JokeFragmentDirections.actionJokeFragmentToHappyComedian(
-                        viewModel.happyJokes,
-                        viewModel.badJokes
-                    )
-                )
-            }
-            else{
-                //navigate to unhappy fragment
-                //Toast.makeText(activity, "Comedian is Unhappy", Toast.LENGTH_SHORT).show()
-                view?.findNavController()?.navigate(JokeFragmentDirections.actionJokeFragmentToSadComedian())
-            }
-            viewModel.startOver()
-        }
-        else{
-            viewModel.changeCurrentJoke()
-        }
 
-    }
-
-    private fun happy() {
+    private fun showHappySmiley() {
         val drawableResource = when (Random.nextInt(3)) {
             0 -> R.drawable.ic_iconmonstr_smiley_1
             1 -> R.drawable.ic_iconmonstr_smiley_13
             else -> R.drawable.ic_iconmonstr_smiley_2
-
         }
         binding.happyImage.setImageResource(drawableResource)
-
-        viewModel.goodJoke()
-    }
-
-
-
-    private fun countUnhappy(){
-        viewModel.badJoke()
     }
 
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-
-    }
 }
\ No newline at end of file
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModel.kt b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModel.kt
index 8a74c7d..9bb919f 100644
--- a/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModel.kt
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModel.kt
@@ -24,16 +24,35 @@ class JokeViewModel: ViewModel() {
     val currentJoke: LiveData<String>
         get() = _currentJoke
 
+    private val _shouldEvaluate = MutableLiveData<Boolean>()
+    val shouldEvaluate : LiveData<Boolean>
+        get() = _shouldEvaluate
+
+
+    init {
+        changeCurrentJoke()
+    }
 
     fun changeCurrentJoke() {
+        //Check for evaluation:
+        if (happyJokes + badJokes == 3){
+            _shouldEvaluate.value = true
+            startOver()
+            return
+        }
+
         var randomListNumber = Random.nextInt(jokes.size)
         if(_currentJoke.value == jokes[randomListNumber]) randomListNumber = randomListNumber.plus(1).mod(jokes.size)
         //use mod to stay in the correct range
         _currentJoke.value = jokes[randomListNumber]
     }
 
+    fun evaluationComplete(){
+        _shouldEvaluate.value = false
+    }
+
     fun isHappy() = happyJokes > 2
-    fun shouldEvaluate() = happyJokes+badJokes > 2
+    //fun shouldEvaluate() = happyJokes+badJokes > 2
 
     var totalJokesTold = 0
 

From a2cf9d19af995270c52ef7042bdb603267de19a6 Mon Sep 17 00:00:00 2001
From: Gertjan Bosteels <gertjan.bosteels@hogent.be>
Date: Wed, 3 Nov 2021 12:31:11 +0100
Subject: [PATCH 04/10] adds viewModel with constructor for score view

---
 .../example/jokeapp/SadComedianFragment.kt    | 45 ----------------
 .../jokeapp/screens/jokes/JokeFragment.kt     | 11 ++--
 .../score}/HappyComedianFragment.kt           | 26 ++++++++-
 .../jokeapp/screens/score/ScoreViewModel.kt   | 27 ++++++++++
 .../screens/score/ScoreViewModelFactory.kt    | 13 +++++
 .../res/layout/fragment_happy_comedian.xml    |  1 +
 .../main/res/layout/fragment_sad_comedian.xml | 53 -------------------
 .../src/main/res/navigation/navigation.xml    | 17 +-----
 8 files changed, 69 insertions(+), 124 deletions(-)
 delete mode 100644 JokeApp/app/src/main/java/com/example/jokeapp/SadComedianFragment.kt
 rename JokeApp/app/src/main/java/com/example/jokeapp/{ => screens/score}/HappyComedianFragment.kt (62%)
 create mode 100644 JokeApp/app/src/main/java/com/example/jokeapp/screens/score/ScoreViewModel.kt
 create mode 100644 JokeApp/app/src/main/java/com/example/jokeapp/screens/score/ScoreViewModelFactory.kt
 delete mode 100644 JokeApp/app/src/main/res/layout/fragment_sad_comedian.xml

diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/SadComedianFragment.kt b/JokeApp/app/src/main/java/com/example/jokeapp/SadComedianFragment.kt
deleted file mode 100644
index 440e9f3..0000000
--- a/JokeApp/app/src/main/java/com/example/jokeapp/SadComedianFragment.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.example.jokeapp
-
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.databinding.DataBindingUtil
-import androidx.navigation.Navigation
-import com.example.jokeapp.databinding.FragmentSadComedianBinding
-
-
-/**
- * A simple [Fragment] subclass.
- * Use the [SadComedianFragment.newInstance] factory method to
- * create an instance of this fragment.
- */
-class SadComedianFragment : Fragment() {
-    lateinit var binding: FragmentSadComedianBinding
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        // Inflate the layout for this fragment
-        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_sad_comedian, container, false)
-        setClickListeners()
-        return binding.root
-    }
-
-    private fun setClickListeners() {
-        binding.homeButton.setOnClickListener(
-            Navigation.createNavigateOnClickListener(R.id.action_sadComedian_to_homeFragment2)
-        )
-
-        binding.startAgainButton.setOnClickListener (
-            Navigation.createNavigateOnClickListener(R.id.action_sadComedian_to_jokeFragment)
-        )
-    }
-}
\ No newline at end of file
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt
index 1f3726f..14b1df3 100644
--- a/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt
@@ -46,14 +46,9 @@ class JokeFragment : Fragment() {
 
         viewModel.shouldEvaluate.observe(viewLifecycleOwner, Observer { shouldEveluate ->
             if(shouldEveluate){
-                if(viewModel.isHappy()){
-                    //navigate to happy fragment
-                    view?.findNavController()?.navigate(JokeFragmentDirections.actionJokeFragmentToHappyComedian(viewModel.happyJokes, viewModel.badJokes))
-                }
-                else{
-                    //navigate to unhappy fragment
-                    view?.findNavController()?.navigate(JokeFragmentDirections.actionJokeFragmentToSadComedian())
-                }
+
+                view?.findNavController()?.navigate(JokeFragmentDirections.actionJokeFragmentToHappyComedian(viewModel.happyJokes, viewModel.badJokes))
+
                 viewModel.evaluationComplete()
             }
         })
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/HappyComedianFragment.kt b/JokeApp/app/src/main/java/com/example/jokeapp/screens/score/HappyComedianFragment.kt
similarity index 62%
rename from JokeApp/app/src/main/java/com/example/jokeapp/HappyComedianFragment.kt
rename to JokeApp/app/src/main/java/com/example/jokeapp/screens/score/HappyComedianFragment.kt
index b3b0a56..59c4f6f 100644
--- a/JokeApp/app/src/main/java/com/example/jokeapp/HappyComedianFragment.kt
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/screens/score/HappyComedianFragment.kt
@@ -1,13 +1,17 @@
-package com.example.jokeapp
+package com.example.jokeapp.screens.score
 
+import android.graphics.Color
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.core.content.ContextCompat
 import androidx.databinding.DataBindingUtil
+import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.Navigation
+import com.example.jokeapp.R
 import com.example.jokeapp.databinding.FragmentHappyComedianBinding
 
 
@@ -19,6 +23,10 @@ import com.example.jokeapp.databinding.FragmentHappyComedianBinding
 class HappyComedianFragment : Fragment() {
 
     lateinit var binding: FragmentHappyComedianBinding
+    lateinit var viewModel: ScoreViewModel
+    lateinit var viewModelFactory: ScoreViewModelFactory
+
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
     }
@@ -28,16 +36,30 @@ class HappyComedianFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View? {
         // Inflate the layout for this fragment
-        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_happy_comedian, container, false)
+        binding = DataBindingUtil.inflate(inflater,
+            R.layout.fragment_happy_comedian, container, false)
 
         setClickListeners()
 
         val args = HappyComedianFragmentArgs.fromBundle(requireArguments())
         Toast.makeText(context, "There were ${args.numHappyJokes} happy jokes and ${args.numUnhappyJokes} bad jokes", Toast.LENGTH_SHORT).show()
 
+        viewModelFactory = ScoreViewModelFactory(args.numHappyJokes, args.numUnhappyJokes)
+        viewModel = ViewModelProvider(this, viewModelFactory).get(ScoreViewModel::class.java)
+
+        setBackgroundCollor()
+
         return binding.root
     }
 
+    private fun setBackgroundCollor() {
+        if(!viewModel.isHappy()){
+            //make sad screen:
+            binding.scoreConstraintLayout.setBackgroundColor(ContextCompat.getColor(requireActivity(), R.color.sad_red))
+            binding.textView.text = "Sad"
+        }
+    }
+
     private fun setClickListeners() {
         binding.homeButton.setOnClickListener(
             Navigation.createNavigateOnClickListener(R.id.action_happyComedian_to_homeFragment2)
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/screens/score/ScoreViewModel.kt b/JokeApp/app/src/main/java/com/example/jokeapp/screens/score/ScoreViewModel.kt
new file mode 100644
index 0000000..07925a8
--- /dev/null
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/screens/score/ScoreViewModel.kt
@@ -0,0 +1,27 @@
+package com.example.jokeapp.screens.score
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import timber.log.Timber
+
+class ScoreViewModel(happyJokesCount: Int, sadJokesCount: Int) : ViewModel(){
+
+    private val _happyJokes = MutableLiveData<Int>()
+    val happyJokes: LiveData<Int>
+        get() = _happyJokes
+
+    private val _sadJokes = MutableLiveData<Int>()
+    val sadJokes: LiveData<Int>
+        get() = _sadJokes
+
+    init {
+        _happyJokes.value = happyJokesCount
+        _sadJokes.value = sadJokesCount
+        //Timber.i("happyJokeCount: ${happyJokesCount}")
+        //Timber.i("sadJokeCount: ${sadJokesCount}")
+    }
+
+    fun isHappy() = happyJokes.value == 3
+
+}
\ No newline at end of file
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/screens/score/ScoreViewModelFactory.kt b/JokeApp/app/src/main/java/com/example/jokeapp/screens/score/ScoreViewModelFactory.kt
new file mode 100644
index 0000000..5c66b38
--- /dev/null
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/screens/score/ScoreViewModelFactory.kt
@@ -0,0 +1,13 @@
+package com.example.jokeapp.screens.score
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+
+class ScoreViewModelFactory(private val happyJokes: Int, private val sadJokes: Int): ViewModelProvider.Factory {
+    override fun <T: ViewModel?> create(modelClass: Class<T>): T {
+        if(modelClass.isAssignableFrom(ScoreViewModel::class.java)) {
+            return ScoreViewModel(happyJokes, sadJokes) as T
+        }
+        throw IllegalArgumentException("Unknown ViewModel class")
+    }
+}
\ No newline at end of file
diff --git a/JokeApp/app/src/main/res/layout/fragment_happy_comedian.xml b/JokeApp/app/src/main/res/layout/fragment_happy_comedian.xml
index 234e7d3..aec66fa 100644
--- a/JokeApp/app/src/main/res/layout/fragment_happy_comedian.xml
+++ b/JokeApp/app/src/main/res/layout/fragment_happy_comedian.xml
@@ -6,6 +6,7 @@
 
 
     <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/score_constraint_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/happy_green">
diff --git a/JokeApp/app/src/main/res/layout/fragment_sad_comedian.xml b/JokeApp/app/src/main/res/layout/fragment_sad_comedian.xml
deleted file mode 100644
index 079c17c..0000000
--- a/JokeApp/app/src/main/res/layout/fragment_sad_comedian.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/sad_red">
-
-        <TextView
-            android:id="@+id/textView"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:text="SAD"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <Button
-            android:id="@+id/start_again_button"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="8dp"
-            android:text="Again"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/home_button"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/textView"
-            app:layout_constraintVertical_bias="0.87" />
-
-        <Button
-            android:id="@+id/home_button"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="16dp"
-            android:text="Home"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toEndOf="@+id/start_again_button"
-            app:layout_constraintTop_toTopOf="@+id/start_again_button" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-</layout>
\ No newline at end of file
diff --git a/JokeApp/app/src/main/res/navigation/navigation.xml b/JokeApp/app/src/main/res/navigation/navigation.xml
index 073d5dd..ec41d17 100644
--- a/JokeApp/app/src/main/res/navigation/navigation.xml
+++ b/JokeApp/app/src/main/res/navigation/navigation.xml
@@ -23,13 +23,10 @@
         <action
             android:id="@+id/action_jokeFragment_to_happyComedian"
             app:destination="@id/happyComedian" />
-        <action
-            android:id="@+id/action_jokeFragment_to_sadComedian"
-            app:destination="@id/sadComedian" />
     </fragment>
     <fragment
         android:id="@+id/happyComedian"
-        android:name="com.example.jokeapp.HappyComedianFragment"
+        android:name="com.example.jokeapp.screens.score.HappyComedianFragment"
         android:label="HappyComedian"
         tools:layout="@layout/fragment_happy_comedian">
         <action
@@ -50,18 +47,6 @@
             android:name="numUnhappyJokes"
             app:argType="integer" />
     </fragment>
-    <fragment
-        android:id="@+id/sadComedian"
-        android:name="com.example.jokeapp.SadComedianFragment"
-        android:label="SadComedian"
-        tools:layout="@layout/fragment_sad_comedian">
-        <action
-            android:id="@+id/action_sadComedian_to_jokeFragment"
-            app:destination="@id/jokeFragment" />
-        <action
-            android:id="@+id/action_sadComedian_to_homeFragment2"
-            app:destination="@id/homeFragment2" />
-    </fragment>
     <fragment
         android:id="@+id/aboutFragment"
         android:name="com.example.jokeapp.AboutFragment"

From 7ee95e59bf500b744238e6a8d9529a98abdd3d99 Mon Sep 17 00:00:00 2001
From: Gertjan Bosteels <gertjan.bosteels@hogent.be>
Date: Wed, 3 Nov 2021 12:43:48 +0100
Subject: [PATCH 05/10] adds viewModel clickListeners to the XML - removing the
 Fragment as intermediar

---
 .../jokeapp/screens/jokes/JokeFragment.kt     | 24 +++++++------------
 .../jokeapp/screens/jokes/JokeViewModel.kt    | 12 ++++++++++
 .../app/src/main/res/layout/fragment_joke.xml |  2 ++
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt
index 14b1df3..58db6fe 100644
--- a/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt
@@ -39,6 +39,8 @@ class JokeFragment : Fragment() {
 
         binding.jokes = viewModel
 
+        binding.setLifecycleOwner (this)
+
         viewModel.currentJoke.observe(viewLifecycleOwner, Observer {
             newJoke -> binding.jokeTextview.text = newJoke
         })
@@ -53,26 +55,16 @@ class JokeFragment : Fragment() {
             }
         })
 
-
-        setOnClickListeners()
+        viewModel.showSmileyEvent.observe(viewLifecycleOwner, Observer {
+            show -> if(show){
+                showHappySmiley()
+                viewModel.showImageComplete()
+            }
+        })
 
         return binding.root
     }
 
-    //set click listener for each element in the list
-    private fun setOnClickListeners() {
-        val clickableElements = listOf(
-            binding.happyButton,
-            binding.nextjokeButton
-        )
-        for (item in clickableElements){
-            when(item.id){
-                R.id.nextjoke_button -> item.setOnClickListener { viewModel.badJoke(); viewModel.changeCurrentJoke()}
-                R.id.happy_button -> item.setOnClickListener { showHappySmiley(); viewModel.goodJoke(); viewModel.changeCurrentJoke()}
-            }
-        }
-    }
-
 
     private fun showHappySmiley() {
         val drawableResource = when (Random.nextInt(3)) {
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModel.kt b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModel.kt
index 9bb919f..35c21da 100644
--- a/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModel.kt
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModel.kt
@@ -28,6 +28,9 @@ class JokeViewModel: ViewModel() {
     val shouldEvaluate : LiveData<Boolean>
         get() = _shouldEvaluate
 
+    private val _showSmileyEvent = MutableLiveData<Boolean>()
+    val showSmileyEvent : LiveData<Boolean>
+        get() = _showSmileyEvent
 
     init {
         changeCurrentJoke()
@@ -51,6 +54,10 @@ class JokeViewModel: ViewModel() {
         _shouldEvaluate.value = false
     }
 
+    fun showImageComplete(){
+        _showSmileyEvent.value = false
+    }
+
     fun isHappy() = happyJokes > 2
     //fun shouldEvaluate() = happyJokes+badJokes > 2
 
@@ -64,10 +71,15 @@ class JokeViewModel: ViewModel() {
 
     fun goodJoke() {
         happyJokes++
+        changeCurrentJoke()
+        _showSmileyEvent.value = true
     }
 
     fun badJoke() {
         badJokes++
+        changeCurrentJoke()
     }
 
+
+
 }
\ No newline at end of file
diff --git a/JokeApp/app/src/main/res/layout/fragment_joke.xml b/JokeApp/app/src/main/res/layout/fragment_joke.xml
index 3751561..5b1eb35 100644
--- a/JokeApp/app/src/main/res/layout/fragment_joke.xml
+++ b/JokeApp/app/src/main/res/layout/fragment_joke.xml
@@ -53,6 +53,7 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="@dimen/margin_bottom"
             android:text="@string/next_joke"
+            android:onClick="@{()-> jokes.badJoke()}"
             app:layout_constraintBottom_toTopOf="@+id/happy_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
@@ -65,6 +66,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:text="@string/good_one"
+            android:onClick="@{()->jokes.goodJoke()}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"

From bd8af8f6f973c857e0b56ea73b7f6a07578cbfd1 Mon Sep 17 00:00:00 2001
From: Gertjan Bosteels <gertjan.bosteels@hogent.be>
Date: Wed, 3 Nov 2021 12:51:17 +0100
Subject: [PATCH 06/10] cleans up some leftovers

---
 .../com/example/jokeapp/HeaderFragment.kt     | 59 -------------------
 .../{ => screens/home}/HomeFragment.kt        | 14 +++--
 .../{ => screens/utils}/AboutFragment.kt      |  3 +-
 .../utils}/ButtonNavigationFragment.kt        |  6 +-
 .../jokeapp/screens/utils/HeaderFragment.kt   | 30 ++++++++++
 .../main/res/layout-land/fragment_home.xml    |  2 +-
 .../res/layout/fragment_button_navigation.xml |  2 +-
 .../src/main/res/layout/header_fragment.xml   |  2 +-
 .../src/main/res/navigation/navigation.xml    |  4 +-
 9 files changed, 49 insertions(+), 73 deletions(-)
 delete mode 100644 JokeApp/app/src/main/java/com/example/jokeapp/HeaderFragment.kt
 rename JokeApp/app/src/main/java/com/example/jokeapp/{ => screens/home}/HomeFragment.kt (91%)
 rename JokeApp/app/src/main/java/com/example/jokeapp/{ => screens/utils}/AboutFragment.kt (92%)
 rename JokeApp/app/src/main/java/com/example/jokeapp/{ => screens/utils}/ButtonNavigationFragment.kt (85%)
 create mode 100644 JokeApp/app/src/main/java/com/example/jokeapp/screens/utils/HeaderFragment.kt

diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/HeaderFragment.kt b/JokeApp/app/src/main/java/com/example/jokeapp/HeaderFragment.kt
deleted file mode 100644
index 374c3d5..0000000
--- a/JokeApp/app/src/main/java/com/example/jokeapp/HeaderFragment.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.example.jokeapp
-
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-
-// TODO: Rename parameter arguments, choose names that match
-// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-private const val ARG_PARAM1 = "param1"
-private const val ARG_PARAM2 = "param2"
-
-/**
- * A simple [Fragment] subclass.
- * Use the [HeaderFragment.newInstance] factory method to
- * create an instance of this fragment.
- */
-class HeaderFragment : Fragment() {
-    // TODO: Rename and change types of parameters
-    private var param1: String? = null
-    private var param2: String? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        arguments?.let {
-            param1 = it.getString(ARG_PARAM1)
-            param2 = it.getString(ARG_PARAM2)
-        }
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.header_fragment, container, false)
-    }
-
-    companion object {
-        /**
-         * Use this factory method to create a new instance of
-         * this fragment using the provided parameters.
-         *
-         * @param param1 Parameter 1.
-         * @param param2 Parameter 2.
-         * @return A new instance of fragment HeaderFragment.
-         */
-        // TODO: Rename and change types and number of parameters
-        @JvmStatic
-        fun newInstance(param1: String, param2: String) =
-            HeaderFragment().apply {
-                arguments = Bundle().apply {
-                    putString(ARG_PARAM1, param1)
-                    putString(ARG_PARAM2, param2)
-                }
-            }
-    }
-}
\ No newline at end of file
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/HomeFragment.kt b/JokeApp/app/src/main/java/com/example/jokeapp/screens/home/HomeFragment.kt
similarity index 91%
rename from JokeApp/app/src/main/java/com/example/jokeapp/HomeFragment.kt
rename to JokeApp/app/src/main/java/com/example/jokeapp/screens/home/HomeFragment.kt
index 0b38975..4454895 100644
--- a/JokeApp/app/src/main/java/com/example/jokeapp/HomeFragment.kt
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/screens/home/HomeFragment.kt
@@ -1,4 +1,4 @@
-package com.example.jokeapp
+package com.example.jokeapp.screens.home
 
 import android.os.Bundle
 import android.view.*
@@ -8,12 +8,8 @@ import androidx.databinding.DataBindingUtil
 import androidx.navigation.Navigation
 import androidx.navigation.findNavController
 import androidx.navigation.ui.NavigationUI
+import com.example.jokeapp.R
 import com.example.jokeapp.databinding.FragmentHomeBinding
-import kotlin.random.Random
-
-// TODO: Rename parameter arguments, choose names that match
-// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-
 
 /**
  * A simple [Fragment] subclass.
@@ -21,6 +17,12 @@ import kotlin.random.Random
  * create an instance of this fragment.
  */
 class HomeFragment : Fragment() {
+
+    /*
+    Note: the HomeFragment doesn't follow the MVVM architecture to demonstrate the alternatives
+    The Homefragment still uses savedInstanceState and clickListeners with DataBinding
+     */
+
     lateinit var binding: FragmentHomeBinding
     var numberOfOncreates = 0
     var numberOfOncreateViews = 0
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/AboutFragment.kt b/JokeApp/app/src/main/java/com/example/jokeapp/screens/utils/AboutFragment.kt
similarity index 92%
rename from JokeApp/app/src/main/java/com/example/jokeapp/AboutFragment.kt
rename to JokeApp/app/src/main/java/com/example/jokeapp/screens/utils/AboutFragment.kt
index c36ebc5..fcf71d3 100644
--- a/JokeApp/app/src/main/java/com/example/jokeapp/AboutFragment.kt
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/screens/utils/AboutFragment.kt
@@ -1,4 +1,4 @@
-package com.example.jokeapp
+package com.example.jokeapp.screens.utils
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import com.example.jokeapp.R
 
 
 /**
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/ButtonNavigationFragment.kt b/JokeApp/app/src/main/java/com/example/jokeapp/screens/utils/ButtonNavigationFragment.kt
similarity index 85%
rename from JokeApp/app/src/main/java/com/example/jokeapp/ButtonNavigationFragment.kt
rename to JokeApp/app/src/main/java/com/example/jokeapp/screens/utils/ButtonNavigationFragment.kt
index fd3f2ba..c3d89d7 100644
--- a/JokeApp/app/src/main/java/com/example/jokeapp/ButtonNavigationFragment.kt
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/screens/utils/ButtonNavigationFragment.kt
@@ -1,4 +1,4 @@
-package com.example.jokeapp
+package com.example.jokeapp.screens.utils
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
@@ -7,6 +7,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.databinding.DataBindingUtil
 import androidx.navigation.Navigation
+import com.example.jokeapp.R
 import com.example.jokeapp.databinding.FragmentButtonNavigationBinding
 
 
@@ -31,7 +32,8 @@ class ButtonNavigationFragment : Fragment() {
     ): View? {
         // Inflate the layout for this fragment
         //return inflater.inflate(R.layout.fragment_button_navigation, container, false)
-        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_button_navigation, container, false)
+        binding = DataBindingUtil.inflate(inflater,
+            R.layout.fragment_button_navigation, container, false)
         binding.button2.setOnClickListener(Navigation.createNavigateOnClickListener(R.id.action_homeFragment2_to_jokeFragment))
         return binding.root
     }
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/screens/utils/HeaderFragment.kt b/JokeApp/app/src/main/java/com/example/jokeapp/screens/utils/HeaderFragment.kt
new file mode 100644
index 0000000..c505ad9
--- /dev/null
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/screens/utils/HeaderFragment.kt
@@ -0,0 +1,30 @@
+package com.example.jokeapp.screens.utils
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.example.jokeapp.R
+
+
+/**
+ * A simple [Fragment] subclass.
+ * Use the [HeaderFragment.newInstance] factory method to
+ * create an instance of this fragment.
+ */
+class HeaderFragment : Fragment() {
+
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.header_fragment, container, false)
+    }
+}
\ No newline at end of file
diff --git a/JokeApp/app/src/main/res/layout-land/fragment_home.xml b/JokeApp/app/src/main/res/layout-land/fragment_home.xml
index cffac34..ccc735a 100644
--- a/JokeApp/app/src/main/res/layout-land/fragment_home.xml
+++ b/JokeApp/app/src/main/res/layout-land/fragment_home.xml
@@ -67,7 +67,7 @@
 
         <fragment
             android:id="@+id/fragment"
-            android:name="com.example.jokeapp.ButtonNavigationFragment"
+            android:name="com.example.jokeapp.screens.utils.ButtonNavigationFragment"
             android:layout_width="0dp"
             android:layout_height="match_parent"
 
diff --git a/JokeApp/app/src/main/res/layout/fragment_button_navigation.xml b/JokeApp/app/src/main/res/layout/fragment_button_navigation.xml
index 6522ac5..c784db8 100644
--- a/JokeApp/app/src/main/res/layout/fragment_button_navigation.xml
+++ b/JokeApp/app/src/main/res/layout/fragment_button_navigation.xml
@@ -8,7 +8,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".ButtonNavigationFragment">
+        tools:context=".screens.utils.ButtonNavigationFragment">
 
 
         <Button
diff --git a/JokeApp/app/src/main/res/layout/header_fragment.xml b/JokeApp/app/src/main/res/layout/header_fragment.xml
index 9fdb1b6..0e268cc 100644
--- a/JokeApp/app/src/main/res/layout/header_fragment.xml
+++ b/JokeApp/app/src/main/res/layout/header_fragment.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    tools:context=".HeaderFragment">
+    tools:context=".screens.utils.HeaderFragment">
 
 
     <TextView
diff --git a/JokeApp/app/src/main/res/navigation/navigation.xml b/JokeApp/app/src/main/res/navigation/navigation.xml
index ec41d17..5026d75 100644
--- a/JokeApp/app/src/main/res/navigation/navigation.xml
+++ b/JokeApp/app/src/main/res/navigation/navigation.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/homeFragment2"
-        android:name="com.example.jokeapp.HomeFragment"
+        android:name="com.example.jokeapp.screens.home.HomeFragment"
         android:label="HomeFragment"
         tools:layout="@layout/fragment_home">
 
@@ -49,6 +49,6 @@
     </fragment>
     <fragment
         android:id="@+id/aboutFragment"
-        android:name="com.example.jokeapp.AboutFragment"
+        android:name="com.example.jokeapp.screens.utils.AboutFragment"
         android:label="AboutFragment" />
 </navigation>
\ No newline at end of file

From e1256bb2c70e646fc5ed5aef5708c29edbecb2a1 Mon Sep 17 00:00:00 2001
From: Gertjan Bosteels <gertjan.bosteels@hogent.be>
Date: Wed, 3 Nov 2021 13:03:52 +0100
Subject: [PATCH 07/10] fix final issue regarding viewModel construction

---
 .../example/jokeapp/screens/jokes/JokeFragment.kt | 15 ++++++++++++---
 .../jokeapp/screens/jokes/JokeViewModel.kt        |  2 ++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt
index 58db6fe..1e12d70 100644
--- a/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeFragment.kt
@@ -7,6 +7,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.findNavController
 import com.example.jokeapp.R
 import com.example.jokeapp.databinding.FragmentJokeBinding
@@ -35,15 +36,23 @@ class JokeFragment : Fragment() {
         //Step 1, use databinding to inflate the xml
 
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_joke, container, false)
-        viewModel = JokeViewModel()
+
+        //Not OK: don't call the viewModel like a normal class.
+        //It needs to be special to survive e.g. config changes
+        //viewModel = JokeViewModel()
+
+        viewModel = ViewModelProvider(this).get(JokeViewModel::class.java)
 
         binding.jokes = viewModel
 
+        //this call allows to automatically update the livedata
+        //Meaning: no more resets or whatsoever
         binding.setLifecycleOwner (this)
 
-        viewModel.currentJoke.observe(viewLifecycleOwner, Observer {
+        //This is now no longer needed --> you can just call it from the XML
+        /*viewModel.currentJoke.observe(viewLifecycleOwner, Observer {
             newJoke -> binding.jokeTextview.text = newJoke
-        })
+        })*/
 
 
         viewModel.shouldEvaluate.observe(viewLifecycleOwner, Observer { shouldEveluate ->
diff --git a/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModel.kt b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModel.kt
index 35c21da..a2663f9 100644
--- a/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModel.kt
+++ b/JokeApp/app/src/main/java/com/example/jokeapp/screens/jokes/JokeViewModel.kt
@@ -3,6 +3,7 @@ package com.example.jokeapp.screens.jokes
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import timber.log.Timber
 import kotlin.random.Random
 
 class JokeViewModel: ViewModel() {
@@ -33,6 +34,7 @@ class JokeViewModel: ViewModel() {
         get() = _showSmileyEvent
 
     init {
+        Timber.i("init is called")
         changeCurrentJoke()
     }
 

From 1da58d3f06ac4c436a2f7a50bbbb683738868e6a Mon Sep 17 00:00:00 2001
From: Gertjan Bosteels <gertjan.bosteels@hogent.be>
Date: Thu, 4 Nov 2021 08:28:29 +0100
Subject: [PATCH 08/10] adds viewmodel test

---
 JokeApp/app/build.gradle                      | 13 +++++++--
 .../screens/jokes/JokeViewModelTest.kt        | 28 +++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 JokeApp/app/src/test/java/com/example/jokeapp/screens/jokes/JokeViewModelTest.kt

diff --git a/JokeApp/app/build.gradle b/JokeApp/app/build.gradle
index 993e99e..dd44376 100644
--- a/JokeApp/app/build.gradle
+++ b/JokeApp/app/build.gradle
@@ -11,12 +11,12 @@ apply plugin: 'androidx.navigation.safeargs'
 
 
 android {
-    compileSdk 31
+    compileSdk 30
 
     defaultConfig {
         applicationId "com.example.jokeapp"
         minSdk 24
-        targetSdk 31
+        targetSdk 30
         versionCode 1
         versionName "1.0"
 
@@ -41,8 +41,14 @@ android {
     dataBinding{
         enabled = true
     }
+
+    testOptions.unitTests {
+        includeAndroidResources = true
+    }
 }
 
+
+
 dependencies {
 
     implementation 'androidx.core:core-ktx:1.6.0'
@@ -50,9 +56,12 @@ dependencies {
     implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.test.ext:junit-ktx:1.1.3'
     testImplementation 'junit:junit:4.+'
+    testImplementation 'org.hamcrest:hamcrest:2.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    testImplementation "org.robolectric:robolectric:4.5.1"
     implementation "android.arch.navigation:navigation-fragment-ktx:$version_navigation"
     implementation "android.arch.navigation:navigation-ui-ktx:$version_navigation"
     implementation 'com.jakewharton.timber:timber:5.0.1'
diff --git a/JokeApp/app/src/test/java/com/example/jokeapp/screens/jokes/JokeViewModelTest.kt b/JokeApp/app/src/test/java/com/example/jokeapp/screens/jokes/JokeViewModelTest.kt
new file mode 100644
index 0000000..ff80240
--- /dev/null
+++ b/JokeApp/app/src/test/java/com/example/jokeapp/screens/jokes/JokeViewModelTest.kt
@@ -0,0 +1,28 @@
+package com.example.jokeapp.screens.jokes
+
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.hamcrest.core.Is.`is`
+import org.junit.Assert.*
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class JokeViewModelTest{
+    @Test
+    fun simple_jokeModel_test(){
+        val jokeViewModel = JokeViewModel()
+        jokeViewModel.startOver()
+
+        assertThat(jokeViewModel.happyJokes, `is`(0))
+    }
+
+    @Test
+    fun failing_jokeModel_test(){
+        val jokeViewModel = JokeViewModel()
+        jokeViewModel.startOver()
+
+        assertThat(jokeViewModel.happyJokes, `is`(5))
+    }
+
+}
\ No newline at end of file

From 3306ae5c3de9ce50572811a2200159c78a4c9732 Mon Sep 17 00:00:00 2001
From: Gertjan Bosteels <gertjan.bosteels@hogent.be>
Date: Thu, 4 Nov 2021 08:42:05 +0100
Subject: [PATCH 09/10] adds test for livedata

---
 JokeApp/app/build.gradle                      |  1 +
 .../com/example/jokeapp/LiveDataTestUtil.kt   | 42 +++++++++++++++++++
 .../screens/jokes/JokeViewModelTest.kt        | 19 +++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 JokeApp/app/src/test/java/com/example/jokeapp/LiveDataTestUtil.kt

diff --git a/JokeApp/app/build.gradle b/JokeApp/app/build.gradle
index dd44376..b66e789 100644
--- a/JokeApp/app/build.gradle
+++ b/JokeApp/app/build.gradle
@@ -62,6 +62,7 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     testImplementation "org.robolectric:robolectric:4.5.1"
+    testImplementation "androidx.arch.core:core-testing:2.1.0"
     implementation "android.arch.navigation:navigation-fragment-ktx:$version_navigation"
     implementation "android.arch.navigation:navigation-ui-ktx:$version_navigation"
     implementation 'com.jakewharton.timber:timber:5.0.1'
diff --git a/JokeApp/app/src/test/java/com/example/jokeapp/LiveDataTestUtil.kt b/JokeApp/app/src/test/java/com/example/jokeapp/LiveDataTestUtil.kt
new file mode 100644
index 0000000..30e89f0
--- /dev/null
+++ b/JokeApp/app/src/test/java/com/example/jokeapp/LiveDataTestUtil.kt
@@ -0,0 +1,42 @@
+package com.example.jokeapp
+
+import androidx.annotation.VisibleForTesting
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.Observer
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.TimeoutException
+
+
+@VisibleForTesting(otherwise = VisibleForTesting.NONE)
+fun <T> LiveData<T>.getOrAwaitValue(
+    time: Long = 2,
+    timeUnit: TimeUnit = TimeUnit.SECONDS,
+    afterObserve: () -> Unit = {}
+): T {
+    var data: T? = null
+    val latch = CountDownLatch(1)
+    val observer = object : Observer<T> {
+        override fun onChanged(o: T?) {
+            data = o
+            latch.countDown()
+            this@getOrAwaitValue.removeObserver(this)
+        }
+    }
+    this.observeForever(observer)
+
+    try {
+        afterObserve.invoke()
+
+        // Don't wait indefinitely if the LiveData is not set.
+        if (!latch.await(time, timeUnit)) {
+            throw TimeoutException("LiveData value was never set.")
+        }
+
+    } finally {
+        this.removeObserver(observer)
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    return data as T
+}
\ No newline at end of file
diff --git a/JokeApp/app/src/test/java/com/example/jokeapp/screens/jokes/JokeViewModelTest.kt b/JokeApp/app/src/test/java/com/example/jokeapp/screens/jokes/JokeViewModelTest.kt
index ff80240..28c2298 100644
--- a/JokeApp/app/src/test/java/com/example/jokeapp/screens/jokes/JokeViewModelTest.kt
+++ b/JokeApp/app/src/test/java/com/example/jokeapp/screens/jokes/JokeViewModelTest.kt
@@ -1,14 +1,22 @@
 package com.example.jokeapp.screens.jokes
 
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.example.jokeapp.getOrAwaitValue
+import org.hamcrest.CoreMatchers.nullValue
 import org.hamcrest.core.Is.`is`
+import org.hamcrest.core.IsNot.not
 import org.junit.Assert.*
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class JokeViewModelTest{
+    @get:Rule
+    var instantExecutorRule = InstantTaskExecutorRule()
+
     @Test
     fun simple_jokeModel_test(){
         val jokeViewModel = JokeViewModel()
@@ -25,4 +33,15 @@ class JokeViewModelTest{
         assertThat(jokeViewModel.happyJokes, `is`(5))
     }
 
+    @Test
+    fun test_liveData(){
+        val jokeViewModel = JokeViewModel()
+
+        jokeViewModel.changeCurrentJoke()
+
+        val value = jokeViewModel.currentJoke.getOrAwaitValue()
+
+        assertThat(value, not(nullValue()))
+    }
+
 }
\ No newline at end of file

From 4108e9383a774a7c1a626255a61dae5012d52a11 Mon Sep 17 00:00:00 2001
From: Gertjan Bosteels <gertjan.bosteels@hogent.be>
Date: Thu, 4 Nov 2021 08:43:09 +0100
Subject: [PATCH 10/10] fix deprication

---
 .../com/example/jokeapp/screens/jokes/JokeViewModelTest.kt     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/JokeApp/app/src/test/java/com/example/jokeapp/screens/jokes/JokeViewModelTest.kt b/JokeApp/app/src/test/java/com/example/jokeapp/screens/jokes/JokeViewModelTest.kt
index 28c2298..73911fc 100644
--- a/JokeApp/app/src/test/java/com/example/jokeapp/screens/jokes/JokeViewModelTest.kt
+++ b/JokeApp/app/src/test/java/com/example/jokeapp/screens/jokes/JokeViewModelTest.kt
@@ -5,9 +5,10 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.example.jokeapp.getOrAwaitValue
 import org.hamcrest.CoreMatchers.nullValue
+import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.core.Is.`is`
 import org.hamcrest.core.IsNot.not
-import org.junit.Assert.*
+
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith