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
5109b9ab
Commit
5109b9ab
authored
Aug 07, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow modules be managed in core only mode, and add notice in UI
parent
7fb4777c
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
49 additions
and
8 deletions
+49
-8
MagiskFragment.java
app/src/full/java/com/topjohnwu/magisk/MagiskFragment.java
+3
-0
MainActivity.java
app/src/full/java/com/topjohnwu/magisk/MainActivity.java
+6
-7
ic_warning.xml
app/src/full/res/drawable/ic_warning.xml
+0
-0
activity_request.xml
app/src/full/res/layout/activity_request.xml
+1
-1
fragment_magisk.xml
app/src/full/res/layout/fragment_magisk.xml
+39
-0
No files found.
app/src/full/java/com/topjohnwu/magisk/MagiskFragment.java
View file @
5109b9ab
...
...
@@ -50,6 +50,8 @@ public class MagiskFragment extends BaseFragment
@BindView
(
R
.
id
.
swipeRefreshLayout
)
SwipeRefreshLayout
mSwipeRefreshLayout
;
@BindView
(
R
.
id
.
core_only_notice
)
CardView
coreOnlyNotice
;
@BindView
(
R
.
id
.
magisk_update
)
RelativeLayout
magiskUpdate
;
@BindView
(
R
.
id
.
magisk_update_icon
)
ImageView
magiskUpdateIcon
;
@BindView
(
R
.
id
.
magisk_update_status
)
TextView
magiskUpdateText
;
...
...
@@ -217,6 +219,7 @@ public class MagiskFragment extends BaseFragment
safetyNetCard
.
setVisibility
(
hasNetwork
?
View
.
VISIBLE
:
View
.
GONE
);
installOptionCard
.
setVisibility
(
hasNetwork
?
View
.
VISIBLE
:
View
.
GONE
);
uninstallButton
.
setVisibility
(
isUpToDate
&&
hasRoot
?
View
.
VISIBLE
:
View
.
GONE
);
coreOnlyNotice
.
setVisibility
(
mm
.
prefs
.
getBoolean
(
Const
.
Key
.
COREONLY
,
false
)
?
View
.
VISIBLE
:
View
.
GONE
);
int
image
,
color
;
...
...
app/src/full/java/com/topjohnwu/magisk/MainActivity.java
View file @
5109b9ab
...
...
@@ -119,13 +119,12 @@ public class MainActivity extends BaseActivity
public
void
checkHideSection
()
{
Menu
menu
=
navigationView
.
getMenu
();
menu
.
findItem
(
R
.
id
.
magiskhide
).
setVisible
(
Shell
.
rootAccess
()
&&
Data
.
magiskVersionCode
>=
Const
.
MAGISK_VER
.
UNIFIED
&&
mm
.
prefs
.
getBoolean
(
Const
.
Key
.
MAGISKHIDE
,
false
));
menu
.
findItem
(
R
.
id
.
modules
).
setVisible
(!
mm
.
prefs
.
getBoolean
(
Const
.
Key
.
COREONLY
,
false
)
&&
Shell
.
rootAccess
()
&&
Data
.
magiskVersionCode
>=
0
);
menu
.
findItem
(
R
.
id
.
downloads
).
setVisible
(!
mm
.
prefs
.
getBoolean
(
Const
.
Key
.
COREONLY
,
false
)
&&
Download
.
checkNetworkStatus
(
this
)
&&
Shell
.
rootAccess
()
&&
Data
.
magiskVersionCode
>=
0
);
menu
.
findItem
(
R
.
id
.
magiskhide
).
setVisible
(
Shell
.
rootAccess
()
&&
Data
.
magiskVersionCode
>=
Const
.
MAGISK_VER
.
UNIFIED
&&
mm
.
prefs
.
getBoolean
(
Const
.
Key
.
MAGISKHIDE
,
false
));
menu
.
findItem
(
R
.
id
.
modules
).
setVisible
(
Shell
.
rootAccess
()
&&
Data
.
magiskVersionCode
>=
0
);
menu
.
findItem
(
R
.
id
.
downloads
).
setVisible
(
Download
.
checkNetworkStatus
(
this
)
&&
Shell
.
rootAccess
()
&&
Data
.
magiskVersionCode
>=
0
);
menu
.
findItem
(
R
.
id
.
log
).
setVisible
(
Shell
.
rootAccess
());
menu
.
findItem
(
R
.
id
.
superuser
).
setVisible
(
Shell
.
rootAccess
()
&&
!(
Const
.
USER_ID
>
0
&&
Data
.
multiuserMode
==
Const
.
Value
.
MULTIUSER_MODE_OWNER_MANAGED
));
...
...
app/src/full/res/drawable/ic_
su_
warning.xml
→
app/src/full/res/drawable/ic_warning.xml
View file @
5109b9ab
File moved
app/src/full/res/layout/activity_request.xml
View file @
5109b9ab
...
...
@@ -82,7 +82,7 @@
android:id=
"@+id/warning"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:drawableStart=
"@drawable/ic_
su_
warning"
android:drawableStart=
"@drawable/ic_warning"
android:textColor=
"?android:textColorSecondary"
android:text=
"@string/su_warning"
android:layout_gravity=
"center_horizontal"
...
...
app/src/full/res/layout/fragment_magisk.xml
View file @
5109b9ab
...
...
@@ -20,6 +20,45 @@
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
>
<android.support.v7.widget.CardView
android:id=
"@+id/core_only_notice"
style=
"?attr/cardStyle"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"4dp"
android:layout_marginEnd=
"5dp"
android:layout_marginStart=
"5dp"
android:layout_marginTop=
"4dp"
app:cardCornerRadius=
"@dimen/card_corner_radius"
app:cardElevation=
"@dimen/card_elevation"
>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginBottom=
"12dp"
android:layout_marginTop=
"12dp"
>
<ImageView
android:layout_width=
"25dp"
android:layout_height=
"25dp"
android:layout_centerVertical=
"true"
android:layout_toStartOf=
"@+id/core_only"
android:src=
"@drawable/ic_warning"
/>
<TextView
android:id=
"@+id/core_only"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerHorizontal=
"true"
android:layout_centerVertical=
"true"
android:gravity=
"center"
android:minWidth=
"225dp"
android:padding=
"6dp"
android:text=
"@string/settings_core_only_title"
android:textStyle=
"bold"
/>
</RelativeLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
style=
"?attr/cardStyle"
android:layout_width=
"match_parent"
...
...
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