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
15aa8134
Commit
15aa8134
authored
Apr 17, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrated to compat shared prefs and fixed it not reacting to changes
Added back dark theme
parent
605faccf
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
6 deletions
+33
-6
App.java
app/src/main/java/com/topjohnwu/magisk/App.java
+0
-0
App.kt
app/src/main/java/com/topjohnwu/magisk/App.kt
+5
-6
MagiskActivity.kt
.../main/java/com/topjohnwu/magisk/ui/base/MagiskActivity.kt
+13
-0
SettingsFragment.java
...va/com/topjohnwu/magisk/ui/settings/SettingsFragment.java
+1
-0
styles_new.xml
app/src/main/res/values-night/styles_new.xml
+14
-0
No files found.
app/src/main/java/com/topjohnwu/magisk/App.java
deleted
100644 → 0
View file @
605faccf
app/src/main/java/com/topjohnwu/magisk/App.kt
View file @
15aa8134
...
...
@@ -9,8 +9,8 @@ import android.content.res.Configuration
import
android.os.AsyncTask
import
android.os.Build
import
android.os.Bundle
import
android.preference.PreferenceManager
import
androidx.appcompat.app.AppCompatDelegate
import
androidx.preference.PreferenceManager
import
com.topjohnwu.magisk.data.database.MagiskDB
import
com.topjohnwu.magisk.data.database.RepoDatabaseHelper
import
com.topjohnwu.magisk.di.koinModules
...
...
@@ -26,7 +26,7 @@ import java.util.concurrent.ThreadPoolExecutor
open
class
App
:
Application
(),
Application
.
ActivityLifecycleCallbacks
{
// Global resources
val
prefs
:
SharedPreferences
by
lazy
{
PreferenceManager
.
getDefaultSharedPreferences
(
deContext
)
}
val
prefs
:
SharedPreferences
get
()
=
PreferenceManager
.
getDefaultSharedPreferences
(
deContext
)
val
DB
:
MagiskDB
by
lazy
{
MagiskDB
(
deContext
)
}
@JvmField
var
repoDB
:
RepoDatabaseHelper
?
=
null
...
...
@@ -52,10 +52,7 @@ open class App : Application(), Application.ActivityLifecycleCallbacks {
if
(
Build
.
VERSION
.
SDK_INT
>=
24
)
{
deContext
=
base
.
createDeviceProtectedStorageContext
()
deContext
.
moveSharedPreferencesFrom
(
base
,
PreferenceManager
.
getDefaultSharedPreferencesName
(
base
)
)
deContext
.
moveSharedPreferencesFrom
(
base
,
base
.
defaultPrefsName
)
}
Networking
.
init
(
base
)
...
...
@@ -89,6 +86,8 @@ open class App : Application(), Application.ActivityLifecycleCallbacks {
override
fun
onActivityDestroyed
(
activity
:
Activity
)
{}
//endregion
private
val
Context
.
defaultPrefsName
get
()
=
"${packageName}_preferences"
companion
object
{
//fixme this should be at least weak reference, me no likey
...
...
app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskActivity.kt
View file @
15aa8134
...
...
@@ -3,12 +3,14 @@ package com.topjohnwu.magisk.ui.base
import
android.content.Intent
import
android.os.Bundle
import
androidx.annotation.CallSuper
import
androidx.appcompat.app.AppCompatDelegate
import
androidx.core.net.toUri
import
androidx.databinding.ViewDataBinding
import
androidx.fragment.app.Fragment
import
com.ncapdevi.fragnav.FragNavController
import
com.ncapdevi.fragnav.FragNavTransactionOptions
import
com.skoumal.teanity.viewevents.ViewEvent
import
com.topjohnwu.magisk.Config
import
com.topjohnwu.magisk.model.navigation.MagiskAnimBuilder
import
com.topjohnwu.magisk.model.navigation.MagiskNavigationEvent
import
com.topjohnwu.magisk.model.navigation.Navigator
...
...
@@ -31,6 +33,17 @@ abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBin
FragNavController
(
supportFragmentManager
,
navHostId
)
}
init
{
val
isDarkTheme
=
Config
.
get
<
Boolean
>(
Config
.
Key
.
DARK_THEME
)
val
theme
=
if
(
isDarkTheme
)
{
AppCompatDelegate
.
MODE_NIGHT_YES
}
else
{
AppCompatDelegate
.
MODE_NIGHT_NO
}
AppCompatDelegate
.
setDefaultNightMode
(
theme
)
AppCompatDelegate
.
setCompatVectorFromResourcesEnabled
(
true
)
}
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
super
.
onCreate
(
savedInstanceState
)
navigationController
.
apply
{
...
...
app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.java
View file @
15aa8134
...
...
@@ -42,6 +42,7 @@ public class SettingsFragment extends BasePreferenceFragment {
@Override
public
void
onCreatePreferences
(
Bundle
savedInstanceState
,
String
rootKey
)
{
getPreferenceManager
().
setStorageDeviceProtected
();
setPreferencesFromResource
(
R
.
xml
.
app_settings
,
rootKey
);
requireActivity
().
setTitle
(
R
.
string
.
settings
);
...
...
app/src/main/res/values-night/styles_new.xml
0 → 100644
View file @
15aa8134
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style
name=
"ThemeFoundation"
parent=
"Theme.MaterialComponents.NoActionBar"
/>
<style
name=
"MagiskTheme"
parent=
"ThemeFoundation.Colored.ExtraProps"
>
<!--All of these attributes are deprecated and will be removed-->
<item
name=
"cardStyle"
>
@style/CardViewStyle.Dark
</item>
<item
name=
"imageColorTint"
>
@color/dark_secondary_text
</item>
<item
name=
"colorControl"
>
?android:attr/textColorSecondary
</item>
<item
name=
"colorAccentFallback"
>
@color/accentFallback
</item>
</style>
</resources>
\ No newline at end of file
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