Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Room Park Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vladislav Bogdashkin
Room Park Android
Commits
51122052
Commit
51122052
authored
Dec 01, 2019
by
Vladislav
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix miscellaneous, added arm64 compile
parent
075f8bc0
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
7 deletions
+12
-7
build.gradle
app/build.gradle
+1
-1
FeedsRepository.kt
...nto/visual/roompark/data/data_provider/FeedsRepository.kt
+5
-5
feeds.kt
...in/java/com/biganto/visual/roompark/domain/model/feeds.kt
+1
-1
ScreenDI.kt
...o/visual/roompark/presentation/screen/article/ScreenDI.kt
+5
-0
No files found.
app/build.gradle
View file @
51122052
...
@@ -17,7 +17,7 @@ android {
...
@@ -17,7 +17,7 @@ android {
defaultConfig
{
defaultConfig
{
applicationId
$APPLICATION_ID
applicationId
$APPLICATION_ID
ndk
{
ndk
{
abiFilters
'armeabi-v7a'
,
'
x86
'
abiFilters
'armeabi-v7a'
,
'
arm64-v8a
'
}
}
minSdkVersion
minSdkVersion_RoomPark
minSdkVersion
minSdkVersion_RoomPark
targetSdkVersion
targetSdkVersion_RoomPark
targetSdkVersion
targetSdkVersion_RoomPark
...
...
app/src/main/java/com/biganto/visual/roompark/data/data_provider/FeedsRepository.kt
View file @
51122052
...
@@ -7,7 +7,10 @@ import com.biganto.visual.roompark.data.repository.mapper.fromRaw
...
@@ -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.data.repository.mapper.fromRawList
import
com.biganto.visual.roompark.domain.contract.FeedsContract
import
com.biganto.visual.roompark.domain.contract.FeedsContract
import
com.biganto.visual.roompark.domain.custom_exception.CustomApiException
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.Observable
import
io.reactivex.schedulers.Schedulers
import
io.reactivex.schedulers.Schedulers
import
timber.log.Timber
import
timber.log.Timber
...
@@ -124,10 +127,7 @@ class FeedsContractModule @Inject constructor(
...
@@ -124,10 +127,7 @@ class FeedsContractModule @Inject constructor(
private
fun
fetchArticleDb
(
id
:
Int
)
=
private
fun
fetchArticleDb
(
id
:
Int
)
=
db
.
getArticle
(
id
).
observable
()
db
.
getArticle
(
id
).
observable
()
.
map
{
.
filter
{
it
.
body
!=
null
}
if
(
it
.
body
==
null
)
null
else
it
}
.
subscribeOn
(
Schedulers
.
io
())
.
subscribeOn
(
Schedulers
.
io
())
private
fun
fetchArticle
(
articleId
:
Int
):
Observable
<
ArticleModel
>
=
private
fun
fetchArticle
(
articleId
:
Int
):
Observable
<
ArticleModel
>
=
...
...
app/src/main/java/com/biganto/visual/roompark/domain/model/feeds.kt
View file @
51122052
...
@@ -16,9 +16,9 @@ data class FeedModel(val feedId:Int, val title:String, val alias:String? = null)
...
@@ -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
FeedsHeaderModel
(
val
feeds
:
List
<
FeedModel
>)
data class
ArticlePreviewModel
(
data class
ArticlePreviewModel
(
val
title
:
String
,
val
articleId
:
Int
,
val
articleId
:
Int
,
val
published
:
Date
,
val
published
:
Date
,
val
title
:
String
,
val
announce
:
String
,
val
announce
:
String
,
val
previewUrl
:
String
,
val
previewUrl
:
String
,
val
isRead
:
Boolean
val
isRead
:
Boolean
...
...
app/src/main/java/com/biganto/visual/roompark/presentation/screen/article/ScreenDI.kt
View file @
51122052
...
@@ -2,8 +2,10 @@ package com.biganto.visual.roompark.presentation.screen.article
...
@@ -2,8 +2,10 @@ package com.biganto.visual.roompark.presentation.screen.article
import
android.content.Context
import
android.content.Context
import
com.biganto.visual.roompark.base.RoomParkMainActivity
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.AppComponent
import
com.biganto.visual.roompark.di.dagger.PerScreen
import
com.biganto.visual.roompark.di.dagger.PerScreen
import
com.biganto.visual.roompark.domain.contract.FeedsContract
import
dagger.Binds
import
dagger.Binds
import
dagger.BindsInstance
import
dagger.BindsInstance
import
dagger.Component
import
dagger.Component
...
@@ -39,4 +41,7 @@ abstract class ArticleScreenModule{
...
@@ -39,4 +41,7 @@ abstract class ArticleScreenModule{
@Binds
@Binds
abstract
fun
provideContext
(
activity
:
RoomParkMainActivity
):
Context
abstract
fun
provideContext
(
activity
:
RoomParkMainActivity
):
Context
@PerScreen
@Binds
abstract
fun
provideContract
(
impl
:
FeedsContractModule
):
FeedsContract
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment