Skip to content

Lesson 5 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gwbostee wants to merge 10 commits into
base: lesson-4
Choose a base branch
from
Open

Lesson 5 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9302068
refactors to viewModel class
gwbostee Nov 2, 2021
c5f454c
refactors current joke as liveData
gwbostee Nov 2, 2021
97134d1
refactors all logic to viewModel
gwbostee Nov 2, 2021
a2cf9d1
adds viewModel with constructor for score view
gwbostee Nov 3, 2021
7ee95e5
adds viewModel clickListeners to the XML - removing the Fragment as i…
gwbostee Nov 3, 2021
bd8af8f
cleans up some leftovers
gwbostee Nov 3, 2021
e1256bb
fix final issue regarding viewModel construction
gwbostee Nov 3, 2021
1da58d3
adds viewmodel test
gwbostee Nov 4, 2021
3306ae5
adds test for livedata
gwbostee Nov 4, 2021
4108e93
fix deprication
gwbostee Nov 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions JokeApp/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -41,22 +41,32 @@ android {
dataBinding{
enabled = true
}

testOptions.unitTests {
includeAndroidResources = true
}
}



dependencies {

implementation 'androidx.core:core-ktx:1.6.0'
implementation 'androidx.appcompat:appcompat:1.3.1'
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"
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'

implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'

}

Expand Down
28 changes: 0 additions & 28 deletions JokeApp/app/src/main/java/com/example/jokeapp/Comedian.kt
View file
Open in desktop

This file was deleted.

59 changes: 0 additions & 59 deletions JokeApp/app/src/main/java/com/example/jokeapp/HeaderFragment.kt
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions JokeApp/app/src/main/java/com/example/jokeapp/JokeBook.kt
View file
Open in desktop

This file was deleted.

116 changes: 0 additions & 116 deletions JokeApp/app/src/main/java/com/example/jokeapp/JokeFragment.kt
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions JokeApp/app/src/main/java/com/example/jokeapp/SadComedianFragment.kt
View file
Open in desktop

This file was deleted.

14 changes: 8 additions & 6 deletions .../java/com/example/jokeapp/HomeFragment.kt → ...mple/jokeapp/screens/home/HomeFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.jokeapp
package com.example.jokeapp.screens.home

import android.os.Bundle
import android.view.*
Expand All @@ -8,19 +8,21 @@ 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.
* Use the [HomeFragment.newInstance] factory method to
* 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
Expand Down
Loading