Fixes GithubBrowser

Author: JoseAlcerreca

GithubBrowserSample/app/build.gradle

@@ -29,7 +29,7 @@ android {
  compileSdkVersion build_versions.compile_sdk
  defaultConfig {
  applicationId "com.android.example.github"
- minSdkVersion build_versions.min_sdk
+ minSdkVersion 21
  targetSdkVersion build_versions.target_sdk
  versionCode 1
  versionName "1.0"
@@ -60,6 +60,7 @@ android {
  }
  lintOptions {
  lintConfig rootProject.file('lint.xml')
+ disable 'InvalidPackage'
  }
 }
 
@@ -98,7 +99,6 @@ dependencies {
  testImplementation deps.arch_core.testing
  testImplementation deps.mockito.core
 
- androidTestImplementation deps.atsl.core
  androidTestImplementation deps.atsl.ext_junit
  androidTestImplementation deps.atsl.runner
  androidTestImplementation deps.atsl.rules

GithubBrowserSample/app/src/main/AndroidManifest.xml

@@ -19,6 +19,7 @@
  package="com.android.example.github">
 
  <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
  <application
  android:name=".GithubApp"
  android:allowBackup="false"

GithubBrowserSample/app/src/main/java/com/android/example/github/repository/FetchNextSearchPageTask.kt

@@ -36,8 +36,8 @@ class FetchNextSearchPageTask constructor(
  private val githubService: GithubService,
  private val db: GithubDb
 ) : Runnable {
- private val _liveData = MutableLiveData<Resource<Boolean>>()
- val liveData: LiveData<Resource<Boolean>> = _liveData
+ private val _liveData = MutableLiveData<Resource<Boolean>?>()
+ val liveData: MutableLiveData<Resource<Boolean>?> = _liveData
 
  override fun run() {
  val current = db.repoDao().findSearchResult(query)

GithubBrowserSample/app/src/main/java/com/android/example/github/repository/RepoRepository.kt

@@ -125,7 +125,7 @@ class RepoRepository @Inject constructor(
  }.asLiveData()
  }
 
- fun searchNextPage(query: String): LiveData<Resource<Boolean>> {
+ fun searchNextPage(query: String): LiveData<Resource<Boolean>?> {
  val fetchNextSearchPageTask = FetchNextSearchPageTask(
  query = query,
  githubService = githubService,

GithubBrowserSample/app/src/main/java/com/android/example/github/ui/repo/RepoFragment.kt

@@ -90,7 +90,8 @@ class RepoFragment : Fragment(), Injectable {
  }
  }
  binding = dataBinding
- sharedElementReturnTransition = TransitionInflater.from(context).inflateTransition(R.transition.move)
+ sharedElementReturnTransition = TransitionInflater.from(requireContext())
+ .inflateTransition(R.transition.move)
  return dataBinding.root
  }
 

GithubBrowserSample/app/src/main/java/com/android/example/github/ui/search/SearchViewModel.kt

@@ -85,8 +85,8 @@ class SearchViewModel @Inject constructor(repoRepository: RepoRepository) : View
  }
  }
 
- class NextPageHandler(private val repository: RepoRepository) : Observer<Resource<Boolean>> {
- private var nextPageLiveData: LiveData<Resource<Boolean>>? = null
+ class NextPageHandler(private val repository: RepoRepository) : Observer<Resource<Boolean>?> {
+ private var nextPageLiveData: LiveData<Resource<Boolean>?>? = null
  val loadMoreState = MutableLiveData<LoadMoreState>()
  private var query: String? = null
  private var _hasMore: Boolean = false

GithubBrowserSample/app/src/main/java/com/android/example/github/ui/user/UserFragment.kt

@@ -77,7 +77,8 @@ class UserFragment : Fragment(), Injectable {
  }
  }
  binding = dataBinding
- sharedElementEnterTransition = TransitionInflater.from(context).inflateTransition(R.transition.move)
+ sharedElementEnterTransition = TransitionInflater.from(requireContext())
+ .inflateTransition(R.transition.move)
  // When the image is loaded, set the image request listener to start the transaction
  binding.imageRequestListener = object: RequestListener<Drawable> {
  override fun onLoadFailed(e: GlideException?, model: Any?, target: Target<Drawable>?, isFirstResource: Boolean): Boolean {

GithubBrowserSample/app/src/test/java/com/android/example/github/repository/FetchNextSearchPageTaskTest.kt

@@ -27,18 +27,19 @@ import com.android.example.github.util.mock
 import com.android.example.github.vo.RepoSearchResult
 import com.android.example.github.vo.Resource
 import okhttp3.Headers
-import okhttp3.MediaType
-import okhttp3.ResponseBody
+import okhttp3.Headers.Companion.headersOf
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.ResponseBody.Companion.toResponseBody
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import org.mockito.ArgumentMatchers.any
-import org.mockito.Mockito.`when`
 import org.mockito.Mockito.mock
 import org.mockito.Mockito.verify
 import org.mockito.Mockito.verifyNoMoreInteractions
+import org.mockito.Mockito.`when`
 import retrofit2.Call
 import retrofit2.Response
 import java.io.IOException
@@ -58,7 +59,7 @@ class FetchNextSearchPageTaskTest {
 
  private lateinit var task: FetchNextSearchPageTask
 
- private val observer: Observer<Resource<Boolean>> = mock()
+ private val observer: Observer<Resource<Boolean>?> = mock()
 
  @Before
  fun init() {
@@ -120,9 +121,8 @@ class FetchNextSearchPageTaskTest {
  val call = mock<Call<RepoSearchResponse>>()
  `when`(call.execute()).thenReturn(
  Response.error(
- 400, ResponseBody.create(
- MediaType.parse("txt"), "bar"
- )
+ 400, "bar"
+ .toResponseBody("txt".toMediaTypeOrNull())
  )
  )
  `when`(service.searchRepos("foo", 1)).thenReturn(call)
@@ -152,12 +152,11 @@ class FetchNextSearchPageTaskTest {
  val headers = if (nextPage == null)
  null
  else
- Headers
- .of(
- "link",
- "<https://api.github.com/search/repositories?q=foo&page=" + nextPage
- + ">; rel=\"next\""
- )
+ headersOf(
+ "link",
+ "<https://api.github.com/search/repositories?q=foo&page=" + nextPage
+ + ">; rel=\"next\""
+ )
  val success = if (headers == null)
  Response.success(body)
  else
@@ -167,4 +166,4 @@ class FetchNextSearchPageTaskTest {
 
  return call
  }
-}
+}

GithubBrowserSample/app/src/test/java/com/android/example/github/repository/RepoRepositoryTest.kt

@@ -145,7 +145,7 @@ class RepoRepositoryTest {
  @Test
  fun searchNextPage_null() {
  `when`(dao.findSearchResult("foo")).thenReturn(null)
- val observer = mock<Observer<Resource<Boolean>>>()
+ val observer = mock<Observer<Resource<Boolean>?>>()
  repository.searchNextPage("foo").observeForever(observer)
  verify(observer).onChanged(null)
  }
@@ -230,4 +230,4 @@ class RepoRepositoryTest {
  apiResponse.postValue(ApiResponse.create(Exception("idk")))
  verify(observer).onChanged(Resource.error("idk", null))
  }
-}
+}

GithubBrowserSample/app/src/test/java/com/android/example/github/ui/search/NextPageHandlerTest.kt

@@ -147,9 +147,9 @@ class NextPageHandlerTest {
  assertThat(liveData.hasActiveObservers(), `is`(false))
  }
 
- private fun enqueueResponse(query: String): MutableLiveData<Resource<Boolean>> {
- val liveData = MutableLiveData<Resource<Boolean>>()
+ private fun enqueueResponse(query: String): MutableLiveData<Resource<Boolean>?> {
+ val liveData = MutableLiveData<Resource<Boolean>?>()
  `when`(repository.searchNextPage(query)).thenReturn(liveData)
  return liveData
  }
-}
+}