Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
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
e119bfde
Commit
e119bfde
authored
Jan 23, 2020
by
Vladislav Bogdashkin
🎣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix toolbar dissappear after logout
parent
3821836f
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
10 deletions
+19
-10
RoomParkMainActivity.kt
.../com/biganto/visual/roompark/base/RoomParkMainActivity.kt
+13
-5
ScreenController.kt
...ual/roompark/presentation/screen/auth/ScreenController.kt
+1
-1
BottomNavigationRouterPagerAdapter.kt
...ntation/screen/home/BottomNavigationRouterPagerAdapter.kt
+1
-0
ScreenController.kt
...l/roompark/presentation/screen/splash/ScreenController.kt
+1
-1
activity_main.xml
app/src/main/res/layout/activity_main.xml
+2
-2
find_flat_screen.xml
app/src/main/res/layout/find_flat_screen.xml
+1
-1
No files found.
app/src/main/java/com/biganto/visual/roompark/base/RoomParkMainActivity.kt
View file @
e119bfde
...
...
@@ -90,7 +90,16 @@ class RoomParkMainActivity(
get
()
=
headerToolbar
.
findViewById
<
MaterialTextView
>(
R
.
id
.
back_button_chevron
)
override
fun
setToolbar
(
header
:
HeaderToolbarModel
?,
status
:
StatusToolbarModel
?){
appBar
.
setExpanded
(
false
,
false
)
if
(
header
==
null
&&
status
==
null
){
hideAll
()
appBar
.
setGone
(
true
)
return
}
else
appBar
.
setGone
(
false
)
showAll
()
appBarScrollable
(
false
)
Timber
.
d
(
"NOTGONE"
)
headerToolbar
.
setGone
(
header
==
null
)
statusToolbar
.
setGone
(
status
==
null
)
header
?.
let
{
...
...
@@ -104,7 +113,6 @@ class RoomParkMainActivity(
statusToolbar
.
status_icon
.
setGone
(
it
.
state
==
null
)
statusToolbar
.
status_title
.
setGone
(
it
.
state
==
null
)
it
.
state
?.
let
{
state
->
Timber
.
d
(
"status: $state"
)
statusToolbar
.
status_icon
.
isEnabled
=
when
(
state
){
StatusState
.
AVAILABLE
->
true
else
->
false
...
...
@@ -128,13 +136,13 @@ class RoomParkMainActivity(
override
fun
hide
()
{
bottomNavigation
.
visibility
=
BottomNavigationView
.
GONE
bottom
Shadow
.
visibility
=
View
.
GONE
bottomNavigation
.
setGone
(
true
)
bottom
Navigation
.
setGone
(
true
)
}
override
fun
show
()
{
bottomNavigation
.
visibility
=
Toolbar
.
VISIBLE
bottom
Shadow
.
visibility
=
View
.
VISIBLE
bottomNavigation
.
setGone
(
false
)
bottom
Navigation
.
setGone
(
false
)
}
...
...
app/src/main/java/com/biganto/visual/roompark/presentation/screen/auth/ScreenController.kt
View file @
e119bfde
...
...
@@ -31,7 +31,7 @@ class AuthScreenController :
override
fun
onViewBound
(
v
:
View
)
{
toolBar
.
hideAll
()
toolBar
.
setToolbar
()
bottomNavigation
.
hide
()
}
...
...
app/src/main/java/com/biganto/visual/roompark/presentation/screen/home/BottomNavigationRouterPagerAdapter.kt
View file @
e119bfde
...
...
@@ -123,6 +123,7 @@ class BNVRouterPagerAdapter(
}
fun
drawToolbar
(
position
:
Int
){
return
val
toolBar
=
currentPrimaryRouter
?.
activity
as
ICollapsingToolBar
toolBar
.
showAll
()
toolBar
.
appBar
.
setExpanded
(
false
,
true
)
...
...
app/src/main/java/com/biganto/visual/roompark/presentation/screen/splash/ScreenController.kt
View file @
e119bfde
...
...
@@ -24,7 +24,7 @@ class SplashScreenController :
override
fun
onViewBound
(
v
:
View
)
{
toolBar
.
hideAll
()
// toolBar.setToolbar
()
bottomNavigation
.
hide
()
}
...
...
app/src/main/res/layout/activity_main.xml
View file @
e119bfde
...
...
@@ -41,7 +41,7 @@
app:contentInsetStart=
"0dp"
android:minHeight=
"0dp"
app:titleEnabled=
"false"
tools:visibility=
"visible"
>
tools:visibility=
"
in
visible"
>
<androidx.appcompat.widget.Toolbar
android:id=
"@+id/top_toolbar"
...
...
@@ -53,7 +53,7 @@
android:contentInsetEnd=
"0dp"
android:contentInsetRight=
"0dp"
android:padding=
"0dp"
android:visibility=
"visible"
android:visibility=
"
in
visible"
android:minHeight=
"0dp"
app:contentInsetEnd=
"0dp"
app:contentInsetLeft=
"0dp"
...
...
app/src/main/res/layout/find_flat_screen.xml
View file @
e119bfde
...
...
@@ -10,7 +10,7 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"16dp"
android:layout_marginTop=
"
16
dp"
android:layout_marginTop=
"
0
dp"
android:layout_marginEnd=
"16dp"
android:background=
"#00000000"
app:tabIndicatorColor=
"@color/colorAccent"
...
...
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