Merge pull request #1 from Roaim/lorem_picksum

lorem_picsum
Roaim · Aug 18, 2019 · 6f268ea · 6f268ea
2 parents 62f1ed2 + 4990edf
commit 6f268ea
Show file tree

Hide file tree

Showing 29 changed files with 191 additions and 425 deletions.
diff --git a/lib_pin_downloader/build.gradle b/lib_pin_downloader/build.gradle
@@ -26,6 +26,10 @@ android {
     testOptions {
         unitTests.returnDefaultValues = true
     }
+    compileOptions {
+        sourceCompatibility = '1.8'
+        targetCompatibility = '1.8'
+    }
 }
 
 dependencies {
@@ -49,6 +53,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.squareup.retrofit2:adapter-guava:2.6.1'
     implementation 'com.squareup.retrofit2:converter-gson:2.6.1'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.14.0'
 /*
     // Basic Dagger 2 (required)
     implementation "com.google.dagger:dagger:$dagger2_version"

diff --git a/lib_pin_downloader/src/main/java/com/roaim/pindownloader/JsonPinDownloader.kt b/lib_pin_downloader/src/main/java/com/roaim/pindownloader/JsonPinDownloader.kt
@@ -2,10 +2,12 @@ package com.roaim.pindownloader
 
 import com.google.gson.Gson
 import com.google.gson.JsonElement
+import com.google.gson.stream.JsonReader
 import com.roaim.pindownloader.core.CacheDataSource
 import com.roaim.pindownloader.core.PinDownloader
 import com.roaim.pindownloader.core.RemoteDataSource
 import okhttp3.ResponseBody
+import java.io.StringReader
 
 object JsonCacheDataSource : CacheDataSource<JsonElement>() {
     @ExperimentalStdlibApi
@@ -17,7 +19,9 @@ object JsonCacheDataSource : CacheDataSource<JsonElement>() {
 object JsonRemoteDataSource : RemoteDataSource<JsonElement>() {
     override suspend fun convert(response: ResponseBody?): JsonElement? =
         response?.string().let {
-            Gson().fromJson(it, JsonElement::class.java)
+            val reader = JsonReader(StringReader(it))
+            reader.isLenient = true
+            Gson().fromJson(reader, JsonElement::class.java)
         }
 
 }

diff --git a/lib_pin_downloader/src/main/java/com/roaim/pindownloader/core/RemoteApi.kt b/lib_pin_downloader/src/main/java/com/roaim/pindownloader/core/RemoteApi.kt
@@ -1,7 +1,9 @@
 package com.roaim.pindownloader.core
 
 import com.roaim.pindownloader.BuildConfig
+import okhttp3.OkHttpClient
 import okhttp3.ResponseBody
+import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import retrofit2.http.GET
@@ -16,12 +18,23 @@ interface RemoteApi {
     suspend fun getContent(@Url url: String): ResponseBody //TODO replace ResponseBody with Response<ResponseBody> for better control
 
     companion object Factory {
-        fun create(): RemoteApi {
+        fun create(client: OkHttpClient = httpClient()): RemoteApi {
             val retrofit = Retrofit.Builder()
                 .addConverterFactory(GsonConverterFactory.create())
+                .client(client)
                 .baseUrl(BuildConfig.BASE_URL)
                 .build()
             return retrofit.create(RemoteApi::class.java)
         }
+
+        fun httpClient(loggingInterceptor : HttpLoggingInterceptor = loggingInterceptor()) : OkHttpClient {
+            return OkHttpClient.Builder()
+                .addInterceptor(loggingInterceptor)
+                .build()
+        }
+
+        fun loggingInterceptor() : HttpLoggingInterceptor {
+            return HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BASIC)
+        }
     }
 }
diff --git a/lib_pin_downloader/src/test/java/com/roaim/pindownloader/BitmapRemoteDataSourceTest.kt b/lib_pin_downloader/src/test/java/com/roaim/pindownloader/BitmapRemoteDataSourceTest.kt
@@ -1,6 +1,7 @@
 package com.roaim.pindownloader
 
 import android.graphics.Bitmap
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.roaim.pindownloader.core.RemoteApi
 import com.roaim.pindownloader.mock.MockBitmapRemoteDataSource
 import kotlinx.coroutines.Dispatchers
@@ -12,12 +13,14 @@ import org.hamcrest.CoreMatchers.instanceOf
 import org.junit.After
 import org.junit.Assert.*
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import org.mockito.Mockito.*
 
 class BitmapRemoteDataSourceTest {
     private val url = "https://images.unsplash.com"
-
+    @get:Rule
+    val instantExecutorRule = InstantTaskExecutorRule()
     @ExperimentalCoroutinesApi
     private val testDispatcher = TestCoroutineDispatcher()
     @ExperimentalCoroutinesApi

diff --git a/sample_pinboard_app/build.gradle b/sample_pinboard_app/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdkVersion 19
         targetSdkVersion 28
         versionCode 1
-        versionName "1.0"
+        versionName "2.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField "String", "SAMPLE_JSON_URL", SAMPLE_JSON_URL
     }
@@ -24,6 +24,10 @@ android {
     dataBinding {
         enabled = true
     }
+    compileOptions {
+        sourceCompatibility = '1.8'
+        targetCompatibility = '1.8'
+    }
 }
 
 dependencies {

diff --git a/sample_pinboard_app/src/main/AndroidManifest.xml b/sample_pinboard_app/src/main/AndroidManifest.xml
@@ -22,7 +22,6 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name=".TestActivity"/>
     </application>
 
 </manifest>
diff --git a/sample_pinboard_app/src/main/java/com/roaim/kotlinpinboard/PinActivity.kt b/sample_pinboard_app/src/main/java/com/roaim/kotlinpinboard/PinActivity.kt
@@ -2,7 +2,6 @@ package com.roaim.kotlinpinboard
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import androidx.navigation.findNavController
 import kotlinx.android.synthetic.main.activity_pin_board.*
 
 class PinActivity : AppCompatActivity() {
@@ -11,20 +10,6 @@ class PinActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_pin_board)
         setSupportActionBar(toolbar)
-
-        fab.setOnClickListener {
-            findNavController(R.id.fragmentNavHost).apply {
-                navigate(
-                    when (currentDestination?.id) {
-                        R.id.pinBoardFragment2 -> R.id.action_pinBoardFragment2_to_testActivity2
-                        R.id.pinDetailsFragment -> R.id.action_pinDetailsFragment2_to_testActivity2
-                        else -> {
-                            R.id.action_pinBoardFragment2_to_testActivity2
-                        }
-                    }
-                )
-            }
-        }
     }
 
 }
diff --git a/sample_pinboard_app/src/main/java/com/roaim/kotlinpinboard/TestActivity.kt b/sample_pinboard_app/src/main/java/com/roaim/kotlinpinboard/TestActivity.kt
diff --git a/sample_pinboard_app/src/main/java/com/roaim/kotlinpinboard/data/PinDataSource.kt b/sample_pinboard_app/src/main/java/com/roaim/kotlinpinboard/data/PinDataSource.kt
@@ -1,52 +1,44 @@
 package com.roaim.kotlinpinboard.data
 
-import android.os.Handler
-import android.os.Looper
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Observer
 import androidx.lifecycle.Transformations
-import androidx.paging.ItemKeyedDataSource
-import com.roaim.kotlinpinboard.BuildConfig
-import com.roaim.kotlinpinboard.data.model.Pin
+import androidx.paging.PageKeyedDataSource
+import com.roaim.kotlinpinboard.data.model.LoremPicksum
+import com.roaim.kotlinpinboard.utils.Constants
+import com.roaim.kotlinpinboard.utils.observeOnceInMain
 import com.roaim.pindownloader.BitmapPinDownloader
 import com.roaim.pindownloader.JsonPinDownloader
 import com.roaim.pindownloader.toPoJo
 
 class PinDataSource(
     private val jsonPinDownloader: JsonPinDownloader = JsonPinDownloader(),
     private val bitmapPinDownloader: BitmapPinDownloader = BitmapPinDownloader()
-) : ItemKeyedDataSource<String, Pin>() {
-    override fun loadBefore(params: LoadParams<String>, callback: LoadCallback<Pin>) {
+) : PageKeyedDataSource<Int, LoremPicksum>() {
+    override fun loadBefore(params: LoadParams<Int>, callback: LoadCallback<Int, LoremPicksum>) {
     }
 
-    override fun loadAfter(params: LoadParams<String>, callback: LoadCallback<Pin>) {
-        getPin(params.key).apply {
-            Handler(Looper.getMainLooper()).post {
-                observeForever {
-                    callback.onResult(it)
-                    removeObserver {}
-                }
-            }
+    override fun loadAfter(params: LoadParams<Int>, callback: LoadCallback<Int, LoremPicksum>) {
+        getPin(Constants.getImageListUrl(params.key, params.requestedLoadSize)).apply {
+            observeOnceInMain(Observer {
+                it?.also { callback.onResult(it, params.key.inc()) }
+            })
         }
     }
 
-    override fun loadInitial(params: LoadInitialParams<String>, callback: LoadInitialCallback<Pin>) {
-        getPin(BuildConfig.SAMPLE_JSON_URL).apply {
-            Handler(Looper.getMainLooper()).post {
-                observeForever {
-                    callback.onResult(it)
-                    removeObserver {}
-                }
-            }
+    override fun loadInitial(params: LoadInitialParams<Int>, callback: LoadInitialCallback<Int, LoremPicksum>) {
+        getPin(Constants.getImageListUrl()).apply {
+            observeOnceInMain(Observer {
+                it?.also { callback.onResult(it, 0, 2) }
+            })
         }
     }
 
-    override fun getKey(item: Pin): String = BuildConfig.SAMPLE_JSON_URL
-
     private fun getPin(url: String) = Transformations.switchMap(
         jsonPinDownloader.download(url)
     ) {
-        it?.toPoJo(Array<Pin>::class.java)?.run {
-            MutableLiveData<List<Pin>>(asList())
+        it?.toPoJo(Array<LoremPicksum>::class.java)?.run {
+            MutableLiveData<List<LoremPicksum>>(asList())
         }
     }
 

diff --git a/sample_pinboard_app/src/main/java/com/roaim/kotlinpinboard/data/PinDataSourceFactory.kt b/sample_pinboard_app/src/main/java/com/roaim/kotlinpinboard/data/PinDataSourceFactory.kt
@@ -1,10 +1,10 @@
 package com.roaim.kotlinpinboard.data
 
 import androidx.paging.DataSource
-import com.roaim.kotlinpinboard.data.model.Pin
+import com.roaim.kotlinpinboard.data.model.LoremPicksum
 
-class PinDataSourceFactory(private val pinDataSource: PinDataSource) : DataSource.Factory<String, Pin>() {
-    override fun create(): DataSource<String, Pin> {
+class PinDataSourceFactory(private val pinDataSource: PinDataSource) : DataSource.Factory<Int, LoremPicksum>() {
+    override fun create(): DataSource<Int, LoremPicksum> {
         return pinDataSource
     }
 }
diff --git a/sample_pinboard_app/src/main/java/com/roaim/kotlinpinboard/data/PinRepository.kt b/sample_pinboard_app/src/main/java/com/roaim/kotlinpinboard/data/PinRepository.kt
@@ -3,14 +3,14 @@ package com.roaim.kotlinpinboard.data
 import androidx.lifecycle.LiveData
 import androidx.paging.LivePagedListBuilder
 import androidx.paging.PagedList
-import com.roaim.kotlinpinboard.data.model.Pin
+import com.roaim.kotlinpinboard.data.model.LoremPicksum
 
 class PinRepository(private val pinDataSource: PinDataSource = PinDataSource()) {
     private val dataSourceFactory = PinDataSourceFactory(pinDataSource)
 
     fun getBitmap(url: String) = pinDataSource.getBitmap(url)
 
-    fun getPins(): LiveData<PagedList<Pin>> {
+    fun getPins(): LiveData<PagedList<LoremPicksum>> {
         val config = PagedList.Config.Builder()
             .setPageSize(10)
             .setEnablePlaceholders(false)

diff --git a/sample_pinboard_app/src/main/java/com/roaim/kotlinpinboard/data/model/CategoriesItem.kt b/sample_pinboard_app/src/main/java/com/roaim/kotlinpinboard/data/model/CategoriesItem.kt
diff --git a/sample_pinboard_app/src/main/java/com/roaim/kotlinpinboard/data/model/Links.kt b/sample_pinboard_app/src/main/java/com/roaim/kotlinpinboard/data/model/Links.kt
diff --git a/sample_pinboard_app/src/main/java/com/roaim/kotlinpinboard/data/model/LoremPicksum.kt b/sample_pinboard_app/src/main/java/com/roaim/kotlinpinboard/data/model/LoremPicksum.kt
@@ -0,0 +1,10 @@
+package com.roaim.kotlinpinboard.data.model
+
+data class LoremPicksum(
+    val author: String? = null,
+    val width: Int? = null,
+    val downloadUrl: String? = null,
+    val id: String? = null,
+    val url: String? = null,
+    val height: Int? = null
+)