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
5e965dfc
Commit
5e965dfc
authored
Nov 06, 2019
by
Vladislav Bogdashkin
🎣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reoslve dependencies
parent
e53837ee
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
34 additions
and
12 deletions
+34
-12
IApi.kt
...a/com/biganto/visual/roompark/data/repository/api/IApi.kt
+1
-1
RetrofitRepository.kt
...ompark/data/repository/api/retrofit/RetrofitRepository.kt
+1
-1
Estate.kt
...isual/roompark/data/repository/db/requrey/model/Estate.kt
+1
-1
Feed.kt
.../visual/roompark/data/repository/db/requrey/model/Feed.kt
+4
-3
ImageAlbum.kt
...l/roompark/data/repository/db/requrey/model/ImageAlbum.kt
+5
-5
ImageAlbumJunction.kt
...rk/data/repository/db/requrey/model/ImageAlbumJunction.kt
+19
-0
PlanPreset.kt
...l/roompark/data/repository/db/requrey/model/PlanPreset.kt
+1
-0
Subscription.kt
...roompark/data/repository/db/requrey/model/Subscription.kt
+2
-1
No files found.
app/src/main/java/com/biganto/visual/roompark/data/repository/api/IApi.kt
View file @
5e965dfc
...
...
@@ -38,7 +38,7 @@ interface IRoomParkApi {
showSizes
:
Boolean
,
showWalls
:
Boolean
,
showElectric
:
Boolean
):
Observable
<
List
<
PlanRaw
>>?
):
Observable
<
List
<
String
>>
fun
getMultiTour
(
building
:
Int
,
flat
:
Int
):
Observable
<
List
<
PlanRaw
>>
fun
getArticlesPage
(
feedName
:
String
,
...
...
app/src/main/java/com/biganto/visual/roompark/data/repository/api/retrofit/RetrofitRepository.kt
View file @
5e965dfc
...
...
@@ -87,7 +87,7 @@ class RetrofitRepository(retrofit: Retrofit) : IRoomParkApi {
showSizes
:
Boolean
,
showWalls
:
Boolean
,
showElectric
:
Boolean
):
Observable
<
List
<
PlanRaw
>>
=
):
Observable
<
List
<
String
>>
=
api
.
getPlan
(
estate_id
=
estateId
,
planType
=
planType
.
planId
,
...
...
app/src/main/java/com/biganto/visual/roompark/data/repository/db/requrey/model/Estate.kt
View file @
5e965dfc
...
...
@@ -41,7 +41,7 @@ interface Estate : Persistable {
val
info_building
:
Int
val
info_section_begin
:
Int
val
info_floor
:
Int
@get
:
OneToMany
@get
:
OneToMany
(
mappedBy
=
"id"
)
val
explications
:
Set
<
Explication
>?
val
info_floor_max
:
Int
@get
:
Nullable
...
...
app/src/main/java/com/biganto/visual/roompark/data/repository/db/requrey/model/Feed.kt
View file @
5e965dfc
package
com.biganto.visual.roompark.data.repository.db.requrey.model
import
io.requery.Entity
import
io.requery.Key
import
io.requery.Persistable
import
io.requery.*
/**
* Created by Vladislav Bogdashkin on 29.10.2019.
...
...
@@ -17,4 +15,7 @@ interface Feed : Persistable {
val
title
:
String
@get
:
Key
val
alias
:
String
@get
:
OneToMany
(
mappedBy
=
"id"
)
@get
:
Nullable
val
articles
:
Set
<
Article
>?
}
\ No newline at end of file
app/src/main/java/com/biganto/visual/roompark/data/repository/db/requrey/model/ImageAlbum.kt
View file @
5e965dfc
package
com.biganto.visual.roompark.data.repository.db.requrey.model
import
com.biganto.visual.roompark.data.repository.db.requrey.utils.IsoDateConverter
import
io.requery.*
import
io.requery.Convert
import
io.requery.Entity
import
io.requery.Key
import
io.requery.Persistable
import
java.util.*
/**
...
...
@@ -16,8 +19,5 @@ interface ImageAlbum : Persistable {
val
title
:
String
val
sort
:
Int
@get
:
Convert
(
IsoDateConverter
::
class
)
val
date
:
Date
@get
:
ForeignKey
(
references
=
ImageAlbum
::
class
,
referencedColumn
=
"id"
)
//TODO(create separate custom junction parent table)
val
parent_id
:
Int
val
published
:
Date
}
\ No newline at end of file
app/src/main/java/com/biganto/visual/roompark/data/repository/db/requrey/model/ImageAlbumJunction.kt
0 → 100644
View file @
5e965dfc
package
com.biganto.visual.roompark.data.repository.db.requrey.model
import
io.requery.*
/**
* Created by Vladislav Bogdashkin on 29.10.2019.
*/
@Entity
interface
ImageAlbumJunction
:
Persistable
{
@get
:
Key
@get
:
Generated
val
id
:
Int
@get
:
Nullable
val
albumId
:
Int
?
@get
:
Nullable
val
parentId
:
Int
?
}
\ No newline at end of file
app/src/main/java/com/biganto/visual/roompark/data/repository/db/requrey/model/PlanPreset.kt
View file @
5e965dfc
...
...
@@ -14,6 +14,7 @@ interface PlanPreset : Persistable {
@get
:
Generated
val
id
:
Int
@get
:
ForeignKey
(
references
=
Estate
::
class
)
@get
:
ManyToOne
var
estateId
:
Estate
val
planId
:
Int
val
title
:
String
...
...
app/src/main/java/com/biganto/visual/roompark/data/repository/db/requrey/model/Subscription.kt
View file @
5e965dfc
...
...
@@ -12,8 +12,9 @@ interface Subscription : Persistable {
@get
:
Key
@get
:
Generated
val
id
:
Int
@get
:
ForeignKey
(
references
=
User
::
class
,
referencedColumn
=
"uuid"
)
@get
:
ManyToOne
val
us
er
:
User
val
own
er
:
User
val
deviceToken
:
String
val
topic
:
String
val
number
:
String
...
...
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