From c3a7a5a84489e7906f31379da3c65fc80aff6181 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 25 Oct 2015 12:52:54 +0100 Subject: [PATCH] Switch to blocking, add action toggle all --- .../eu/faircode/netguard/ActivityMain.java | 38 ++++++++++++++---- .../faircode/netguard/BlackHoleService.java | 8 +++- .../main/java/eu/faircode/netguard/Rule.java | 2 +- .../eu/faircode/netguard/RuleAdapter.java | 18 +++++++++ .../ic_network_cell_black_24dp.png | Bin 161 -> 0 bytes .../ic_network_cell_white_24dp.png | Bin 0 -> 162 bytes .../ic_network_wifi_black_24dp.png | Bin 394 -> 0 bytes .../ic_network_wifi_white_24dp.png | Bin 0 -> 427 bytes .../ic_signal_cellular_off_black_24dp.png | Bin 261 -> 0 bytes .../ic_signal_cellular_off_white_24dp.png | Bin 0 -> 282 bytes .../ic_signal_wifi_off_black_24dp.png | Bin 391 -> 0 bytes .../ic_signal_wifi_off_white_24dp.png | Bin 0 -> 421 bytes .../ic_network_cell_black_24dp.png | Bin 131 -> 0 bytes .../ic_network_cell_white_24dp.png | Bin 0 -> 139 bytes .../ic_network_wifi_black_24dp.png | Bin 273 -> 0 bytes .../ic_network_wifi_white_24dp.png | Bin 0 -> 299 bytes .../ic_signal_cellular_off_black_24dp.png | Bin 195 -> 0 bytes .../ic_signal_cellular_off_white_24dp.png | Bin 0 -> 201 bytes .../ic_signal_wifi_off_black_24dp.png | Bin 291 -> 0 bytes .../ic_signal_wifi_off_white_24dp.png | Bin 0 -> 308 bytes .../ic_network_cell_black_24dp.png | Bin 193 -> 0 bytes .../ic_network_cell_white_24dp.png | Bin 0 -> 191 bytes .../ic_network_wifi_black_24dp.png | Bin 491 -> 0 bytes .../ic_network_wifi_white_24dp.png | Bin 0 -> 538 bytes .../ic_signal_cellular_off_black_24dp.png | Bin 289 -> 0 bytes .../ic_signal_cellular_off_white_24dp.png | Bin 0 -> 309 bytes .../ic_signal_wifi_off_black_24dp.png | Bin 481 -> 0 bytes .../ic_signal_wifi_off_white_24dp.png | Bin 0 -> 528 bytes .../ic_network_cell_black_24dp.png | Bin 244 -> 0 bytes .../ic_network_cell_white_24dp.png | Bin 0 -> 263 bytes .../ic_network_wifi_black_24dp.png | Bin 715 -> 0 bytes .../ic_network_wifi_white_24dp.png | Bin 0 -> 786 bytes .../ic_signal_cellular_off_black_24dp.png | Bin 388 -> 0 bytes .../ic_signal_cellular_off_white_24dp.png | Bin 0 -> 435 bytes .../ic_signal_wifi_off_black_24dp.png | Bin 727 -> 0 bytes .../ic_signal_wifi_off_white_24dp.png | Bin 0 -> 795 bytes .../ic_network_cell_black_24dp.png | Bin 278 -> 0 bytes .../ic_network_cell_white_24dp.png | Bin 0 -> 293 bytes .../ic_network_wifi_black_24dp.png | Bin 945 -> 0 bytes .../ic_network_wifi_white_24dp.png | Bin 0 -> 1043 bytes .../ic_signal_cellular_off_black_24dp.png | Bin 463 -> 0 bytes .../ic_signal_cellular_off_white_24dp.png | Bin 0 -> 524 bytes .../ic_signal_wifi_off_black_24dp.png | Bin 899 -> 0 bytes .../ic_signal_wifi_off_white_24dp.png | Bin 0 -> 994 bytes app/src/main/res/drawable/other_off.xml | 2 +- app/src/main/res/drawable/other_on.xml | 2 +- app/src/main/res/drawable/wifi_off.xml | 2 +- app/src/main/res/drawable/wifi_on.xml | 2 +- app/src/main/res/layout/actionbar.xml | 9 +++-- app/src/main/res/menu/main.xml | 12 +++++- app/src/main/res/values/strings.xml | 2 + 51 files changed, 77 insertions(+), 20 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_network_cell_black_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_network_cell_white_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_network_wifi_black_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_network_wifi_white_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_signal_cellular_off_black_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_signal_cellular_off_white_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_signal_wifi_off_black_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_signal_wifi_off_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_network_cell_black_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_network_cell_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_network_wifi_black_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_network_wifi_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_signal_cellular_off_black_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_signal_cellular_off_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_signal_wifi_off_black_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_signal_wifi_off_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_network_cell_black_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_network_cell_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_network_wifi_black_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_network_wifi_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_signal_cellular_off_black_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_signal_cellular_off_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_signal_wifi_off_black_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_signal_wifi_off_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_network_cell_black_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_network_cell_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_network_wifi_black_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_network_wifi_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_signal_cellular_off_black_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_signal_cellular_off_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_signal_wifi_off_black_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_signal_wifi_off_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_network_cell_black_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_network_cell_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_network_wifi_black_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_network_wifi_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_signal_cellular_off_black_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_signal_cellular_off_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_signal_wifi_off_black_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_signal_wifi_off_white_24dp.png diff --git a/app/src/main/java/eu/faircode/netguard/ActivityMain.java b/app/src/main/java/eu/faircode/netguard/ActivityMain.java index d2191c11..f4051e58 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivityMain.java +++ b/app/src/main/java/eu/faircode/netguard/ActivityMain.java @@ -120,25 +120,35 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.main, menu); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + + MenuItem wifiItem = menu.findItem(R.id.menu_wifi); + MenuItem otherItem = menu.findItem(R.id.menu_other); + wifiItem.setIcon(prefs.getBoolean("wifi", true) ? R.drawable.ic_network_wifi_white_24dp : R.drawable.ic_signal_wifi_off_white_24dp); + otherItem.setIcon(prefs.getBoolean("other", true) ? R.drawable.ic_network_cell_white_24dp : R.drawable.ic_signal_cellular_off_white_24dp); + MenuItem searchItem = menu.findItem(R.id.menu_search); SearchView searchView = (SearchView) MenuItemCompat.getActionView(searchItem); searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() { @Override public boolean onQueryTextSubmit(String query) { - applyFilter(query); + if (adapter != null) + adapter.getFilter().filter(query); return true; } @Override public boolean onQueryTextChange(String newText) { - applyFilter(newText); + if (adapter != null) + adapter.getFilter().filter(newText); return true; } }); searchView.setOnCloseListener(new SearchView.OnCloseListener() { @Override public boolean onClose() { - applyFilter(null); + if (adapter != null) + adapter.getFilter().filter(null); return true; } }); @@ -146,15 +156,27 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences return true; } - private void applyFilter(String query) { - if (adapter != null) - adapter.getFilter().filter(query); - } - @Override public boolean onOptionsItemSelected(MenuItem item) { // Handle item selection + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); switch (item.getItemId()) { + case R.id.menu_wifi: + boolean wifi = !prefs.getBoolean("wifi", true); + prefs.edit().putBoolean("wifi", wifi).apply(); + if (adapter != null) + adapter.set("wifi", wifi, this); + invalidateOptionsMenu(); + return true; + + case R.id.menu_other: + boolean other = !prefs.getBoolean("other", true); + prefs.edit().putBoolean("other", other).apply(); + if (adapter != null) + adapter.set("other", other, this); + invalidateOptionsMenu(); + return true; + case R.id.menu_vpn_settings: Intent intent = new Intent("android.net.vpn.SETTINGS"); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); diff --git a/app/src/main/java/eu/faircode/netguard/BlackHoleService.java b/app/src/main/java/eu/faircode/netguard/BlackHoleService.java index 1811a9e8..5820d39b 100644 --- a/app/src/main/java/eu/faircode/netguard/BlackHoleService.java +++ b/app/src/main/java/eu/faircode/netguard/BlackHoleService.java @@ -115,7 +115,7 @@ public class BlackHoleService extends VpnService implements Runnable { builder.setSession("BlackHoleService"); builder.addAddress("10.1.10.1", 32); builder.addRoute("0.0.0.0", 0); - builder.setBlocking(true); + builder.setBlocking(false); // Add list of allowed applications for (Rule rule : Rule.getRules(this)) @@ -135,7 +135,11 @@ public class BlackHoleService extends VpnService implements Runnable { Log.i(TAG, "Loop start thread=" + Thread.currentThread()); FileInputStream in = new FileInputStream(pfd.getFileDescriptor()); while (!Thread.currentThread().isInterrupted() && pfd.getFileDescriptor().valid()) - in.skip(32768); + if (in.skip(32768) < 0) + try { + Thread.sleep(1000); + } catch (InterruptedException ignored) { + } Log.i(TAG, "Loop exit thread=" + Thread.currentThread()); } catch (Throwable ex) { diff --git a/app/src/main/java/eu/faircode/netguard/Rule.java b/app/src/main/java/eu/faircode/netguard/Rule.java index b39b104c..85e985eb 100644 --- a/app/src/main/java/eu/faircode/netguard/Rule.java +++ b/app/src/main/java/eu/faircode/netguard/Rule.java @@ -30,7 +30,7 @@ public class Rule implements Comparable { for (PackageInfo info : context.getPackageManager().getInstalledPackages(0)) listRules.add(new Rule( info, - wifi.getBoolean(info.packageName, false), + wifi.getBoolean(info.packageName, true), other.getBoolean(info.packageName, true), context )); diff --git a/app/src/main/java/eu/faircode/netguard/RuleAdapter.java b/app/src/main/java/eu/faircode/netguard/RuleAdapter.java index 66e0e86d..15b15914 100644 --- a/app/src/main/java/eu/faircode/netguard/RuleAdapter.java +++ b/app/src/main/java/eu/faircode/netguard/RuleAdapter.java @@ -124,6 +124,24 @@ public class RuleAdapter extends RecyclerView.Adapter im }; } + public void set(String name, boolean blocked, Context context) { + SharedPreferences.Editor editor = context.getSharedPreferences(name, Context.MODE_PRIVATE).edit(); + for (Rule rule : listSelected) { + if ("wifi".equals(name)) + rule.wifi_blocked = blocked; + else + rule.other_blocked = blocked; + editor.putBoolean(rule.info.packageName, blocked); + } + editor.apply(); + + Intent intent = new Intent(context, BlackHoleService.class); + intent.putExtra(BlackHoleService.EXTRA_COMMAND, BlackHoleService.Command.reload); + context.startService(intent); + + notifyDataSetChanged(); + } + @Override public RuleAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { return new ViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.rule, parent, false)); diff --git a/app/src/main/res/drawable-hdpi/ic_network_cell_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_network_cell_black_24dp.png deleted file mode 100644 index fdba6a9a1d93c418d5c025c3cb689ac6b6880a22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8hNp{TNCo5DGl9Gf0X!@lma`eF z^B+`Lc)BRQh3m!7IjgTOLBK0-7XMC>SXg;Xa8_l@v5B)QpB$Sw%N59ycF&X9c+)*Y sW@jN#2*~>e76S6xE^c#t(l+sLTwA36eh-FPTcDi`p00i_>zopr0GvWVaR2}S diff --git a/app/src/main/res/drawable-hdpi/ic_network_cell_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_network_cell_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..8bee424e4175703cfd2aa4fac797f9a8b592e7cf GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8rl*TzNCo5FGlq-@40sM~SfDxc zko1E$1}wE(>(6Gtz4{qLH{1XK literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_network_wifi_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_network_wifi_black_24dp.png deleted file mode 100644 index bb2383fcb2d6cf796d6571ce185e1250f9edfff7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 394 zcmV;50d@X~P)S8nu?%Uw73ODkhG_s&t8F|Ah?PkICRll&tjqiVb9hpew46r6t zdfnYCBaj1 zN>3!(5ht`GS>~%)(-#@(R_uwY{n9g|O=H#9*ffW2@xQjs>5W+Gt+{o4694sCM+03$ oQM9M4p@9Qq1Dbo}G0h$M3kj=RlA~6)+h@coW*bRyx`E$msKv58EMG!2~=oWMVVyT!Sg=PVQ8&DK2 zwGGh}sWOqz!i-Fqzn4kMoLj!f2lsLBIZu*C3MFKwNRUQjoh+N^6xcvx36*JN5k!PI z844IaRbYiU5pRgXJb7P)z49!eI3ZCM(S;#a>7*IAzla*pjDMp^z$z-1_nFSFbR@Ljcp7Ja*kOdhRy{oMAhQF`^b)=JfL6gdo9U*Uzj`ZZJXp>81u%2 z-}cYZ6v8x_4Kk7voj^>7l87gr1%ggR9kS|+sft^z!mB6d#l_BiP$?R&m@m|R1EA=# zDkjA+SyFa@%3)*awg*!QpKno~{xQ!)2Z_o=*O?k522I^8ZA`Mm2=HT0M&FoW=oeW< Vqh>;b>ihrz002ovPDHLkV1oCcwUPh; literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_signal_cellular_off_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_signal_cellular_off_black_24dp.png deleted file mode 100644 index 1fce6de6d83918cf2ab5c98aad460dbc0744ef7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 261 zcmV+g0s8)lP)~C zt>2W`etyc&2ud?zTGHU18c%6PQ<~9~N^j9X>IM^a_YXXgs_GYbguTATPlRQ*6wJrcriY#UKyK25Yex52Z{P zcW#c-ICZ+6x%bSRg@x~L_wV#s9{z9(r0g()cN^3uLZP}@CeJZEtyJ(AY5tuq94EmBh1)_>{;L|V_U#gX!pueS_8poiVEh@s9Eh@o- z1~H}vaXic?ePqn3IS(`gz=k=sqcGe2wqB(s2w0dC$rNY?*&2d!a0uEd{xJ8%P+MgZ lqXuv&(~E^>nZ`o@eFH&a@;qHD;UsPR^10!l*ecSw8X;bHT8)ZP47cDAHms2v0 zQgEc&>C;V1H8p9HmkF0Bd|bFig?LgR#?){*F|GPyfS5V8Py@}0h_Gc&?Nu?VJDZl^# diff --git a/app/src/main/res/drawable-mdpi/ic_network_cell_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_network_cell_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..a2045c33efb7eef2f0c5374cde28a7f3a07d6690 GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iAWs*^kP61Lrxh6w7znT&3>P+@ zDt<72OUNJ#UTy!I#el!y-2$0|y5y=siS1isQ=WW~+ki|c zy6~uPXl!h#@4>lHR0G%(9J}*w66wvYAlOwXJJU0nQ`f1oDLX#r9t<@6aAG`jK5``D zX6C^aaWB#NlbI@Bf6aSV&9QA@dj6qif!t{7*|r4N#lfXS&)@TV$twD~R!EoG@<+Y^ Xo-3R1QWgYC00000NkvXXu0mjf-x_-+ diff --git a/app/src/main/res/drawable-mdpi/ic_network_wifi_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_network_wifi_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..1c3e8b98793de1aecf85422d398b42cb39bdb859 GIT binary patch literal 299 zcmV+`0o4A9P)4mTQN&lnQKr2S4Zoj2sFV!NULm002ovPDHLkV1n;7d{F=Z literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_signal_cellular_off_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_signal_cellular_off_black_24dp.png deleted file mode 100644 index d9721f58ea92bbdf48ca4e43a97b27a89d6f9214..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iE>9Q7kP61Fm-q5I849pGoY>*x zDB>V^<*>hl_LFlwdEF%wPejO;8wvfs^pojy-Jks9S7UVEw8$LjoA&I}pOYLXC0!R7 zPMF*u6EK;Zt6`$G?ip4~%LPmlHw&~K9rwNKnsekp|1X0{&lx@QO_fUXRO*sAPZs@t uHv7i=gb$$Yq%!kr8fS_~Eoo6NiSl;05!UECqQ<8yHel z8j9|IQ)JA@^I_6B?~#}yEPa7B=#nK@&l}ch)2>!rnWeQ5=r#sVS3j3^P6nY=7F?ZdXBP*tLN7;A5!~Fp0|ym_Z|HXstw?d{U{gGT zgb+d#8yA0PJN%#R^}A~Jl2 z-ULCEOM+J&6EvsHFQ!i;2W8@fV0LI}LtPK1BLDCx3*cKL-E8O)?SLeGlL}ig@ld~aezrINl%6wbw}^OWW2`+ewAzx6=f3&rw~eKlx2EniL7cNC_beSYGtt|F zE2e&csz~^5q9bwFSKuh&v)gg1q9s{-7%}C5j0)t5M8um`kGgvhw=5du zqDJQWQU`IODw4H<9D;aCfn16v5U&d)CD8S$KnfuG=ISl1R7PbG53KF_<-XxxGA@I7 zY}cdO`3GeXFTgXAEqSS<3|#ZUdsn5g0*IS#NEwv(|KJZ@XZ{SRQ+Cw=0000e*sN#c0OM#lLUcneLwze|G(|@XxD%Uj36*$9SK2U%H*ZzmJU{Eehn=&pkd+ zDPz&k{Jiji4d0yOjh~4WT;BNEpg@l8+~EV25`XsH=2jEYG!0obBM;~%22WQ%mvv4F FO#lo;Oj!T` diff --git a/app/src/main/res/drawable-xhdpi/ic_network_cell_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_network_cell_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..1ccc9770dd41f5a1bb7f0c4537f5c7855711f31c GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DHcuDFkP61PXAMJH0z{4;2>pDf zrZW6PfI@>7Z@Mt!=bzu=i|zK;i_8yadOr0)rD{PO=NuH~XRm}Q2Q(T3nHICSarOvF ks2Y$Y!0l4sX#bz_<0`Wm1;1Bz0A0l3>FVdQ&MBb@0M>jyrvLx| literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_network_wifi_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_network_wifi_black_24dp.png deleted file mode 100644 index 7234a0ccc9de13600a05a1403a739d3ef24fb435..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 491 zcmV<4vTfvki4kI^3LnBudHEF3JvR2;gCUjQA*_vXjS60aZ$=$ zaSF&dCu&fGGPD{KHKADcdwt;e6VQFZG|dBpHw3E z-_!Rj*%GR>>AhJ|WqOr!K~&OpbG``&?5me%L?sQW(DHBWf*00>gnjp1p={g=9VSI? zSruyRlba$F+U=v;yrNJ?zrAuo70-k^dn(3~P)Cbmb@?LH*s82}`fUrzv#s9&-LNYp zY}bqgo(KthETIJBayUH~+{Q(#dZ6pVQ{-po_002ovPDHLkV1oKq*L(l~ diff --git a/app/src/main/res/drawable-xhdpi/ic_network_wifi_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_network_wifi_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ca927f3de51d3ca9a3e120a15f5014cddc525533 GIT binary patch literal 538 zcmV+#0_FXQP)jG{tg#hjv@%| z7X@p1JZNg$v`N1#x4v@>c_ztxnR!Q&3M$B9;i48VK6(idB#eSWm>>i6(t(#6TxQW# z$n-Nx#2`lLL&hV5E<l+u>^Xa7h#sa4f+9MUo^@Nyrg=2)9~;2Au*&nPra{7d-Gu zf&?EtaLy^a%n;QnbbV@><*euhV!WZJS5BDEnxG}~pmwKSo?w@I^3@&NjHli2*Zv7b z$zn&@;u%prvYGr~zs1$0a1$cJG&h*l6;nhAQjx1!G_Xe;EBa!GI=yDMfmN*=_0yOo z{AoUe=GHX+Ca=LmJMX6O@3iMT(;}eXFjLkLS1goM$|5ylrEbb~iTnqeQZZpQE z&7jf!H$2&_HyY#H5dTfoinCiWOt5U#JRa%d53Re?3NCZvFLL%xp%ksWWW~Q|rk3dx zN|q)bCv2yUU(zI4w0l!HNW<^jzlxM|mc*Y??!>m!{AUH8@H(|njSwf!u#-F6JadK3 cwV(|B0Q(+KdOT+vSO5S307*qoM6N<$f+ZvLy8r+H literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_signal_cellular_off_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_signal_cellular_off_black_24dp.png deleted file mode 100644 index c11e5962995dd8a7ae16510e1f76c6735f02e146..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D7oIMTAr*{IuWvki$U(s6A?N=I z0-R0;Q#u#2pE}4Iz`&?^ELEpd)#cG~qbQXx=bygs_FI1Wzf4Z}-2PWJA|p|b0Po$ diff --git a/app/src/main/res/drawable-xhdpi/ic_signal_cellular_off_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_signal_cellular_off_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..8ed814e1242707bb04bfcf5031707c05c8e499ce GIT binary patch literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DKb|g*Ar*{ouNWG!Bnq@Wv=`wD z72G6K+-7ajXW78avE-WEW8pH*rSpC*&t10vPwgf-`}hAhrCf3QSLL0wV5<0q^YeKl zgqi>DX^gvfpmdvzR3(FXrGL>JCAnbt1n)^oX`k8hJ~J{^GAK-7H}JJlEp~X@=kk;yca(4o%6|W zm&m`iPeNE4%sw(L@Z9s1%c1**mi~hMpPA$L9jYyw#4D=}37l3 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_signal_wifi_off_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_signal_wifi_off_black_24dp.png deleted file mode 100644 index 78b1b22698d3b8a33f57da6e5772d398bca06e94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 481 zcmV<70UrK|P))KD~ph+#N1 z-$>DdXfVC{v^ZEVdhfaCoF)AJ#`l5Gb~ygCjwrPOUtCaHXM7WWmPfo1qD-ROvXrP8 zG-AS>&sJ>+b-%1wH0zN&&a31js$Po&x8bdE1BDaGmfUk(!!FrQi1sFlu<5C@_O0KH z9U*cMVaId*l8$*`D>-hB2wNUHYEL)S(zAq^6B$->186syJ{LlS32k&)5=|4YG69P^ z;j|y65bOHvcFlI-MBNp88W#l9TZUw4Ok^ak%h+@_ zB70Q}WfQ&D$|i=@%O*xe*~C9!qH133vkxk|^AkN*MLJ)dfFg*Y^ry^kgHRN4 zHvw)#N|@DRPsE;0LP~h2ON+JpD0cT=g_Q7EmmHn6B7~Z5C3VrJ4d;~Dh+7Uj?C<^n XnZjwRRxoFt00000NkvXXu0mjf9+J}a diff --git a/app/src/main/res/drawable-xhdpi/ic_signal_wifi_off_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_signal_wifi_off_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..480145c087981521ff0b0c874421b6deedfcc4f9 GIT binary patch literal 528 zcmV+r0`L8aP)-32ZI1rG}y*L=3~B z*+|iX_z&j2`f9!0!#&4y&$&a<`!k*CwVdBK{;vEd%3kBgh%ZJv2b}c{KaF+@cmo+k zA)wzzl29>b(yV2lZQDcL|F*1I^2i+*RI-3{qUyEu_PjM?Boin=0PF5Kkp+ZH4iZH7 z5efD^b*?oqY|$YUAUO2ga1uD~ff`Vlpyr`tjlfNtKq|2;Pn&KC5xUI*r4!8R3Vqf& zGVw~D*7SyO#*dB=yM{yv;hKZeiMlI|f6)vj6VuJ_V6jwUK{NxsKII^~ENR`Uo+J=X z`(6sMW3bgNy6T`XQ8$rx?Cz6`c&WK5kp_fkg@}2P1@u^Jn^;lJ2EvftoWu*TZ9vEd zgv;u=iJEb7R3J=~lejMO0AV2~5qW{C)iQ`Qeb7#EBBX6Xy(kgVH$^cbWNltr3pUb; zY@ljIt3IgcPbWh525ckQS0{x?5_y3zuBN$P#)L>Aasc6O0=O-NB(c;U5T0mkP6$cj zoxXN~ZXW@>R}qrLV|}7sAe^!VHua0_Mh8o;)q!N`Gi3ZvEno&d(w1}+U| c(xl|yF|X;_ecMdxArr{$p00i_>zopr0DJgKL;wH) diff --git a/app/src/main/res/drawable-xxhdpi/ic_network_cell_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_network_cell_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..a93e6166dc41232a55f8243ef607521062dc66ad GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xZ3?!EyURMI7gaUj*T!Hj|RA3jh)(R-fS`y?J z%%H~LJ=u2WqGX`Jd`}n0kP619XEyR4Vh}js@R)Ov&xAk!E^lO*GUdJ5p{=EV%Gb{< zoaT3c^;b+{6|;l_j{qA7a|`1khQtN~2M|~9f)VfUCxXjn$D>J5$Yl|(dh>;~JjnQ^ U;9_q^pi>z57J3?i7lj)cc;Q74pt8$A z=nrE53?h005+wbX7Q2Zkx3o6U*(wyKFS9 zYM)W#COzelx}a{#lb$eUpQ;B`l;o<Zqz0%D%q+gV-tlSz&mQWHAZgw0kpU`!~WQDy&A zveRLqpbpugWSO!9Lcu+*3@~g;=z^wf0d@;r(g;v8Ds(~n-Ep^?P;e7ASZ1)r9nG5a zri(6_w_s62!=eTAF8Rb8PMU3TKLb|SA|&V;r+nyVaov_&^?_GR3klk+i4kFqj+pa> zf5aAB^tqFc2y0ZOx&1=ZX1wKBv5kIl){M}!$E<3DT9dV$^S78me|g)?dSiyw$NjXk zZipH7r`H`5?sU+Abqoo&JK?IBL-Sq`{;O`21ge5*=Pijjwd6g=1-m44)K6m0T~U|V z{pLGx(7lrLs2gIAUH7mSJ)i4_W~A_%m{Vt@Qu3LYLl>oXpDSX<{h*=^kGP)kr{1GY zvl))N;aM3tBWBcT8TnMqppRsx;zzN~zB4F8d)plMg55IqoQ9aPTaL@YX)$G|tytuZjtq(;*kc1ii0g27N28(`EfSXvBiJ zM!(yk!;ZNnHqT9U1$bF(o);D5yx6376sGKJaYbLbM}c;_CNAqY+Z8Ohxope_b%B?} x+nvxQ-W5gXbd7$OeW_0udC)d#^z`)f{0kcxbRFxFIFtYY002ovPDHLkV1n`PT?_yK diff --git a/app/src/main/res/drawable-xxhdpi/ic_network_wifi_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_network_wifi_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..75469cd852958cb43add295e80b12f2ac1922e1d GIT binary patch literal 786 zcmV+t1MU2YP)E9EZ<_N$R@QMd=1gsk?@jUF3R^8_7n#?5Jtfve4HEyeKp>@WP8eKxLPK&0o^Zal3oP9X+n=|J>BZP~Ki;Ig@*g_?K z0<;h!OoS736Gb6P7sokD8!ZIbgAb3rBBl6gqMay;&gvmdGk!{CtM~{KHXxE;VFLJM zsFV?)!-7a|bMD%491DVqc|g6XNFl4BuSAWLy9B`W_iRlhKU=@PsREh zzgpM8Q;c$-k8I8g3*6%pgSzHb+a3vSIHZ>mp79%_q5b|Nnw9u%q2OgTznHF|I zC2tMuyi$4DB2j5S-wf$2YPLAilm-oiJ58UkA1><_8WDwoXrHj$EW9E& zp%f&!q0U$8L}8(yw5HCoffh%i(nU?7^THXJQq{R7oPu&*=IOj(n{W>5S^$s*Aaf->fKF8x!lC8d4T7LksNi_8DSAMQr}1GmRF QKmY&$07*qoM6N<$f@BP4<^TWy literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_signal_cellular_off_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_signal_cellular_off_black_24dp.png deleted file mode 100644 index ce41f10cb3696dcd2d7ba5b6dfa7f583601c2547..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 388 zcmV-~0ek+5P)u%t+qksdc^z2IgW_~NC~+}x@gC*3&d z#z{9$x^Y^7*2D){oOI))6{ik5Wic@)HO?nnmXmT) z4}#@B$>$IdNFpa7kVH;EAc>s7u}HV101`+JC!mltPCz0_oPb5TR5$^VBya*#l5U6q z5=j?q>Y#2Ux{>Hcq8o{BB)XB*zQ`Y>b2i5Xy%I8(By$9k)C)PVU5zAiB$CiGAw|-+ z3fkv*B!#1rM)gF9OAzru- diff --git a/app/src/main/res/drawable-xxhdpi/ic_signal_cellular_off_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_signal_cellular_off_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..dedee3938e0f75486752ae5821f060f40d398be2 GIT binary patch literal 435 zcmV;k0ZjghP);TKm7D-natct-`4XTtRG^;YK|Ln}^&AiS&Z6a5(8zh=z_R0b(8vKI(gp-* zhGR&A<3S4!AV`wqK@-b}v;hzDB+v06Px2fO@+8mkpoFxA03=9)qd}e|IUeLmj^ja| zbR{_+_IxgrI=*i+vC3Nj<11c~DR4K|RTXdQuO{Ng-(B6=q03*`F5l0N_a; zNkl?Phzbl7DQMlIMFa*>VcCNy za^YSmPg;heHJA%5{=GXjBIl@AVTKx!xBaruiRE;VDtM#^vm5A`Dg+*|Vr5mY=Mcqh^q;(@*MCe8u)Qwcgq;8~2e)vM9<*yRu zHTZbkYt-{VB9)=M^PWN7fEfqrz9-HAKs=;vym94>QveR6dG(|UzHP|)LMcF;q5Fxb>ei9 z;GH%kI*0>kLgK_KM;8)zNYDC{2r^_(qL2pK>0^))BFwYMGLT@2MLrT?gj@7;j7Ex7 zknU%Y-e!`hW{f{LO^k7_bCj*#NDnMYr%2#73C0R^zD&(8u6RlVFP0?3g-6Y`XhF zf|t~o{ZYM+))#+Bzd1)i=CcVq?rbE5l#pOF^_*zum#eOGK9QodB@144-PJGBeoNC^&`EsR$rN~t0Bo3GRX zUaSl0Y1X};&CKMSG)bA&=DLSP1*Fcj+lzI6QfI&4CvrxLbI{3&Xh3SF%u0|hIy<5T zc$O2=Bj-oha;B7!PFj#6l)5=p*Aw-Xw7_n+H;-1wGsQ@%uqCa~B6At)liZi=Nf+cU zi~*h~B6VbthUBl+WlSn3O;94_LoGj)lD@G^cnb$42e%n1Mzio9dXdc=1F2T1iQ#RC z2a+mKDG}XBH7w{xYB9W^(SURwbR!LEMxulX-AL7ZcZFE7S}N6$nq3U;C7QTrbzV|K zI_ntJBLu-*knTF-46e5JpTs6!+j7Dbr`j7ybLvS|e6{3!Hf*aoAT_a^l@nv%n)W#$ zoyiJ1ZQ4GQG_UM1lJ*m~O*uESw*N<(x4qL#fj07L4QGrE7Cn+Ae>g%2K_y=@IG@;V z(<8_=-#9`D!G4y~2J>FA{-GxY>ehfGgb)k@a6=Q05EK(;RKYiBg`^6$X~fAVpM3tO Z`~{g<9R*{#^Edzi002ovPDHLkV1g(+V?h7_ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_network_cell_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_network_cell_black_24dp.png deleted file mode 100644 index 10a2595da3e96562879835e3089f43ea0c52f6a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeE3?v1%WpM*3{s5m4S0IfH{P~{u0{JW@L4Lsu zYTlE--r)EFAmS5Lf+AIYp?f-sq-@Je8wm0?j z`LQo=zI^cIgOUO(3)wm7Ts}6YB91Nv=KvPTCZ!VsB93hfIE+|aCn#z(@i+>mP)jQG b!Qov diff --git a/app/src/main/res/drawable-xxxhdpi/ic_network_cell_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_network_cell_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..706da32010658fb50e5cd84ac0d3399405441bdf GIT binary patch literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeE3?v1%WpM*3p#Yx{S0Mc#71#x>wE~K=mIV0) zGpI3mPqy8;C>bcQ*VDx@q$2L^X-8iM0|sV?3kIypr3SoH1OA6OFnw2f`0xA2=YM|x z`StPR*J}2|wGw=7zYSz~z9(8pygOWAaHsuY!Vdn!2MgrenjhNnKor>U9G#G;(Z=I! zm?F`ocsPJZvMuR^frxY4LJ1>kNd++o{A>QnrZ%0+=^j`Sc(L?aN>7fTZ=@x_sW)u zg-EOq3V_PBNU$pv@Io&VtTzRCBND9fixeN&Qdo(E`l7H+>0bP7r_NfU`r|l`zo#0| z7;W(;yNNsVStD?fM*4Ledr}qK$~Cs4MfXi1=$pV$ed4$QJ!;ydddurH;W_|qf)AhbA%a33^vA7&QOU;sa&Q}fYMbN z$9RT@SkOp0GJ)9C1a0g`C9RMk ziFA*7FCA!z&1tl;8%1KpgwQD$MSK;s5ITo~^@EOZfZxC>Y+z$3)L9umM}3+Y81 z>N5+l!8*ne2O4E9HreCAm}699qw|Q(oyArG9w0W>MF5-4=M!R6ADM>()-ZzD& z$Sxbk9AgI#I*nM|DIC^`SlE3Wm(2&nqTZ8@3szY)<{zxYC6z=GlSSE%i%udYJAupY zAtvg;by>Va4Aw&k4=7+5G0+hCctnMPF;7yCha5*z>?j`7j-=3kcut6JL}zcAiw7-d z2+`4Z^6;oqCUuOr1P^OQX6P^;cL$lK+jw3kZ;&LtCKDgXV-QJV2*MS;BO+RaRAPy` z;l>iXAQ56MrD1d)H=VXRr!!~y&L-!1ujf0@n>p|KwpWr|TwGjSTwGjSbVCxEWHXcz zjAasq6jMTwGD4IQq=X_SGmZd0vdJXHF50Ph@l!wvA(b(ciTLr7W{r3X*^H)GwYFRo zGn#Bt%~H=GmnlNTJH}LU$uLsA2R^15qTW6V@d+?aGS`t{S$tLuM-}IP--jrwyAG0 zo<#atCVVLM%@vuQ%XcGSYx!v8(@jplpP+?-88Mx{9VaTkW8|Ze*IEyxGTCwZAwo=Q z`MA=Hpd%9qwl4h`=*R@T?W@3nHPCVTDsYtk_?Rh;WTxvJw4AkU;RLnR^Mv;_&_pxM zG||9&9#c;($Jxvp%5^@eh$Q*FmbPM^&3dZ2OCw5YZWBfXzo};{6$+o6n`kXMA>j~9sOA%*`N&BYX((Qq z1FE7p1FYr(zc7kl)UYz{hCfN!!HIk^FXy75mnI%zYFH}!{8D-<-H{E5`SDz;X~Ha; zILVwChyH3dmBaq|>1N(xHgDOeqIhMBd3@`qvJR`b!h#lyaavBB3kgxh2dv}+>j+UO zy9Y~{LOREYU^UGgRb0F=DXhhMBCOGKHh0AG1P<#vTdHJ~KWDndoBhJoB7NP4}Ih-8I)r>g|GMpSUbLD*$QF&R*d=AwV>>f z{acG3hGXk>{R$NR_j6vXDR#2Dzsby{<9V=?oxISo=gfzWW;)r;7y9&b!hz%VXF4XF zZ*QrwQ+e`PQE@&$=g%6C6VIKU)Z_)u?H4@sb56tdMGk%(&x;Se`>gx=Ej!cMe&K|= zc?_RFvrL<>-tfnU@yT}~zQz?jg#A`Y%&UX5&5&}jPgQu&X%Q~loCIBS@#@7G< diff --git a/app/src/main/res/drawable-xxxhdpi/ic_signal_cellular_off_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_signal_cellular_off_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..b6adb4e0ef69dbfcdb8035dcaab0e6f6ebaa5885 GIT binary patch literal 524 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7zZDOACaP!D#z% zaW&ryPR)c5|J7Rd^IIhP&0uExDY}q-j)Bsb21mO+d>n=kTDmSU`>o)xebA!#u=%%) z!HM-CHc*fcB-j9F^aU{UWpJuKXqacfe&+M@7R!WL_6mE-*}H8bciSf0{MN7t{LE;cmN>^*z0z1C~{^Zf(X@3~lauXe|4?b=n0 zl5iC-_*7@g=Z8p@Q1QGFsS+yI2$3#fl@KWt7Rdgegfq-?t0h)@#|GQ&a?nvBbHo8X zw%K5<=Pb3rEaS>T7-ycxec(4y=XU$plWsP-Si)pGMT7gv%NFWNlu)%VEOT+%gb=n` zqPx|ENlhh$%tvlAJY_-%J(fCMLv>l2< z+FlyMw?-R87dTJ~!ah?CvKvH>gsz$hnX5I>!-W$b&`=fc7D{+ShXxyCYhi@1b<%j} z`6Fk-HqpoSnxaWvCu=$3n7NwRGSOnfeVSUu+c^`)t0ugr>78s#%LtpDB!|wiza@m- zy5-b0vfK$<%#mYDMb3nga;?Lg`4aMPv~N-;Otmj{!d0@=3HOV%2_0TfozUs4)Cp7U zNu4m)vD69oiqr|OiUzhpRy1Lh&0>(-Xr$YVCv@8_2C*JpPzJ)BLHx|UW@UzW7(f;~xz0z-riNSWW)Ue$38e6fNb`mhi=YvXD+X69B5oqhDn8-Rz~oV6^pW&_H6jd-knoINp&YN(pC8Z(g4z5~xr{cr4}K9K-o$F`?4% zwO>dRa>CpQesl?!&_t$?7xKYo!g?VyxVT_3A<>I)TF4GPDYuPKMt31U4CSjWgc@l# z`Fs|bEpapZBb1XNtP6QyF(FP^8DcnRHNoQ0gD1KZ(y7&*FjMMgRzlbSS`&!jjP8VZ z9_da<WO<47-n{QM{10f@f&D_Y8 z*5jjqu+}tSmDlmP>Io-J)j#ZWylMhnO*|@fm(B(gloOIed{pf{iGC(1C(Ph?(E7gu zJTxX)YCyPR=T2A?6tE)5g!Y75CI~yj@qqOULzvK(V0V2X=)yg}^^1)*ufdF#2cGS( zFN6>z@xieEI|hY3BL@#(7%$X>sWkf3Z(yRS8QIF}3n2uneE`daUg4Nm{ezm-7lJrS zTkGGJ^3M#m6Wmk-@RorZ))zturqD=(l8-`Zgq7rKT;GWkCr+F=aS|kd0RQV?fCTWH Q#sB~S07*qoM6N<$f`@##u>b%7 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/other_off.xml b/app/src/main/res/drawable/other_off.xml index bebb5d98..64c74383 100644 --- a/app/src/main/res/drawable/other_off.xml +++ b/app/src/main/res/drawable/other_off.xml @@ -1,4 +1,4 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/other_on.xml b/app/src/main/res/drawable/other_on.xml index 9ed2259d..f0449b39 100644 --- a/app/src/main/res/drawable/other_on.xml +++ b/app/src/main/res/drawable/other_on.xml @@ -1,4 +1,4 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/wifi_off.xml b/app/src/main/res/drawable/wifi_off.xml index d78270be..f99d5c82 100644 --- a/app/src/main/res/drawable/wifi_off.xml +++ b/app/src/main/res/drawable/wifi_off.xml @@ -1,4 +1,4 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/wifi_on.xml b/app/src/main/res/drawable/wifi_on.xml index 6969c9d3..3aa2389b 100644 --- a/app/src/main/res/drawable/wifi_on.xml +++ b/app/src/main/res/drawable/wifi_on.xml @@ -1,4 +1,4 @@ \ No newline at end of file diff --git a/app/src/main/res/layout/actionbar.xml b/app/src/main/res/layout/actionbar.xml index c4b6599d..e822886f 100644 --- a/app/src/main/res/layout/actionbar.xml +++ b/app/src/main/res/layout/actionbar.xml @@ -1,11 +1,12 @@ - + android:background="@color/colorPrimary" + android:orientation="horizontal"> - \ No newline at end of file + android:layout_marginLeft="12dp" /> + \ No newline at end of file diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml index 45da71b8..286b200a 100644 --- a/app/src/main/res/menu/main.xml +++ b/app/src/main/res/menu/main.xml @@ -6,7 +6,17 @@ android:icon="@drawable/ic_search_white_24dp" android:title="@string/menu_search" netguard:actionViewClass="android.support.v7.widget.SearchView" - netguard:showAsAction="ifRoom|collapseActionView" /> + netguard:showAsAction="always|collapseActionView" /> + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c67414dd..2ad61bca 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,6 +2,8 @@ NetGuard Copyright \u00A9 2015 by M. Bokhorst (M66B) Search + Toggle Wi-Fi + Toggle other VPN settings About