Remove About, Add Feedback, Add Version Number to Drawer

* Device test before saving as configured device
* Reordering of outlets
* German help text improved

Still missing:
* Save scenes and configured devices as json files
* Renamed outlets are not persistent (json files necessary)
* NFC (json files necessary)
* Widgets do not work

Author: davidgraeff

.idea/workspace.xml

@@ -76,7 +76,7 @@
         <service
             android:label="@string/app_name"
             android:icon="@drawable/netpowerctrl"
-            android:name="oly.netpowerctrl.service.NetpowerctrlService"
+            android:name="oly.netpowerctrl.anelservice.NetpowerctrlService"
             android:permission="android.permission.INTERNET" />
 
     </application>

app/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
-package oly.netpowerctrl.service;
+package oly.netpowerctrl.anelservice;
 
 import android.content.Context;
 import android.content.SharedPreferences;

…ly/netpowerctrl/service/DeviceQuery.java …etpowerctrl/anelservice/DeviceQuery.javaapp/src/main/java/oly/netpowerctrl/service/DeviceQuery.java renamed to app/src/main/java/oly/netpowerctrl/anelservice/DeviceQuery.java app/src/main/java/oly/netpowerctrl/service/DeviceQuery.java renamed to app/src/main/java/oly/netpowerctrl/anelservice/DeviceQuery.java

@@ -1,4 +1,4 @@
-package oly.netpowerctrl.network;
+package oly.netpowerctrl.anelservice;
 
 import android.content.Context;
 
@@ -17,14 +17,14 @@
 import oly.netpowerctrl.datastructure.OutletCommandGroup;
 import oly.netpowerctrl.utils.ShowToast;
 
