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
085ede6d
Commit
085ede6d
authored
Aug 06, 2019
by
Viktor De Pasquale
Committed by
John Wu
Aug 07, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added simple ui blocks for whenever connection drops out
parent
4ef19d17
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
37 additions
and
15 deletions
+37
-15
MainActivity.kt
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
+6
-2
HomeViewModel.kt
...c/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
+15
-6
DataBindingAdapters.kt
...in/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
+6
-1
fragment_magisk.xml
app/src/main/res/layout/fragment_magisk.xml
+4
-4
include_update_card.xml
app/src/main/res/layout/include_update_card.xml
+4
-2
item_repo.xml
app/src/main/res/layout/item_repo.xml
+2
-0
No files found.
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
View file @
085ede6d
...
@@ -4,6 +4,7 @@ import android.content.Intent
...
@@ -4,6 +4,7 @@ import android.content.Intent
import
android.os.Bundle
import
android.os.Bundle
import
androidx.core.view.GravityCompat
import
androidx.core.view.GravityCompat
import
androidx.fragment.app.Fragment
import
androidx.fragment.app.Fragment
import
com.skoumal.teanity.extensions.addOnPropertyChangedCallback
import
com.topjohnwu.magisk.ClassMap
import
com.topjohnwu.magisk.ClassMap
import
com.topjohnwu.magisk.Config
import
com.topjohnwu.magisk.Config
import
com.topjohnwu.magisk.Const.Key.OPEN_SECTION
import
com.topjohnwu.magisk.Const.Key.OPEN_SECTION
...
@@ -20,7 +21,6 @@ import com.topjohnwu.magisk.ui.module.ReposFragment
...
@@ -20,7 +21,6 @@ import com.topjohnwu.magisk.ui.module.ReposFragment
import
com.topjohnwu.magisk.ui.settings.SettingsFragment
import
com.topjohnwu.magisk.ui.settings.SettingsFragment
import
com.topjohnwu.magisk.ui.superuser.SuperuserFragment
import
com.topjohnwu.magisk.ui.superuser.SuperuserFragment
import
com.topjohnwu.magisk.utils.Utils
import
com.topjohnwu.magisk.utils.Utils
import
com.topjohnwu.magisk.net.Networking
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
kotlin.reflect.KClass
import
kotlin.reflect.KClass
...
@@ -57,6 +57,10 @@ open class MainActivity : MagiskActivity<MainViewModel, ActivityMainBinding>() {
...
@@ -57,6 +57,10 @@ open class MainActivity : MagiskActivity<MainViewModel, ActivityMainBinding>() {
checkHideSection
()
checkHideSection
()
setSupportActionBar
(
binding
.
mainInclude
.
mainToolbar
)
setSupportActionBar
(
binding
.
mainInclude
.
mainToolbar
)
viewModel
.
isConnected
.
addOnPropertyChangedCallback
{
checkHideSection
()
}
if
(
savedInstanceState
==
null
)
{
if
(
savedInstanceState
==
null
)
{
intent
.
getStringExtra
(
OPEN_SECTION
)
?.
let
{
intent
.
getStringExtra
(
OPEN_SECTION
)
?.
let
{
onEventDispatched
(
Navigation
.
fromSection
(
it
))
onEventDispatched
(
Navigation
.
fromSection
(
it
))
...
@@ -110,7 +114,7 @@ open class MainActivity : MagiskActivity<MainViewModel, ActivityMainBinding>() {
...
@@ -110,7 +114,7 @@ open class MainActivity : MagiskActivity<MainViewModel, ActivityMainBinding>() {
menu
.
findItem
(
R
.
id
.
modulesFragment
).
isVisible
=
menu
.
findItem
(
R
.
id
.
modulesFragment
).
isVisible
=
Shell
.
rootAccess
()
&&
Info
.
magiskVersionCode
>=
0
Shell
.
rootAccess
()
&&
Info
.
magiskVersionCode
>=
0
menu
.
findItem
(
R
.
id
.
reposFragment
).
isVisible
=
menu
.
findItem
(
R
.
id
.
reposFragment
).
isVisible
=
(
Networking
.
checkNetworkStatus
(
this
)
&&
Shell
.
rootAccess
()
&&
Info
.
magiskVersionCode
>=
0
)
(
viewModel
.
isConnected
.
value
&&
Shell
.
rootAccess
()
&&
Info
.
magiskVersionCode
>=
0
)
menu
.
findItem
(
R
.
id
.
logFragment
).
isVisible
=
menu
.
findItem
(
R
.
id
.
logFragment
).
isVisible
=
Shell
.
rootAccess
()
Shell
.
rootAccess
()
menu
.
findItem
(
R
.
id
.
superuserFragment
).
isVisible
=
menu
.
findItem
(
R
.
id
.
superuserFragment
).
isVisible
=
...
...
app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
View file @
085ede6d
...
@@ -25,7 +25,10 @@ class HomeViewModel(
...
@@ -25,7 +25,10 @@ class HomeViewModel(
val
isForceEncryption
=
KObservableField
(
Info
.
keepEnc
)
val
isForceEncryption
=
KObservableField
(
Info
.
keepEnc
)
val
isKeepVerity
=
KObservableField
(
Info
.
keepVerity
)
val
isKeepVerity
=
KObservableField
(
Info
.
keepVerity
)
val
magiskState
=
KObservableField
(
MagiskState
.
LOADING
)
private
val
_magiskState
=
KObservableField
(
MagiskState
.
LOADING
)
val
magiskState
=
Observer
(
_magiskState
,
isConnected
)
{
if
(
isConnected
.
value
)
_magiskState
.
value
else
MagiskState
.
UP_TO_DATE
}
val
magiskStateText
=
Observer
(
magiskState
)
{
val
magiskStateText
=
Observer
(
magiskState
)
{
when
(
magiskState
.
value
)
{
when
(
magiskState
.
value
)
{
MagiskState
.
NO_ROOT
->
TODO
()
MagiskState
.
NO_ROOT
->
TODO
()
...
@@ -44,7 +47,10 @@ class HomeViewModel(
...
@@ -44,7 +47,10 @@ class HomeViewModel(
""
""
}
}
val
managerState
=
KObservableField
(
MagiskState
.
LOADING
)
private
val
_managerState
=
KObservableField
(
MagiskState
.
LOADING
)
val
managerState
=
Observer
(
_managerState
,
isConnected
)
{
if
(
isConnected
.
value
)
_managerState
.
value
else
MagiskState
.
UP_TO_DATE
}
val
managerStateText
=
Observer
(
managerState
)
{
val
managerStateText
=
Observer
(
managerState
)
{
when
(
managerState
.
value
)
{
when
(
managerState
.
value
)
{
MagiskState
.
NO_ROOT
->
"wtf"
MagiskState
.
NO_ROOT
->
"wtf"
...
@@ -89,6 +95,9 @@ class HomeViewModel(
...
@@ -89,6 +95,9 @@ class HomeViewModel(
isKeepVerity
.
addOnPropertyChangedCallback
{
isKeepVerity
.
addOnPropertyChangedCallback
{
Info
.
keepVerity
=
it
?:
return
@addOnPropertyChangedCallback
Info
.
keepVerity
=
it
?:
return
@addOnPropertyChangedCallback
}
}
isConnected
.
addOnPropertyChangedCallback
{
if
(
it
==
true
)
refresh
()
}
refresh
()
refresh
()
}
}
...
@@ -154,8 +163,8 @@ class HomeViewModel(
...
@@ -154,8 +163,8 @@ class HomeViewModel(
magiskRepo
.
fetchUpdate
()
magiskRepo
.
fetchUpdate
()
.
applyViewModel
(
this
)
.
applyViewModel
(
this
)
.
doOnSubscribeUi
{
.
doOnSubscribeUi
{
magiskState
.
value
=
MagiskState
.
LOADING
_
magiskState
.
value
=
MagiskState
.
LOADING
managerState
.
value
=
MagiskState
.
LOADING
_
managerState
.
value
=
MagiskState
.
LOADING
ctsState
.
value
=
SafetyNetState
.
IDLE
ctsState
.
value
=
SafetyNetState
.
IDLE
basicIntegrityState
.
value
=
SafetyNetState
.
IDLE
basicIntegrityState
.
value
=
SafetyNetState
.
IDLE
safetyNetTitle
.
value
=
R
.
string
.
safetyNet_check_text
safetyNetTitle
.
value
=
R
.
string
.
safetyNet_check_text
...
@@ -170,7 +179,7 @@ class HomeViewModel(
...
@@ -170,7 +179,7 @@ class HomeViewModel(
private
fun
updateSelf
()
{
private
fun
updateSelf
()
{
state
=
State
.
LOADED
state
=
State
.
LOADED
magiskState
.
value
=
when
(
Info
.
magiskVersionCode
)
{
_
magiskState
.
value
=
when
(
Info
.
magiskVersionCode
)
{
in
Int
.
MIN_VALUE
until
0
->
MagiskState
.
NOT_INSTALLED
in
Int
.
MIN_VALUE
until
0
->
MagiskState
.
NOT_INSTALLED
!
in
Info
.
remote
.
magisk
.
versionCode
..
Int
.
MAX_VALUE
->
MagiskState
.
OBSOLETE
!
in
Info
.
remote
.
magisk
.
versionCode
..
Int
.
MAX_VALUE
->
MagiskState
.
OBSOLETE
else
->
MagiskState
.
UP_TO_DATE
else
->
MagiskState
.
UP_TO_DATE
...
@@ -185,7 +194,7 @@ class HomeViewModel(
...
@@ -185,7 +194,7 @@ class HomeViewModel(
magiskLatestVersion
.
value
=
version
magiskLatestVersion
.
value
=
version
.
format
(
Info
.
remote
.
magisk
.
version
,
Info
.
remote
.
magisk
.
versionCode
)
.
format
(
Info
.
remote
.
magisk
.
version
,
Info
.
remote
.
magisk
.
versionCode
)
managerState
.
value
=
when
(
Info
.
remote
.
app
.
versionCode
)
{
_
managerState
.
value
=
when
(
Info
.
remote
.
app
.
versionCode
)
{
in
Int
.
MIN_VALUE
until
0
->
MagiskState
.
NOT_INSTALLED
//wrong update channel
in
Int
.
MIN_VALUE
until
0
->
MagiskState
.
NOT_INSTALLED
//wrong update channel
in
(
BuildConfig
.
VERSION_CODE
+
1
)
..
Int
.
MAX_VALUE
->
MagiskState
.
OBSOLETE
in
(
BuildConfig
.
VERSION_CODE
+
1
)
..
Int
.
MAX_VALUE
->
MagiskState
.
OBSOLETE
else
->
MagiskState
.
UP_TO_DATE
else
->
MagiskState
.
UP_TO_DATE
...
...
app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
View file @
085ede6d
...
@@ -215,4 +215,9 @@ fun setScrollListener(view: RecyclerView, listener: InverseBindingListener) {
...
@@ -215,4 +215,9 @@ fun setScrollListener(view: RecyclerView, listener: InverseBindingListener) {
@InverseBindingAdapter
(
attribute
=
"scrollPosition"
,
event
=
"recyclerScrollEvent"
)
@InverseBindingAdapter
(
attribute
=
"scrollPosition"
,
event
=
"recyclerScrollEvent"
)
fun
getScrollPosition
(
view
:
RecyclerView
)
=
(
view
.
layoutManager
as
?
LinearLayoutManager
)
fun
getScrollPosition
(
view
:
RecyclerView
)
=
(
view
.
layoutManager
as
?
LinearLayoutManager
)
?.
findLastCompletelyVisibleItemPosition
()
?.
findLastCompletelyVisibleItemPosition
()
?:
-
1
?:
-
1
\ No newline at end of file
@BindingAdapter
(
"isEnabled"
)
fun
setEnabled
(
view
:
View
,
isEnabled
:
Boolean
)
{
view
.
isEnabled
=
isEnabled
}
\ No newline at end of file
app/src/main/res/layout/fragment_magisk.xml
View file @
085ede6d
...
@@ -66,8 +66,8 @@
...
@@ -66,8 +66,8 @@
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_vertical"
android:layout_gravity=
"center_vertical"
android:paddingBottom=
"10dp"
android:paddingTop=
"10dp"
android:paddingTop=
"10dp"
android:paddingBottom=
"10dp"
android:text=
"@string/app_name"
android:text=
"@string/app_name"
android:textAppearance=
"@style/TextAppearance.AppCompat.Headline"
android:textAppearance=
"@style/TextAppearance.AppCompat.Headline"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
...
@@ -194,7 +194,7 @@
...
@@ -194,7 +194,7 @@
android:layout_margin=
"@dimen/margin_generic"
/>
android:layout_margin=
"@dimen/margin_generic"
/>
<LinearLayout
<LinearLayout
gone=
"@{!viewModel.hasRoot}"
gone=
"@{!viewModel.hasRoot
|| !viewModel.isConnected
}"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
>
android:orientation=
"vertical"
>
...
@@ -202,8 +202,8 @@
...
@@ -202,8 +202,8 @@
<androidx.constraintlayout.widget.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:padding
Bottom
=
"@dimen/margin_generic_half"
android:padding
Top
=
"@dimen/margin_generic_half"
android:padding
Top
=
"@dimen/margin_generic_half"
>
android:padding
Bottom
=
"@dimen/margin_generic_half"
>
<ImageView
<ImageView
android:id=
"@+id/sn_logo"
android:id=
"@+id/sn_logo"
...
...
app/src/main/res/layout/include_update_card.xml
View file @
085ede6d
...
@@ -7,6 +7,8 @@
...
@@ -7,6 +7,8 @@
<import
type=
"com.topjohnwu.magisk.ui.home.MagiskState"
/>
<import
type=
"com.topjohnwu.magisk.ui.home.MagiskState"
/>
<import
type=
"com.topjohnwu.magisk.ui.home.MagiskItem"
/>
<import
type=
"com.topjohnwu.magisk.R"
/>
<import
type=
"com.topjohnwu.magisk.R"
/>
<variable
<variable
...
@@ -49,7 +51,7 @@
...
@@ -49,7 +51,7 @@
<com.google.android.material.button.MaterialButton
<com.google.android.material.button.MaterialButton
android:id=
"@+id/install"
android:id=
"@+id/install"
style=
"@style/Widget.Button.Text"
style=
"@style/Widget.Button.Text"
gone=
"@{state == MagiskState.LOADING}"
gone=
"@{state == MagiskState.LOADING
|| !viewModel.isConnected
}"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginEnd=
"8dp"
android:layout_marginEnd=
"8dp"
...
@@ -118,7 +120,7 @@
...
@@ -118,7 +120,7 @@
<androidx.appcompat.widget.AppCompatTextView
<androidx.appcompat.widget.AppCompatTextView
android:id=
"@+id/latest_version"
android:id=
"@+id/latest_version"
gone=
"@{currentVersion == latestVersion}"
gone=
"@{currentVersion == latestVersion
|| !viewModel.isConnected
}"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
style=
"@style/Widget.Text.Caption.Inactive"
style=
"@style/Widget.Text.Caption.Inactive"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_repo.xml
View file @
085ede6d
...
@@ -106,6 +106,8 @@
...
@@ -106,6 +106,8 @@
<androidx.appcompat.widget.AppCompatImageView
<androidx.appcompat.widget.AppCompatImageView
android:id=
"@+id/download"
android:id=
"@+id/download"
style=
"@style/Widget.Icon"
style=
"@style/Widget.Icon"
isEnabled=
"@{viewModel.isConnected}"
android:alpha=
"@{viewModel.isConnected ? 1f : .2f}"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_vertical"
android:layout_gravity=
"center_vertical"
...
...
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