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
3ad06c40
Commit
3ad06c40
authored
Aug 22, 2016
by
dvdandroid
Committed by
topjohnwu
Aug 22, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[WIP] Use checkbox and delete button instead of a popup menu
parent
c68e37a8
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
100 additions
and
145 deletions
+100
-145
Module.java
app/src/main/java/com/topjohnwu/magisk/model/Module.java
+19
-3
ModulesAdapter.java
...src/main/java/com/topjohnwu/magisk/rv/ModulesAdapter.java
+36
-7
BaseModuleFragment.java
...main/java/com/topjohnwu/magisk/ui/BaseModuleFragment.java
+21
-48
ic_block.xml
app/src/main/res/drawable/ic_block.xml
+0
-9
list_item_module.xml
app/src/main/res/layout/list_item_module.xml
+22
-2
module_popup.xml
app/src/main/res/menu/module_popup.xml
+0
-14
colors.xml
app/src/main/res/values/colors.xml
+1
-0
strings.xml
app/src/main/res/values/strings.xml
+1
-0
RootAccessDeniedException.java
...lysecure/rootcommands/util/RootAccessDeniedException.java
+0
-32
UnsupportedArchitectureException.java
...e/rootcommands/util/UnsupportedArchitectureException.java
+0
-30
No files found.
app/src/main/java/com/topjohnwu/magisk/model/Module.java
View file @
3ad06c40
...
...
@@ -45,12 +45,28 @@ public class Module {
return
mDescription
;
}
public
void
createDisableFile
()
{
Utils
.
executeCommand
(
"touch "
+
mDisableFile
.
getPath
());
}
public
boolean
removeDisableFile
()
{
return
mDisableFile
.
delete
();
}
public
boolean
isEnabled
()
{
return
mDisableFile
.
exists
();
}
public
void
createRemoveFile
()
{
Utils
.
executeCommand
(
"
echo \"\" >
"
+
mRemoveFile
.
getPath
());
Utils
.
executeCommand
(
"
touch
"
+
mRemoveFile
.
getPath
());
}
public
void
createDisableFile
()
{
Utils
.
executeCommand
(
"echo \"\" > "
+
mDisableFile
.
getPath
());
public
boolean
deleteRemoveFile
()
{
return
mRemoveFile
.
delete
();
}
public
boolean
willBeRemoved
()
{
return
mRemoveFile
.
exists
();
}
public
void
parse
()
throws
Exception
{
...
...
app/src/main/java/com/topjohnwu/magisk/rv/ModulesAdapter.java
View file @
3ad06c40
...
...
@@ -4,6 +4,8 @@ import android.support.v7.widget.RecyclerView;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
android.widget.CheckBox
;
import
android.widget.CompoundButton
;
import
android.widget.ImageView
;
import
android.widget.TextView
;
...
...
@@ -18,11 +20,13 @@ import butterknife.ButterKnife;
public
class
ModulesAdapter
extends
RecyclerView
.
Adapter
<
ModulesAdapter
.
ViewHolder
>
{
private
final
List
<
Module
>
mList
;
private
final
ItemClickListener
mListener
;
private
final
ItemClickListener
chboxListener
;
private
final
ItemClickListener
deleteBtnListener
;
public
ModulesAdapter
(
List
<
Module
>
list
,
ItemClickListener
l
istener
)
{
public
ModulesAdapter
(
List
<
Module
>
list
,
ItemClickListener
chboxListener
,
ItemClickListener
deleteBtnL
istener
)
{
this
.
mList
=
list
;
this
.
mListener
=
listener
;
this
.
chboxListener
=
chboxListener
;
this
.
deleteBtnListener
=
deleteBtnListener
;
}
@Override
...
...
@@ -34,18 +38,38 @@ public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHold
@Override
public
void
onBindViewHolder
(
final
ViewHolder
holder
,
int
position
)
{
Module
module
=
mList
.
get
(
position
);
final
Module
module
=
mList
.
get
(
position
);
holder
.
title
.
setText
(
module
.
getName
());
holder
.
versionName
.
setText
(
module
.
getVersion
());
holder
.
description
.
setText
(
module
.
getDescription
());
holder
.
overflowButton
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
holder
.
checkBox
.
setChecked
(
module
.
isEnabled
());
holder
.
checkBox
.
setOnCheckedChangeListener
(
new
CompoundButton
.
OnCheckedChangeListener
()
{
@Override
public
void
onCheckedChanged
(
CompoundButton
compoundButton
,
boolean
b
)
{
chboxListener
.
onItemClick
(
compoundButton
,
holder
.
getAdapterPosition
());
}
});
holder
.
delete
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
view
)
{
mListener
.
onItemClick
(
holder
.
overflowButton
,
holder
.
getAdapterPosition
());
deleteBtnListener
.
onItemClick
(
holder
.
delete
,
holder
.
getAdapterPosition
());
holder
.
warning
.
setVisibility
(
module
.
willBeRemoved
()
?
View
.
VISIBLE
:
View
.
GONE
);
}
});
holder
.
delete
.
setOnLongClickListener
(
new
View
.
OnLongClickListener
()
{
@Override
public
boolean
onLongClick
(
View
view
)
{
module
.
deleteRemoveFile
();
holder
.
warning
.
setVisibility
(
module
.
willBeRemoved
()
?
View
.
VISIBLE
:
View
.
GONE
);
return
false
;
}
});
holder
.
warning
.
setVisibility
(
module
.
willBeRemoved
()
?
View
.
VISIBLE
:
View
.
GONE
);
}
@Override
...
...
@@ -56,9 +80,14 @@ public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHold
static
class
ViewHolder
extends
RecyclerView
.
ViewHolder
{
@BindView
(
R
.
id
.
title
)
TextView
title
;
@BindView
(
R
.
id
.
version_name
)
TextView
versionName
;
@BindView
(
R
.
id
.
description
)
TextView
description
;
@BindView
(
R
.
id
.
overflow
)
ImageView
overflowButton
;
@BindView
(
R
.
id
.
warning
)
TextView
warning
;
@BindView
(
R
.
id
.
checkbox
)
CheckBox
checkBox
;
@BindView
(
R
.
id
.
delete
)
ImageView
delete
;
public
ViewHolder
(
View
itemView
)
{
super
(
itemView
);
...
...
app/src/main/java/com/topjohnwu/magisk/ui/BaseModuleFragment.java
View file @
3ad06c40
...
...
@@ -4,20 +4,17 @@ import android.os.Bundle;
import
android.support.annotation.Nullable
;
import
android.support.design.widget.Snackbar
;
import
android.support.v4.app.Fragment
;
import
android.support.v7.widget.PopupMenu
;
import
android.support.v7.widget.RecyclerView
;
import
android.view.LayoutInflater
;
import
android.view.MenuItem
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
android.widget.CheckBox
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.model.Module
;
import
com.topjohnwu.magisk.rv.ItemClickListener
;
import
com.topjohnwu.magisk.rv.ModulesAdapter
;
import
java.lang.reflect.Field
;
import
java.lang.reflect.Method
;
import
java.util.List
;
import
butterknife.BindView
;
...
...
@@ -27,56 +24,32 @@ public abstract class BaseModuleFragment extends Fragment {
@BindView
(
R
.
id
.
recyclerView
)
RecyclerView
recyclerView
;
private
ItemClickListener
moduleActions
=
new
ItemClickListener
()
{
@Override
public
void
onItemClick
(
final
View
view
,
final
int
position
)
{
PopupMenu
popup
=
new
PopupMenu
(
getContext
(),
view
);
// Force show icons
try
{
Field
[]
fields
=
popup
.
getClass
().
getDeclaredFields
();
for
(
Field
field
:
fields
)
{
if
(
"mPopup"
.
equals
(
field
.
getName
()))
{
field
.
setAccessible
(
true
);
Object
menuPopupHelper
=
field
.
get
(
popup
);
Class
<?>
classPopupHelper
=
Class
.
forName
(
menuPopupHelper
.
getClass
().
getName
());
Method
setForceIcons
=
classPopupHelper
.
getMethod
(
"setForceShowIcon"
,
boolean
.
class
);
setForceIcons
.
invoke
(
menuPopupHelper
,
true
);
break
;
}
}
}
catch
(
Exception
ignored
)
{
}
popup
.
setOnMenuItemClickListener
(
new
PopupMenu
.
OnMenuItemClickListener
()
{
@Override
public
boolean
onMenuItemClick
(
MenuItem
item
)
{
switch
(
item
.
getItemId
())
{
case
R
.
id
.
remove
:
listModules
().
get
(
position
).
createRemoveFile
();
Snackbar
.
make
(
view
,
R
.
string
.
remove_file_created
,
Snackbar
.
LENGTH_SHORT
).
show
();
break
;
case
R
.
id
.
disable
:
listModules
().
get
(
position
).
createDisableFile
();
Snackbar
.
make
(
view
,
R
.
string
.
disable_file_created
,
Snackbar
.
LENGTH_SHORT
).
show
();
break
;
}
return
false
;
}
});
popup
.
inflate
(
R
.
menu
.
module_popup
);
popup
.
show
();
}
};
@Nullable
@Override
public
View
onCreateView
(
LayoutInflater
inflater
,
@Nullable
ViewGroup
container
,
@Nullable
Bundle
savedInstanceState
)
{
View
view
=
inflater
.
inflate
(
R
.
layout
.
single_module_fragment
,
container
,
false
);
ButterKnife
.
bind
(
this
,
view
);
recyclerView
.
setAdapter
(
new
ModulesAdapter
(
listModules
(),
moduleActions
));
recyclerView
.
setAdapter
(
new
ModulesAdapter
(
listModules
(),
new
ItemClickListener
()
{
@Override
public
void
onItemClick
(
View
view
,
int
position
)
{
CheckBox
chbox
=
(
CheckBox
)
view
;
if
(!
chbox
.
isChecked
())
{
listModules
().
get
(
position
).
createDisableFile
();
Snackbar
.
make
(
view
,
R
.
string
.
disable_file_created
,
Snackbar
.
LENGTH_SHORT
).
show
();
}
else
{
listModules
().
get
(
position
).
removeDisableFile
();
Snackbar
.
make
(
view
,
R
.
string
.
disable_file_removed
,
Snackbar
.
LENGTH_SHORT
).
show
();
}
}
},
new
ItemClickListener
()
{
@Override
public
void
onItemClick
(
View
view
,
int
position
)
{
listModules
().
get
(
position
).
createRemoveFile
();
Snackbar
.
make
(
view
,
R
.
string
.
remove_file_created
,
Snackbar
.
LENGTH_SHORT
).
show
();
}
}));
return
view
;
}
...
...
app/src/main/res/drawable/ic_block.xml
deleted
100644 → 0
View file @
c68e37a8
<vector
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:width=
"24dp"
android:height=
"24dp"
android:viewportWidth=
"24.0"
android:viewportHeight=
"24.0"
>
<path
android:fillColor=
"#757575"
android:pathData=
"M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-4.42 3.58,-8 8,-8 1.85,0 3.55,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4,13.85 4,12zM12,20c-1.85,0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20,10.15 20,12c0,4.42 -3.58,8 -8,8z"
/>
</vector>
app/src/main/res/layout/list_item_module.xml
View file @
3ad06c40
...
...
@@ -64,10 +64,20 @@
android:textAppearance=
"?android:attr/textAppearanceSmall"
android:textIsSelectable=
"false"
/>
<TextView
android:id=
"@+id/warning"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_vertical"
android:text=
"@string/remove_file_created"
android:textAppearance=
"?android:attr/textAppearanceSmall"
android:textColor=
"@color/red500"
android:visibility=
"gone"
/>
</LinearLayout>
<
ImageView
android:id=
"@+id/
overflow
"
<
CheckBox
android:id=
"@+id/
checkbox
"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:focusable=
"false"
...
...
@@ -76,6 +86,16 @@
android:src=
"@drawable/ic_menu_overflow_material"
tools:ignore=
"ContentDescription"
/>
<ImageView
android:id=
"@+id/delete"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:focusable=
"false"
android:gravity=
"center"
android:padding=
"3dp"
android:src=
"@drawable/ic_delete"
tools:ignore=
"ContentDescription"
/>
</LinearLayout>
</android.support.v7.widget.CardView>
\ No newline at end of file
app/src/main/res/menu/module_popup.xml
deleted
100644 → 0
View file @
c68e37a8
<?xml version="1.0" encoding="utf-8"?>
<menu
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<item
android:id=
"@+id/remove"
android:icon=
"@drawable/ic_delete"
android:title=
"@string/remove"
/>
<item
android:id=
"@+id/disable"
android:icon=
"@drawable/ic_block"
android:title=
"@string/disable"
/>
</menu>
\ No newline at end of file
app/src/main/res/values/colors.xml
View file @
3ad06c40
...
...
@@ -9,5 +9,6 @@
<color
name=
"secondary_text"
>
#757575
</color>
<color
name=
"icons"
>
#FFFFFF
</color>
<color
name=
"divider"
>
#BDBDBD
</color>
<color
name=
"red500"
>
#F44336
</color>
</resources>
app/src/main/res/values/strings.xml
View file @
3ad06c40
...
...
@@ -40,5 +40,6 @@
<string
name=
"log_is_empty"
>
Log is empty
</string>
<string
name=
"logs_save_failed"
>
Could not write log to SD card:
</string>
<string
name=
"permissionNotGranted"
>
This feature will not work without permission to write external storage.
</string>
<string
name=
"disable_file_removed"
>
Module will be enabled at next reboot
</string>
</resources>
lib/RootCommands/src/main/java/org/sufficientlysecure/rootcommands/util/RootAccessDeniedException.java
deleted
100644 → 0
View file @
c68e37a8
/*
* Copyright (C) 2012 Dominik Schürmann <dominik@dominikschuermann.de>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org
.
sufficientlysecure
.
rootcommands
.
util
;
import
java.io.IOException
;
public
class
RootAccessDeniedException
extends
IOException
{
private
static
final
long
serialVersionUID
=
9088998884166225540L
;
public
RootAccessDeniedException
()
{
super
();
}
public
RootAccessDeniedException
(
String
detailMessage
)
{
super
(
detailMessage
);
}
}
lib/RootCommands/src/main/java/org/sufficientlysecure/rootcommands/util/UnsupportedArchitectureException.java
deleted
100644 → 0
View file @
c68e37a8
/*
* Copyright (C) 2012 Dominik Schürmann <dominik@dominikschuermann.de>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org
.
sufficientlysecure
.
rootcommands
.
util
;
public
class
UnsupportedArchitectureException
extends
Exception
{
private
static
final
long
serialVersionUID
=
7826528799780001655L
;
public
UnsupportedArchitectureException
()
{
super
();
}
public
UnsupportedArchitectureException
(
String
detailMessage
)
{
super
(
detailMessage
);
}
}
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