mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Make room for all those new features ;-)

This commit is contained in:
M66B 2016-02-03 19:14:10 +01:00
parent 013e5b8cc2
commit 099db1b820
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/faircode/netguard/RuleAdapter.java
View File

@ -307,6 +307,9 @@ public class RuleAdapter extends RecyclerView.Adapter<RuleAdapter.ViewHolder> im
// Show if non default rules
holder.itemView.setBackgroundColor(rule.changed || rules > 0 ? colorChanged : Color.TRANSPARENT);
// Show expand/collapse indicator
holder.ivExpander.setImageLevel(rule.expanded ? 1 : 0);
// Show application icon
if (rule.info.applicationInfo == null || rule.info.applicationInfo.icon == 0)
Picasso.with(context).load(android.R.drawable.sym_def_app_icon).into(holder.ivIcon);
@ -315,9 +318,6 @@ public class RuleAdapter extends RecyclerView.Adapter<RuleAdapter.ViewHolder> im
Picasso.with(context).load(uri).into(holder.ivIcon);
}
// Show expand/collapse indicator
holder.ivExpander.setImageLevel(rule.expanded ? 1 : 0);
// Show application label
holder.tvName.setText(rule.name);

21
app/src/main/res/layout/rule.xml
View File

@ -18,12 +18,6 @@
android:layout_weight="1"
android:orientation="horizontal">
<ImageView
android:id="@+id/ivIcon"
android:layout_width="?android:attr/listPreferredItemHeightSmall"
android:layout_height="?android:attr/listPreferredItemHeightSmall"
android:layout_gravity="center_vertical" />
<ImageView
android:id="@+id/ivExpander"
android:layout_width="32dp"
@ -31,6 +25,12 @@
android:layout_gravity="center_vertical"
android:src="?attr/expander" />
<ImageView
android:id="@+id/ivIcon"
android:layout_width="?android:attr/listPreferredItemHeightSmall"
android:layout_height="?android:attr/listPreferredItemHeightSmall"
android:layout_gravity="center_vertical" />
<TextView
android:id="@+id/tvName"
android:layout_width="0dp"
@ -38,6 +38,8 @@
android:layout_weight="1"
android:ellipsize="end"
android:gravity="center_vertical"
android:paddingLeft="4dp"
android:paddingStart="4dp"
android:textAppearance="@style/TextMedium" />
</LinearLayout>
@ -141,12 +143,9 @@
android:id="@+id/llConfiguration"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_marginLeft="32dp"
android:layout_marginStart="32dp"
android:orientation="vertical"
android:paddingLeft="?android:attr/listPreferredItemHeightSmall"
android:paddingStart="?android:attr/listPreferredItemHeightSmall"
android:paddingTop="0dp"
android:visibility="gone">
<TextView