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
1c8846dc
Commit
1c8846dc
authored
Jun 08, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make PreferenceModel an interface
parent
2f320c72
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
29 additions
and
28 deletions
+29
-28
KConfig.kt
app/src/main/java/com/topjohnwu/magisk/KConfig.kt
+1
-2
BooleanProperty.kt
.../com/topjohnwu/magisk/model/preference/BooleanProperty.kt
+1
-1
FloatProperty.kt
...va/com/topjohnwu/magisk/model/preference/FloatProperty.kt
+1
-1
IntProperty.kt
...java/com/topjohnwu/magisk/model/preference/IntProperty.kt
+1
-1
LongProperty.kt
...ava/com/topjohnwu/magisk/model/preference/LongProperty.kt
+1
-1
PreferenceModel.kt
.../com/topjohnwu/magisk/model/preference/PreferenceModel.kt
+22
-20
StringProperty.kt
...a/com/topjohnwu/magisk/model/preference/StringProperty.kt
+1
-1
StringSetProperty.kt
...om/topjohnwu/magisk/model/preference/StringSetProperty.kt
+1
-1
No files found.
app/src/main/java/com/topjohnwu/magisk/KConfig.kt
View file @
1c8846dc
...
...
@@ -6,10 +6,9 @@ import com.topjohnwu.magisk.di.Protected
import
com.topjohnwu.magisk.model.preference.PreferenceModel
import
com.topjohnwu.magisk.utils.inject
object
KConfig
:
PreferenceModel
()
{
object
KConfig
:
PreferenceModel
{
override
val
context
:
Context
by
inject
(
Protected
)
override
val
fileName
:
String
=
"${context.packageName}_preferences"
private
var
internalUpdateChannel
by
preference
(
Config
.
Key
.
UPDATE_CHANNEL
,
STABLE
.
id
.
toString
())
var
useCustomTabs
by
preference
(
"useCustomTabs"
,
true
)
...
...
app/src/main/java/com/topjohnwu/magisk/model/preference/BooleanProperty.kt
View file @
1c8846dc
...
...
@@ -16,7 +16,7 @@ class BooleanProperty(
property
:
KProperty
<
*
>
):
Boolean
{
val
prefName
=
name
.
trimEmptyToNull
()
?:
property
.
name
return
runCatching
{
thisRef
.
prefs
.
get
(
prefName
,
default
)
}.
getOrNull
()
?:
default
return
thisRef
.
prefs
.
get
(
prefName
,
default
)
}
override
operator
fun
setValue
(
...
...
app/src/main/java/com/topjohnwu/magisk/model/preference/FloatProperty.kt
View file @
1c8846dc
...
...
@@ -16,7 +16,7 @@ class FloatProperty(
property
:
KProperty
<
*
>
):
Float
{
val
prefName
=
name
.
trimEmptyToNull
()
?:
property
.
name
return
runCatching
{
thisRef
.
prefs
.
get
(
prefName
,
default
)
}.
getOrNull
()
?:
default
return
thisRef
.
prefs
.
get
(
prefName
,
default
)
}
override
operator
fun
setValue
(
...
...
app/src/main/java/com/topjohnwu/magisk/model/preference/IntProperty.kt
View file @
1c8846dc
...
...
@@ -16,7 +16,7 @@ class IntProperty(
property
:
KProperty
<
*
>
):
Int
{
val
prefName
=
name
.
trimEmptyToNull
()
?:
property
.
name
return
runCatching
{
thisRef
.
prefs
.
get
(
prefName
,
default
)
}.
getOrNull
()
?:
default
return
thisRef
.
prefs
.
get
(
prefName
,
default
)
}
override
operator
fun
setValue
(
...
...
app/src/main/java/com/topjohnwu/magisk/model/preference/LongProperty.kt
View file @
1c8846dc
...
...
@@ -16,7 +16,7 @@ class LongProperty(
property
:
KProperty
<
*
>
):
Long
{
val
prefName
=
name
.
trimEmptyToNull
()
?:
property
.
name
return
runCatching
{
thisRef
.
prefs
.
get
(
prefName
,
default
)
}.
getOrNull
()
?:
default
return
thisRef
.
prefs
.
get
(
prefName
,
default
)
}
override
operator
fun
setValue
(
...
...
app/src/main/java/com/topjohnwu/magisk/model/preference/PreferenceModel.kt
View file @
1c8846dc
package
com.topjohnwu.magisk.model.preference
import
android.content.Context
import
kotlin.properties.ReadWriteProperty
import
android.content.SharedPreferences
abstract
class
PreferenceModel
(
private
val
commitPrefs
:
Boolean
=
false
)
{
interface
PreferenceModel
{
protected
abstract
val
fileName
:
String
protected
abstract
val
context
:
Context
val
context
:
Context
internal
val
prefs
get
()
=
context
.
getSharedPreferences
(
fileName
,
Context
.
MODE_PRIVATE
)
val
fileName
:
String
get
()
=
"${context.packageName}_preferences"
val
commitPrefs
:
Boolean
get
()
=
false
val
prefs
:
SharedPreferences
get
()
=
context
.
getSharedPreferences
(
fileName
,
Context
.
MODE_PRIVATE
)
protected
fun
preference
(
fun
preference
(
name
:
String
,
default
:
Boolean
,
commit
:
Boolean
=
commitPrefs
)
:
ReadWriteProperty
<
PreferenceModel
,
Boolean
>
=
BooleanProperty
(
name
,
default
,
commit
)
)
=
BooleanProperty
(
name
,
default
,
commit
)
protected
fun
preference
(
fun
preference
(
name
:
String
,
default
:
Float
,
commit
:
Boolean
=
commitPrefs
)
:
ReadWriteProperty
<
PreferenceModel
,
Float
>
=
FloatProperty
(
name
,
default
,
commit
)
)
=
FloatProperty
(
name
,
default
,
commit
)
protected
fun
preference
(
fun
preference
(
name
:
String
,
default
:
Int
,
commit
:
Boolean
=
commitPrefs
)
:
ReadWriteProperty
<
PreferenceModel
,
Int
>
=
IntProperty
(
name
,
default
,
commit
)
)
=
IntProperty
(
name
,
default
,
commit
)
protected
fun
preference
(
fun
preference
(
name
:
String
,
default
:
Long
,
commit
:
Boolean
=
commitPrefs
)
:
ReadWriteProperty
<
PreferenceModel
,
Long
>
=
LongProperty
(
name
,
default
,
commit
)
)
=
LongProperty
(
name
,
default
,
commit
)
protected
fun
preference
(
fun
preference
(
name
:
String
,
default
:
String
,
commit
:
Boolean
=
commitPrefs
)
:
ReadWriteProperty
<
PreferenceModel
,
String
>
=
StringProperty
(
name
,
default
,
commit
)
)
=
StringProperty
(
name
,
default
,
commit
)
protected
fun
preference
(
fun
preference
(
name
:
String
,
default
:
Set
<
String
>,
commit
:
Boolean
=
commitPrefs
)
:
ReadWriteProperty
<
PreferenceModel
,
Set
<
String
>>
=
StringSetProperty
(
name
,
default
,
commit
)
)
=
StringSetProperty
(
name
,
default
,
commit
)
}
app/src/main/java/com/topjohnwu/magisk/model/preference/StringProperty.kt
View file @
1c8846dc
...
...
@@ -16,7 +16,7 @@ class StringProperty(
property
:
KProperty
<
*
>
):
String
{
val
prefName
=
name
.
trimEmptyToNull
()
?:
property
.
name
return
runCatching
{
thisRef
.
prefs
.
get
(
prefName
,
default
)
}.
getOrNull
()
?:
default
return
thisRef
.
prefs
.
get
(
prefName
,
default
)
}
override
operator
fun
setValue
(
...
...
app/src/main/java/com/topjohnwu/magisk/model/preference/StringSetProperty.kt
View file @
1c8846dc
...
...
@@ -16,7 +16,7 @@ class StringSetProperty(
property
:
KProperty
<
*
>
):
Set
<
String
>
{
val
prefName
=
name
.
trimEmptyToNull
()
?:
property
.
name
return
runCatching
{
thisRef
.
prefs
.
get
(
prefName
,
default
)
}.
getOrNull
()
?:
default
return
thisRef
.
prefs
.
get
(
prefName
,
default
)
}
override
operator
fun
setValue
(
...
...
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