Commit 51122052 authored by Vladislav's avatar Vladislav

fix miscellaneous, added arm64 compile

parent 075f8bc0
......@@ -17,7 +17,7 @@ android {
defaultConfig {
applicationId $APPLICATION_ID
ndk {
abiFilters 'armeabi-v7a', 'x86'
abiFilters 'armeabi-v7a', 'arm64-v8a'
}
minSdkVersion minSdkVersion_RoomPark
targetSdkVersion targetSdkVersion_RoomPark
......
......@@ -7,7 +7,10 @@ import com.biganto.visual.roompark.data.repository.mapper.fromRaw
import com.biganto.visual.roompark.data.repository.mapper.fromRawList
import com.biganto.visual.roompark.domain.contract.FeedsContract
import com.biganto.visual.roompark.domain.custom_exception.CustomApiException
import com.biganto.visual.roompark.domain.model.*
import com.biganto.visual.roompark.domain.model.ArticleModel
import com.biganto.visual.roompark.domain.model.ArticlesPreviewModel
import com.biganto.visual.roompark.domain.model.FeedModel
import com.biganto.visual.roompark.domain.model.fromEntity
import io.reactivex.Observable
import io.reactivex.schedulers.Schedulers
import timber.log.Timber
......@@ -124,10 +127,7 @@ class FeedsContractModule @Inject constructor(
private fun fetchArticleDb(id:Int) =
db.getArticle(id).observable()
.map {
if (it.body == null) null
else it
}
.filter{it.body != null}
.subscribeOn(Schedulers.io())
private fun fetchArticle(articleId:Int): Observable<ArticleModel> =
......
......@@ -16,9 +16,9 @@ data class FeedModel(val feedId:Int, val title:String, val alias:String? = null)
data class FeedsHeaderModel(val feeds:List<FeedModel>)
data class ArticlePreviewModel(
val title:String,
val articleId:Int,
val published: Date,
val title:String,
val announce:String,
val previewUrl:String,
val isRead:Boolean
......
......@@ -2,8 +2,10 @@ package com.biganto.visual.roompark.presentation.screen.article
import android.content.Context
import com.biganto.visual.roompark.base.RoomParkMainActivity
import com.biganto.visual.roompark.data.data_provider.FeedsContractModule
import com.biganto.visual.roompark.di.dagger.AppComponent
import com.biganto.visual.roompark.di.dagger.PerScreen
import com.biganto.visual.roompark.domain.contract.FeedsContract
import dagger.Binds
import dagger.BindsInstance
import dagger.Component
......@@ -39,4 +41,7 @@ abstract class ArticleScreenModule{
@Binds
abstract fun provideContext(activity: RoomParkMainActivity): Context
@PerScreen
@Binds
abstract fun provideContract(impl: FeedsContractModule): FeedsContract
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment