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
7e5e1416
Commit
7e5e1416
authored
Apr 18, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed titles not setting to activity toolbar
parent
bcd1064e
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
3 deletions
+21
-3
MainActivity.kt
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
+8
-0
MagiskFragment.kt
.../main/java/com/topjohnwu/magisk/ui/home/MagiskFragment.kt
+5
-0
SettingsFragment.java
...va/com/topjohnwu/magisk/ui/settings/SettingsFragment.java
+7
-2
SuperuserFragment.kt
...va/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt
+1
-1
No files found.
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
View file @
7e5e1416
...
@@ -56,6 +56,14 @@ open class MainActivity : MagiskActivity<MainViewModel, ActivityMainBinding>() {
...
@@ -56,6 +56,14 @@ open class MainActivity : MagiskActivity<MainViewModel, ActivityMainBinding>() {
}
}
override
fun
setTitle
(
title
:
CharSequence
?)
{
supportActionBar
?.
title
=
title
}
override
fun
setTitle
(
titleId
:
Int
)
{
supportActionBar
?.
setTitle
(
titleId
)
}
override
fun
onBackPressed
()
{
override
fun
onBackPressed
()
{
if
(
binding
.
drawerLayout
.
isDrawerOpen
(
binding
.
navView
))
{
if
(
binding
.
drawerLayout
.
isDrawerOpen
(
binding
.
navView
))
{
binding
.
drawerLayout
.
closeDrawer
(
binding
.
navView
)
binding
.
drawerLayout
.
closeDrawer
(
binding
.
navView
)
...
...
app/src/main/java/com/topjohnwu/magisk/ui/home/MagiskFragment.kt
View file @
7e5e1416
...
@@ -46,6 +46,11 @@ class MagiskFragment : NewMagiskFragment<HomeViewModel, FragmentMagiskBinding>()
...
@@ -46,6 +46,11 @@ class MagiskFragment : NewMagiskFragment<HomeViewModel, FragmentMagiskBinding>()
setHasOptionsMenu
(
true
)
setHasOptionsMenu
(
true
)
}
}
override
fun
onStart
()
{
super
.
onStart
()
requireActivity
().
setTitle
(
R
.
string
.
magisk
)
}
private
fun
installMagisk
()
{
private
fun
installMagisk
()
{
// Show Manager update first
// Show Manager update first
if
(
Config
.
remoteManagerVersionCode
>
BuildConfig
.
VERSION_CODE
)
{
if
(
Config
.
remoteManagerVersionCode
>
BuildConfig
.
VERSION_CODE
)
{
...
...
app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.java
View file @
7e5e1416
...
@@ -40,11 +40,16 @@ public class SettingsFragment extends BasePreferenceFragment {
...
@@ -40,11 +40,16 @@ public class SettingsFragment extends BasePreferenceFragment {
private
ListPreference
updateChannel
,
autoRes
,
suNotification
,
private
ListPreference
updateChannel
,
autoRes
,
suNotification
,
requestTimeout
,
rootConfig
,
multiuserConfig
,
nsConfig
;
requestTimeout
,
rootConfig
,
multiuserConfig
,
nsConfig
;
@Override
public
void
onStart
()
{
super
.
onStart
();
requireActivity
().
setTitle
(
R
.
string
.
settings
);
}
@Override
@Override
public
void
onCreatePreferences
(
Bundle
savedInstanceState
,
String
rootKey
)
{
public
void
onCreatePreferences
(
Bundle
savedInstanceState
,
String
rootKey
)
{
getPreferenceManager
().
setStorageDeviceProtected
();
getPreferenceManager
().
setStorageDeviceProtected
();
setPreferencesFromResource
(
R
.
xml
.
app_settings
,
rootKey
);
setPreferencesFromResource
(
R
.
xml
.
app_settings
,
rootKey
);
requireActivity
().
setTitle
(
R
.
string
.
settings
);
boolean
showSuperuser
=
Utils
.
showSuperUser
();
boolean
showSuperuser
=
Utils
.
showSuperUser
();
app
.
getPrefs
().
edit
()
app
.
getPrefs
().
edit
()
...
...
app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt
View file @
7e5e1416
...
@@ -13,7 +13,7 @@ class SuperuserFragment :
...
@@ -13,7 +13,7 @@ class SuperuserFragment :
override
fun
onStart
()
{
override
fun
onStart
()
{
super
.
onStart
()
super
.
onStart
()
magiskActivity
.
supportActionBar
?.
title
=
getString
(
R
.
string
.
superuser
)
requireActivity
().
setTitle
(
R
.
string
.
superuser
)
}
}
override
fun
onResume
()
{
override
fun
onResume
()
{
...
...
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