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
294ad094
Commit
294ad094
authored
Sep 29, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show repo loading progress by showing repos already loaded
parent
c1a0f520
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
8 deletions
+26
-8
ReposFragment.java
app/src/main/java/com/topjohnwu/magisk/ReposFragment.java
+16
-8
ReposAdapter.java
...main/java/com/topjohnwu/magisk/adapters/ReposAdapter.java
+1
-0
UpdateRepos.java
...rc/main/java/com/topjohnwu/magisk/asyncs/UpdateRepos.java
+9
-0
No files found.
app/src/main/java/com/topjohnwu/magisk/ReposFragment.java
View file @
294ad094
...
...
@@ -15,7 +15,6 @@ import android.widget.TextView;
import
com.topjohnwu.magisk.adapters.ReposAdapter
;
import
com.topjohnwu.magisk.asyncs.UpdateRepos
;
import
com.topjohnwu.magisk.components.Fragment
;
import
com.topjohnwu.magisk.utils.Logger
;
import
com.topjohnwu.magisk.utils.Topic
;
import
butterknife.BindView
;
...
...
@@ -29,7 +28,7 @@ public class ReposFragment extends Fragment implements Topic.Subscriber {
@BindView
(
R
.
id
.
empty_rv
)
TextView
emptyRv
;
@BindView
(
R
.
id
.
swipeRefreshLayout
)
SwipeRefreshLayout
mSwipeRefreshLayout
;
p
rivate
ReposAdapter
adapter
;
p
ublic
static
ReposAdapter
adapter
;
@Override
public
void
onCreate
(
@Nullable
Bundle
savedInstanceState
)
{
...
...
@@ -43,13 +42,11 @@ public class ReposFragment extends Fragment implements Topic.Subscriber {
View
view
=
inflater
.
inflate
(
R
.
layout
.
fragment_repos
,
container
,
false
);
unbinder
=
ButterKnife
.
bind
(
this
,
view
);
adapter
=
new
ReposAdapter
(
getApplication
().
repoDB
,
getApplication
().
moduleMap
);
recyclerView
.
setAdapter
(
adapter
);
mSwipeRefreshLayout
.
setRefreshing
(
true
);
mSwipeRefreshLayout
.
setOnRefreshListener
(()
->
{
recyclerView
.
setVisibility
(
View
.
GONE
);
recyclerView
.
setVisibility
(
View
.
VISIBLE
);
emptyRv
.
setVisibility
(
View
.
GONE
);
new
UpdateRepos
(
getActivity
()).
exec
();
});
...
...
@@ -58,11 +55,22 @@ public class ReposFragment extends Fragment implements Topic.Subscriber {
return
view
;
}
@Override
public
void
onResume
()
{
adapter
=
new
ReposAdapter
(
getApplication
().
repoDB
,
getApplication
().
moduleMap
);
recyclerView
.
setAdapter
(
adapter
);
super
.
onResume
();
}
@Override
public
void
onPause
()
{
super
.
onPause
();
adapter
=
null
;
}
@Override
public
void
onTopicPublished
(
Topic
topic
)
{
Logger
.
dev
(
"ReposFragment: UI refresh triggered"
);
mSwipeRefreshLayout
.
setRefreshing
(
false
);
adapter
.
notifyDBChanged
();
recyclerView
.
setVisibility
(
adapter
.
getItemCount
()
==
0
?
View
.
GONE
:
View
.
VISIBLE
);
emptyRv
.
setVisibility
(
adapter
.
getItemCount
()
==
0
?
View
.
VISIBLE
:
View
.
GONE
);
}
...
...
app/src/main/java/com/topjohnwu/magisk/adapters/ReposAdapter.java
View file @
294ad094
...
...
@@ -44,6 +44,7 @@ public class ReposAdapter extends SectionedAdapter<ReposAdapter.SectionHolder, R
repoDB
=
db
;
moduleMap
=
map
;
repoPairs
=
new
ArrayList
<>();
notifyDBChanged
();
}
...
...
app/src/main/java/com/topjohnwu/magisk/asyncs/UpdateRepos.java
View file @
294ad094
...
...
@@ -5,6 +5,7 @@ import android.content.SharedPreferences;
import
android.text.TextUtils
;
import
com.topjohnwu.magisk.MagiskManager
;
import
com.topjohnwu.magisk.ReposFragment
;
import
com.topjohnwu.magisk.database.RepoDatabaseHelper
;
import
com.topjohnwu.magisk.module.BaseModule
;
import
com.topjohnwu.magisk.module.Repo
;
...
...
@@ -45,6 +46,7 @@ public class UpdateRepos extends ParallelTask<Void, Void, Void> {
super
(
context
);
prefs
=
getMagiskManager
().
prefs
;
repoDB
=
getMagiskManager
().
repoDB
;
getMagiskManager
().
repoLoadDone
.
hasPublished
=
false
;
String
prefsPath
=
context
.
getApplicationInfo
().
dataDir
+
"/shared_prefs"
;
// Legacy data cleanup
File
old
=
new
File
(
prefsPath
,
"RepoMap.xml"
);
...
...
@@ -81,6 +83,7 @@ public class UpdateRepos extends ParallelTask<Void, Void, Void> {
}
if
(
updated
)
{
repoDB
.
addRepo
(
repo
);
publishProgress
();
}
}
catch
(
BaseModule
.
CacheModException
ignored
)
{}
}
...
...
@@ -154,6 +157,12 @@ public class UpdateRepos extends ParallelTask<Void, Void, Void> {
return
true
;
}
@Override
protected
void
onProgressUpdate
(
Void
...
values
)
{
if
(
ReposFragment
.
adapter
!=
null
)
ReposFragment
.
adapter
.
notifyDBChanged
();
}
@Override
protected
Void
doInBackground
(
Void
...
voids
)
{
Logger
.
dev
(
"UpdateRepos: Loading repos"
);
...
...
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