-public class UDPSendToDevice {
+public class DeviceSend {
     /**
      * This class extracts the destination ip, user access data
      * and provides outlet manipulation methods (on/off/toggle).
      * The resulting data byte variable can be used to send a
      * bulk-change udp packet.
      */
-    static final class DeviceSwitch {
+    static final public class DeviceSwitch {
         // build bulk change byte, see: www.anel-elektronik.de/forum_neu/viewtopic.php?f=16&t=207
         // “Sw” + Steckdosen + User + Passwort
         // Steckdosen = Zustand aller Steckdosen binär
@@ -35,7 +35,7 @@ static final class DeviceSwitch {
         int port;
         String access;
 
-        DeviceSwitch(DeviceInfo di) {
+        public DeviceSwitch(DeviceInfo di) {
             this.data = 0;
             this.port = di.SendPort;
             try {

…etpowerctrl/network/UDPSendToDevice.java …netpowerctrl/anelservice/DeviceSend.javaapp/src/main/java/oly/netpowerctrl/network/UDPSendToDevice.java renamed to app/src/main/java/oly/netpowerctrl/anelservice/DeviceSend.java app/src/main/java/oly/netpowerctrl/network/UDPSendToDevice.java renamed to app/src/main/java/oly/netpowerctrl/anelservice/DeviceSend.java

@@ -1,4 +1,4 @@
-package oly.netpowerctrl.service;
+package oly.netpowerctrl.anelservice;
 
 import java.io.IOException;
 import java.net.DatagramPacket;

…etpowerctrl/service/DiscoveryThread.java …werctrl/anelservice/DiscoveryThread.javaapp/src/main/java/oly/netpowerctrl/service/DiscoveryThread.java renamed to app/src/main/java/oly/netpowerctrl/anelservice/DiscoveryThread.java app/src/main/java/oly/netpowerctrl/service/DiscoveryThread.java renamed to app/src/main/java/oly/netpowerctrl/anelservice/DiscoveryThread.java

@@ -1,4 +1,4 @@
-package oly.netpowerctrl.service;
+package oly.netpowerctrl.anelservice;
 
 import android.app.Service;
 import android.content.Intent;
@@ -16,7 +16,7 @@ public class NetpowerctrlService extends Service {
     private final IBinder mBinder = new LocalBinder();
 
     private ArrayList<DeviceUpdated> observer = new ArrayList<DeviceUpdated>();
-    private ArrayList<DeviceError> errorobserver = new ArrayList<DeviceError>();
+    private ArrayList<DeviceError> errorObserver = new ArrayList<DeviceError>();
 
     public void registerDeviceUpdateObserver(DeviceUpdated o) {
         observer.add(o);
@@ -27,15 +27,16 @@ public void unregisterDeviceUpdateObserver(DeviceUpdated o) {
     }
 
     public void registerDeviceErrorObserver(DeviceError o) {
-        errorobserver.add(o);
+        errorObserver.add(o);
     }
 
     public void unregisterDeviceErrorObserver(DeviceError o) {
-        errorobserver.remove(o);
+        errorObserver.remove(o);
     }
 
     public void notifyObservers(final DeviceInfo di) {
-        if (observer == null)
+        assert di != null;
+        if (observer.isEmpty())
             return;
 
         Handler h = new Handler(getMainLooper());
@@ -50,14 +51,14 @@ public void run() {
     }
 
     public void notifyErrorObservers(final String deviceName, final String errMessage) {
-        if (observer == null)
+        if (errorObserver.isEmpty())
             return;
 
         Handler h = new Handler(getMainLooper());
 
         h.post(new Runnable() {
             public void run() {
-                for (DeviceError o : errorobserver) {
+                for (DeviceError o : errorObserver) {
                     o.onDeviceError(deviceName, errMessage);
                 }
             }
@@ -72,7 +73,7 @@ public NetpowerctrlService getService() {
     }
 
     @Override
-	public IBinder onBind(Intent intent) {
+    public IBinder onBind(Intent intent) {
         startDiscoveryThreads();
         return mBinder;
     }
@@ -85,24 +86,24 @@ public boolean onUnbind(Intent intent) {
 
     private void startDiscoveryThreads() {
         // only start if not yet running
-    	if (discoveryThreads.size() == 0) {
-	    	for (int port: DeviceQuery.getAllReceivePorts(this)) {
-	        	DiscoveryThread thr = new DiscoveryThread(port, this);
-	        	thr.start();
-	        	discoveryThreads.add(thr);
-	        }
+        if (discoveryThreads.size() == 0) {
+            for (int port : DeviceQuery.getAllReceivePorts(this)) {
+                DiscoveryThread thr = new DiscoveryThread(port, this);
+                thr.start();
+                discoveryThreads.add(thr);
+            }
             // give the threads a chance to start
             try {
                 Thread.sleep(100);
             } catch (InterruptedException ignored) {
             }
         }
-	}
-	
+    }
+
     public void restartDiscoveryThreads() {
         stopDiscoveryThreads();
         startDiscoveryThreads();
-	}
+    }
 
     private void stopDiscoveryThreads() {
         for (DiscoveryThread thr : discoveryThreads)

…werctrl/service/NetpowerctrlService.java …trl/anelservice/NetpowerctrlService.javaapp/src/main/java/oly/netpowerctrl/service/NetpowerctrlService.java renamed to app/src/main/java/oly/netpowerctrl/anelservice/NetpowerctrlService.java app/src/main/java/oly/netpowerctrl/service/NetpowerctrlService.java renamed to app/src/main/java/oly/netpowerctrl/anelservice/NetpowerctrlService.java

@@ -9,7 +9,7 @@
 import java.util.UUID;
 
 import oly.netpowerctrl.R;
-import oly.netpowerctrl.service.DeviceQuery;
+import oly.netpowerctrl.anelservice.DeviceQuery;
 
 // this class holds all the info about one device
 public class DeviceInfo implements Parcelable {

app/src/main/java/oly/netpowerctrl/datastructure/DeviceInfo.java

@@ -4,14 +4,15 @@
 import android.os.Parcelable;
 
 //this class holds the info about a single outlet
-public class OutletInfo implements Parcelable {
+public class OutletInfo implements Parcelable, Comparable {
     public int OutletNumber;
     public String Description;
     public String UserDescription;
     public boolean State;
     public boolean Disabled;
     public DeviceInfo device;
     public boolean Hidden;
+    public int positionRequest;
 
     public OutletInfo() {
         OutletNumber = -1;
@@ -20,6 +21,7 @@ public OutletInfo() {
         State = false;
         Disabled = false;
         Hidden = false;
+        positionRequest = 0;
     }
 
     public OutletInfo(OutletInfo other) {
@@ -29,19 +31,25 @@ public OutletInfo(OutletInfo other) {
         State = other.State;
         Disabled = other.Disabled;
         Hidden = other.Hidden;
+        positionRequest = other.positionRequest;
+    }
+
+    public boolean equals(OutletInfo other) {
+        return (OutletNumber == other.OutletNumber) && device.equals(device);
     }
 
     public int describeContents() {
         return 0;
     }
 
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeInt(OutletNumber);
-        dest.writeString(Description);
-        dest.writeString(UserDescription);
-        dest.writeInt(State ? 1 : 0);
-        dest.writeInt(Disabled ? 1 : 0);
-        dest.writeInt(Hidden ? 1 : 0);
+    public void writeToParcel(Parcel destination, int flags) {
+        destination.writeInt(OutletNumber);
+        destination.writeString(Description);
+        destination.writeString(UserDescription);
+        destination.writeInt(State ? 1 : 0);
+        destination.writeInt(Disabled ? 1 : 0);
+        destination.writeInt(Hidden ? 1 : 0);
+        destination.writeInt(positionRequest);
     }
 
     // this is used to regenerate your object. All Parcelables must have a CREATOR that implements these two methods
@@ -63,6 +71,21 @@ private OutletInfo(Parcel in) {
         State = in.readInt() != 0;
         Disabled = in.readInt() != 0;
         Hidden = in.readInt() != 0;
+        positionRequest = in.readInt();
+    }
+
+    @Override
+    public int compareTo(Object o) {
+        OutletInfo other = (OutletInfo) o;
+        if (other.equals(this))
+            return 0;
+
+        if (positionRequest == 0 && other.positionRequest == 0) {
+            return ((UserDescription.isEmpty() ? Description : UserDescription).compareTo(
+                    (other.UserDescription.isEmpty() ? other.Description : other.UserDescription)));
+        } else {
+            return positionRequest < other.positionRequest ? -1 : 1;
+        }
     }
 }
 

app/src/main/java/oly/netpowerctrl/datastructure/OutletInfo.java

@@ -12,9 +12,9 @@
 import java.util.List;
 
 import oly.netpowerctrl.R;
+import oly.netpowerctrl.anelservice.DeviceUpdated;
 import oly.netpowerctrl.datastructure.DeviceInfo;
 import oly.netpowerctrl.main.NetpowerctrlApplication;
-import oly.netpowerctrl.service.DeviceUpdated;
 import oly.netpowerctrl.utils.ListItemMenu;
 
 public class DeviceListAdapter extends BaseAdapter implements OnClickListener, DeviceUpdated {

app/src/main/java/oly/netpowerctrl/listadapter/DeviceListAdapter.java

@@ -20,6 +20,27 @@ public class DrawerAdapter extends BaseAdapter {
     private List<Object> mItems = new ArrayList<Object>();
     private LayoutInflater inflater;
 
+    public void add(String[] mFragmentNames, String[] mFragmentDesc, String[] mFragmentClasses) {
+        for (int i = 0; i < mFragmentNames.length; ++i) {
+            if (mFragmentDesc[i].equals("-")) {
+                addHeader(mFragmentNames[i]);
+            } else {
+                addItem(mFragmentNames[i], mFragmentDesc[i], mFragmentClasses[i], mFragmentClasses[i].contains("Dialog"));
+            }
+        }
+    }
+
+    public int indexOf(String className) {
+        for (int i = 0; i < mItems.size(); i++) {
+            if (getItemViewType(i) == 1) {
+                DrawerItem item = (DrawerItem) mItems.get(i);
+                if (item.mClazz.equals(className)) return i;
+            }
+
+        }
+        return -1;
+    }
+
     public static class Header {
 
         String mTitle;