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
27fb0474
Commit
27fb0474
authored
Oct 20, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added more standard night-mode system
parent
7f0a8774
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
3 deletions
+13
-3
Config.kt
app/src/main/java/com/topjohnwu/magisk/Config.kt
+7
-0
BaseActivity.kt
app/src/main/java/com/topjohnwu/magisk/base/BaseActivity.kt
+6
-3
No files found.
app/src/main/java/com/topjohnwu/magisk/Config.kt
View file @
27fb0474
...
@@ -4,6 +4,7 @@ import android.content.Context
...
@@ -4,6 +4,7 @@ import android.content.Context
import
android.content.SharedPreferences
import
android.content.SharedPreferences
import
android.os.Environment
import
android.os.Environment
import
android.util.Xml
import
android.util.Xml
import
androidx.appcompat.app.AppCompatDelegate
import
androidx.core.content.edit
import
androidx.core.content.edit
import
com.topjohnwu.magisk.data.database.SettingsDao
import
com.topjohnwu.magisk.data.database.SettingsDao
import
com.topjohnwu.magisk.data.database.StringDao
import
com.topjohnwu.magisk.data.database.StringDao
...
@@ -45,6 +46,7 @@ object Config : PreferenceModel, DBConfig {
...
@@ -45,6 +46,7 @@ object Config : PreferenceModel, DBConfig {
const
val
CUSTOM_CHANNEL
=
"custom_channel"
const
val
CUSTOM_CHANNEL
=
"custom_channel"
const
val
LOCALE
=
"locale"
const
val
LOCALE
=
"locale"
const
val
DARK_THEME
=
"dark_theme"
const
val
DARK_THEME
=
"dark_theme"
const
val
DARK_THEME_EXTENDED
=
"dark_theme_extended"
const
val
REPO_ORDER
=
"repo_order"
const
val
REPO_ORDER
=
"repo_order"
const
val
SHOW_SYSTEM_APP
=
"show_system"
const
val
SHOW_SYSTEM_APP
=
"show_system"
const
val
DOWNLOAD_PATH
=
"download_path"
const
val
DOWNLOAD_PATH
=
"download_path"
...
@@ -110,7 +112,12 @@ object Config : PreferenceModel, DBConfig {
...
@@ -110,7 +112,12 @@ object Config : PreferenceModel, DBConfig {
var
updateChannel
by
preferenceStrInt
(
Key
.
UPDATE_CHANNEL
,
defaultChannel
)
var
updateChannel
by
preferenceStrInt
(
Key
.
UPDATE_CHANNEL
,
defaultChannel
)
var
redesign
by
preference
(
Key
.
REDESIGN
,
false
)
var
redesign
by
preference
(
Key
.
REDESIGN
,
false
)
@Deprecated
(
"Use extended dark theme"
)
var
darkTheme
by
preference
(
Key
.
DARK_THEME
,
true
)
var
darkTheme
by
preference
(
Key
.
DARK_THEME
,
true
)
var
darkThemeExtended
by
preference
(
Key
.
DARK_THEME_EXTENDED
,
AppCompatDelegate
.
MODE_NIGHT_FOLLOW_SYSTEM
)
var
suReAuth
by
preference
(
Key
.
SU_REAUTH
,
false
)
var
suReAuth
by
preference
(
Key
.
SU_REAUTH
,
false
)
var
checkUpdate
by
preference
(
Key
.
CHECK_UPDATES
,
true
)
var
checkUpdate
by
preference
(
Key
.
CHECK_UPDATES
,
true
)
var
magiskHide
by
preference
(
Key
.
MAGISKHIDE
,
true
)
var
magiskHide
by
preference
(
Key
.
MAGISKHIDE
,
true
)
...
...
app/src/main/java/com/topjohnwu/magisk/base/BaseActivity.kt
View file @
27fb0474
...
@@ -39,10 +39,13 @@ abstract class BaseActivity<ViewModel : BaseViewModel, Binding : ViewDataBinding
...
@@ -39,10 +39,13 @@ abstract class BaseActivity<ViewModel : BaseViewModel, Binding : ViewDataBinding
private
val
resultCallbacks
by
lazy
{
SparseArrayCompat
<
RequestCallback
>()
}
private
val
resultCallbacks
by
lazy
{
SparseArrayCompat
<
RequestCallback
>()
}
init
{
init
{
val
theme
=
if
(
Config
.
darkTheme
)
{
val
theme
=
if
(
Config
.
redesign
)
{
AppCompatDelegate
.
MODE_NIGHT_YES
Config
.
darkThemeExtended
}
else
{
}
else
{
AppCompatDelegate
.
MODE_NIGHT_NO
when
{
Config
.
darkTheme
->
AppCompatDelegate
.
MODE_NIGHT_YES
else
->
AppCompatDelegate
.
MODE_NIGHT_NO
}
}
}
AppCompatDelegate
.
setDefaultNightMode
(
theme
)
AppCompatDelegate
.
setDefaultNightMode
(
theme
)
}
}
...
...
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