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
c3c155a1
Commit
c3c155a1
authored
Jan 25, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improved settings
parent
b0671056
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
40 additions
and
50 deletions
+40
-50
Global.java
app/src/main/java/com/topjohnwu/magisk/Global.java
+1
-1
SettingsActivity.java
app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
+17
-25
strings.xml
app/src/main/res/values-ar/strings.xml
+2
-2
strings.xml
app/src/main/res/values-de/strings.xml
+2
-2
strings.xml
app/src/main/res/values-es/strings.xml
+2
-2
strings.xml
app/src/main/res/values-it/strings.xml
+2
-2
strings.xml
app/src/main/res/values-nl/strings.xml
+2
-2
strings.xml
app/src/main/res/values-pt/strings.xml
+2
-2
strings.xml
app/src/main/res/values-zh-rCN/strings.xml
+2
-2
strings.xml
app/src/main/res/values/strings.xml
+2
-2
app_settings.xml
app/src/main/res/xml/app_settings.xml
+6
-8
No files found.
app/src/main/java/com/topjohnwu/magisk/Global.java
View file @
c3c155a1
...
...
@@ -45,7 +45,7 @@ public class Global {
public
static
void
init
(
Context
context
)
{
SharedPreferences
prefs
=
PreferenceManager
.
getDefaultSharedPreferences
(
context
);
isDarkTheme
=
prefs
.
get
String
(
"theme"
,
context
.
getString
(
R
.
string
.
theme_default_value
)).
equalsIgnoreCase
(
context
.
getString
(
R
.
string
.
theme_dark_value
)
);
isDarkTheme
=
prefs
.
get
Boolean
(
"dark_theme"
,
false
);
devLogging
=
prefs
.
getBoolean
(
"developer_logging"
,
false
);
shellLogging
=
prefs
.
getBoolean
(
"shell_logging"
,
false
);
}
...
...
app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
View file @
c3c155a1
...
...
@@ -7,6 +7,7 @@ import android.preference.ListPreference;
import
android.preference.Preference
;
import
android.preference.PreferenceFragment
;
import
android.preference.PreferenceManager
;
import
android.preference.SwitchPreference
;
import
android.support.v7.app.ActionBar
;
import
android.support.v7.app.AppCompatActivity
;
import
android.support.v7.widget.Toolbar
;
...
...
@@ -73,7 +74,6 @@ public class SettingsActivity extends AppCompatActivity {
public
static
class
SettingsFragment
extends
PreferenceFragment
implements
SharedPreferences
.
OnSharedPreferenceChangeListener
{
private
ListPreference
themePreference
;
private
SharedPreferences
prefs
;
@Override
...
...
@@ -83,10 +83,9 @@ public class SettingsActivity extends AppCompatActivity {
PreferenceManager
.
setDefaultValues
(
getActivity
(),
R
.
xml
.
app_settings
,
false
);
prefs
=
PreferenceManager
.
getDefaultSharedPreferences
(
getActivity
());
themePreference
=
(
ListPreference
)
findPreference
(
"theme"
);
CheckBoxPreference
busyboxPreference
=
(
CheckBoxPreference
)
findPreference
(
"busybox"
);
CheckBoxPreference
magiskhidePreference
=
(
CheckBoxPreference
)
findPreference
(
"magiskhide"
);
CheckBoxPreference
hostsPreference
=
(
CheckBox
Preference
)
findPreference
(
"hosts"
);
SwitchPreference
hostsPreference
=
(
Switch
Preference
)
findPreference
(
"hosts"
);
Preference
clear
=
findPreference
(
"clear"
);
clear
.
setOnPreferenceClickListener
((
pref
)
->
{
...
...
@@ -94,25 +93,18 @@ public class SettingsActivity extends AppCompatActivity {
return
true
;
});
if
(
Global
.
Configs
.
isDarkTheme
)
{
themePreference
.
setSummary
(
R
.
string
.
theme_dark
);
if
(!
Shell
.
rootAccess
())
{
busyboxPreference
.
setEnabled
(
false
);
magiskhidePreference
.
setEnabled
(
false
);
hostsPreference
.
setEnabled
(
false
);
}
else
{
themePreference
.
setSummary
(
R
.
string
.
theme_default
);
}
if
(
Global
.
Info
.
magiskVersion
<
9
)
{
hostsPreference
.
setEnabled
(
false
);
busyboxPreference
.
setEnabled
(
false
);
}
else
if
(
Global
.
Info
.
magiskVersion
<
8
)
{
magiskhidePreference
.
setEnabled
(
false
);
}
else
if
(!
Shell
.
rootAccess
())
{
busyboxPreference
.
setEnabled
(
false
);
}
if
(
Global
.
Info
.
magiskVersion
<
8
)
{
magiskhidePreference
.
setEnabled
(
false
);
hostsPreference
.
setEnabled
(
false
);
}
else
{
busyboxPreference
.
setEnabled
(
true
);
magiskhidePreference
.
setEnabled
(
true
);
hostsPreference
.
setEnabled
(
true
);
}
}
}
...
...
@@ -123,9 +115,9 @@ public class SettingsActivity extends AppCompatActivity {
}
@Override
public
void
onDestroy
()
{
public
void
onStop
()
{
super
.
onStop
();
prefs
.
unregisterOnSharedPreferenceChangeListener
(
this
);
super
.
onDestroy
();
}
@Override
...
...
@@ -134,10 +126,10 @@ public class SettingsActivity extends AppCompatActivity {
boolean
checked
;
switch
(
key
)
{
case
"theme"
:
String
theme
=
prefs
.
getString
(
"theme"
,
getString
(
R
.
string
.
theme_default_value
)
);
if
(
Global
.
Configs
.
isDarkTheme
!=
theme
.
equalsIgnoreCase
(
getString
(
R
.
string
.
theme_dark_value
))
)
{
Global
.
Configs
.
isDarkTheme
=
!
Global
.
Configs
.
isDarkTheme
;
case
"
dark_
theme"
:
checked
=
prefs
.
getBoolean
(
"dark_theme"
,
false
);
if
(
Global
.
Configs
.
isDarkTheme
!=
checked
)
{
Global
.
Configs
.
isDarkTheme
=
checked
;
getActivity
().
recreate
();
Global
.
Events
.
reloadMainActivity
.
trigger
();
}
...
...
app/src/main/res/values-ar/strings.xml
View file @
c3c155a1
...
...
@@ -83,8 +83,8 @@
<!--Settings Activity -->
<string
name=
"settings_general_category"
>
عام
</string>
<string
name=
"settings_theme_title"
>
السمة
</string>
<string
name=
"settings_theme_summary"
>
أختر سمة
</string>
<string
name=
"settings_
dark_
theme_title"
>
السمة
</string>
<string
name=
"settings_
dark_
theme_summary"
>
أختر سمة
</string>
<string
name=
"theme_default"
>
إفتراضي
</string>
<string
name=
"theme_dark"
>
غامق
</string>
...
...
app/src/main/res/values-de/strings.xml
View file @
c3c155a1
...
...
@@ -113,8 +113,8 @@
<!--Settings Activity -->
<string
name=
"settings_general_category"
>
Allgemein
</string>
<string
name=
"settings_theme_title"
>
Thema
</string>
<string
name=
"settings_theme_summary"
>
Wähle ein Thema
</string>
<string
name=
"settings_
dark_
theme_title"
>
Thema
</string>
<string
name=
"settings_
dark_
theme_summary"
>
Wähle ein Thema
</string>
<string
name=
"theme_default"
>
Standard
</string>
<string
name=
"theme_dark"
>
Dunkel
</string>
<string
name=
"settings_clear_cache_title"
>
Repo-Cache löschen
</string>
...
...
app/src/main/res/values-es/strings.xml
View file @
c3c155a1
...
...
@@ -80,8 +80,8 @@
<!--Settings Activity -->
<string
name=
"settings_general_category"
>
General
</string>
<string
name=
"settings_theme_title"
>
Tema
</string>
<string
name=
"settings_theme_summary"
>
Selecciona un tema
</string>
<string
name=
"settings_
dark_
theme_title"
>
Tema
</string>
<string
name=
"settings_
dark_
theme_summary"
>
Selecciona un tema
</string>
<string
name=
"theme_default"
>
Por defecto
</string>
<string
name=
"theme_dark"
>
Oscuro
</string>
...
...
app/src/main/res/values-it/strings.xml
View file @
c3c155a1
...
...
@@ -78,8 +78,8 @@
<!--Settings Fragment -->
<string
name=
"settings_general_category"
>
Generali
</string>
<string
name=
"settings_theme_title"
>
Tema
</string>
<string
name=
"settings_theme_summary"
>
Scegli un tema
</string>
<string
name=
"settings_
dark_
theme_title"
>
Tema
</string>
<string
name=
"settings_
dark_
theme_summary"
>
Scegli un tema
</string>
<string
name=
"theme_default"
>
Default
</string>
<string
name=
"theme_dark"
>
Scuro
</string>
...
...
app/src/main/res/values-nl/strings.xml
View file @
c3c155a1
...
...
@@ -78,8 +78,8 @@
<!--Settings Fragment -->
<string
name=
"settings_general_category"
>
Algemeen
</string>
<string
name=
"settings_theme_title"
>
Thema
</string>
<string
name=
"settings_theme_summary"
>
Selecteer een thema
</string>
<string
name=
"settings_
dark_
theme_title"
>
Thema
</string>
<string
name=
"settings_
dark_
theme_summary"
>
Selecteer een thema
</string>
<string
name=
"theme_default"
>
Standaard
</string>
<string
name=
"theme_dark"
>
Donker
</string>
...
...
app/src/main/res/values-pt/strings.xml
View file @
c3c155a1
...
...
@@ -107,8 +107,8 @@
<!--Settings Fragment -->
<string
name=
"settings_general_category"
>
Geral
</string>
<string
name=
"settings_theme_title"
>
Tema
</string>
<string
name=
"settings_theme_summary"
>
Escolha um tema
</string>
<string
name=
"settings_
dark_
theme_title"
>
Tema
</string>
<string
name=
"settings_
dark_
theme_summary"
>
Escolha um tema
</string>
<string
name=
"theme_default"
>
Padrão
</string>
<string
name=
"theme_dark"
>
Escuro
</string>
...
...
app/src/main/res/values-zh-rCN/strings.xml
View file @
c3c155a1
...
...
@@ -104,8 +104,8 @@
<!--Settings Activity -->
<string
name=
"settings_general_category"
>
常规
</string>
<string
name=
"settings_theme_title"
>
主题
</string>
<string
name=
"settings_theme_summary"
>
选择一个主题
</string>
<string
name=
"settings_
dark_
theme_title"
>
主题
</string>
<string
name=
"settings_
dark_
theme_summary"
>
选择一个主题
</string>
<string
name=
"theme_default"
>
默认
</string>
<string
name=
"theme_dark"
>
深色
</string>
...
...
app/src/main/res/values/strings.xml
View file @
c3c155a1
...
...
@@ -121,8 +121,8 @@
<!--Settings Activity -->
<string
name=
"settings_general_category"
>
General
</string>
<string
name=
"settings_
theme_title"
>
Theme
</string>
<string
name=
"settings_
theme_summary"
>
Select a
theme
</string>
<string
name=
"settings_
dark_theme_title"
>
Dark
Theme
</string>
<string
name=
"settings_
dark_theme_summary"
>
Toggle dark
theme
</string>
<string
name=
"theme_default"
>
Default
</string>
<string
name=
"theme_dark"
>
Dark
</string>
<string
name=
"settings_clear_cache_title"
>
Clear Repo Cache
</string>
...
...
app/src/main/res/xml/app_settings.xml
View file @
c3c155a1
...
...
@@ -4,13 +4,11 @@
<PreferenceCategory
android:title=
"@string/settings_general_category"
>
<ListPreference
android:key=
"theme"
android:title=
"@string/settings_theme_title"
android:summary=
"@string/settings_theme_summary"
android:defaultValue=
"@string/theme_default_value"
android:entries=
"@array/themes"
android:entryValues=
"@array/themes_values"
/>
<SwitchPreference
android:defaultValue=
"false"
android:title=
"@string/settings_dark_theme_title"
android:summary=
"@string/settings_dark_theme_summary"
android:key=
"dark_theme"
/>
<Preference
android:key=
"clear"
...
...
@@ -34,7 +32,7 @@
android:title=
"@string/settings_busybox_title"
android:summary=
"@string/settings_busybox_summary"
/>
<
CheckBox
Preference
<
Switch
Preference
android:key=
"hosts"
android:defaultValue=
"false"
android:title=
"@string/settings_hosts_title"
...
...
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