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
4bd41430
Commit
4bd41430
authored
Jan 20, 2020
by
Vladislav Bogdashkin
🎣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
set fitsystemswindow == true seems not able to help
parent
d11513ae
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
25 additions
and
6 deletions
+25
-6
RoomParkMainActivity.kt
.../com/biganto/visual/roompark/base/RoomParkMainActivity.kt
+5
-2
ScreenController.kt
...ual/roompark/presentation/screen/deal/ScreenController.kt
+5
-1
ScreenController.kt
...al/roompark/presentation/screen/deals/ScreenController.kt
+0
-1
activity_main.xml
app/src/main/res/layout/activity_main.xml
+8
-1
status_layout_toolbar.xml
app/src/main/res/layout/status_layout_toolbar.xml
+4
-1
switch_toolbar.xml
app/src/main/res/layout/switch_toolbar.xml
+3
-0
No files found.
app/src/main/java/com/biganto/visual/roompark/base/RoomParkMainActivity.kt
View file @
4bd41430
...
@@ -3,6 +3,7 @@ package com.biganto.visual.roompark.base
...
@@ -3,6 +3,7 @@ package com.biganto.visual.roompark.base
import
android.os.Bundle
import
android.os.Bundle
import
android.view.View
import
android.view.View
import
android.view.ViewGroup
import
android.view.ViewGroup
import
android.widget.LinearLayout
import
androidx.appcompat.widget.Toolbar
import
androidx.appcompat.widget.Toolbar
import
androidx.coordinatorlayout.widget.CoordinatorLayout
import
androidx.coordinatorlayout.widget.CoordinatorLayout
import
butterknife.BindView
import
butterknife.BindView
...
@@ -37,6 +38,8 @@ class RoomParkMainActivity(
...
@@ -37,6 +38,8 @@ class RoomParkMainActivity(
@BindView
(
R
.
id
.
topToolbarHolder
)
override
lateinit
var
coordinatorLayout
:
CoordinatorLayout
@BindView
(
R
.
id
.
topToolbarHolder
)
override
lateinit
var
coordinatorLayout
:
CoordinatorLayout
@BindView
(
R
.
id
.
conductor_container
)
override
lateinit
var
conductorContainer
:
ViewGroup
@BindView
(
R
.
id
.
conductor_container
)
override
lateinit
var
conductorContainer
:
ViewGroup
@BindView
(
R
.
id
.
bottom_navigation_view
)
override
lateinit
var
bottomNavigation
:
BottomNavigationView
@BindView
(
R
.
id
.
bottom_navigation_view
)
override
lateinit
var
bottomNavigation
:
BottomNavigationView
@BindView
(
R
.
id
.
custom_toolbar_container
)
lateinit
var
tbContainer
:
LinearLayout
@BindView
(
R
.
id
.
bottom_view_divider
)
lateinit
var
bottomShadow
:
View
@BindView
(
R
.
id
.
bottom_view_divider
)
lateinit
var
bottomShadow
:
View
...
@@ -73,10 +76,10 @@ class RoomParkMainActivity(
...
@@ -73,10 +76,10 @@ class RoomParkMainActivity(
override
val
statusToolbar
:
ViewGroup
override
val
statusToolbar
:
ViewGroup
get
()
=
t
opAppBa
r
.
findViewById
<
ViewGroup
>(
R
.
id
.
status_toolbar_container
)
get
()
=
t
bContaine
r
.
findViewById
<
ViewGroup
>(
R
.
id
.
status_toolbar_container
)
override
val
headerToolbar
:
ViewGroup
override
val
headerToolbar
:
ViewGroup
get
()
=
t
opAppBa
r
.
findViewById
<
ViewGroup
>(
R
.
id
.
switch_toolbar_container
)
get
()
=
t
bContaine
r
.
findViewById
<
ViewGroup
>(
R
.
id
.
switch_toolbar_container
)
override
fun
hide
()
{
override
fun
hide
()
{
...
...
app/src/main/java/com/biganto/visual/roompark/presentation/screen/deal/ScreenController.kt
View file @
4bd41430
...
@@ -74,11 +74,15 @@ class DealScreenController :
...
@@ -74,11 +74,15 @@ class DealScreenController :
Timber
.
d
(
"content insets : ${toolBar.topAppBar.contentInsetEnd}"
)
Timber
.
d
(
"content insets : ${toolBar.topAppBar.contentInsetEnd}"
)
activity
?.
actionBar
?.
setDisplayShowTitleEnabled
(
false
)
toolBar
.
statusToolbar
.
visibility
=
View
.
GONE
toolBar
.
statusToolbar
.
visibility
=
View
.
GONE
toolBar
.
headerToolbar
.
visibility
=
View
.
VISIBLE
toolBar
.
statusToolbar
.
visibility
=
View
.
VISIBLE
toolBar
.
headerToolbar
.
visibility
=
View
.
GONE
toolBar
.
headerToolbar
.
findViewById
<
MaterialTextView
>(
R
.
id
.
toolbar_title
).
text
=
"Azzzzaa"
toolBar
.
headerToolbar
.
findViewById
<
MaterialTextView
>(
R
.
id
.
toolbar_title
).
text
=
"Azzzzaa"
toolBar
.
topAppBar
.
invalidate
()
activity
?.
actionBar
?.
setDisplayShowTitleEnabled
(
true
)
}
}
...
...
app/src/main/java/com/biganto/visual/roompark/presentation/screen/deals/ScreenController.kt
View file @
4bd41430
...
@@ -50,7 +50,6 @@ class DealsScreenController :
...
@@ -50,7 +50,6 @@ class DealsScreenController :
private
fun
setToolbar
(){
private
fun
setToolbar
(){
toolBar
.
topAppBar
.
removeAllViews
()
toolBar
.
showAll
()
toolBar
.
showAll
()
toolBar
.
appBar
.
setExpanded
(
false
,
true
)
toolBar
.
appBar
.
setExpanded
(
false
,
true
)
toolBar
.
topAppBar
.
title
=
"МОИ СДЕЛКИ"
toolBar
.
topAppBar
.
title
=
"МОИ СДЕЛКИ"
...
...
app/src/main/res/layout/activity_main.xml
View file @
4bd41430
...
@@ -34,15 +34,16 @@
...
@@ -34,15 +34,16 @@
android:contentInsetLeft=
"0dp"
android:contentInsetLeft=
"0dp"
android:contentInsetEnd=
"0dp"
android:contentInsetEnd=
"0dp"
android:contentInsetRight=
"0dp"
android:contentInsetRight=
"0dp"
android:minHeight=
"24dp"
android:visibility=
"visible"
android:visibility=
"visible"
app:contentInsetEnd=
"0dp"
app:contentInsetEnd=
"0dp"
app:contentInsetLeft=
"0dp"
app:contentInsetLeft=
"0dp"
app:contentInsetRight=
"0dp"
app:contentInsetRight=
"0dp"
app:contentInsetStart=
"0dp"
app:contentInsetStart=
"0dp"
android:fitsSystemWindows=
"true"
tools:visibility=
"visible"
>
tools:visibility=
"visible"
>
<androidx.appcompat.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:fitsSystemWindows=
"true"
android:id=
"@+id/top_toolbar"
android:id=
"@+id/top_toolbar"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
...
@@ -65,6 +66,10 @@
...
@@ -65,6 +66,10 @@
app:titleTextAppearance=
"@style/Header_TextView.Main_Header"
>
app:titleTextAppearance=
"@style/Header_TextView.Main_Header"
>
<LinearLayout
<LinearLayout
android:minHeight=
"24dp"
android:id=
"@+id/custom_toolbar_container"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:fitsSystemWindows=
"true"
android:fitsSystemWindows=
"true"
...
@@ -75,10 +80,12 @@
...
@@ -75,10 +80,12 @@
layout=
"@layout/status_layout_toolbar"
layout=
"@layout/status_layout_toolbar"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:fitsSystemWindows=
"true"
android:visibility=
"visible"
/>
android:visibility=
"visible"
/>
<include
<include
layout=
"@layout/switch_toolbar"
layout=
"@layout/switch_toolbar"
android:fitsSystemWindows=
"true"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:visibility=
"visible"
/>
android:visibility=
"visible"
/>
...
...
app/src/main/res/layout/status_layout_toolbar.xml
View file @
4bd41430
...
@@ -4,11 +4,13 @@
...
@@ -4,11 +4,13 @@
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:id=
"@+id/status_toolbar_container"
android:id=
"@+id/status_toolbar_container"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:fitsSystemWindows=
"true"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
>
android:orientation=
"vertical"
>
<FrameLayout
<FrameLayout
android:id=
"@+id/status_icon"
android:id=
"@+id/status_icon"
android:fitsSystemWindows=
"true"
android:layout_width=
"8dp"
android:layout_width=
"8dp"
android:layout_height=
"8dp"
android:layout_height=
"8dp"
android:layout_marginStart=
"16dp"
android:layout_marginStart=
"16dp"
...
@@ -22,6 +24,7 @@
...
@@ -22,6 +24,7 @@
<com.google.android.material.textview.MaterialTextView
<com.google.android.material.textview.MaterialTextView
android:id=
"@+id/status_title"
android:id=
"@+id/status_title"
android:fitsSystemWindows=
"true"
style=
"@style/Accent_Minor_TextView"
style=
"@style/Accent_Minor_TextView"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
...
@@ -37,7 +40,7 @@
...
@@ -37,7 +40,7 @@
android:layout_height=
"24dp"
android:layout_height=
"24dp"
android:layout_marginEnd=
"16dp"
android:layout_marginEnd=
"16dp"
android:scaleType=
"centerCrop"
android:scaleType=
"centerCrop"
android:fitsSystemWindows=
"true"
android:tint=
"@color/colorGray"
android:tint=
"@color/colorGray"
app:layout_constraintBottom_toBottomOf=
"@+id/status_icon"
app:layout_constraintBottom_toBottomOf=
"@+id/status_icon"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
...
...
app/src/main/res/layout/switch_toolbar.xml
View file @
4bd41430
...
@@ -21,9 +21,11 @@
...
@@ -21,9 +21,11 @@
app:drawableTint=
"@color/colorAccent"
app:drawableTint=
"@color/colorAccent"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
android:fitsSystemWindows=
"true"
app:layout_constraintTop_toTopOf=
"parent"
/>
app:layout_constraintTop_toTopOf=
"parent"
/>
<com.google.android.material.textview.MaterialTextView
<com.google.android.material.textview.MaterialTextView
android:fitsSystemWindows=
"true"
android:id=
"@+id/toolbar_title"
android:id=
"@+id/toolbar_title"
style=
"@style/Header_TextView.Main_Header"
style=
"@style/Header_TextView.Main_Header"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
...
@@ -50,6 +52,7 @@
...
@@ -50,6 +52,7 @@
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintHorizontal_bias=
"1.0"
app:layout_constraintHorizontal_bias=
"1.0"
app:layout_constraintStart_toEndOf=
"@+id/toolbar_title"
app:layout_constraintStart_toEndOf=
"@+id/toolbar_title"
android:fitsSystemWindows=
"true"
app:layout_constraintTop_toTopOf=
"parent"
/>
app:layout_constraintTop_toTopOf=
"parent"
/>
...
...
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