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

Refactoring

This commit is contained in:
M66B 2015-10-29 13:02:12 +01:00
parent 6a36dbbd57
commit 5d313de6dc
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,9 +40,9 @@ public class RuleAdapter extends RecyclerView.Adapter<RuleAdapter.ViewHolder> im
public CheckBox cbWifi;
public CheckBox cbOther;
public LinearLayout llAttributes;
public ImageView ivUnused;
public ImageView ivUsing;
public LinearLayout llConfiguration;
public CheckBox cbUnused;
public CheckBox cbUsing;
public ViewHolder(View itemView) {
super(itemView);
@ -54,9 +54,9 @@ public class RuleAdapter extends RecyclerView.Adapter<RuleAdapter.ViewHolder> im
cbWifi = (CheckBox) itemView.findViewById(R.id.cbWifi);
cbOther = (CheckBox) itemView.findViewById(R.id.cbOther);
llAttributes = (LinearLayout) itemView.findViewById(R.id.llAttributes);
ivUnused = (ImageView) itemView.findViewById(R.id.ivUnused);
ivUsing = (ImageView) itemView.findViewById(R.id.ivUsing);
llConfiguration = (LinearLayout) itemView.findViewById(R.id.llConfiguration);
cbUnused = (CheckBox) itemView.findViewById(R.id.cbUnused);
cbUsing = (CheckBox) itemView.findViewById(R.id.cbUsing);
}
}
@ -107,9 +107,9 @@ public class RuleAdapter extends RecyclerView.Adapter<RuleAdapter.ViewHolder> im
rule.unused = false;
SharedPreferences punused = context.getSharedPreferences("unused", Context.MODE_PRIVATE);
punused.edit().remove(rule.info.packageName).apply();
holder.ivUnused.setVisibility(View.INVISIBLE);
holder.ivUsing.setVisibility(View.INVISIBLE);
holder.llConfiguration.setVisibility(View.GONE);
holder.cbUnused.setChecked(false);
holder.cbUsing.setChecked(false);
}
SinkholeService.reload(network, context);
@ -144,17 +144,17 @@ public class RuleAdapter extends RecyclerView.Adapter<RuleAdapter.ViewHolder> im
holder.cbOther.setChecked(rule.other_blocked);
holder.cbOther.setOnCheckedChangeListener(cbListener);
holder.ivUnused.setVisibility(rule.unused ? View.VISIBLE : View.INVISIBLE);
holder.ivUsing.setVisibility(rule.unused ? View.VISIBLE : View.INVISIBLE);
holder.llConfiguration.setVisibility(rule.attributes ? View.VISIBLE : View.GONE);
holder.cbUnused.setOnCheckedChangeListener(null);
holder.cbUnused.setChecked(rule.unused);
holder.cbUsing.setOnCheckedChangeListener(null);
holder.cbUsing.setChecked(rule.unused);
holder.llApplication.setOnClickListener(llListener);
holder.llAttributes.setOnClickListener(llListener);
holder.cbUnused.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
holder.cbUsing.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
rule.unused = isChecked;
@ -163,7 +163,7 @@ public class RuleAdapter extends RecyclerView.Adapter<RuleAdapter.ViewHolder> im
punused.edit().putBoolean(rule.info.packageName, true).apply();
else
punused.edit().remove(rule.info.packageName).apply();
holder.ivUnused.setVisibility(rule.unused ? View.VISIBLE : View.INVISIBLE);
holder.ivUsing.setVisibility(rule.unused ? View.VISIBLE : View.INVISIBLE);
SinkholeService.reload(null, context);
}

0
app/src/main/res/drawable/unused.xml → app/src/main/res/drawable/using.xml
View File

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

@ -72,12 +72,12 @@
android:orientation="horizontal">
<ImageView
android:id="@+id/ivUnused"
android:id="@+id/ivUsing"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="12dp"
android:src="@drawable/unused" />
android:src="@drawable/using" />
</LinearLayout>
</LinearLayout>
@ -92,10 +92,10 @@
android:visibility="gone">
<CheckBox
android:id="@+id/cbUnused"
android:id="@+id/cbUsing"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/title_unused"
android:text="@string/title_using"
android:textAppearance="@android:style/TextAppearance.Material.Small" />
</LinearLayout>
</LinearLayout>

2
app/src/main/res/values-fr/strings.xml
View File

@ -15,5 +15,5 @@
<string name="msg_sure">Etes-vous sûr ?</string>
<string name="title_unused">Allow when device in use</string>
<string name="title_using">Allow when device in use</string>
</resources>

2
app/src/main/res/values/strings.xml
View File

@ -16,5 +16,5 @@
<string name="msg_sure">Are you sure?</string>
<string name="title_unused">Allow when device in use</string>
<string name="title_using">Allow when device in use</string>
</resources>