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
a5751804
Commit
a5751804
authored
Dec 30, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use recyclerlist for FlashActivity console
parent
07d1a20f
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
59 additions
and
27 deletions
+59
-27
FlashActivity.java
app/src/full/java/com/topjohnwu/magisk/FlashActivity.java
+47
-9
MagiskLogFragment.java
...ava/com/topjohnwu/magisk/fragments/MagiskLogFragment.java
+1
-1
activity_flash.xml
app/src/full/res/layout/activity_flash.xml
+11
-17
list_item_console.xml
app/src/main/res/layout/list_item_console.xml
+0
-0
No files found.
app/src/full/java/com/topjohnwu/magisk/FlashActivity.java
View file @
a5751804
...
@@ -3,12 +3,9 @@ package com.topjohnwu.magisk;
...
@@ -3,12 +3,9 @@ package com.topjohnwu.magisk;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.net.Uri
;
import
android.net.Uri
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.text.TextUtils
;
import
android.view.View
;
import
android.view.View
;
import
android.widget.Button
;
import
android.widget.Button
;
import
android.widget.LinearLayout
;
import
android.widget.LinearLayout
;
import
android.widget.ScrollView
;
import
android.widget.TextView
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
com.topjohnwu.core.App
;
import
com.topjohnwu.core.App
;
...
@@ -16,6 +13,7 @@ import com.topjohnwu.core.Const;
...
@@ -16,6 +13,7 @@ import com.topjohnwu.core.Const;
import
com.topjohnwu.core.tasks.FlashZip
;
import
com.topjohnwu.core.tasks.FlashZip
;
import
com.topjohnwu.core.tasks.MagiskInstaller
;
import
com.topjohnwu.core.tasks.MagiskInstaller
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.core.utils.Utils
;
import
com.topjohnwu.magisk.adapters.StringListAdapter
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
com.topjohnwu.superuser.CallbackList
;
import
com.topjohnwu.superuser.CallbackList
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
...
@@ -29,18 +27,21 @@ import java.util.Collections;
...
@@ -29,18 +27,21 @@ import java.util.Collections;
import
java.util.List
;
import
java.util.List
;
import
java.util.Locale
;
import
java.util.Locale
;
import
androidx.annotation.NonNull
;
import
androidx.appcompat.app.ActionBar
;
import
androidx.appcompat.app.ActionBar
;
import
androidx.appcompat.widget.Toolbar
;
import
androidx.appcompat.widget.Toolbar
;
import
androidx.recyclerview.widget.RecyclerView
;
import
butterknife.BindColor
;
import
butterknife.BindView
;
import
butterknife.BindView
;
import
butterknife.OnClick
;
import
butterknife.OnClick
;
public
class
FlashActivity
extends
BaseActivity
{
public
class
FlashActivity
extends
BaseActivity
{
@BindView
(
R
.
id
.
toolbar
)
Toolbar
toolbar
;
@BindView
(
R
.
id
.
toolbar
)
Toolbar
toolbar
;
@BindView
(
R
.
id
.
txtLog
)
TextView
flashLogs
;
@BindView
(
R
.
id
.
button_panel
)
LinearLayout
buttonPanel
;
@BindView
(
R
.
id
.
button_panel
)
public
LinearLayout
buttonPanel
;
@BindView
(
R
.
id
.
reboot
)
Button
reboot
;
@BindView
(
R
.
id
.
re
boot
)
public
Button
reboot
;
@BindView
(
R
.
id
.
re
cyclerView
)
RecyclerView
rv
;
@Bind
View
(
R
.
id
.
scrollView
)
ScrollView
sv
;
@Bind
Color
(
android
.
R
.
color
.
white
)
int
white
;
private
List
<
String
>
console
,
logs
;
private
List
<
String
>
console
,
logs
;
...
@@ -106,6 +107,7 @@ public class FlashActivity extends BaseActivity {
...
@@ -106,6 +107,7 @@ public class FlashActivity extends BaseActivity {
logs
=
Collections
.
synchronizedList
(
new
ArrayList
<>());
logs
=
Collections
.
synchronizedList
(
new
ArrayList
<>());
console
=
new
ConsoleList
();
console
=
new
ConsoleList
();
rv
.
setAdapter
(
new
ConsoleAdapter
());
Intent
intent
=
getIntent
();
Intent
intent
=
getIntent
();
Uri
uri
=
intent
.
getData
();
Uri
uri
=
intent
.
getData
();
...
@@ -129,6 +131,42 @@ public class FlashActivity extends BaseActivity {
...
@@ -129,6 +131,42 @@ public class FlashActivity extends BaseActivity {
}
}
}
}
private
class
ConsoleAdapter
extends
StringListAdapter
<
ConsoleAdapter
.
ViewHolder
>
{
ConsoleAdapter
()
{
super
(
console
,
true
);
}
@Override
public
void
onBindViewHolder
(
@NonNull
ViewHolder
holder
,
int
position
)
{
super
.
onBindViewHolder
(
holder
,
position
);
holder
.
txt
.
setTextColor
(
white
);
}
@Override
protected
int
itemLayoutRes
()
{
return
R
.
layout
.
list_item_console
;
}
@NonNull
@Override
public
ViewHolder
createViewHolder
(
@NonNull
View
v
)
{
return
new
ViewHolder
(
v
);
}
class
ViewHolder
extends
StringListAdapter
.
ViewHolder
{
public
ViewHolder
(
@NonNull
View
itemView
)
{
super
(
itemView
);
}
@Override
protected
int
textViewResId
()
{
return
R
.
id
.
txt
;
}
}
}
private
class
ConsoleList
extends
CallbackList
<
String
>
{
private
class
ConsoleList
extends
CallbackList
<
String
>
{
ConsoleList
()
{
ConsoleList
()
{
...
@@ -136,8 +174,8 @@ public class FlashActivity extends BaseActivity {
...
@@ -136,8 +174,8 @@ public class FlashActivity extends BaseActivity {
}
}
private
void
updateUI
()
{
private
void
updateUI
()
{
flashLogs
.
setText
(
TextUtils
.
join
(
"\n"
,
this
)
);
rv
.
getAdapter
().
notifyItemChanged
(
size
()
-
1
);
sv
.
postDelayed
(()
->
sv
.
fullScroll
(
ScrollView
.
FOCUS_DOWN
),
10
);
rv
.
postDelayed
(()
->
rv
.
smoothScrollToPosition
(
size
()
-
1
),
10
);
}
}
@Override
@Override
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/MagiskLogFragment.java
View file @
a5751804
...
@@ -112,7 +112,7 @@ public class MagiskLogFragment extends BaseFragment {
...
@@ -112,7 +112,7 @@ public class MagiskLogFragment extends BaseFragment {
@Override
@Override
protected
int
itemLayoutRes
()
{
protected
int
itemLayoutRes
()
{
return
R
.
layout
.
list_item_
magisk_log
;
return
R
.
layout
.
list_item_
console
;
}
}
@NonNull
@NonNull
...
...
app/src/full/res/layout/activity_flash.xml
View file @
a5751804
...
@@ -9,29 +9,23 @@
...
@@ -9,29 +9,23 @@
<include
layout=
"@layout/toolbar"
/>
<include
layout=
"@layout/toolbar"
/>
<ScrollView
<HorizontalScrollView
android:id=
"@+id/scrollView"
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
>
android:layout_height=
"0dp"
>
<HorizontalScrollView
<androidx.recyclerview.widget.RecyclerView
android:layout_width=
"match_parent"
android:id=
"@+id/recyclerView"
android:layout_height=
"wrap_content"
>
<TextView
android:id=
"@+id/txtLog"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"match_parent"
android:fontFamily=
"monospace"
android:paddingStart=
"8dp"
android:padding=
"8dp"
android:paddingEnd=
"8dp"
android:textColor=
"@android:color/white"
app:layoutManager=
"androidx.recyclerview.widget.LinearLayoutManager"
/>
android:textSize=
"10sp"
/>
</HorizontalScrollView>
</HorizontalScrollView>
</ScrollView>
<LinearLayout
<LinearLayout
android:id=
"@+id/button_panel"
android:id=
"@+id/button_panel"
style=
"?android:buttonStyle"
style=
"?android:buttonStyle"
...
...
app/src/main/res/layout/list_item_
magisk_log
.xml
→
app/src/main/res/layout/list_item_
console
.xml
View file @
a5751804
File moved
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