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
592b1a3f
Commit
592b1a3f
authored
Oct 11, 2019
by
Vladislav Bogdashkin
🎣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adde botoom navigation bar
parent
d8e14f50
Changes
20
Show whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
447 additions
and
17 deletions
+447
-17
RoomParkMainActivity.kt
.../com/biganto/visual/roompark/base/RoomParkMainActivity.kt
+1
-1
BigantoBaseContract.kt
.../biganto/visual/roompark/conductor/BigantoBaseContract.kt
+3
-1
ContextModule.kt
...va/com/biganto/visual/roompark/di/dagger/ContextModule.kt
+8
-2
AuthContract.kt
...m/biganto/visual/roompark/domain/contract/AuthContract.kt
+2
-2
auth.kt
...ava/com/biganto/visual/roompark/domain/interactor/auth.kt
+2
-2
authUseCase.kt
...om/biganto/visual/roompark/domain/use_case/authUseCase.kt
+1
-1
ScreenController.kt
...ual/roompark/presentation/screen/auth/ScreenController.kt
+10
-2
ScreenPresenter.kt
...sual/roompark/presentation/screen/auth/ScreenPresenter.kt
+15
-3
BottomNavigationRouterPagerAdapter.kt
...ntation/screen/home/BottomNavigationRouterPagerAdapter.kt
+185
-0
HomeController.kt
...isual/roompark/presentation/screen/home/HomeController.kt
+98
-0
ScreenContract.kt
...isual/roompark/presentation/screen/home/ScreenContract.kt
+12
-0
ScreenDI.kt
...anto/visual/roompark/presentation/screen/home/ScreenDI.kt
+57
-0
ScreenPresenter.kt
...sual/roompark/presentation/screen/home/ScreenPresenter.kt
+21
-0
ScreenViewState.kt
...sual/roompark/presentation/screen/home/ScreenViewState.kt
+13
-0
ScreenController.kt
...l/roompark/presentation/screen/splash/ScreenController.kt
+1
-1
sign_in_button_selector.xml
app/src/main/res/color/sign_in_button_selector.xml
+5
-0
activity_main.xml
app/src/main/res/layout/activity_main.xml
+2
-1
authentication_screen.xml
app/src/main/res/layout/authentication_screen.xml
+0
-1
home_screen_viewpager.xml
app/src/main/res/layout/home_screen_viewpager.xml
+10
-0
styles.xml
app/src/main/res/values/styles.xml
+1
-0
No files found.
app/src/main/java/com/biganto/visual/roompark/base/RoomParkMainActivity.kt
View file @
592b1a3f
...
...
@@ -78,7 +78,7 @@ class RoomParkMainActivity(
}
override
fun
showAll
()
{
appBar
.
setExpanded
(
fals
e
,
false
)
appBar
.
setExpanded
(
tru
e
,
false
)
collapsingToolbarLayout
.
visibility
=
View
.
VISIBLE
bottomNavigation
.
visibility
=
Toolbar
.
VISIBLE
bottomShadow
.
visibility
=
View
.
VISIBLE
...
...
app/src/main/java/com/biganto/visual/roompark/conductor/BigantoBaseContract.kt
View file @
592b1a3f
package
com.biganto.visual.roompark.conductor
import
com.hannesdorfmann.mosby3.mvp.MvpView
import
timber.log.Timber
/**
* Created by Vladislav Bogdashkin on 28.05.2018.
*/
interface
BigantoBaseContract
<
in
VS
:
BigantoBaseViewState
>
:
MvpView
{
fun
render
(
viewState
:
VS
)
fun
render
(
viewState
:
VS
)
=
Timber
.
d
(
"Render state ${viewState.javaClass}"
)
}
abstract
class
BigantoBaseViewState
\ No newline at end of file
app/src/main/java/com/biganto/visual/roompark/di/dagger/ContextModule.kt
View file @
592b1a3f
...
...
@@ -4,8 +4,9 @@ import com.biganto.visual.roompark.domain.contract.AuthContract
import
com.biganto.visual.roompark.domain.model.AuthInfoModel
import
dagger.Module
import
dagger.Provides
import
io.reactivex.rxjava3.core.Completable
import
io.reactivex.rxjava3.core.Observable
import
io.reactivex.Completable
import
io.reactivex.Observable
import
timber.log.Timber
import
javax.inject.Inject
import
javax.inject.Singleton
...
...
@@ -34,9 +35,14 @@ class AppModule() {
class
AuthContractModule
@Inject
constructor
():
AuthContract
{
init
{
Timber
.
d
(
"Auth Repository Created"
)
}
override
fun
signOut
():
Completable
=
Completable
.
complete
()
override
fun
signIn
(
email
:
String
,
password
:
String
):
Observable
<
AuthInfoModel
>
{
Timber
.
d
(
"Gonna signIIn"
)
return
Observable
.
just
(
AuthInfoModel
(
"some tokan zzaza"
,
1488
,
"hi4"
,
"biganto@demo.ru"
))
}
...
...
app/src/main/java/com/biganto/visual/roompark/domain/contract/AuthContract.kt
View file @
592b1a3f
package
com.biganto.visual.roompark.domain.contract
import
com.biganto.visual.roompark.domain.model.AuthInfoModel
import
io.reactivex.
rxjava3.core.
Completable
import
io.reactivex.
rxjava3.core.
Observable
import
io.reactivex.Completable
import
io.reactivex.Observable
/**
...
...
app/src/main/java/com/biganto/visual/roompark/domain/interactor/auth.kt
View file @
592b1a3f
...
...
@@ -12,6 +12,6 @@ class AuthInteractor @Inject constructor(
){
fun
getAuth
()
=
uc
.
validateAuth
()
fun
authorizate
(
login
:
String
,
password
:
String
)
=
uc
.
authorizate
(
login
,
password
)
fun
signIn
(
login
:
String
,
password
:
String
)
=
uc
.
signIn
(
login
,
password
)
}
\ No newline at end of file
app/src/main/java/com/biganto/visual/roompark/domain/use_case/authUseCase.kt
View file @
592b1a3f
...
...
@@ -14,7 +14,7 @@ class AuthUseCase @Inject constructor(
fun
validateAuth
()
=
Observable
.
just
(
true
)
fun
authorizate
(
login
:
String
,
pwd
:
String
)
=
authContract
.
signIn
(
login
,
pwd
)
fun
signIn
(
login
:
String
,
pwd
:
String
)
=
authContract
.
signIn
(
login
,
pwd
)
...
...
app/src/main/java/com/biganto/visual/roompark/presentation/screen/auth/ScreenController.kt
View file @
592b1a3f
...
...
@@ -8,11 +8,14 @@ import com.biganto.visual.roompark.R
import
com.biganto.visual.roompark.base.RoomParkApplication
import
com.biganto.visual.roompark.base.RoomParkMainActivity
import
com.biganto.visual.roompark.conductor.BigantoBaseController
import
com.biganto.visual.roompark.presentation.screen.home.HomeController
import
com.bluelinelabs.conductor.RouterTransaction
import
com.google.android.material.button.MaterialButton
import
com.google.android.material.snackbar.Snackbar
import
com.google.android.material.textfield.TextInputLayout
import
com.jakewharton.rxbinding3.view.clicks
import
io.reactivex.Observable
import
timber.log.Timber
import
javax.inject.Inject
/**
...
...
@@ -68,6 +71,8 @@ class AuthScreenController :
override
fun
render
(
viewState
:
AuthScreenViewState
)
{
super
.
render
(
viewState
)
Timber
.
d
(
"Render state $viewState"
)
when
(
viewState
){
is
AuthScreenViewState
.
Idle
->
render
(
viewState
)
is
AuthScreenViewState
.
Authorization
->
render
(
viewState
)
...
...
@@ -83,17 +88,20 @@ class AuthScreenController :
}
private
fun
render
(
viewState
:
AuthScreenViewState
.
Authorization
){
toolBar
.
hideAll
()
// toolBar.hideAll()
signInButton
.
isEnabled
=
false
// snacky.showSnackBar("lul")
}
private
fun
render
(
viewState
:
AuthScreenViewState
.
SignedIn
){
router
.
setRoot
(
RouterTransaction
.
with
(
HomeController
()))
// snacky.showSnackBar("lul")
}
private
fun
render
(
viewState
:
AuthScreenViewState
.
SignInError
){
snackbar
.
showSnackBar
(
viewState
.
message
,
Snackbar
.
LENGTH_LONG
)
toolBar
.
hideAll
()
// toolBar.hideAll()
signInButton
.
isEnabled
=
true
// snacky.showSnackBar("lul")
}
...
...
app/src/main/java/com/biganto/visual/roompark/presentation/screen/auth/ScreenPresenter.kt
View file @
592b1a3f
...
...
@@ -2,6 +2,9 @@ package com.biganto.visual.roompark.presentation.screen.auth
import
com.biganto.visual.roompark.conductor.BigantoBasePresenter
import
com.biganto.visual.roompark.domain.interactor.AuthInteractor
import
io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.schedulers.Schedulers
import
timber.log.Timber
import
javax.inject.Inject
/**
...
...
@@ -18,13 +21,22 @@ class AuthScreenPresenter @Inject constructor(
override
fun
bindIntents
()
{
val
onAuth
=
intent
(
AuthScreen
::
tryAuth
)
.
flatMap
{
interactor
.
getAuth
()
}
.
flatMap
<
AuthScreenViewState
>{
model
->
interactor
.
signIn
(
model
.
login
,
model
.
pwd
)
.
doOnNext
{
Timber
.
d
(
"auth returned $it"
)}
.
map
{
it
}
.
map
<
AuthScreenViewState
>
{
AuthScreenViewState
.
SignInError
(
""
)
}
.
map
{
AuthScreenViewState
.
SignedIn
()
}
}
// .startWith(Observable.just(AuthScreenViewState.Authorization()))
val
state
=
restoreStateObservable
.
mergeWith
(
interactor
.
getAuth
()
.
map
{
AuthScreenViewState
.
ToScreen
(
it
.
toString
())
})
.
mergeWith
(
onAuth
)
.
doOnError
{
Timber
.
e
(
it
)}
.
subscribeOn
(
Schedulers
.
io
())
.
observeOn
(
AndroidSchedulers
.
mainThread
())
subscribeViewState
(
state
.
cast
(
AuthScreenViewState
::
class
.
java
),
AuthScreen
::
render
)
}
...
...
app/src/main/java/com/biganto/visual/roompark/presentation/screen/home/BottomNavigationRouterPagerAdapter.kt
0 → 100644
View file @
592b1a3f
package
com.biganto.visual.roompark.presentation.screen.home
import
android.os.Bundle
import
android.os.Parcelable
import
android.util.SparseArray
import
android.view.Menu
import
android.view.View
import
android.view.ViewGroup
import
androidx.annotation.NonNull
import
androidx.core.view.contains
import
androidx.core.view.forEach
import
androidx.core.view.get
import
androidx.viewpager.widget.PagerAdapter
import
androidx.viewpager.widget.ViewPager
import
com.bluelinelabs.conductor.Controller
import
com.bluelinelabs.conductor.Router
import
com.bluelinelabs.conductor.RouterTransaction
import
com.google.android.material.bottomnavigation.BottomNavigationView
import
timber.log.Timber
/**
* Created by Vladislav Bogdashkin on 11.10.2019.
*/
class
BNVRouterPagerAdapter
(
val
host
:
Controller
,
val
bnv
:
BottomNavigationView
,
val
viewPager
:
ViewPager
,
val
pages
:
Map
<
Int
,
()
->
Controller
>
):
PagerAdapter
()
{
companion
object
{
private
const
val
KEY_SAVED_PAGES
=
"BottomBarRouterPagerAdapter.savedStates"
private
const
val
KEY_MAX_PAGES_TO_STATE_SAVE
=
"BottomBarRouterPagerAdapter.maxPagesToStateSave"
private
const
val
KEY_SAVE_PAGE_HISTORY
=
"BottomBarRouterPagerAdapter.savedPageHistory"
}
private
var
maxPagesToStateSave
=
Integer
.
MAX_VALUE
private
val
visibleRouters
=
SparseArray
<
Router
>()
var
currentPrimaryRouter
:
Router
?
=
null
private
set
var
savedPageHistory
=
ArrayList
<
Int
>()
private
set
var
savedPages
:
SparseArray
<
Bundle
>
=
SparseArray
()
private
set
init
{
require
(
bnv
.
menu
.
all
{
pages
.
containsKey
(
it
.
itemId
)
})
{
"All menu items must have a matching page setup!"
}
viewPager
.
adapter
=
this
bnv
.
setOnNavigationItemSelectedListener
{
viewPager
.
currentItem
=
bnv
.
menu
.
indexOf
(
it
)
true
}
}
/**
* Called when a router is instantiated. Here the router's root should be set if needed.
*
* @param router The router used for the page
* @param position The page position to be instantiated.
*/
fun
configureRouter
(
@NonNull
router
:
Router
,
position
:
Int
)
{
if
(!
router
.
hasRootController
())
{
val
page
=
pages
[
bnv
.
menu
[
position
].
itemId
]
?:
throw
Exception
(
"Page not found in initializers!"
)
router
.
setRoot
(
RouterTransaction
.
with
(
page
.
invoke
()))
}
}
override
fun
getCount
():
Int
=
bnv
.
menu
.
size
()
override
fun
getPageTitle
(
position
:
Int
):
CharSequence
?
=
bnv
.
menu
[
position
].
title
override
fun
instantiateItem
(
container
:
ViewGroup
,
position
:
Int
):
Any
{
return
host
.
getChildRouter
(
container
,
makeRouterName
(
container
.
id
,
getItemId
(
position
))).
apply
{
if
(!
hasRootController
())
{
val
savedState
=
savedPages
.
get
(
position
)
if
(
savedState
!=
null
)
{
restoreInstanceState
(
savedState
)
savedPages
.
remove
(
position
)
savedPageHistory
.
remove
(
position
)
}
rebindIfNeeded
()
configureRouter
(
this
,
position
)
if
(
this
!==
currentPrimaryRouter
)
{
backstack
.
forEach
{
it
.
controller
().
setOptionsMenuHidden
(
true
)
}
}
visibleRouters
.
put
(
position
,
this
)
}
}
}
override
fun
destroyItem
(
container
:
ViewGroup
,
position
:
Int
,
router
:
Any
)
{
require
(
router
is
Router
)
{
"Non-router object in router stack!"
}
val
savedState
=
Bundle
()
router
.
saveInstanceState
(
savedState
)
savedPages
.
put
(
position
,
savedState
)
savedPageHistory
.
remove
(
position
)
savedPageHistory
.
add
(
position
)
ensurePagesSaved
()
host
.
removeChildRouter
(
router
)
visibleRouters
.
remove
(
position
)
}
override
fun
setPrimaryItem
(
container
:
ViewGroup
,
position
:
Int
,
router
:
Any
)
{
require
(
router
is
Router
)
{
"Non-router object in router stack!"
}
if
(
router
!==
currentPrimaryRouter
)
{
currentPrimaryRouter
?.
backstack
?.
forEach
{
it
.
controller
().
setOptionsMenuHidden
(
true
)
}
router
.
backstack
.
forEach
{
it
.
controller
().
setOptionsMenuHidden
(
false
)
}
currentPrimaryRouter
=
router
}
}
override
fun
isViewFromObject
(
view
:
View
,
router
:
Any
):
Boolean
{
require
(
router
is
Router
)
{
"Non-router object in router stack!"
}
for
(
transaction
in
router
.
backstack
)
if
(
transaction
.
controller
().
view
==
view
)
return
true
return
false
}
fun
setMaxPagesToStateSave
(
maxPagesToStateSave
:
Int
)
{
require
(
maxPagesToStateSave
>=
0
)
{
"Only positive integers may be passed for maxPagesToStateSave."
}
this
.
maxPagesToStateSave
=
maxPagesToStateSave
ensurePagesSaved
()
}
override
fun
saveState
():
Parcelable
?
{
return
(
super
.
saveState
()
as
?
Bundle
?
?:
Bundle
()).
apply
{
putSparseParcelableArray
(
KEY_SAVED_PAGES
,
savedPages
)
putInt
(
KEY_MAX_PAGES_TO_STATE_SAVE
,
maxPagesToStateSave
)
putIntegerArrayList
(
KEY_SAVE_PAGE_HISTORY
,
savedPageHistory
)
}
}
override
fun
restoreState
(
state
:
Parcelable
?,
loader
:
ClassLoader
?)
{
super
.
restoreState
(
state
,
loader
)
(
state
as
?
Bundle
?)
?.
apply
{
savedPages
=
getSparseParcelableArray
(
KEY_SAVED_PAGES
)
?:
SparseArray
()
maxPagesToStateSave
=
getInt
(
KEY_MAX_PAGES_TO_STATE_SAVE
)
savedPageHistory
=
getIntegerArrayList
(
KEY_SAVE_PAGE_HISTORY
)
as
ArrayList
<
Int
>
}
}
fun
getRouter
(
position
:
Int
):
Router
=
visibleRouters
[
position
,
null
]
fun
getItemId
(
position
:
Int
):
Long
{
return
bnv
.
menu
.
getItem
(
position
).
itemId
.
toLong
()
}
private
fun
ensurePagesSaved
()
{
while
(
savedPages
.
size
()
>
maxPagesToStateSave
)
{
val
positionToRemove
=
savedPageHistory
.
removeAt
(
0
)
savedPages
.
remove
(
positionToRemove
)
}
}
private
fun
makeRouterName
(
viewId
:
Int
,
id
:
Long
):
String
{
return
"$viewId:$id"
}
}
fun
Menu
.
all
(
predicate
:
(
android
.
view
.
MenuItem
)
->
Boolean
):
Boolean
{
if
(
size
()
==
0
)
return
false
for
(
index
in
(
0
until
size
()))
if
(!
predicate
(
get
(
index
)))
return
false
return
true
}
fun
Menu
.
indexOf
(
item
:
android
.
view
.
MenuItem
):
Int
{
require
(
size
()
>
0
)
{
"Menu is empty!"
}
require
(
contains
(
item
))
{
"Item is not part of menu!"
}
for
(
index
in
(
0
until
size
()))
if
(
get
(
index
)
==
item
)
return
index
throw
Exception
(
"Item is not part of menu!"
)
}
\ No newline at end of file
app/src/main/java/com/biganto/visual/roompark/presentation/screen/home/HomeController.kt
0 → 100644
View file @
592b1a3f
package
com.biganto.visual.roompark.presentation.screen.home
import
android.view.LayoutInflater
import
android.view.View
import
android.view.ViewGroup
import
androidx.viewpager.widget.ViewPager
import
butterknife.BindView
import
com.biganto.visual.roompark.R
import
com.biganto.visual.roompark.base.IBottomNavigation
import
com.biganto.visual.roompark.base.ICollapsingToolBar
import
com.biganto.visual.roompark.base.RoomParkApplication
import
com.biganto.visual.roompark.base.RoomParkMainActivity
import
com.biganto.visual.roompark.conductor.BigantoBaseController
import
com.biganto.visual.roompark.presentation.screen.auth.AuthScreenController
import
com.biganto.visual.roompark.presentation.screen.splash.SplashScreenController
import
javax.inject.Inject
/**
* Created by Vladislav Bogdashkin on 11.10.2019.
*/
class
HomeController
:
BigantoBaseController
<
HomeScreenViewState
,
HomeScreen
,
HomeScreenPresenter
>()
,
HomeScreen
{
override
fun
injectDependencies
()
{
getComponent
()
}
@BindView
(
R
.
id
.
home_router_host
)
lateinit
var
viewpager
:
ViewPager
@Inject
lateinit
var
tb
:
ICollapsingToolBar
@Inject
lateinit
var
bottomNavigation
:
IBottomNavigation
@Inject
override
lateinit
var
injectedPresenter
:
HomeScreenPresenter
lateinit
var
pageAdapter
:
BNVRouterPagerAdapter
// @Inject
// lateinit var snacky:ISnackBarProvider
fun
getComponent
()
=
DaggerHomeScreenComponent
.
factory
()
.
create
(
RoomParkApplication
.
component
,
activity
as
RoomParkMainActivity
)
.
inject
(
this
)
// @Inject
// lateinit var ac: RoomParkMainActivity
override
fun
onCreateView
(
inflater
:
LayoutInflater
,
container
:
ViewGroup
):
View
{
val
v
=
super
.
onCreateView
(
inflater
,
container
)
tb
.
showAll
()
pageAdapter
=
BNVRouterPagerAdapter
(
this
,
bottomNavigation
.
bottomNavigation
,
viewpager
,
mapOf
(
Pair
(
R
.
id
.
tab_feeds
,{
SplashScreenController
()})
,
Pair
(
R
.
id
.
tab_favorites
,{
AuthScreenController
()})
,
Pair
(
R
.
id
.
tab_deals
,{
AuthScreenController
()})
,
Pair
(
R
.
id
.
tab_look_flat
,{
AuthScreenController
()})
,
Pair
(
R
.
id
.
tab_settings
,{
SplashScreenController
()})
)
)
return
v
}
override
fun
render
(
viewState
:
HomeScreenViewState
)
{
when
(
viewState
){
is
HomeScreenViewState
.
Idle
->
render
(
viewState
)
is
HomeScreenViewState
.
ToScreen
->
render
(
viewState
)
}
}
private
fun
render
(
viewState
:
HomeScreenViewState
.
Idle
){
}
private
fun
render
(
viewState
:
HomeScreenViewState
.
ToScreen
){
// snacky.showSnackBar("lul")
}
override
fun
getLayoutId
():
Int
=
R
.
layout
.
home_screen_viewpager
}
\ No newline at end of file
app/src/main/java/com/biganto/visual/roompark/presentation/screen/home/ScreenContract.kt
0 → 100644
View file @
592b1a3f
package
com.biganto.visual.roompark.presentation.screen.home
import
com.biganto.visual.roompark.conductor.BigantoBaseContract
import
com.biganto.visual.roompark.presentation.screen.home.HomeScreenViewState
/**
* Created by Vladislav Bogdashkin on 30.09.2019.
*/
interface
HomeScreen
:
BigantoBaseContract
<
HomeScreenViewState
>
{
}
\ No newline at end of file
app/src/main/java/com/biganto/visual/roompark/presentation/screen/home/ScreenDI.kt
0 → 100644
View file @
592b1a3f
package
com.biganto.visual.roompark.presentation.screen.home
import
android.content.Context
import
com.biganto.visual.roompark.base.IBottomNavigation
import
com.biganto.visual.roompark.base.ICollapsingToolBar
import
com.biganto.visual.roompark.base.RoomParkMainActivity
import
com.biganto.visual.roompark.di.dagger.AppComponent
import
com.biganto.visual.roompark.di.dagger.AuthContractModule
import
com.biganto.visual.roompark.di.dagger.PerScreen
import
com.biganto.visual.roompark.domain.contract.AuthContract
import
dagger.Binds
import
dagger.BindsInstance
import
dagger.Component
import
dagger.Module
///**
// * Created by Vladislav Bogdashkin on 30.09.2019.
// */
@PerScreen
@Component
(
modules
=
[
HomeScreenModule
::
class
],
dependencies
=
[
AppComponent
::
class
])
interface
HomeScreenComponent
{
@Component
.
Factory
interface
Factory
{
fun
create
(
appComponent
:
AppComponent
,
@BindsInstance
activity
:
RoomParkMainActivity
):
HomeScreenComponent
}
val
presenter
:
HomeScreenPresenter
fun
inject
(
controller
:
HomeController
)
}
@Module
abstract
class
HomeScreenModule
{
@PerScreen
@Binds
abstract
fun
provideContext
(
activity
:
RoomParkMainActivity
):
Context
@PerScreen
@Binds
abstract
fun
provideAuth
(
contract
:
AuthContractModule
):
AuthContract
@PerScreen
@Binds
abstract
fun
provideToolbar
(
activitiy
:
RoomParkMainActivity
):
ICollapsingToolBar
@PerScreen
@Binds
abstract
fun
provideBottomNavigation
(
activitiy
:
RoomParkMainActivity
):
IBottomNavigation
}
app/src/main/java/com/biganto/visual/roompark/presentation/screen/home/ScreenPresenter.kt
0 → 100644
View file @
592b1a3f
package
com.biganto.visual.roompark.presentation.screen.home
import
com.biganto.visual.roompark.conductor.BigantoBasePresenter
import
javax.inject.Inject
/**
* Created by Vladislav Bogdashkin on 30.09.2019.
*/
class
HomeScreenPresenter
@Inject
constructor
(
// ,var context:Context
)
:
BigantoBasePresenter
<
HomeScreen
,
HomeScreenViewState
>()
{
override
fun
bindIntents
()
{
val
state
=
restoreStateObservable
subscribeViewState
(
state
.
cast
(
HomeScreenViewState
::
class
.
java
),
HomeScreen
::
render
)
}
}
\ No newline at end of file
app/src/main/java/com/biganto/visual/roompark/presentation/screen/home/ScreenViewState.kt
0 → 100644
View file @
592b1a3f
package
com.biganto.visual.roompark.presentation.screen.home
import
com.biganto.visual.roompark.conductor.BigantoBaseViewState
/**
* Created by Vladislav Bogdashkin on 30.09.2019.
*/
sealed
class
HomeScreenViewState
:
BigantoBaseViewState
()
{
class
Idle
:
HomeScreenViewState
()
class
ToScreen
(
val
message
:
String
)
:
HomeScreenViewState
()
}
\ No newline at end of file
app/src/main/java/com/biganto/visual/roompark/presentation/screen/splash/ScreenController.kt
View file @
592b1a3f
...
...
@@ -68,7 +68,7 @@ class SplashScreenController :
private
fun
render
(
viewState
:
SplashScreenViewState
.
ToScreen
){
snackbar
.
showSnackBar
(
viewState
.
message
,
Snackbar
.
LENGTH_LONG
)
tb
.
hideAll
()
//
tb.hideAll()
router
.
pushController
(
RouterTransaction
.
with
(
AuthScreenController
())
.
popChangeHandler
(
FadeChangeHandler
())
.
pushChangeHandler
(
FadeChangeHandler
())
...
...
app/src/main/res/color/sign_in_button_selector.xml
0 → 100644
View file @
592b1a3f
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<item
android:state_enabled=
"false"
android:color=
"@color/colorAccent"
/>
<item
android:color=
"@color/colorGray"
/>
</selector>
\ No newline at end of file
app/src/main/res/layout/activity_main.xml
View file @
592b1a3f
...
...
@@ -104,7 +104,8 @@
app:itemHorizontalTranslationEnabled=
"false"
app:itemIconTint=
"@drawable/bottom_navigation_icon_selector"
app:labelVisibilityMode=
"labeled"
app:menu=
"@menu/bottom_navigation_menu"
>
app:menu=
"@menu/bottom_navigation_menu"
tools:visibility=
"visible"
>
</com.google.android.material.bottomnavigation.BottomNavigationView>
...
...
app/src/main/res/layout/authentication_screen.xml
View file @
592b1a3f
...
...
@@ -12,7 +12,6 @@
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"16dp"
android:layout_marginTop=
"8dp"
android:layout_marginEnd=
"16dp"
android:text=
"@string/enter"
android:textAlignment=
"textStart"
...
...
app/src/main/res/layout/home_screen_viewpager.xml
0 → 100644
View file @
592b1a3f
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:orientation=
"vertical"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<androidx.viewpager.widget.ViewPager
android:id=
"@+id/home_router_host"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
/>
</LinearLayout>
\ No newline at end of file
app/src/main/res/values/styles.xml
View file @
592b1a3f
...
...
@@ -132,6 +132,7 @@
<style
name=
"AuthButton.Enable"
>
<item
name=
"android:text"
>
"ВОЙТИ"
</item>
<item
name=
"strokeColor"
>
@color/sign_in_button_selector
</item>
</style>
...
...
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