Flash group in green color if activated: Sleep a few ms between udp packets

Fix: Don't show window on shortcut activation if not explicitly required
Fix: Avoid flash while updaing outlet states in outletlist;

Author: davidgraeff

AndroidManifest.xml

@@ -15,6 +15,7 @@
         <activity
             android:name="oly.netpowerctrl.main.NetpowerctrlActivity"
             android:label="@string/app_name"
+            android:launchMode="singleInstance"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:theme="@style/Theme.CustomLightTheme">
             <intent-filter>
@@ -48,7 +49,11 @@
             android:name="oly.netpowerctrl.service.ShortcutExecutionActivity"
             android:label="@string/app_name"
             android:icon="@drawable/netpowerctrl"
+            android:theme="@style/Theme.Transparent"
             android:exported="true">
+			<intent-filter>
+            	<action android:name="android.intent.action.MAIN"/>
+        	</intent-filter>
         </activity>
 
 	    <activity android:name="oly.netpowerctrl.widget.WidgetConfig">

res/layout/shortcut_activity.xml

@@ -14,6 +14,15 @@
 
     </ListView>
 
+    <Switch
+        android:id="@+id/shortcut_show_mainwindow"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+    	android:layout_marginBottom="5dp"
+    	android:layout_marginTop="5dp"
+        android:text="@string/shortcut_show_mainwindow" />
+    
+        
     <LinearLayout 
 	    style="?android:attr/buttonBarStyle"
 	    android:layout_width="match_parent"

res/values-de/strings.xml

@@ -79,6 +79,7 @@
 
     <string name="groupname">Gruppename</string>
     <string name="groupname_long">Bitte geben Sie einen neuen Gruppennamen ein</string>
+    <string name="shortcut_show_mainwindow">Zeige Hauptfenster</string>
 
     <string name="off">Aus</string>
     <string name="on">An</string>

res/values-en/strings.xml

@@ -79,6 +79,7 @@
 
     <string name="groupname">Group name</string>
     <string name="groupname_long">Please enter a new group name</string>
+    <string name="shortcut_show_mainwindow">Show mainwindow on execution</string>
 
     <string name="off">Off</string>
     <string name="on">On</string>

res/values/strings.xml

@@ -79,6 +79,7 @@
 
     <string name="groupname">Group name</string>
     <string name="groupname_long">Please enter a new group name</string>
+    <string name="shortcut_show_mainwindow">Show mainwindow on execution</string>
 
     <string name="off">Off</string>
     <string name="on">On</string>

res/values/theme.xml

@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="Theme.CustomLightTheme" parent="android:Theme.Light" />
+    
+    <style name="Theme.Transparent" parent="android:Theme">
+    <item name="android:windowIsTranslucent">true</item>
+    <item name="android:windowBackground">@android:color/transparent</item>
+    <item name="android:windowContentOverlay">@null</item>
+    <item name="android:windowNoTitle">true</item>
+    <item name="android:windowIsFloating">true</item>
+    <item name="android:backgroundDimEnabled">false</item>
+  </style>
 </resources>

src/oly/netpowerctrl/listadapter/DeviceListAdapter.java

@@ -1,8 +1,6 @@
 package oly.netpowerctrl.listadapter;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 import java.util.UUID;
 
 import oly.netpowerctrl.R;
@@ -15,34 +13,29 @@
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
-import android.widget.Filter;
-import android.widget.Filterable;
 import android.widget.ImageButton;
 import android.widget.TextView;
 
