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
5313a46a
Commit
5313a46a
authored
Jan 22, 2022
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Overhaul SettingsItem
Close #5021
parent
761a8dde
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
162 additions
and
217 deletions
+162
-217
BaseSettingsItem.kt
...java/com/topjohnwu/magisk/ui/settings/BaseSettingsItem.kt
+53
-85
SettingsItems.kt
...in/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt
+88
-109
SettingsViewModel.kt
...ava/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt
+15
-17
dialog_settings_download_path.xml
app/src/main/res/layout/dialog_settings_download_path.xml
+1
-1
dialog_settings_update_channel.xml
app/src/main/res/layout/dialog_settings_update_channel.xml
+1
-1
item_settings.xml
app/src/main/res/layout/item_settings.xml
+4
-4
No files found.
app/src/main/java/com/topjohnwu/magisk/ui/settings/BaseSettingsItem.kt
View file @
5313a46a
...
@@ -3,7 +3,6 @@ package com.topjohnwu.magisk.ui.settings
...
@@ -3,7 +3,6 @@ package com.topjohnwu.magisk.ui.settings
import
android.content.Context
import
android.content.Context
import
android.content.res.Resources
import
android.content.res.Resources
import
android.view.View
import
android.view.View
import
androidx.annotation.CallSuper
import
androidx.databinding.Bindable
import
androidx.databinding.Bindable
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
...
@@ -20,76 +19,33 @@ sealed class BaseSettingsItem : ObservableRvItem() {
...
@@ -20,76 +19,33 @@ sealed class BaseSettingsItem : ObservableRvItem() {
open
val
title
:
TextHolder
get
()
=
TextHolder
.
EMPTY
open
val
title
:
TextHolder
get
()
=
TextHolder
.
EMPTY
@get
:
Bindable
@get
:
Bindable
open
val
description
:
TextHolder
get
()
=
TextHolder
.
EMPTY
open
val
description
:
TextHolder
get
()
=
TextHolder
.
EMPTY
// ---
open
val
showSwitch
get
()
=
false
open
val
showSwitch
get
()
=
false
@get
:
Bindable
@get
:
Bindable
open
val
isChecked
get
()
=
false
open
val
isChecked
get
()
=
false
open
fun
onToggle
(
view
:
View
,
callback
:
Callback
,
checked
:
Boolean
)
{}
// ---
@get
:
Bindable
@get
:
Bindable
var
isEnabled
=
true
var
isEnabled
=
true
set
(
value
)
=
set
(
value
,
field
,
{
field
=
it
},
BR
.
enabled
,
BR
.
description
)
set
(
value
)
=
set
(
value
,
field
,
{
field
=
it
},
BR
.
enabled
,
BR
.
description
)
open
fun
onPressed
(
view
:
View
,
callback
:
Callback
)
{
open
fun
onToggle
(
view
:
View
,
handler
:
Handler
,
checked
:
Boolean
)
{}
callback
.
onItemPressed
(
view
,
this
)
open
fun
onPressed
(
view
:
View
,
handler
:
Handler
)
{
handler
.
onItemPressed
(
view
,
this
)
}
}
open
fun
refresh
()
{}
open
fun
refresh
()
{}
// ---
interface
Handler
{
fun
onItemPressed
(
view
:
View
,
item
:
BaseSettingsItem
,
andThen
:
()
->
Unit
=
{})
interface
Callback
{
fun
onItemAction
(
view
:
View
,
item
:
BaseSettingsItem
)
fun
onItemPressed
(
view
:
View
,
item
:
BaseSettingsItem
,
callback
:
()
->
Unit
=
{})
fun
onItemChanged
(
view
:
View
,
item
:
BaseSettingsItem
)
}
}
// ---
abstract
class
Value
<
T
>
:
BaseSettingsItem
()
{
abstract
class
Value
<
T
>
:
BaseSettingsItem
()
{
/**
/**
* Represents last agreed-upon value by the validation process and the user for current
* Represents last agreed-upon value by the validation process and the user for current
* child. Be very aware that this shouldn't be **set** unless both sides agreed that _that_
* child. Be very aware that this shouldn't be **set** unless both sides agreed that _that_
* is the new value.
* is the new value.
*
* Annotating [value] as [Bindable] property should raise red flags immediately. If you
* need a [Bindable] property create another one. Seriously.
* */
* */
abstract
var
value
:
T
abstract
var
value
:
T
/**
* We don't want this to be accessible to be set from outside the instances. It will
* introduce unwanted bugs!
* */
protected
set
protected
set
protected
var
callbackVars
:
Pair
<
View
,
Callback
>?
=
null
@CallSuper
override
fun
onPressed
(
view
:
View
,
callback
:
Callback
)
{
callbackVars
=
view
to
callback
callback
.
onItemPressed
(
view
,
this
)
{
onPressed
(
view
)
}
}
abstract
fun
onPressed
(
view
:
View
)
protected
inline
fun
<
reified
T
>
setV
(
new
:
T
,
old
:
T
,
setter
:
(
T
)
->
Unit
,
afterChanged
:
(
T
)
->
Unit
=
{})
{
set
(
new
,
old
,
setter
,
BR
.
description
,
BR
.
checked
)
{
afterChanged
(
it
)
callbackVars
?.
let
{
(
view
,
callback
)
->
callbackVars
=
null
callback
.
onItemChanged
(
view
,
this
)
}
}
}
}
}
abstract
class
Toggle
:
Value
<
Boolean
>()
{
abstract
class
Toggle
:
Value
<
Boolean
>()
{
...
@@ -97,38 +53,45 @@ sealed class BaseSettingsItem : ObservableRvItem() {
...
@@ -97,38 +53,45 @@ sealed class BaseSettingsItem : ObservableRvItem() {
override
val
showSwitch
get
()
=
true
override
val
showSwitch
get
()
=
true
override
val
isChecked
get
()
=
value
override
val
isChecked
get
()
=
value
override
fun
onToggle
(
view
:
View
,
callback
:
Callback
,
checked
:
Boolean
)
=
override
fun
onToggle
(
view
:
View
,
handler
:
Handler
,
checked
:
Boolean
)
=
set
(
checked
,
value
,
{
onPressed
(
view
,
callback
)
},
BR
.
checked
)
set
(
checked
,
value
,
{
onPressed
(
view
,
handler
)
}
)
override
fun
onPressed
(
view
:
View
)
{
override
fun
onPressed
(
view
:
View
,
handler
:
Handler
)
{
value
=
!
value
handler
.
onItemPressed
(
view
,
this
)
{
value
=
!
value
notifyPropertyChanged
(
BR
.
checked
)
handler
.
onItemAction
(
view
,
this
)
}
}
}
}
}
abstract
class
Input
:
Value
<
String
>()
{
abstract
class
Input
:
Value
<
String
>()
{
protected
abstract
val
inputResult
:
String
?
@get
:
Bindable
abstract
val
inputResult
:
String
?
override
fun
onPressed
(
view
:
View
)
{
MagiskDialog
(
view
.
context
).
apply
{
override
fun
onPressed
(
view
:
View
,
handler
:
Handler
)
{
setTitle
(
title
.
getText
(
view
.
resources
))
handler
.
onItemPressed
(
view
,
this
)
{
setView
(
getView
(
view
.
context
))
MagiskDialog
(
view
.
context
).
apply
{
setButton
(
MagiskDialog
.
ButtonType
.
POSITIVE
)
{
setTitle
(
title
.
getText
(
view
.
resources
))
text
=
android
.
R
.
string
.
ok
setView
(
getView
(
view
.
context
))
onClick
{
setButton
(
MagiskDialog
.
ButtonType
.
POSITIVE
)
{
inputResult
?.
let
{
result
->
text
=
android
.
R
.
string
.
ok
doNotDismiss
=
false
onClick
{
value
=
result
inputResult
?.
let
{
result
->
it
.
dismiss
()
doNotDismiss
=
false
return
@onClick
value
=
result
handler
.
onItemAction
(
view
,
this
@Input
)
return
@onClick
}
doNotDismiss
=
true
}
}
doNotDismiss
=
true
}
}
}
setButton
(
MagiskDialog
.
ButtonType
.
NEGATIVE
)
{
setButton
(
MagiskDialog
.
ButtonType
.
NEGATIVE
)
{
text
=
android
.
R
.
string
.
cancel
text
=
android
.
R
.
string
.
cancel
}
}
}
.
show
()
}
.
show
()
}
}
}
abstract
fun
getView
(
context
:
Context
):
View
abstract
fun
getView
(
context
:
Context
):
View
...
@@ -150,18 +113,23 @@ sealed class BaseSettingsItem : ObservableRvItem() {
...
@@ -150,18 +113,23 @@ sealed class BaseSettingsItem : ObservableRvItem() {
private
fun
Resources
.
getArrayOrEmpty
(
id
:
Int
):
Array
<
String
>
=
private
fun
Resources
.
getArrayOrEmpty
(
id
:
Int
):
Array
<
String
>
=
runCatching
{
getStringArray
(
id
)
}.
getOrDefault
(
emptyArray
())
runCatching
{
getStringArray
(
id
)
}.
getOrDefault
(
emptyArray
())
override
fun
onPressed
(
view
:
View
)
{
override
fun
onPressed
(
view
:
View
,
handler
:
Handler
)
{
MagiskDialog
(
view
.
context
).
apply
{
handler
.
onItemPressed
(
view
,
this
)
{
setTitle
(
title
.
getText
(
view
.
resources
))
MagiskDialog
(
view
.
context
).
apply
{
setButton
(
MagiskDialog
.
ButtonType
.
NEGATIVE
)
{
setTitle
(
title
.
getText
(
view
.
resources
))
text
=
android
.
R
.
string
.
cancel
setButton
(
MagiskDialog
.
ButtonType
.
NEGATIVE
)
{
}
text
=
android
.
R
.
string
.
cancel
setListItems
(
entries
(
view
.
resources
))
{
}
value
=
it
setListItems
(
entries
(
view
.
resources
))
{
}
if
(
value
!=
it
)
{
}.
show
()
value
=
it
notifyPropertyChanged
(
BR
.
description
)
handler
.
onItemAction
(
view
,
this
@Selector
)
}
}
}.
show
()
}
}
}
}
}
abstract
class
Blank
:
BaseSettingsItem
()
abstract
class
Blank
:
BaseSettingsItem
()
...
...
app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt
View file @
5313a46a
This diff is collapsed.
Click to expand it.
app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt
View file @
5313a46a
...
@@ -26,10 +26,10 @@ import com.topjohnwu.magisk.utils.Utils
...
@@ -26,10 +26,10 @@ import com.topjohnwu.magisk.utils.Utils
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
kotlinx.coroutines.launch
import
kotlinx.coroutines.launch
class
SettingsViewModel
:
BaseViewModel
(),
BaseSettingsItem
.
Callback
{
class
SettingsViewModel
:
BaseViewModel
(),
BaseSettingsItem
.
Handler
{
val
adapter
=
adapterOf
<
BaseSettingsItem
>()
val
adapter
=
adapterOf
<
BaseSettingsItem
>()
val
itemBinding
=
itemBindingOf
<
BaseSettingsItem
>
{
it
.
bindExtra
(
BR
.
callback
,
this
)
}
val
itemBinding
=
itemBindingOf
<
BaseSettingsItem
>
{
it
.
bindExtra
(
BR
.
handler
,
this
)
}
val
items
=
createItems
()
val
items
=
createItems
()
init
{
init
{
...
@@ -96,27 +96,25 @@ class SettingsViewModel : BaseViewModel(), BaseSettingsItem.Callback {
...
@@ -96,27 +96,25 @@ class SettingsViewModel : BaseViewModel(), BaseSettingsItem.Callback {
return
list
return
list
}
}
override
fun
onItemPressed
(
view
:
View
,
item
:
BaseSettingsItem
,
callback
:
()
->
Unit
)
{
override
fun
onItemPressed
(
view
:
View
,
item
:
BaseSettingsItem
,
andThen
:
()
->
Unit
)
{
when
(
item
)
{
when
(
item
)
{
is
DownloadPath
->
withExternalRW
(
callback
)
DownloadPath
->
withExternalRW
(
andThen
)
is
Biometrics
->
authenticate
(
callback
)
Biometrics
->
authenticate
(
andThen
)
is
Theme
->
Theme
->
SettingsFragmentDirections
.
actionSettingsFragmentToThemeFragment
().
navigate
()
SettingsFragmentDirections
.
actionSettingsFragmentToThemeFragment
().
navigate
()
DenyListConfig
->
SettingsFragmentDirections
.
actionSettingsFragmentToDenyFragment
().
navigate
()
is
DenyListConfig
->
SystemlessHosts
->
createHosts
()
SettingsFragmentDirections
.
actionSettingsFragmentToDenyFragment
().
navigate
()
Restore
->
RestoreAppDialog
().
publish
()
is
SystemlessHosts
->
createHosts
()
AddShortcut
->
AddHomeIconEvent
().
publish
()
is
Restore
->
RestoreAppDialog
().
publish
()
else
->
andThen
()
is
AddShortcut
->
AddHomeIconEvent
().
publish
()
else
->
callback
()
}
}
}
}
override
fun
onItem
Changed
(
view
:
View
,
item
:
BaseSettingsItem
)
{
override
fun
onItem
Action
(
view
:
View
,
item
:
BaseSettingsItem
)
{
when
(
item
)
{
when
(
item
)
{
is
Language
->
RecreateEvent
().
publish
()
Language
->
RecreateEvent
().
publish
()
is
UpdateChannel
->
openUrlIfNecessary
(
view
)
UpdateChannel
->
openUrlIfNecessary
(
view
)
is
Hide
->
viewModelScope
.
launch
{
HideAPK
.
hide
(
view
.
activity
,
item
.
value
)
}
is
Hide
->
viewModelScope
.
launch
{
HideAPK
.
hide
(
view
.
activity
,
item
.
value
)
}
is
Zygisk
->
if
(
Zygisk
.
mismatch
)
SnackbarEvent
(
R
.
string
.
reboot_apply_change
).
publish
()
Zygisk
->
if
(
Zygisk
.
mismatch
)
SnackbarEvent
(
R
.
string
.
reboot_apply_change
).
publish
()
else
->
Unit
else
->
Unit
}
}
}
}
...
...
app/src/main/res/layout/dialog_settings_download_path.xml
View file @
5313a46a
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:inputType=
"textUri"
android:inputType=
"textUri"
android:text=
"@={data.
r
esult}"
android:text=
"@={data.
inputR
esult}"
android:textAppearance=
"@style/AppearanceFoundation.Body"
android:textAppearance=
"@style/AppearanceFoundation.Body"
android:textColor=
"?colorOnSurface"
android:textColor=
"?colorOnSurface"
tools:text=
"@tools:sample/lorem"
/>
tools:text=
"@tools:sample/lorem"
/>
...
...
app/src/main/res/layout/dialog_settings_update_channel.xml
View file @
5313a46a
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:inputType=
"textUri"
android:inputType=
"textUri"
android:text=
"@={data.
r
esult}"
android:text=
"@={data.
inputR
esult}"
android:textAppearance=
"@style/AppearanceFoundation.Body"
android:textAppearance=
"@style/AppearanceFoundation.Body"
android:textColor=
"?colorOnSurface"
android:textColor=
"?colorOnSurface"
tools:text=
"@tools:sample/lorem"
/>
tools:text=
"@tools:sample/lorem"
/>
...
...
app/src/main/res/layout/item_settings.xml
View file @
5313a46a
...
@@ -10,8 +10,8 @@
...
@@ -10,8 +10,8 @@
type=
"com.topjohnwu.magisk.ui.settings.BaseSettingsItem"
/>
type=
"com.topjohnwu.magisk.ui.settings.BaseSettingsItem"
/>
<variable
<variable
name=
"
callback
"
name=
"
handler
"
type=
"com.topjohnwu.magisk.ui.settings.BaseSettingsItem.
Callback
"
/>
type=
"com.topjohnwu.magisk.ui.settings.BaseSettingsItem.
Handler
"
/>
</data>
</data>
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
android:alpha=
"@{item.enabled ? 1f : .5f}"
android:alpha=
"@{item.enabled ? 1f : .5f}"
android:clickable=
"@{item.enabled}"
android:clickable=
"@{item.enabled}"
android:focusable=
"@{item.enabled}"
android:focusable=
"@{item.enabled}"
android:onClick=
"@{(view) -> item.onPressed(view,
callback
)}"
android:onClick=
"@{(view) -> item.onPressed(view,
handler
)}"
tools:layout_gravity=
"center"
>
tools:layout_gravity=
"center"
>
<LinearLayout
<LinearLayout
...
@@ -81,7 +81,7 @@
...
@@ -81,7 +81,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:checked=
"@{item.checked}"
android:checked=
"@{item.checked}"
android:focusable=
"@{item.enabled}"
android:focusable=
"@{item.enabled}"
android:onCheckedChanged=
"@{(v, c) -> item.onToggle(v,
callback
, c)}"
/>
android:onCheckedChanged=
"@{(v, c) -> item.onToggle(v,
handler
, c)}"
/>
</LinearLayout>
</LinearLayout>
...
...
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