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
8d8c226a
Commit
8d8c226a
authored
Jan 28, 2020
by
Vladislav Bogdashkin
🎣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix main screen bottom margin
parent
db96e964
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
8 deletions
+6
-8
RoomParkMainActivity.kt
.../com/biganto/visual/roompark/base/RoomParkMainActivity.kt
+1
-4
ScreenController.kt
...al/roompark/presentation/screen/feeds/ScreenController.kt
+3
-3
ScreenPresenter.kt
...ual/roompark/presentation/screen/feeds/ScreenPresenter.kt
+0
-1
view_size.xml
app/src/main/res/values/view_size.xml
+2
-0
No files found.
app/src/main/java/com/biganto/visual/roompark/base/RoomParkMainActivity.kt
View file @
8d8c226a
...
@@ -148,17 +148,14 @@ class RoomParkMainActivity(
...
@@ -148,17 +148,14 @@ class RoomParkMainActivity(
bottomNavigation
.
setGone
(
false
)
bottomNavigation
.
setGone
(
false
)
bottomNavigation
.
setGone
(
false
)
bottomNavigation
.
setGone
(
false
)
val
params
=
conductorContainer
.
layoutParams
as
CoordinatorLayout
.
LayoutParams
val
params
=
conductorContainer
.
layoutParams
as
CoordinatorLayout
.
LayoutParams
params
.
bottomMargin
=
bottomNavigation
.
height
params
.
bottomMargin
=
resources
.
getDimensionPixelSize
(
R
.
dimen
.
bottom_navigation_height
)
conductorContainer
.
requestLayout
()
conductorContainer
.
requestLayout
()
}
}
override
fun
showAll
()
{
override
fun
showAll
()
{
// appBar.setExpanded(true,false)
// appBar.visibility= View.VISIBLE
topAppBar
.
visibility
=
View
.
VISIBLE
topAppBar
.
visibility
=
View
.
VISIBLE
val
params
=
conductorContainer
.
layoutParams
as
CoordinatorLayout
.
LayoutParams
val
params
=
conductorContainer
.
layoutParams
as
CoordinatorLayout
.
LayoutParams
params
.
behavior
=
AppBarLayout
.
ScrollingViewBehavior
()
params
.
behavior
=
AppBarLayout
.
ScrollingViewBehavior
()
conductorContainer
.
requestLayout
()
conductorContainer
.
requestLayout
()
...
...
app/src/main/java/com/biganto/visual/roompark/presentation/screen/feeds/ScreenController.kt
View file @
8d8c226a
...
@@ -47,16 +47,16 @@ class FeedsScreenController :
...
@@ -47,16 +47,16 @@ class FeedsScreenController :
override
fun
onCameraSelected
():
Observable
<
WebCamModel
>
=
override
fun
onCameraSelected
():
Observable
<
WebCamModel
>
=
(
camsRecyclerView
.
adapter
as
CamsListAdapter
).
onItemClicked
(
camsRecyclerView
.
adapter
as
CamsListAdapter
).
onItemClicked
.
debounce
(
12
2
0L
,
TimeUnit
.
MILLISECONDS
)
.
debounce
(
120L
,
TimeUnit
.
MILLISECONDS
)
override
fun
onArticleSelected
():
Observable
<
ArticlePreviewModel
>
=
override
fun
onArticleSelected
():
Observable
<
ArticlePreviewModel
>
=
(
feedsRecyclerView
.
adapter
as
ArticlesPreviewAdapter
).
onItemClicked
(
feedsRecyclerView
.
adapter
as
ArticlesPreviewAdapter
).
onItemClicked
.
debounce
(
12
2
0L
,
TimeUnit
.
MILLISECONDS
)
.
debounce
(
120L
,
TimeUnit
.
MILLISECONDS
)
override
fun
onAlbumSelected
():
Observable
<
AlbumPreviewModel
>
=
override
fun
onAlbumSelected
():
Observable
<
AlbumPreviewModel
>
=
(
devProgressRecyclerView
.
adapter
as
AlbumsPreviewAdapter
).
onItemClicked
(
devProgressRecyclerView
.
adapter
as
AlbumsPreviewAdapter
).
onItemClicked
.
debounce
(
12
2
0L
,
TimeUnit
.
MILLISECONDS
)
.
debounce
(
120L
,
TimeUnit
.
MILLISECONDS
)
override
fun
feedsTabSelected
():
Observable
<
String
>
override
fun
feedsTabSelected
():
Observable
<
String
>
=
feedsTabs
.
selections
()
=
feedsTabs
.
selections
()
...
...
app/src/main/java/com/biganto/visual/roompark/presentation/screen/feeds/ScreenPresenter.kt
View file @
8d8c226a
...
@@ -33,7 +33,6 @@ class FeedsScreenPresenter @Inject constructor(
...
@@ -33,7 +33,6 @@ class FeedsScreenPresenter @Inject constructor(
override
fun
attachView
(
view
:
FeedsScreen
)
{
override
fun
attachView
(
view
:
FeedsScreen
)
{
Timber
.
d
(
"AttachView "
)
Timber
.
d
(
"AttachView "
)
super
.
attachView
(
view
)
super
.
attachView
(
view
)
}
}
...
...
app/src/main/res/values/view_size.xml
View file @
8d8c226a
...
@@ -10,4 +10,6 @@
...
@@ -10,4 +10,6 @@
<dimen
name=
"ceil_grid_padding"
>
8dp
</dimen>
<dimen
name=
"ceil_grid_padding"
>
8dp
</dimen>
<dimen
name=
"tab_max_width"
>
999dp
</dimen>
<dimen
name=
"tab_max_width"
>
999dp
</dimen>
<dimen
name=
"bottom_navigation_height"
>
56dp
</dimen>
</resources>
</resources>
\ No newline at end of file
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