Clean unused resources, fix lint warnings.

Add dark theme variant of radio button.
Less saturation for the off-state image.
Wake up from engery saving mode option.
Improve nfc description and add nfc settings button

Author: David Gräff

.idea/inspectionProfiles/Project_Default.xml

@@ -9,6 +9,10 @@ android {
         targetSdkVersion 19
     }
 
+    lintOptions {
+        abortOnError false
+    }
+
     buildTypes {
         release {
             zipAlign true

.idea/misc.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="oly.netpowerctrl"
-    android:versionCode="46"
-    android:versionName="3.0">
+    android:versionCode="47"
+    android:versionName="3.1">
 
     <!-- Api level 14: Android 4.0 15. Dezember 2011 -->
     <!-- Api level 16: Android 4.1 27. Juni 2012 -->

.idea/workspace.xml

@@ -17,7 +17,7 @@
 import oly.netpowerctrl.network.DeviceSend;
 
 /**
- * Created by david on 21.02.14.
+ * A DeviceSend.Job that provide broadcast sending to anel devices.
  */
 public class AnelBroadcastSendJob implements DeviceSend.Job {
     private void sendPacket(DeviceSend deviceSend, InetAddress ip, int SendPort, byte[] message) {

app/build.gradle

@@ -13,11 +13,11 @@
 import oly.netpowerctrl.preferences.SharedPrefs;
 import oly.netpowerctrl.utils.ShowToast;
 
-public class AnelDeviceDiscoveryThread extends Thread {
-    private int receive_port;
+class AnelDeviceDiscoveryThread extends Thread {
+    private final int receive_port;
     private boolean keep_running;
     private DatagramSocket socket;
-    private AnelPlugin anelPlugin;
+    private final AnelPlugin anelPlugin;
 
     public AnelDeviceDiscoveryThread(AnelPlugin anelPlugin, int port) {
         this.anelPlugin = anelPlugin;

app/src/main/AndroidManifest.xml

@@ -37,7 +37,7 @@
  * This is a specialized class for Anel devices.
  */
 final public class AnelPlugin implements PluginInterface {
-    private List<AnelDeviceDiscoveryThread> discoveryThreads = new ArrayList<AnelDeviceDiscoveryThread>();
+    private final List<AnelDeviceDiscoveryThread> discoveryThreads = new ArrayList<AnelDeviceDiscoveryThread>();
 
     public void startDiscoveryThreads(int additional_port) {
         // Get all ports of configured devices and add the additional_port if != 0
@@ -147,7 +147,7 @@ private static void executeDeviceBatch(DeviceInfo di, List<Scene.PortAndCommand>
             DevicePort oi = it.next();
             if (oi.Disabled || oi.current_value == 0)
                 continue;
-            int id = (int) oi.id;
+            int id = oi.id;
             if (id >= 10) {
                 data_io = switchOn(data_io, id - 10);
             } else {
@@ -160,7 +160,7 @@ private static void executeDeviceBatch(DeviceInfo di, List<Scene.PortAndCommand>
         for (Scene.PortAndCommand c : command_list) {
             c.port.last_command_timecode = System.currentTimeMillis();
 
-            int id = (int) c.port.id;
+            int id = c.port.id;
             if (id >= 10) {
                 containsIO = true;
             } else {
@@ -213,7 +213,7 @@ private static void executeDeviceBatch(DeviceInfo di, List<Scene.PortAndCommand>
             callback.onExecutionFinished(command_list.size());
     }
 
-    static final byte[] requestMessage = "wer da?\r\n".getBytes();
+    private static final byte[] requestMessage = "wer da?\r\n".getBytes();
 
     /**
      * Switch a single outlet or io port
@@ -250,7 +250,7 @@ else if (command == DevicePort.TOGGLE)
             callback.onExecutionFinished(1);
     }
 
-    static Thread renameThread;
+    private static Thread renameThread;
 
     @Override
     public void finish() {
@@ -329,7 +329,7 @@ public void run() {
         renameThread.start();
     }
 
-    private List<Scene.PortAndCommand> command_list = new ArrayList<Scene.PortAndCommand>();
+    private final List<Scene.PortAndCommand> command_list = new ArrayList<Scene.PortAndCommand>();
 
     @Override
     public void addToTransaction(DevicePort port, int command) {

app/src/main/java/oly/netpowerctrl/anel/AnelBroadcastSendJob.java

@@ -36,7 +36,7 @@ private enum TestStates {TEST_INIT, TEST_REACHABLE, TEST_ACCESS, TEST_OK}
     private DeviceInfo device;
     private DeviceQuery deviceQuery;
 
-    public ConfigureDeviceFragment() {
+    private ConfigureDeviceFragment() {
     }
 
     public static ConfigureDeviceFragment instantiate(Context ctx, DeviceInfo di) {
@@ -156,8 +156,8 @@ public void onCreate(Bundle savedInstanceState) {
         if (getArguments() != null) {
             try {
                 device = DeviceInfo.fromJSON(JSONHelper.getReader(getArguments().getString(DEVICE_PARAMETER)));
-            } catch (IOException e) {
-            } catch (ClassNotFoundException e) {
+            } catch (IOException ignored) {
+            } catch (ClassNotFoundException ignored) {
             }
         }
 
@@ -237,7 +237,7 @@ public void onDeviceQueryFinished(List<DeviceInfo> timeout_devices) {
     }
 
     @Override
-    public void onDeviceError(DeviceInfo di, String error_message) {
+    public void onDeviceError(DeviceInfo di) {
         if (test_state == TestStates.TEST_ACCESS) {
             if (di.equalsByUniqueID(device)) {
                 test_state = TestStates.TEST_INIT;

app/src/main/java/oly/netpowerctrl/anel/AnelDeviceDiscoveryThread.java

@@ -21,15 +21,14 @@
 /**
  * For displaying DeviceInfo fields in a ListView
  */
-public class DeviceConfigurationAdapter extends BaseAdapter implements View.OnClickListener {
+class DeviceConfigurationAdapter extends BaseAdapter implements View.OnClickListener {
     public static class ReviewItem {
-        public static final int DEFAULT_WEIGHT = 0;
 
-        public String mTitle;
+        public final String mTitle;
         public String mDisplayValueString;
         public int mDisplayValueInt;
         public boolean mDisplayValueBoolean;
-        public int mPageKey;
+        public final int mPageKey;
         public int type = 0; // o string, 1 int, 2 boolean
         public boolean mEnabled;
 
@@ -49,19 +48,19 @@ public ReviewItem(String title, int displayValue, int pageKey, boolean enabled)
             type = 1;
         }
 
-        public ReviewItem(String title, boolean displayValue, int pageKey) {
+        public ReviewItem(String title, boolean displayValue) {
             mTitle = title;
             mDisplayValueBoolean = displayValue;
-            mPageKey = pageKey;
+            mPageKey = DeviceConfigurationAdapter.DefaultPorts;
             mEnabled = true;
             type = 2;
         }
     }
 
-    public List<ReviewItem> deviceConfigurationOptions = new ArrayList<ReviewItem>();
-    private Context context;
-    private DeviceInfo deviceInfo;
-    private LayoutInflater inflater;
+    private final List<ReviewItem> deviceConfigurationOptions = new ArrayList<ReviewItem>();
+    private final Context context;
+    private final DeviceInfo deviceInfo;
+    private final LayoutInflater inflater;
 
     private static final int DeviceName = 0;
     private static final int HostName = 1;
@@ -79,7 +78,7 @@ public DeviceConfigurationAdapter(Context context, DeviceInfo deviceInfo) {
         deviceConfigurationOptions.add(new ReviewItem(context.getString(R.string.device_ip), deviceInfo.HostName, HostName));
         deviceConfigurationOptions.add(new ReviewItem(context.getString(R.string.device_username), deviceInfo.UserName, UserName));
         deviceConfigurationOptions.add(new ReviewItem(context.getString(R.string.device_password), deviceInfo.Password, Password));
-        deviceConfigurationOptions.add(new ReviewItem(context.getString(R.string.device_default_ports), deviceInfo.DefaultPorts, DefaultPorts));
+        deviceConfigurationOptions.add(new ReviewItem(context.getString(R.string.device_default_ports), deviceInfo.DefaultPorts));
         deviceConfigurationOptions.add(new ReviewItem(context.getString(R.string.device_recv_udp), deviceInfo.ReceivePort, ReceivePort, !deviceInfo.DefaultPorts));
         deviceConfigurationOptions.add(new ReviewItem(context.getString(R.string.device_send_udp), deviceInfo.SendPort, SendPort, !deviceInfo.DefaultPorts));
     }
@@ -120,6 +119,7 @@ public View getView(int position, View convertView, ViewGroup container) {
             convertView = inflater.inflate(R.layout.device_configuration_item, null);
 
         ReviewItem reviewItem = deviceConfigurationOptions.get(position);
+        assert convertView != null;
         ((TextView) convertView.findViewById(R.id.titleText)).setText(reviewItem.mTitle);
         TextView text = (TextView) convertView.findViewById(R.id.textOption);
         CheckBox checkbox = (CheckBox) convertView.findViewById(R.id.checkboxOption);
@@ -171,17 +171,20 @@ public void onClick(final View view) {
             return;
         }
 
-        final EditText text = new EditText(context);
-        text.setText(((TextView) view).getText());
+        EditText textView = new EditText(context);
+        textView.setText(((TextView) view).getText());
         AlertDialog.Builder builder = new AlertDialog.Builder(context);
-        builder.setView(text);
+        builder.setView(textView);
+
+        @SuppressWarnings("ConstantConditions")
+        final String text = textView.getText().toString();
 
         switch (key) {
             case DeviceName:
                 builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        item.mDisplayValueString = text.getText().toString();
+                        item.mDisplayValueString = text;
                         deviceInfo.DeviceName = item.mDisplayValueString;
                         notifyDataSetChanged();
                     }
@@ -191,7 +194,7 @@ public void onClick(DialogInterface dialogInterface, int i) {
                 builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        item.mDisplayValueString = text.getText().toString();
+                        item.mDisplayValueString = text;
                         deviceInfo.HostName = item.mDisplayValueString;
                         notifyDataSetChanged();
                     }
@@ -201,7 +204,7 @@ public void onClick(DialogInterface dialogInterface, int i) {
                 builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        item.mDisplayValueString = text.getText().toString();
+                        item.mDisplayValueString = text;
                         deviceInfo.UserName = item.mDisplayValueString;
                         notifyDataSetChanged();
                     }
@@ -211,29 +214,29 @@ public void onClick(DialogInterface dialogInterface, int i) {
                 builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        item.mDisplayValueString = text.getText().toString();
+                        item.mDisplayValueString = text;
                         deviceInfo.Password = item.mDisplayValueString;
                         notifyDataSetChanged();
                     }
                 });
                 break;
             case ReceivePort:
-                text.setInputType(InputType.TYPE_CLASS_NUMBER);
+                textView.setInputType(InputType.TYPE_CLASS_NUMBER);
                 builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        item.mDisplayValueInt = Integer.valueOf(text.getText().toString());
+                        item.mDisplayValueInt = Integer.valueOf(text);
                         deviceInfo.ReceivePort = item.mDisplayValueInt;
                         notifyDataSetChanged();
                     }
                 });
                 break;
             case SendPort:
-                text.setInputType(InputType.TYPE_CLASS_NUMBER);
+                textView.setInputType(InputType.TYPE_CLASS_NUMBER);
                 builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        item.mDisplayValueInt = Integer.valueOf(text.getText().toString());
+                        item.mDisplayValueInt = Integer.valueOf(text);
                         deviceInfo.SendPort = item.mDisplayValueInt;
                         notifyDataSetChanged();
                     }