Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
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
Administrator
Magisk
Commits
e8e7cd50
Commit
e8e7cd50
authored
Jul 11, 2020
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simply redirect isConnected ObservableField
parent
78734339
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
7 deletions
+4
-7
build.gradle.kts
app/build.gradle.kts
+2
-2
BaseViewModel.kt
...c/main/java/com/topjohnwu/magisk/ui/base/BaseViewModel.kt
+1
-3
build.gradle.kts
build.gradle.kts
+1
-1
BuildSource.kt
buildSrc/src/main/java/BuildSource.kt
+0
-1
No files found.
app/build.gradle.kts
View file @
e8e7cd50
...
@@ -77,8 +77,8 @@ dependencies {
...
@@ -77,8 +77,8 @@ dependencies {
implementation
(
"com.github.topjohnwu:jtar:1.0.0"
)
implementation
(
"com.github.topjohnwu:jtar:1.0.0"
)
implementation
(
"com.jakewharton.timber:timber:4.7.1"
)
implementation
(
"com.jakewharton.timber:timber:4.7.1"
)
implementation
(
"org.jetbrains.kotlin:kotlin-stdlib:${Deps.vKotlin}"
)
implementation
(
kotlin
(
"stdlib"
)
)
implementation
(
"org.jetbrains.kotlin:kotlin-stdlib-jdk7:${Deps.vKotlin}"
)
implementation
(
kotlin
(
"stdlib-jdk7"
)
)
val
vBAdapt
=
"4.0.0"
val
vBAdapt
=
"4.0.0"
val
bindingAdapter
=
"me.tatarka.bindingcollectionadapter2:bindingcollectionadapter"
val
bindingAdapter
=
"me.tatarka.bindingcollectionadapter2:bindingcollectionadapter"
...
...
app/src/main/java/com/topjohnwu/magisk/ui/base/BaseViewModel.kt
View file @
e8e7cd50
...
@@ -15,10 +15,8 @@ import androidx.navigation.NavDirections
...
@@ -15,10 +15,8 @@ import androidx.navigation.NavDirections
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.base.BaseActivity
import
com.topjohnwu.magisk.core.base.BaseActivity
import
com.topjohnwu.magisk.extensions.value
import
com.topjohnwu.magisk.model.events.*
import
com.topjohnwu.magisk.model.events.*
import
com.topjohnwu.magisk.model.navigation.NavigationWrapper
import
com.topjohnwu.magisk.model.navigation.NavigationWrapper
import
com.topjohnwu.magisk.model.observer.Observer
import
kotlinx.coroutines.Job
import
kotlinx.coroutines.Job
import
org.koin.core.KoinComponent
import
org.koin.core.KoinComponent
...
@@ -34,7 +32,7 @@ abstract class BaseViewModel(
...
@@ -34,7 +32,7 @@ abstract class BaseViewModel(
val
loaded
@Bindable
get
()
=
state
==
State
.
LOADED
val
loaded
@Bindable
get
()
=
state
==
State
.
LOADED
val
loadingFailed
@Bindable
get
()
=
state
==
State
.
LOADING_FAILED
val
loadingFailed
@Bindable
get
()
=
state
==
State
.
LOADING_FAILED
val
isConnected
=
Observer
(
Info
.
isConnected
)
{
Info
.
isConnected
.
value
}
val
isConnected
get
()
=
Info
.
isConnected
val
viewEvents
:
LiveData
<
ViewEvent
>
get
()
=
_viewEvents
val
viewEvents
:
LiveData
<
ViewEvent
>
get
()
=
_viewEvents
val
insets
=
ObservableField
(
Insets
.
NONE
)
val
insets
=
ObservableField
(
Insets
.
NONE
)
...
...
build.gradle.kts
View file @
e8e7cd50
...
@@ -17,7 +17,7 @@ buildscript {
...
@@ -17,7 +17,7 @@ buildscript {
dependencies
{
dependencies
{
classpath
(
"com.android.tools.build:gradle:4.0.0"
)
classpath
(
"com.android.tools.build:gradle:4.0.0"
)
classpath
(
"org.jetbrains.kotlin:kotlin-gradle-plugin:
${Deps.vKotlin}
"
)
classpath
(
"org.jetbrains.kotlin:kotlin-gradle-plugin:
1.3.72
"
)
classpath
(
"androidx.navigation:navigation-safe-args-gradle-plugin:${Deps.vNav}"
)
classpath
(
"androidx.navigation:navigation-safe-args-gradle-plugin:${Deps.vNav}"
)
// NOTE: Do not place your application dependencies here; they belong
// NOTE: Do not place your application dependencies here; they belong
...
...
buildSrc/src/main/java/BuildSource.kt
View file @
e8e7cd50
...
@@ -6,7 +6,6 @@ import java.io.File
...
@@ -6,7 +6,6 @@ import java.io.File
import
java.util.*
import
java.util.*
object
Deps
{
object
Deps
{
const
val
vKotlin
=
"1.3.72"
const
val
vNav
=
"2.3.0"
const
val
vNav
=
"2.3.0"
}
}
...
...
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