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
0ce17205
Commit
0ce17205
authored
Jun 11, 2019
by
Viktor De Pasquale
Committed by
John Wu
Jun 12, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed magisk log screen lines having multiple lines
parent
ee407472
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
84 additions
and
19 deletions
+84
-19
BindingAdapter.kt
...java/com/topjohnwu/magisk/model/binding/BindingAdapter.kt
+37
-0
ConsoleRvItem.kt
...m/topjohnwu/magisk/model/entity/recycler/ConsoleRvItem.kt
+17
-2
LenientRvItem.kt
...m/topjohnwu/magisk/model/entity/recycler/LenientRvItem.kt
+16
-0
LogViewModel.kt
...src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt
+2
-0
item_page_magisk_log.xml
app/src/main/res/layout/item_page_magisk_log.xml
+12
-17
No files found.
app/src/main/java/com/topjohnwu/magisk/model/binding/BindingAdapter.kt
0 → 100644
View file @
0ce17205
package
com.topjohnwu.magisk.model.binding
import
androidx.databinding.ViewDataBinding
import
androidx.recyclerview.widget.RecyclerView
import
com.skoumal.teanity.databinding.ComparableRvItem
import
com.topjohnwu.magisk.model.entity.recycler.LenientRvItem
import
me.tatarka.bindingcollectionadapter2.BindingRecyclerViewAdapter
class
BindingAdapter
:
BindingRecyclerViewAdapter
<
ComparableRvItem
<*>>()
{
private
var
recyclerView
:
RecyclerView
?
=
null
override
fun
onBindBinding
(
binding
:
ViewDataBinding
,
variableId
:
Int
,
layoutRes
:
Int
,
position
:
Int
,
item
:
ComparableRvItem
<
*
>
)
{
super
.
onBindBinding
(
binding
,
variableId
,
layoutRes
,
position
,
item
)
when
(
item
)
{
is
LenientRvItem
->
{
val
recycler
=
recyclerView
?:
return
item
.
onBindingBound
(
binding
)
item
.
onBindingBound
(
binding
,
recycler
)
}
else
->
item
.
onBindingBound
(
binding
)
}
}
override
fun
onAttachedToRecyclerView
(
recyclerView
:
RecyclerView
)
{
super
.
onAttachedToRecyclerView
(
recyclerView
)
this
.
recyclerView
=
recyclerView
}
}
\ No newline at end of file
app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ConsoleRvItem.kt
View file @
0ce17205
package
com.topjohnwu.magisk.model.entity.recycler
import
com.skoumal.teanity.databinding.ComparableRvItem
import
android.widget.TextView
import
androidx.core.view.updateLayoutParams
import
androidx.databinding.ViewDataBinding
import
androidx.recyclerview.widget.RecyclerView
import
com.topjohnwu.magisk.R
class
ConsoleRvItem
(
val
item
:
String
)
:
Comparable
RvItem
<
ConsoleRvItem
>()
{
class
ConsoleRvItem
(
val
item
:
String
)
:
Lenient
RvItem
<
ConsoleRvItem
>()
{
override
val
layoutRes
:
Int
=
R
.
layout
.
item_console
override
fun
onBindingBound
(
binding
:
ViewDataBinding
,
recyclerView
:
RecyclerView
)
{
val
view
=
binding
.
root
as
TextView
view
.
measure
(
0
,
0
)
val
desiredWidth
=
view
.
measuredWidth
view
.
updateLayoutParams
{
width
=
desiredWidth
}
if
(
recyclerView
.
width
<
desiredWidth
)
{
recyclerView
.
requestLayout
()
}
}
override
fun
contentSameAs
(
other
:
ConsoleRvItem
)
=
itemSameAs
(
other
)
override
fun
itemSameAs
(
other
:
ConsoleRvItem
)
=
item
==
other
.
item
}
\ No newline at end of file
app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/LenientRvItem.kt
0 → 100644
View file @
0ce17205
package
com.topjohnwu.magisk.model.entity.recycler
import
androidx.databinding.ViewDataBinding
import
androidx.recyclerview.widget.RecyclerView
import
com.skoumal.teanity.databinding.ComparableRvItem
/**
* This item addresses issues where enclosing recycler has to be invalidated or generally
* manipulated with. This shouldn't be however necessary for 99.9% of use-cases. Refrain from using
* this item as it provides virtually no additional functionality. Stick with ComparableRvItem.
* */
abstract
class
LenientRvItem
<
in
T
>
:
ComparableRvItem
<
T
>()
{
open
fun
onBindingBound
(
binding
:
ViewDataBinding
,
recyclerView
:
RecyclerView
)
{}
}
\ No newline at end of file
app/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt
View file @
0ce17205
...
...
@@ -12,6 +12,7 @@ import com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.Const
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.data.repository.LogRepository
import
com.topjohnwu.magisk.model.binding.BindingAdapter
import
com.topjohnwu.magisk.model.entity.recycler.ConsoleRvItem
import
com.topjohnwu.magisk.model.entity.recycler.LogItemRvItem
import
com.topjohnwu.magisk.model.entity.recycler.LogRvItem
...
...
@@ -30,6 +31,7 @@ class LogViewModel(
private
val
logRepo
:
LogRepository
)
:
MagiskViewModel
(),
BindingViewPagerAdapter
.
PageTitles
<
ComparableRvItem
<*>>
{
val
itemsAdapter
=
BindingAdapter
()
val
items
=
DiffObservableList
(
ComparableRvItem
.
callback
)
val
itemBinding
=
OnItemBind
<
ComparableRvItem
<*>>
{
itemBinding
,
_
,
item
->
item
.
bind
(
itemBinding
)
...
...
app/src/main/res/layout/item_page_magisk_log.xml
View file @
0ce17205
...
...
@@ -15,15 +15,12 @@
</data>
<FrameLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<HorizontalScrollView
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<androidx.recyclerview.widget.RecyclerView
adapter=
"@{viewModel.itemsAdapter}"
itemBinding=
"@{viewModel.itemBinding}"
items=
"@{item.items}"
android:layout_width=
"wrap_content"
...
...
@@ -34,6 +31,4 @@
</HorizontalScrollView>
</FrameLayout>
</layout>
\ No newline at end of file
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