mirror of https://github.com/M66B/NetGuard.git
Use level list for network state
This commit is contained in:
parent
9c2cda867d
commit
4ecd024df0
|
@ -89,9 +89,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
|
||||||
private boolean running = false;
|
private boolean running = false;
|
||||||
private View actionView;
|
private View actionView;
|
||||||
private ImageView ivInteractive;
|
private ImageView ivInteractive;
|
||||||
private ImageView ivWifi;
|
private ImageView ivNetwork;
|
||||||
private ImageView ivOther;
|
|
||||||
private ImageView ivRoaming;
|
|
||||||
private SwipeRefreshLayout swipeRefresh;
|
private SwipeRefreshLayout swipeRefresh;
|
||||||
private RuleAdapter adapter = null;
|
private RuleAdapter adapter = null;
|
||||||
private MenuItem menuSearch = null;
|
private MenuItem menuSearch = null;
|
||||||
|
@ -129,9 +127,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
|
||||||
actionView = getLayoutInflater().inflate(R.layout.action, null);
|
actionView = getLayoutInflater().inflate(R.layout.action, null);
|
||||||
SwitchCompat swEnabled = (SwitchCompat) actionView.findViewById(R.id.swEnabled);
|
SwitchCompat swEnabled = (SwitchCompat) actionView.findViewById(R.id.swEnabled);
|
||||||
ivInteractive = (ImageView) actionView.findViewById(R.id.ivInteractive);
|
ivInteractive = (ImageView) actionView.findViewById(R.id.ivInteractive);
|
||||||
ivWifi = (ImageView) actionView.findViewById(R.id.ivWifi);
|
ivNetwork = (ImageView) actionView.findViewById(R.id.ivNetwork);
|
||||||
ivOther = (ImageView) actionView.findViewById(R.id.ivOther);
|
|
||||||
ivRoaming = (ImageView) actionView.findViewById(R.id.ivRoaming);
|
|
||||||
getSupportActionBar().setDisplayShowCustomEnabled(true);
|
getSupportActionBar().setDisplayShowCustomEnabled(true);
|
||||||
getSupportActionBar().setCustomView(actionView);
|
getSupportActionBar().setCustomView(actionView);
|
||||||
|
|
||||||
|
@ -322,17 +318,15 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
|
||||||
Log.i(TAG, "Received " + intent);
|
Log.i(TAG, "Received " + intent);
|
||||||
Util.logExtras(TAG, intent);
|
Util.logExtras(TAG, intent);
|
||||||
|
|
||||||
ivWifi.setVisibility(View.GONE);
|
ivNetwork.setVisibility(View.VISIBLE);
|
||||||
ivOther.setVisibility(View.GONE);
|
|
||||||
ivRoaming.setVisibility(View.GONE);
|
|
||||||
|
|
||||||
if (Util.isMetered(context)) {
|
if (Util.isMetered(context)) {
|
||||||
if (Util.isRoaming(context))
|
if (Util.isRoaming(context))
|
||||||
ivRoaming.setVisibility(View.VISIBLE);
|
ivNetwork.setImageLevel(3);
|
||||||
else
|
else
|
||||||
ivOther.setVisibility(View.VISIBLE);
|
ivNetwork.setImageLevel(2);
|
||||||
} else
|
} else
|
||||||
ivWifi.setVisibility(View.VISIBLE);
|
ivNetwork.setImageLevel(1);
|
||||||
|
|
||||||
actionView.postInvalidate();
|
actionView.postInvalidate();
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<level-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<item
|
||||||
|
android:drawable="@drawable/ic_network_wifi_white_24dp"
|
||||||
|
android:maxLevel="1"
|
||||||
|
android:minLevel="1" />
|
||||||
|
<item
|
||||||
|
android:drawable="@drawable/ic_network_cell_white_24dp"
|
||||||
|
android:maxLevel="2"
|
||||||
|
android:minLevel="2" />
|
||||||
|
<item
|
||||||
|
android:drawable="@drawable/ic_network_cell_white_24px_roaming"
|
||||||
|
android:maxLevel="3"
|
||||||
|
android:minLevel="3" />
|
||||||
|
</level-list>
|
|
@ -21,29 +21,11 @@
|
||||||
android:visibility="invisible" />
|
android:visibility="invisible" />
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/ivWifi"
|
android:id="@+id/ivNetwork"
|
||||||
android:layout_width="20dp"
|
android:layout_width="20dp"
|
||||||
android:layout_height="20dp"
|
android:layout_height="20dp"
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_gravity="center_vertical"
|
||||||
android:layout_marginStart="4dp"
|
android:layout_marginStart="4dp"
|
||||||
android:src="@drawable/ic_network_wifi_white_24dp"
|
android:src="@drawable/network"
|
||||||
android:visibility="gone" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/ivOther"
|
|
||||||
android:layout_width="20dp"
|
|
||||||
android:layout_height="20dp"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:layout_marginStart="4dp"
|
|
||||||
android:src="@drawable/ic_network_cell_white_24dp"
|
|
||||||
android:visibility="gone" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/ivRoaming"
|
|
||||||
android:layout_width="20dp"
|
|
||||||
android:layout_height="20dp"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:layout_marginStart="4dp"
|
|
||||||
android:src="@drawable/ic_network_cell_white_24px_roaming"
|
|
||||||
android:visibility="gone" />
|
android:visibility="gone" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
Loading…
Reference in New Issue