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
7bca8c2a
Commit
7bca8c2a
authored
Sep 26, 2019
by
Vladislav Bogdashkin
🎣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update some deps
parent
4c2572e7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
build.gradle
app/build.gradle
+2
-1
RoomParkMainActivity.kt
.../com/biganto/visual/roompark/base/RoomParkMainActivity.kt
+0
-2
AppModule.kt
...ain/java/com/biganto/visual/roompark/di/koin/AppModule.kt
+2
-1
dependencies.gradle
dependencies.gradle
+1
-1
No files found.
app/build.gradle
View file @
7bca8c2a
...
@@ -65,13 +65,14 @@ dependencies {
...
@@ -65,13 +65,14 @@ dependencies {
implementation
fileTree
(
include:
[
'*.jar'
,
'*.aar'
],
dir:
'libs'
)
implementation
fileTree
(
include:
[
'*.jar'
,
'*.aar'
],
dir:
'libs'
)
implementation
"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation
"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation
"org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
implementation
"org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
implementation
'androidx.core:core-ktx:1.
0.2
'
implementation
'androidx.core:core-ktx:1.
1.0
'
//Koin
//Koin
implementation
"org.koin:koin-core:$koinVersion"
implementation
"org.koin:koin-core:$koinVersion"
implementation
"org.koin:koin-core-ext:$koinVersion"
implementation
"org.koin:koin-core-ext:$koinVersion"
implementation
"org.koin:koin-android:$koinVersion"
implementation
"org.koin:koin-android:$koinVersion"
implementation
"org.koin:koin-android-scope:$koinVersion"
implementation
"org.koin:koin-android-scope:$koinVersion"
implementation
"org.koin:koin-androidx-scope:$koinVersion"
//Material
//Material
...
...
app/src/main/java/com/biganto/visual/roompark/base/RoomParkMainActivity.kt
View file @
7bca8c2a
...
@@ -26,8 +26,6 @@ class RoomParkMainActivity(
...
@@ -26,8 +26,6 @@ class RoomParkMainActivity(
,
IConductorActivity
,
IConductorActivity
,
IBottomNavigation
{
,
IBottomNavigation
{
private
val
snackbarProvider
:
ISnackBarProvider
by
currentScope
.
inject
()
private
val
snackbarProvider
:
ISnackBarProvider
by
currentScope
.
inject
()
private
lateinit
var
router
:
Router
private
lateinit
var
router
:
Router
...
...
app/src/main/java/com/biganto/visual/roompark/di/koin/AppModule.kt
View file @
7bca8c2a
...
@@ -2,6 +2,7 @@ package com.biganto.visual.roompark.di.koin
...
@@ -2,6 +2,7 @@ package com.biganto.visual.roompark.di.koin
import
com.biganto.visual.roompark.base.RoomParkApplication
import
com.biganto.visual.roompark.base.RoomParkApplication
import
com.biganto.visual.roompark.base.RoomParkMainActivity
import
com.biganto.visual.roompark.base.RoomParkMainActivity
import
com.biganto.visual.roompark.view_utils.snackbar.SnackBarProvider
import
org.koin.android.ext.koin.androidContext
import
org.koin.android.ext.koin.androidContext
import
org.koin.android.ext.koin.androidLogger
import
org.koin.android.ext.koin.androidLogger
import
org.koin.core.context.startKoin
import
org.koin.core.context.startKoin
...
@@ -30,7 +31,7 @@ val appModule = module{
...
@@ -30,7 +31,7 @@ val appModule = module{
val
scopesModule
=
module
{
val
scopesModule
=
module
{
scope
(
named
<
RoomParkMainActivity
>()){
scope
(
named
<
RoomParkMainActivity
>()){
scoped
{
S
tartUpData
(
"ja pesik!"
)
}
scoped
{
S
nackBarProvider
(
get
()
)
}
}
}
}
}
...
...
dependencies.gradle
View file @
7bca8c2a
...
@@ -13,7 +13,7 @@ ext {
...
@@ -13,7 +13,7 @@ ext {
// requeryVersion = '1.5.1'
// requeryVersion = '1.5.1'
// rxBindingVersion = '2.1.1'
// rxBindingVersion = '2.1.1'
conductorVersion
=
'3.0.0-rc1'
conductorVersion
=
'3.0.0-rc1'
materialVersion
=
'1.1.0-alpha
09
'
materialVersion
=
'1.1.0-alpha
10
'
gradleVersion
=
'3.5.0'
gradleVersion
=
'3.5.0'
koinVersion
=
'2.0.1'
koinVersion
=
'2.0.1'
timberVersion
=
'4.7.1'
timberVersion
=
'4.7.1'
...
...
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