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
edff0946
Commit
edff0946
authored
Mar 16, 2020
by
Viktor De Pasquale
Committed by
John Wu
Mar 26, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added log as primary fragment
parent
aa72a080
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
69 additions
and
47 deletions
+69
-47
MainActivity.kt
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
+4
-1
LogFragment.kt
app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt
+3
-3
SuperuserFragment.kt
...va/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt
+0
-14
fragment_log_md2.xml
app/src/main/res/layout/fragment_log_md2.xml
+7
-29
include_log_superuser.xml
app/src/main/res/layout/include_log_superuser.xml
+49
-0
menu_bottom_nav.xml
app/src/main/res/menu/menu_bottom_nav.xml
+6
-0
No files found.
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
View file @
edff0946
...
...
@@ -21,6 +21,7 @@ import com.topjohnwu.magisk.model.navigation.Navigation
import
com.topjohnwu.magisk.ui.base.BaseUIActivity
import
com.topjohnwu.magisk.ui.base.CompatNavigationDelegate
import
com.topjohnwu.magisk.ui.home.HomeFragment
import
com.topjohnwu.magisk.ui.log.LogFragment
import
com.topjohnwu.magisk.ui.module.ModuleFragment
import
com.topjohnwu.magisk.ui.superuser.SuperuserFragment
import
com.topjohnwu.magisk.utils.HideBottomViewOnScrollBehavior
...
...
@@ -43,7 +44,8 @@ open class MainActivity : BaseUIActivity<MainViewModel, ActivityMainMd2Binding>(
override
val
baseFragments
:
List
<
KClass
<
out
Fragment
>>
=
listOf
(
HomeFragment
::
class
,
ModuleFragment
::
class
,
SuperuserFragment
::
class
SuperuserFragment
::
class
,
LogFragment
::
class
)
//
This
temporarily
fixes
unwanted
feature
of
BottomNavigationView
-
where
the
view
applies
...
...
@@ -81,6 +83,7 @@ open class MainActivity : BaseUIActivity<MainViewModel, ActivityMainMd2Binding>(
R
.
id
.
homeFragment
->
Navigation
.
home
()
R
.
id
.
modulesFragment
->
Navigation
.
modules
()
R
.
id
.
superuserFragment
->
Navigation
.
superuser
()
R
.
id
.
logFragment
->
Navigation
.
log
()
else
->
throw
NotImplementedError
(
"Id ${it.itemId} is not defined as selectable"
)
}.
dispatchOnSelf
()
true
...
...
app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt
View file @
edff0946
...
...
@@ -23,7 +23,7 @@ class LogFragment : BaseUIFragment<LogViewModel, FragmentLogMd2Binding>() {
get
()
=
binding
.
logFilter
.
isVisible
set
(
value
)
{
MotionRevealHelper
.
withViews
(
binding
.
logFilter
,
binding
.
logFilterToggle
,
value
)
actionSave
?.
isVisible
=
value
actionSave
?.
isVisible
=
!
value
(
activity
as
MainActivity
).
invalidateToolbar
()
}
...
...
@@ -45,7 +45,7 @@ class LogFragment : BaseUIFragment<LogViewModel, FragmentLogMd2Binding>() {
super
.
onCreateOptionsMenu
(
menu
,
inflater
)
inflater
.
inflate
(
R
.
menu
.
menu_log_md2
,
menu
)
actionSave
=
menu
.
findItem
(
R
.
id
.
action_save
)
?.
also
{
it
.
isVisible
=
isMagiskLogVisible
it
.
isVisible
=
!
isMagiskLogVisible
}
}
...
...
@@ -53,7 +53,7 @@ class LogFragment : BaseUIFragment<LogViewModel, FragmentLogMd2Binding>() {
when
(
item
.
itemId
)
{
R
.
id
.
action_save
->
viewModel
.
saveMagiskLog
()
R
.
id
.
action_clear
->
if
(
isMagiskLogVisible
)
viewModel
.
clearMagiskLog
()
if
(
!
isMagiskLogVisible
)
viewModel
.
clearMagiskLog
()
else
viewModel
.
clearLog
()
}
return
super
.
onOptionsItemSelected
(
item
)
...
...
app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt
View file @
edff0946
package
com.topjohnwu.magisk.ui.superuser
import
android.view.Menu
import
android.view.MenuInflater
import
android.view.MenuItem
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.databinding.FragmentSuperuserMd2Binding
import
com.topjohnwu.magisk.model.navigation.Navigation
import
com.topjohnwu.magisk.ui.base.BaseUIFragment
import
org.koin.androidx.viewmodel.ext.android.viewModel
...
...
@@ -17,16 +13,6 @@ class SuperuserFragment : BaseUIFragment<SuperuserViewModel, FragmentSuperuserMd
override
fun
onStart
()
{
super
.
onStart
()
activity
.
title
=
resources
.
getString
(
R
.
string
.
superuser
)
setHasOptionsMenu
(
true
)
}
override
fun
onCreateOptionsMenu
(
menu
:
Menu
,
inflater
:
MenuInflater
)
{
inflater
.
inflate
(
R
.
menu
.
menu_superuser_md2
,
menu
)
}
override
fun
onOptionsItemSelected
(
item
:
MenuItem
)
=
when
(
item
.
itemId
)
{
R
.
id
.
action_log
->
Navigation
.
log
().
dispatchOnSelf
()
else
->
null
}
?.
let
{
true
}
?:
super
.
onOptionsItemSelected
(
item
)
}
app/src/main/res/layout/fragment_log_md2.xml
View file @
edff0946
...
...
@@ -15,20 +15,12 @@
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<androidx.recyclerview.widget.RecyclerView
itemBinding=
"@{viewModel.itemBinding}"
items=
"@{viewModel.items}"
<include
android:id=
"@+id/log_filter_magisk"
layout=
"@layout/include_log_magisk"
viewModel=
"@{viewModel}"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:clipToPadding=
"false"
android:orientation=
"vertical"
android:paddingStart=
"@dimen/l1"
android:paddingTop=
"@{viewModel.insets.top + (int) @dimen/internal_action_bar_size}"
android:paddingEnd=
"@dimen/l1"
android:paddingBottom=
"@{viewModel.insets.bottom}"
app:layoutManager=
"androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem=
"@layout/item_log_access_md2"
tools:paddingTop=
"24dp"
/>
android:layout_height=
"match_parent"
/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id=
"@+id/log_filter_toggle"
...
...
@@ -53,28 +45,14 @@
app:cardCornerRadius=
"0dp"
>
<include
android:id=
"@+id/log_filter_
include
"
layout=
"@layout/include_log_
magisk
"
android:id=
"@+id/log_filter_
superuser
"
layout=
"@layout/include_log_
superuser
"
viewModel=
"@{viewModel}"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
/>
</com.google.android.material.circularreveal.cardview.CircularRevealCardView>
<FrameLayout
gone=
"@{!viewModel.items.empty}"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
>
<include
item=
"@{viewModel.itemEmpty}"
layout=
"@layout/item_text"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
</FrameLayout>
</FrameLayout>
</layout>
app/src/main/res/layout/include_log_superuser.xml
0 → 100644
View file @
edff0946
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
>
<data>
<variable
name=
"viewModel"
type=
"com.topjohnwu.magisk.ui.log.LogViewModel"
/>
</data>
<FrameLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<androidx.recyclerview.widget.RecyclerView
itemBinding=
"@{viewModel.itemBinding}"
items=
"@{viewModel.items}"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:clipToPadding=
"false"
android:orientation=
"vertical"
android:paddingStart=
"@dimen/l1"
android:paddingTop=
"@{viewModel.insets.top + (int) @dimen/internal_action_bar_size}"
android:paddingEnd=
"@dimen/l1"
android:paddingBottom=
"@{viewModel.insets.bottom}"
app:layoutManager=
"androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem=
"@layout/item_log_access_md2"
tools:paddingTop=
"24dp"
/>
<FrameLayout
gone=
"@{!viewModel.items.empty}"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
>
<include
item=
"@{viewModel.itemEmpty}"
layout=
"@layout/item_text"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
</FrameLayout>
</FrameLayout>
</layout>
app/src/main/res/menu/menu_bottom_nav.xml
View file @
edff0946
...
...
@@ -14,6 +14,12 @@
android:title=
"@string/superuser"
tools:showAsAction=
"always"
/>
<item
android:id=
"@+id/logFragment"
android:icon=
"@drawable/ic_bug_md2"
android:title=
"@string/logs"
tools:showAsAction=
"always"
/>
<item
android:id=
"@+id/modulesFragment"
android:icon=
"@drawable/ic_module_md2"
...
...
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