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
4581a2fa
Commit
4581a2fa
authored
Jan 21, 2020
by
Vladislav Bogdashkin
🎣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
handle back buttons
parent
e560e3bb
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
14 deletions
+22
-14
BigantoBaseController.kt
...iganto/visual/roompark/conductor/BigantoBaseController.kt
+1
-0
ScreenController.kt
...ual/roompark/presentation/screen/deal/ScreenController.kt
+12
-0
ScreenController.kt
...l/roompark/presentation/screen/estate/ScreenController.kt
+9
-14
No files found.
app/src/main/java/com/biganto/visual/roompark/conductor/BigantoBaseController.kt
View file @
4581a2fa
...
@@ -99,6 +99,7 @@ abstract class BigantoBaseController<VS : BigantoBaseViewState,V: BigantoBaseCon
...
@@ -99,6 +99,7 @@ abstract class BigantoBaseController<VS : BigantoBaseViewState,V: BigantoBaseCon
}
}
override
fun
handleBack
():
Boolean
{
override
fun
handleBack
():
Boolean
{
router
.
popController
(
this
)
return
super
.
handleBack
()
return
super
.
handleBack
()
}
}
...
...
app/src/main/java/com/biganto/visual/roompark/presentation/screen/deal/ScreenController.kt
View file @
4581a2fa
...
@@ -18,6 +18,7 @@ import com.biganto.visual.roompark.util.extensions.toRubly
...
@@ -18,6 +18,7 @@ import com.biganto.visual.roompark.util.extensions.toRubly
import
com.biganto.visual.roompark.util.view_utils.status_progress_view.StatusProgressAnimationState
import
com.biganto.visual.roompark.util.view_utils.status_progress_view.StatusProgressAnimationState
import
com.biganto.visual.roompark.util.view_utils.status_progress_view.StatusProgressCeil
import
com.biganto.visual.roompark.util.view_utils.status_progress_view.StatusProgressCeil
import
com.google.android.material.textview.MaterialTextView
import
com.google.android.material.textview.MaterialTextView
import
com.jakewharton.rxbinding3.view.clicks
import
com.jakewharton.rxbinding3.view.scrollChangeEvents
import
com.jakewharton.rxbinding3.view.scrollChangeEvents
import
io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.android.schedulers.AndroidSchedulers
import
timber.log.Timber
import
timber.log.Timber
...
@@ -84,6 +85,8 @@ class DealScreenController :
...
@@ -84,6 +85,8 @@ class DealScreenController :
activity
?.
actionBar
?.
setDisplayShowTitleEnabled
(
false
)
activity
?.
actionBar
?.
setDisplayShowTitleEnabled
(
false
)
Timber
.
d
(
" bakc: ${toolBar.headerToolbarBack}"
)
toolBar
.
setToolbar
(
HeaderToolbarModel
(
toolBar
.
setToolbar
(
HeaderToolbarModel
(
true
true
,
resources
?.
getString
(
R
.
string
.
deal_back_chevron_title
)
,
resources
?.
getString
(
R
.
string
.
deal_back_chevron_title
)
...
@@ -91,6 +94,15 @@ class DealScreenController :
...
@@ -91,6 +94,15 @@ class DealScreenController :
,
null
)
,
null
)
)
)
toolBar
.
headerToolbarBack
?.
let
{
detachDisposable
.
add
(
it
.
clicks
()
.
doOnNext
{
Timber
.
d
(
"clicked: 1"
)
}
.
subscribeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribe
{
handleBack
()
}
)
}
detachDisposable
.
add
(
detachDisposable
.
add
(
dealContainer
.
scrollChangeEvents
()
dealContainer
.
scrollChangeEvents
()
.
subscribeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribeOn
(
AndroidSchedulers
.
mainThread
())
...
...
app/src/main/java/com/biganto/visual/roompark/presentation/screen/estate/ScreenController.kt
View file @
4581a2fa
...
@@ -171,22 +171,21 @@ class EstateScreenController :
...
@@ -171,22 +171,21 @@ class EstateScreenController :
null
,
StatusToolbarModel
()
null
,
StatusToolbarModel
()
)
)
toolBar
.
statusToolbar
.
findViewById
<
View
>(
R
.
id
.
back_cross
).
let
{
detachDisposable
.
add
(
detachDisposable
.
add
(
flatScroll
.
scrollChangeEvents
()
it
.
clicks
()
.
subscribeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribe
{
handleBack
()
}
)
}
detachDisposable
.
add
(
flatScroll
.
scrollChangeEvents
()
// .debounce (25,TimeUnit.MILLISECONDS)
// .debounce (25,TimeUnit.MILLISECONDS)
.
doOnNext
{
Timber
.
d
(
"Scrolling.. ${it.scrollY}"
)
Timber
.
d
(
"Scrolling.. ${flatTitle.isShown}"
)
}
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribe
{
.
subscribe
{
Timber
.
d
(
"clicked slf;jzalk"
)
activity
?.
runOnUiThread
{
if
(
it
.
scrollY
>
flatTitle
.
measuredHeight
)
{
if
(
it
.
scrollY
>
flatTitle
.
measuredHeight
)
{
val
status
=
estateModel
?.
to
(
val
status
=
estateModel
?.
to
(
StatusToolbarModel
(
StatusToolbarModel
(
StatusState
.
AVAILABLE
StatusState
.
AVAILABLE
...
@@ -207,11 +206,7 @@ class EstateScreenController :
...
@@ -207,11 +206,7 @@ class EstateScreenController :
)
)
)
)
}
}
}
)
)
// planTypesTabLayout.
}
}
private
fun
bindRecycler
()
{
private
fun
bindRecycler
()
{
...
...
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