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
15cf8d2a
Commit
15cf8d2a
authored
Oct 17, 2016
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UI tweaks
parent
ef0ba948
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
89 additions
and
97 deletions
+89
-97
ModulesAdapter.java
app/src/main/java/com/topjohnwu/magisk/ModulesAdapter.java
+58
-30
ReposFragment.java
app/src/main/java/com/topjohnwu/magisk/ReposFragment.java
+2
-2
Module.java
app/src/main/java/com/topjohnwu/magisk/module/Module.java
+7
-44
Utils.java
app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
+0
-6
repos_fragment.xml
app/src/main/res/layout/repos_fragment.xml
+22
-15
No files found.
app/src/main/java/com/topjohnwu/magisk/ModulesAdapter.java
View file @
15cf8d2a
package
com
.
topjohnwu
.
magisk
;
import
android.content.Context
;
import
android.os.AsyncTask
;
import
android.support.design.widget.Snackbar
;
import
android.support.v7.widget.RecyclerView
;
import
android.util.DisplayMetrics
;
...
...
@@ -9,6 +10,7 @@ import android.view.View;
import
android.view.ViewGroup
;
import
android.view.WindowManager
;
import
android.widget.CheckBox
;
import
android.widget.CompoundButton
;
import
android.widget.ImageView
;
import
android.widget.TextView
;
...
...
@@ -27,32 +29,8 @@ public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHold
private
View
mView
;
private
Context
context
;
private
Utils
.
ItemClickListener
chboxListener
,
deleteBtnListener
,
unDeleteBtnListener
;
public
ModulesAdapter
(
List
<
Module
>
list
)
{
mList
=
list
;
chboxListener
=
(
chk
,
position
)
->
{
// On Checkbox change listener
CheckBox
chbox
=
(
CheckBox
)
chk
;
if
(!
chbox
.
isChecked
())
{
mList
.
get
(
position
).
createDisableFile
();
Snackbar
.
make
(
mView
,
R
.
string
.
disable_file_created
,
Snackbar
.
LENGTH_SHORT
).
show
();
}
else
{
mList
.
get
(
position
).
removeDisableFile
();
Snackbar
.
make
(
mView
,
R
.
string
.
disable_file_removed
,
Snackbar
.
LENGTH_SHORT
).
show
();
}
};
deleteBtnListener
=
(
deleteBtn
,
position
)
->
{
// On delete button click listener
mList
.
get
(
position
).
createRemoveFile
();
Snackbar
.
make
(
mView
,
R
.
string
.
remove_file_created
,
Snackbar
.
LENGTH_SHORT
).
show
();
};
unDeleteBtnListener
=
(
undeleteBtn
,
position
)
->
{
// On undelete button click listener
mList
.
get
(
position
).
deleteRemoveFile
();
Snackbar
.
make
(
mView
,
R
.
string
.
remove_file_deleted
,
Snackbar
.
LENGTH_SHORT
).
show
();
};
}
@Override
...
...
@@ -85,16 +63,66 @@ public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHold
}
holder
.
checkBox
.
setChecked
(
module
.
isEnabled
());
holder
.
checkBox
.
setOnCheckedChangeListener
((
compoundButton
,
b
)
->
chboxListener
.
onItemClick
(
compoundButton
,
holder
.
getAdapterPosition
()));
holder
.
checkBox
.
setOnCheckedChangeListener
((
compoundButton
,
isChecked
)
->
{
if
(
isChecked
)
{
new
AsyncTask
<
Void
,
Void
,
Void
>()
{
@Override
protected
Void
doInBackground
(
Void
...
voids
)
{
module
.
removeDisableFile
();
return
null
;
}
holder
.
delete
.
setOnClickListener
(
view
->
{
@Override
protected
void
onPostExecute
(
Void
v
)
{
Snackbar
.
make
(
mView
,
R
.
string
.
disable_file_removed
,
Snackbar
.
LENGTH_SHORT
).
show
();
}
}.
executeOnExecutor
(
AsyncTask
.
SERIAL_EXECUTOR
);
}
else
{
new
AsyncTask
<
Void
,
Void
,
Void
>()
{
@Override
protected
Void
doInBackground
(
Void
...
voids
)
{
module
.
createDisableFile
();
return
null
;
}
@Override
protected
void
onPostExecute
(
Void
v
)
{
Snackbar
.
make
(
mView
,
R
.
string
.
disable_file_created
,
Snackbar
.
LENGTH_SHORT
).
show
();
}
}.
executeOnExecutor
(
AsyncTask
.
SERIAL_EXECUTOR
);
}
});
holder
.
delete
.
setOnClickListener
(
v
->
{
if
(
module
.
willBeRemoved
())
{
unDeleteBtnListener
.
onItemClick
(
holder
.
delete
,
holder
.
getAdapterPosition
());
new
AsyncTask
<
Void
,
Void
,
Void
>()
{
@Override
protected
Void
doInBackground
(
Void
...
voids
)
{
module
.
deleteRemoveFile
();
return
null
;
}
@Override
protected
void
onPostExecute
(
Void
v
)
{
Snackbar
.
make
(
mView
,
R
.
string
.
remove_file_deleted
,
Snackbar
.
LENGTH_SHORT
).
show
();
updateDeleteButton
(
holder
,
module
);
}
}.
executeOnExecutor
(
AsyncTask
.
SERIAL_EXECUTOR
);
}
else
{
deleteBtnListener
.
onItemClick
(
holder
.
delete
,
holder
.
getAdapterPosition
());
new
AsyncTask
<
Void
,
Void
,
Void
>()
{
@Override
protected
Void
doInBackground
(
Void
...
voids
)
{
module
.
createRemoveFile
();
return
null
;
}
@Override
protected
void
onPostExecute
(
Void
v
)
{
Snackbar
.
make
(
mView
,
R
.
string
.
remove_file_created
,
Snackbar
.
LENGTH_SHORT
).
show
();
updateDeleteButton
(
holder
,
module
);
}
}.
executeOnExecutor
(
AsyncTask
.
SERIAL_EXECUTOR
);
}
});
if
(
module
.
isUpdated
())
{
...
...
app/src/main/java/com/topjohnwu/magisk/ReposFragment.java
View file @
15cf8d2a
...
...
@@ -41,7 +41,6 @@ public class ReposFragment extends Fragment {
private
List
<
Repo
>
fInstalledRepos
=
new
ArrayList
<>();
private
List
<
Repo
>
fOthersRepos
=
new
ArrayList
<>();
private
ReposAdapter
mReposAdapter
=
new
ReposAdapter
(
fUpdateRepos
,
fInstalledRepos
,
fOthersRepos
);
private
SimpleSectionedRecyclerViewAdapter
mSectionedAdapter
;
private
SharedPreferences
.
OnSharedPreferenceChangeListener
listener
;
...
...
@@ -57,7 +56,7 @@ public class ReposFragment extends Fragment {
ButterKnife
.
bind
(
this
,
view
);
mSectionedAdapter
=
new
SimpleSectionedRecyclerViewAdapter
(
getActivity
(),
R
.
layout
.
section
,
R
.
id
.
section_text
,
mReposAdapter
);
SimpleSectionedRecyclerViewAdapter
(
getActivity
(),
R
.
layout
.
section
,
R
.
id
.
section_text
,
new
ReposAdapter
(
fUpdateRepos
,
fInstalledRepos
,
fOthersRepos
)
);
recyclerView
.
setAdapter
(
mSectionedAdapter
);
...
...
@@ -176,6 +175,7 @@ public class ReposFragment extends Fragment {
}
SimpleSectionedRecyclerViewAdapter
.
Section
[]
array
=
sections
.
toArray
(
new
SimpleSectionedRecyclerViewAdapter
.
Section
[
sections
.
size
()]);
mSectionedAdapter
.
setSections
(
array
);
emptyTv
.
setVisibility
(
View
.
GONE
);
recyclerView
.
setVisibility
(
View
.
VISIBLE
);
}
mSwipeRefreshLayout
.
setRefreshing
(
false
);
...
...
app/src/main/java/com/topjohnwu/magisk/module/Module.java
View file @
15cf8d2a
...
...
@@ -28,42 +28,17 @@ public class Module extends BaseModule {
Logger
.
dev
(
"Creating Module, id: "
+
mId
);
try
{
mEnable
=
!
Utils
.
itemExist
(
mDisableFile
);
}
catch
(
Exception
e
)
{
mEnable
=
false
;
}
try
{
mRemove
=
Utils
.
itemExist
(
mRemoveFile
);
}
catch
(
Exception
e
)
{
mRemove
=
false
;
}
try
{
mUpdated
=
Utils
.
itemExist
(
mUpdateFile
);
}
catch
(
Exception
e
)
{
mUpdated
=
false
;
}
}
public
void
createDisableFile
()
{
new
AsyncTask
<
Void
,
Void
,
Void
>()
{
@Override
protected
Void
doInBackground
(
Void
...
voids
)
{
mEnable
=
!
Utils
.
createFile
(
mDisableFile
);
return
null
;
}
}.
executeOnExecutor
(
AsyncTask
.
SERIAL_EXECUTOR
);
}
public
void
removeDisableFile
()
{
new
AsyncTask
<
Void
,
Void
,
Void
>()
{
@Override
protected
Void
doInBackground
(
Void
...
voids
)
{
mEnable
=
Utils
.
removeItem
(
mDisableFile
);
return
null
;
}
}.
executeOnExecutor
(
AsyncTask
.
SERIAL_EXECUTOR
);
}
public
boolean
isEnabled
()
{
...
...
@@ -71,23 +46,11 @@ public class Module extends BaseModule {
}
public
void
createRemoveFile
()
{
new
AsyncTask
<
Void
,
Void
,
Void
>()
{
@Override
protected
Void
doInBackground
(
Void
...
voids
)
{
mRemove
=
Utils
.
createFile
(
mRemoveFile
);
return
null
;
}
}.
executeOnExecutor
(
AsyncTask
.
SERIAL_EXECUTOR
);
}
public
void
deleteRemoveFile
()
{
new
AsyncTask
<
Void
,
Void
,
Void
>()
{
@Override
protected
Void
doInBackground
(
Void
...
voids
)
{
mRemove
=
!
Utils
.
removeItem
(
mRemoveFile
);
return
null
;
}
}.
executeOnExecutor
(
AsyncTask
.
SERIAL_EXECUTOR
);
}
public
boolean
willBeRemoved
()
{
...
...
app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
View file @
15cf8d2a
...
...
@@ -135,10 +135,4 @@ public class Utils {
return
secret
;
}
public
interface
ItemClickListener
{
void
onItemClick
(
View
view
,
int
position
);
}
}
\ No newline at end of file
app/src/main/res/layout/repos_fragment.xml
View file @
15cf8d2a
...
...
@@ -7,12 +7,10 @@
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
>
<android.support.v7.widget.RecyclerView
android:id=
"@+id/recyclerView"
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:dividerHeight=
"@dimen/card_divider_space"
app:layoutManager=
"android.support.v7.widget.LinearLayoutManager"
/>
android:orientation=
"vertical"
>
<TextView
android:id=
"@+id/empty_rv"
...
...
@@ -24,6 +22,15 @@
android:text=
"@string/no_modules_found"
android:textSize=
"20sp"
android:textStyle=
"italic"
android:visibility=
"gone"
/>
android:visibility=
"gone"
/>
<android.support.v7.widget.RecyclerView
android:id=
"@+id/recyclerView"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:dividerHeight=
"@dimen/card_divider_space"
app:layoutManager=
"android.support.v7.widget.LinearLayoutManager"
/>
</LinearLayout>
</android.support.v4.widget.SwipeRefreshLayout>
\ 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