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
2106751e
Unverified
Commit
2106751e
authored
Jun 03, 2022
by
残页
Committed by
GitHub
Jun 03, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix SnackBar shows behind window insets
parent
7ae3cd1c
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
41 additions
and
14 deletions
+41
-14
BaseFragment.kt
app/src/main/java/com/topjohnwu/magisk/arch/BaseFragment.kt
+1
-0
MainActivity.kt
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
+5
-0
LogFragment.kt
app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt
+3
-0
SettingsFragment.kt
...java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
+1
-0
fragment_settings_md2.xml
app/src/main/res/layout/fragment_settings_md2.xml
+25
-14
include_log_superuser.xml
app/src/main/res/layout/include_log_superuser.xml
+6
-0
No files found.
app/src/main/java/com/topjohnwu/magisk/arch/BaseFragment.kt
View file @
2106751e
...
@@ -20,6 +20,7 @@ abstract class BaseFragment<Binding : ViewDataBinding> : Fragment(), ViewModelHo
...
@@ -20,6 +20,7 @@ abstract class BaseFragment<Binding : ViewDataBinding> : Fragment(), ViewModelHo
protected
abstract
val
layoutRes
:
Int
protected
abstract
val
layoutRes
:
Int
private
val
navigation
get
()
=
activity
?.
navigation
private
val
navigation
get
()
=
activity
?.
navigation
open
val
snackbarView
:
View
?
get
()
=
null
open
val
snackbarAnchorView
:
View
?
get
()
=
null
open
val
snackbarAnchorView
:
View
?
get
()
=
null
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
...
...
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
View file @
2106751e
...
@@ -36,6 +36,11 @@ class MainActivity : BaseMainActivity<ActivityMainMd2Binding>() {
...
@@ -36,6 +36,11 @@ class MainActivity : BaseMainActivity<ActivityMainMd2Binding>() {
override
val
layoutRes
=
R
.
layout
.
activity_main_md2
override
val
layoutRes
=
R
.
layout
.
activity_main_md2
override
val
viewModel
by
viewModel
<
MainViewModel
>()
override
val
viewModel
by
viewModel
<
MainViewModel
>()
override
val
navHostId
:
Int
=
R
.
id
.
main_nav_host
override
val
navHostId
:
Int
=
R
.
id
.
main_nav_host
override
val
snackbarView
:
View
get
()
{
val
fragmentOverride
=
currentFragment
?.
snackbarView
return
fragmentOverride
?:
super
.
snackbarView
}
override
val
snackbarAnchorView
:
View
?
override
val
snackbarAnchorView
:
View
?
get
()
{
get
()
{
val
fragmentAnchor
=
currentFragment
?.
snackbarAnchorView
val
fragmentAnchor
=
currentFragment
?.
snackbarAnchorView
...
...
app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt
View file @
2106751e
...
@@ -20,6 +20,9 @@ class LogFragment : BaseFragment<FragmentLogMd2Binding>() {
...
@@ -20,6 +20,9 @@ class LogFragment : BaseFragment<FragmentLogMd2Binding>() {
override
val
layoutRes
=
R
.
layout
.
fragment_log_md2
override
val
layoutRes
=
R
.
layout
.
fragment_log_md2
override
val
viewModel
by
viewModel
<
LogViewModel
>()
override
val
viewModel
by
viewModel
<
LogViewModel
>()
override
val
snackbarView
:
View
?
get
()
=
if
(
isMagiskLogVisible
)
binding
.
logFilterSuperuser
.
snackbarContainer
else
super
.
snackbarView
override
val
snackbarAnchorView
get
()
=
binding
.
logFilterToggle
override
val
snackbarAnchorView
get
()
=
binding
.
logFilterToggle
private
var
actionSave
:
MenuItem
?
=
null
private
var
actionSave
:
MenuItem
?
=
null
...
...
app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
View file @
2106751e
...
@@ -14,6 +14,7 @@ class SettingsFragment : BaseFragment<FragmentSettingsMd2Binding>() {
...
@@ -14,6 +14,7 @@ class SettingsFragment : BaseFragment<FragmentSettingsMd2Binding>() {
override
val
layoutRes
=
R
.
layout
.
fragment_settings_md2
override
val
layoutRes
=
R
.
layout
.
fragment_settings_md2
override
val
viewModel
by
viewModel
<
SettingsViewModel
>()
override
val
viewModel
by
viewModel
<
SettingsViewModel
>()
override
val
snackbarView
:
View
get
()
=
binding
.
snackbarContainer
override
fun
onStart
()
{
override
fun
onStart
()
{
super
.
onStart
()
super
.
onStart
()
...
...
app/src/main/res/layout/fragment_settings_md2.xml
View file @
2106751e
...
@@ -13,20 +13,31 @@
...
@@ -13,20 +13,31 @@
</data>
</data>
<androidx.recyclerview.widget.RecyclerView
<FrameLayout
app:items=
"@{viewModel.items}"
app:extraBindings=
"@{viewModel.extraBindings}"
android:id=
"@+id/settings_list"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
>
android:focusableInTouchMode=
"false"
android:clipToPadding=
"false"
<androidx.recyclerview.widget.RecyclerView
android:orientation=
"vertical"
app:items=
"@{viewModel.items}"
android:paddingTop=
"@dimen/internal_action_bar_size"
app:extraBindings=
"@{viewModel.extraBindings}"
app:fitsSystemWindowsInsets=
"top|bottom"
android:id=
"@+id/settings_list"
app:layoutManager=
"androidx.recyclerview.widget.LinearLayoutManager"
android:layout_width=
"match_parent"
tools:layout_marginTop=
"24dp"
android:layout_height=
"match_parent"
tools:listitem=
"@layout/item_settings"
android:focusableInTouchMode=
"false"
tools:paddingTop=
"@dimen/l1"
/>
android:clipToPadding=
"false"
android:orientation=
"vertical"
android:paddingTop=
"@dimen/internal_action_bar_size"
app:fitsSystemWindowsInsets=
"top|bottom"
app:layoutManager=
"androidx.recyclerview.widget.LinearLayoutManager"
tools:layout_marginTop=
"24dp"
tools:listitem=
"@layout/item_settings"
tools:paddingTop=
"@dimen/l1"
/>
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:id=
"@+id/snackbar_container"
app:fitsSystemWindowsInsets=
"top|bottom"
/>
</FrameLayout>
</layout>
</layout>
app/src/main/res/layout/include_log_superuser.xml
View file @
2106751e
...
@@ -43,6 +43,12 @@
...
@@ -43,6 +43,12 @@
</FrameLayout>
</FrameLayout>
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:id=
"@+id/snackbar_container"
app:fitsSystemWindowsInsets=
"top|bottom"
/>
</FrameLayout>
</FrameLayout>
</layout>
</layout>
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