-public class DeviceListAdapter extends BaseAdapter implements Filterable, OnClickListener {
+public class DeviceListAdapter extends BaseAdapter implements OnClickListener {
 
 	private DeviceConfigureEvent deviceConfigureEvent = null;
 
     private List<DeviceInfo> all_devices;
-    private List<DeviceInfo> visible_devices;
     private LayoutInflater inflater;
-    private DeviceFilter filter = null;
     private Context context = null;
 
     public DeviceListAdapter(Context context, List<DeviceInfo> devices) {
     	this.context = context;
         inflater = LayoutInflater.from(context);
         all_devices = devices;
-        visible_devices = new ArrayList<DeviceInfo>(devices);
     }    
 
     public int getCount() {
-        return visible_devices.size();
+        return all_devices.size();
     }
 
     public Object getItem(int position) {
-        return visible_devices.get(position);
+        return all_devices.get(position);
     }
 
     public long getItemId(int position) {
@@ -63,7 +56,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
     	if (convertView == null)
     		convertView = inflater.inflate(R.layout.device_list_item, null);
 
-    	DeviceInfo di = visible_devices.get(position);
+    	DeviceInfo di = all_devices.get(position);
         TextView tvName = (TextView) convertView.findViewById(R.id.device_name);
         tvName.setText(di.DeviceName);
 
@@ -103,53 +96,8 @@ public void onClick(View v) {
 		}
 	}
 
-    
-	public Filter getFilter() {
-	   if (filter == null) {
-            filter = new DeviceFilter();
-        }
-        return filter;
-    }
-	
-	private class DeviceFilter extends Filter
-	{
-
-		@Override
-		protected FilterResults performFiltering(CharSequence constraint) {
-			FilterResults results = new FilterResults();
-            ArrayList<DeviceInfo> list;
-
-			if (constraint == null || constraint.length() == 0) {
-                list = new ArrayList<DeviceInfo>(all_devices);
-			} else {
-                list = new ArrayList<DeviceInfo>();
-				String match = constraint.toString().toLowerCase(Locale.US);
-				for (DeviceInfo item : all_devices) {
-					if (item.DeviceName.toLowerCase(Locale.US).contains(match))
-						list.add(item);
-				}
-				
-			}
-            results.values = list;
-            results.count = list.size();
-			return results;
-		}
-
-		@SuppressWarnings("unchecked")
-		@Override
-		protected void publishResults(CharSequence constraint, FilterResults results) {
-			visible_devices = (List<DeviceInfo>)results.values;
-            if (results.count > 0) {
-                notifyDataSetChanged();
-            } else {
-                notifyDataSetInvalidated();
-            }
-		}
-		
-	}
-
 	public void update() {
-		getFilter().filter("");
+		notifyDataSetChanged();
 	}
 
 }

src/oly/netpowerctrl/listadapter/GroupListAdapter.java

@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 
 import oly.netpowerctrl.R;
+import oly.netpowerctrl.utils.GreenFlasher;
 import oly.netpowerctrl.utils.OutletCommandGroup;
 import oly.netpowerctrl.utils.SharedPrefs;
 import oly.netpowerctrl.utils.UDPSendToDevice;
@@ -64,6 +65,7 @@ public long getItemId(int position) {
 	@Override
 	public void onClick(View v) {
 		int position = (Integer) v.getTag();
+		GreenFlasher.flashBgColor(v);
 		OutletCommandGroup og = (OutletCommandGroup) getItem(position);
 		UDPSendToDevice.sendOutlet(context, og);
 	}

src/oly/netpowerctrl/main/NetpowerctrlActivity.java

@@ -30,6 +30,7 @@
 import android.content.IntentFilter;
 import android.os.Bundle;
 import android.support.v4.content.LocalBroadcastManager;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -93,9 +94,49 @@ public void onCreate(Bundle savedInstanceState) {
     }
 
     private void clearNonConfiguredDevices() {
-    	alDevices = SharedPrefs.ReadConfiguredDevices(this);
-    	adpDevices.setDevices(alDevices);
-    	adpOutlets.setDevices(alDevices);
+    	ArrayList<DeviceInfo> newEntries = SharedPrefs.ReadConfiguredDevices(this);
+    	// This is somehow a more complicated way of alDevices := newEntries
+    	// because with an assignment we would lose the outlet states which are not stored in the SharedPref
+    	// and only with the next UDP update those states are restored. This
+    	// induces a flicker where we can first observe all outlets set to off and
+    	// within a fraction of a second the actual values are applied.
+    	// Therefore we update by hand without touching outlet states.
+    	Iterator<DeviceInfo> oldEntriesIt = alDevices.iterator();
+    	while (oldEntriesIt.hasNext()) {
+    		// remove devices not existing anymore
+    		DeviceInfo old_di = oldEntriesIt.next();
+    		DeviceInfo new_di = null;
+    		for (int i=0;i<newEntries.size();++i) {
+    			if (newEntries.get(i).MacAddress.equals(old_di.MacAddress)) {
+    				new_di = newEntries.get(i);
+    				break;
+    			}
+    		}
+    		if (new_di == null) {
+    			oldEntriesIt.remove();
+    		} else if (old_di.Outlets.size() != new_di.Outlets.size()) {
+        		// Number of outlets have changed. This is a reason to forget about
+    			// outlet states and replace the old device with the new one.
+    			old_di = new_di;
+    		}
+    	}
+    	// add new devices
+    	Iterator<DeviceInfo> newEntriesIt = newEntries.iterator();
+    	while (newEntriesIt.hasNext()) {
+    		DeviceInfo new_di = newEntriesIt.next();
+    		DeviceInfo old_di = null;
+    		for (int i=0;i<alDevices.size();++i) {
+    			if (alDevices.get(i).MacAddress.equals(new_di.MacAddress)) {
+    				old_di = newEntries.get(i);
+    				break;
+    			}
+    		}
+    		if (old_di == null) {
+    			alDevices.add(new_di);
+    		}
+    	}
+    	adpDevices.update();
+    	adpOutlets.update();
     }
 
     @Override
@@ -166,6 +207,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
 				return true;
 			} else if (th.getCurrentTabTag().equals("groups")) {
 				Intent it = new Intent(this, ShortcutCreatorActivity.class);
+				it.putExtra("groups", true);
 				startActivityForResult(it, ACTIVITY_REQUEST_ADDGROUP);
 				return true;				
 			}

src/oly/netpowerctrl/service/ShortcutCreatorActivity.java

@@ -16,12 +16,14 @@
 import android.view.View;
 import android.widget.Button;
 import android.widget.ListView;
+import android.widget.Switch;
 
 public class ShortcutCreatorActivity extends Activity
 {
 	ArrayList<DeviceInfo> alDevices;
 	OutledListAdapter adpOutlets;
 	ListView lvOutletSelect;
+	Switch show_mainwindow;
 	final Activity that = this;
 
 	@Override
@@ -31,19 +33,31 @@ protected void onCreate(final Bundle savedInstanceState)
 		setResult(RESULT_CANCELED,null);
 		setContentView(R.layout.shortcut_activity);
 		setTitle(R.string.choose_shortcut_outlets);
+		
+		boolean isForGroups = false;
+		Intent it = getIntent();
+		if (it != null) {
+			Bundle extra = it.getExtras();
+			if (extra != null) {
+				Object o = extra.get("groups");
+				if (o != null) {
+					isForGroups = (Boolean) o; 
+				}
+			}
+		}
 
     	alDevices = SharedPrefs.ReadConfiguredDevices(this);
   		adpOutlets = new OutledListAdapter(this, alDevices);
+  		show_mainwindow = (Switch)findViewById(R.id.shortcut_show_mainwindow);
+  		if (isForGroups)
+  			show_mainwindow.setVisibility(View.GONE);
 
 		lvOutletSelect = (ListView)findViewById(R.id.lvOutletSelect);
   		lvOutletSelect.setAdapter(adpOutlets);
 
   		((Button)findViewById(R.id.btnAcceptShortcut)).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				// Create shortcut intent
-				Intent shortcutIntent=new Intent(that, oly.netpowerctrl.service.ShortcutExecutionActivity.class);
-				
 				// Generate list of checked items
 				List<OutletCommand> commands = adpOutlets.getCheckedItems();
 				if (commands.isEmpty()) {
@@ -54,9 +68,20 @@ public void onClick(View v) {
 				for (OutletCommand c: commands) {
 					og.add(c);
 				}
+				
+				// Determine default name
 				Calendar t = Calendar.getInstance();
 				og.groupname = DateFormat.getMediumDateFormat(that).format(t.getTime()) + " - " + DateFormat.getTimeFormat(that).format(t.getTime());
+				
+				// Create shortcut intent
+				Intent shortcutIntent=new Intent(that, oly.netpowerctrl.service.ShortcutExecutionActivity.class);
 				shortcutIntent.putExtra("commands", og.toString());
+				shortcutIntent.setClass(that, oly.netpowerctrl.service.ShortcutExecutionActivity.class);
+				shortcutIntent.setAction(Intent.ACTION_MAIN);
+				
+				if (show_mainwindow.isChecked()) {
+					shortcutIntent.putExtra("show_mainwindow", true);
+				}
 
 				// Return result
 				// Shortcut name is "app_name (9)" where 9 is the amount of commands