Add scene help button and show help for first time when clicked on "+" button. IconThemeDialog in MaterialDesign. Fix for scenes as widgets.

David Graeff · David Graeff · commit 1b99466ecaea · 2015-05-11T00:48:44.000+02:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,8 +16,8 @@ android {
     defaultConfig {
         minSdkVersion 17
         targetSdkVersion 22
-        versionCode 117
-        versionName "7.1"
+        versionCode 119
+        versionName "8.0"
         applicationId appID
         testApplicationId "oly.netpowerctrl.tests"
         testInstrumentationRunner "android.test.InstrumentationTestRunner"
diff --git a/app/src/main/java/oly/netpowerctrl/devices/DeviceQuery.java b/app/src/main/java/oly/netpowerctrl/devices/DeviceQuery.java
@@ -3,6 +3,7 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
+import android.support.annotation.NonNull;
 import android.util.Log;
 
 import java.util.ArrayList;
@@ -134,15 +135,16 @@ private void deviceSuccess(Credentials credentials) {
         if (Thread.currentThread() != thread) throw new RuntimeException();
         Log.w(TAG, "Response " + credentials.deviceName);
         handler.removeMessages(MSG_REQUEST, credentials);
-        for (DevicesObserver devicesObserver : devicesObserverList) {
+        for (Iterator<DevicesObserver> iterator = devicesObserverList.iterator(); iterator.hasNext(); ) {
+            DevicesObserver devicesObserver = iterator.next();
             if (!devicesObserver.credentialsList.containsKey(credentials.deviceUID)) continue;
             devicesObserver.credentialsList.remove(credentials.deviceUID);
             devicesObserver.success.add(credentials);
-            checkObserverFinished(devicesObserver);
+            checkObserverFinished(iterator, devicesObserver);
         }
     }
 
-    private void checkObserverFinished(DevicesObserver devicesObserver) {
+    private void checkObserverFinished(@NonNull Iterator<DevicesObserver> iterator, @NonNull DevicesObserver devicesObserver) {
         if (Thread.currentThread() != thread) throw new RuntimeException();
         if (!devicesObserver.credentialsList.isEmpty()) return;
 
@@ -157,25 +159,21 @@ private void checkObserverFinished(DevicesObserver devicesObserver) {
             handler.sendMessageDelayed(handler.obtainMessage(MSG_RECHECK_MINIMUM_TIME, devicesObserver), devicesObserver.minimumTimeInMS - runtimeMS);
             return;
         }
-        // Finished
-        for (Iterator<DevicesObserver> iterator = devicesObserverList.iterator(); iterator.hasNext(); ) {
-            if (iterator.next() == devicesObserver) {
-                iterator.remove();
-                mainHandler.sendMessage(mainHandler.obtainMessage(0, devicesObserver));
-                break;
-            }
-        }
+
+        iterator.remove();
+        mainHandler.sendMessage(mainHandler.obtainMessage(0, devicesObserver));
     }
 
     private void deviceFailed(Credentials credentials) {
         Log.w(TAG, "Query failed " + credentials.getDeviceName());
         if (Thread.currentThread() != thread) throw new RuntimeException();
         handler.removeMessages(MSG_REQUEST, credentials);
-        for (DevicesObserver devicesObserver : devicesObserverList) {
+        for (Iterator<DevicesObserver> iterator = devicesObserverList.iterator(); iterator.hasNext(); ) {
+            DevicesObserver devicesObserver = iterator.next();
             if (!devicesObserver.credentialsList.containsKey(credentials.deviceUID)) continue;
             devicesObserver.credentialsList.remove(credentials.deviceUID);
             devicesObserver.failed.add(credentials);
-            checkObserverFinished(devicesObserver);
+            checkObserverFinished(iterator, devicesObserver);
         }
     }
 
@@ -194,7 +192,13 @@ private void devicesTimeout(DevicesObserver devicesObserver) {
                 dataService.connections.put(l);
             }
         }
-        checkObserverFinished(devicesObserver);
+
+        for (Iterator<DevicesObserver> iterator = devicesObserverList.iterator(); iterator.hasNext(); ) {
+            if (iterator.next() == devicesObserver) {
+                checkObserverFinished(iterator, devicesObserver);
+                break;
+            }
+        }
     }
 
     /**
@@ -287,7 +291,12 @@ public void handleMessage(Message msg) {
                 }
                 case MSG_RECHECK_MINIMUM_TIME: {
                     DevicesObserver devicesObserver = (DevicesObserver) msg.obj;
-                    checkObserverFinished(devicesObserver);
+                    for (Iterator<DevicesObserver> iterator = devicesObserverList.iterator(); iterator.hasNext(); ) {
+                        if (iterator.next() == devicesObserver) {
+                            checkObserverFinished(iterator, devicesObserver);
+                            break;
+                        }
+                    }
                     break;
                 }
                 case MSG_RESPONSE: {
diff --git a/app/src/main/java/oly/netpowerctrl/executables/ExecutableHideShowDialog.java b/app/src/main/java/oly/netpowerctrl/executables/ExecutableHideShowDialog.java
@@ -70,7 +70,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         dataService = DataService.getService();
 
-        Dialog dialog = new com.rey.material.app.Dialog(getActivity());
+        Dialog dialog = new Dialog(getActivity());
         dialog.setTitle(R.string.device_shown_actions);
         dialog.layoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         dialog.positiveActionClickListener(new View.OnClickListener() {
diff --git a/app/src/main/java/oly/netpowerctrl/executables/ExecutablesFragment.java b/app/src/main/java/oly/netpowerctrl/executables/ExecutablesFragment.java
@@ -53,6 +53,7 @@
 import oly.netpowerctrl.network.Utils;
 import oly.netpowerctrl.preferences.PreferencesFragment;
 import oly.netpowerctrl.preferences.SharedPrefs;
+import oly.netpowerctrl.scenes.SceneHelp;
 import oly.netpowerctrl.ui.EmptyListener;
 import oly.netpowerctrl.ui.FragmentUtils;
 import oly.netpowerctrl.ui.ItemShadowDecoration;
@@ -297,9 +298,13 @@ public void onClick(View view) {
         btnAdd.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Intent it = new Intent(getActivity(), EditActivity.class);
-                it.putExtra(EditActivity.CREATE_SCENE, true);
-                startActivityForResult(it, EditActivity.REQUEST_CODE);
+                if (SharedPrefs.getInstance().isFirstTimeSceneAdd()) {
+                    SceneHelp.showHelp(getActivity());
+                } else {
+                    Intent it = new Intent(getActivity(), EditActivity.class);
+                    it.putExtra(EditActivity.CREATE_SCENE, true);
+                    startActivityForResult(it, EditActivity.REQUEST_CODE);
+                }
             }
         });
 
diff --git a/app/src/main/java/oly/netpowerctrl/main/EditActivity.java b/app/src/main/java/oly/netpowerctrl/main/EditActivity.java
@@ -48,6 +48,7 @@
 import oly.netpowerctrl.scenes.Scene;
 import oly.netpowerctrl.scenes.SceneElementsAddDialog;
 import oly.netpowerctrl.scenes.SceneElementsAssigning;
+import oly.netpowerctrl.scenes.SceneHelp;
 import oly.netpowerctrl.timer.Timer;
 import oly.netpowerctrl.timer.TimerAdapter;
 import oly.netpowerctrl.timer.TimerEditFragmentDialog;
@@ -282,6 +283,14 @@ public void onClick(View view) {
             }
         });
 
+        View btnHelp = findViewById(R.id.btnHelp);
+        btnHelp.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                SceneHelp.showHelp(EditActivity.this);
+            }
+        });
+
         btnNFC = (Button) findViewById(R.id.btnNFC);
         btnNFC.setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/app/src/main/java/oly/netpowerctrl/plugin_anel/AnelPlugin.java b/app/src/main/java/oly/netpowerctrl/plugin_anel/AnelPlugin.java
@@ -155,7 +155,8 @@ private int executeDeviceBatch(@NonNull IOConnection ioConnection,
         for (int id = 1; id <= 8; ++id) {
             Executable oi = dataService.executables.findByUID(makeExecutableUID(credentials.deviceUID, id));
             if (oi == null) {
-                Log.e(getPluginID(), "executeDeviceBatch. Did not find " + makeExecutableUID(credentials.deviceUID, id) + " " + credentials.getDeviceName());
+                // For Anel devices with only 3 outputs we will run into this case
+                //Log.e(getPluginID(), "executeDeviceBatch. Did not find " + makeExecutableUID(credentials.deviceUID, id) + " " + credentials.getDeviceName());
                 continue;
             }
             if (oi.current_value == 0) // Only take "ON" commands into account for the bulk change byte
diff --git a/app/src/main/java/oly/netpowerctrl/preferences/LogDialog.java b/app/src/main/java/oly/netpowerctrl/preferences/LogDialog.java
@@ -112,7 +112,7 @@ public void onClick(View view) {
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         isDialog = true;
-        Dialog dialog = new com.rey.material.app.Dialog(getActivity());
+        Dialog dialog = new Dialog(getActivity());
         dialog.setTitle(R.string.device_shown_actions);
         dialog.layoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         dialog.positiveActionClickListener(new View.OnClickListener() {
diff --git a/app/src/main/java/oly/netpowerctrl/preferences/SharedPrefs.java b/app/src/main/java/oly/netpowerctrl/preferences/SharedPrefs.java
@@ -296,6 +296,13 @@ public void setOpenAutoIssues(long last_access) {
         prefs.edit().putLong("open_auto_issues_last_access", last_access).apply();
     }
 
+    public boolean isFirstTimeSceneAdd() {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        boolean first = prefs.getBoolean("isFirstTimeSceneAdd2", true);
+        prefs.edit().putBoolean("isFirstTimeSceneAdd2", false).apply();
+        return first;
+    }
+
     private static class SingletonHolder {
         public static final SharedPrefs instance = new SharedPrefs();
     }
diff --git a/app/src/main/java/oly/netpowerctrl/scenes/SceneHelp.java b/app/src/main/java/oly/netpowerctrl/scenes/SceneHelp.java
@@ -0,0 +1,29 @@
+package oly.netpowerctrl.scenes;
+
+import android.content.Context;
+import android.view.View;
+
+import com.rey.material.app.Dialog;
+import com.rey.material.app.SimpleDialog;
+
+import oly.netpowerctrl.R;
+
+/**
+ * Show help for scene dialog
+ */
+public class SceneHelp {
+    public static void showHelp(Context context) {
+        final SimpleDialog.Builder builder = new SimpleDialog.Builder(R.style.SimpleDialogLight);
+        builder.title(context.getString(R.string.scene_add));
+        builder.message(context.getString(R.string.help_scene));
+        builder.positiveAction(context.getString(android.R.string.ok));
+        final Dialog dialog = builder.build(context);
+        dialog.positiveActionClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                dialog.dismiss();
+            }
+        });
+        dialog.show();
+    }
+}
diff --git a/app/src/main/java/oly/netpowerctrl/ui/IconThemeDialog.java b/app/src/main/java/oly/netpowerctrl/ui/IconThemeDialog.java
@@ -1,14 +1,16 @@
 package oly.netpowerctrl.ui;
 
-import android.app.AlertDialog;
-import android.app.Dialog;
 import android.app.DialogFragment;
-import android.content.DialogInterface;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.RadioButton;
 
+import com.rey.material.app.Dialog;
+
 import java.io.IOException;
 
 import oly.netpowerctrl.R;
@@ -18,14 +20,16 @@
  * Try to setup all found devices, The dialog shows a short log about the actions.
  */
 public class IconThemeDialog extends DialogFragment {
+    private SoftRadioGroup radioGroupTheme;
     public IconThemeDialog() {
     }
 
+    @Nullable
     @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        View rootView = getActivity().getLayoutInflater().inflate(R.layout.fragment_icon_theme, null, false);
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View rootView = inflater.inflate(R.layout.fragment_icon_theme, container, false);
 
-        final SoftRadioGroup radioGroupTheme = new SoftRadioGroup();
+        radioGroupTheme = new SoftRadioGroup();
         radioGroupTheme.addView((RadioButton) rootView.findViewById(R.id.theme1));
         radioGroupTheme.addView((RadioButton) rootView.findViewById(R.id.theme2));
         radioGroupTheme.addView((RadioButton) rootView.findViewById(R.id.theme3));
@@ -55,18 +59,24 @@ public void onClick(View view) {
             }
         }
 
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setView(rootView)
-                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialogInterface, int i) {
-                        int index = radioGroupTheme.getCheckedRadioButtonIndex();
-                        if (index != -1) {
-                            String[] icon_themes = getResources().getStringArray(R.array.default_fallback_icon_set_keys);
-                            LoadStoreIconData.setDefaultFallbackIconSet(icon_themes[index]);
-                        }
-                    }
-                });
-        return builder.create();
+        return rootView;
+    }
+
+    @Override
+    public com.rey.material.app.Dialog onCreateDialog(Bundle savedInstanceState) {
+        Dialog dialog = new com.rey.material.app.Dialog(getActivity());
+        dialog.layoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        dialog.positiveActionClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                int index = radioGroupTheme.getCheckedRadioButtonIndex();
+                if (index != -1) {
+                    String[] icon_themes = getResources().getStringArray(R.array.default_fallback_icon_set_keys);
+                    LoadStoreIconData.setDefaultFallbackIconSet(icon_themes[index]);
+                }
+                dismiss();
+            }
+        }).positiveAction(android.R.string.ok);
+        return dialog;
     }
 }
diff --git a/app/src/main/java/oly/netpowerctrl/widget/WidgetExecutable.java b/app/src/main/java/oly/netpowerctrl/widget/WidgetExecutable.java
@@ -57,14 +57,14 @@ private void loadExecutable(DataService dataService) {
             executable = dataService.executables.findByUID(executableID);
         }
         Credentials credentials = null;
-        if (executable != null) {
-            credentials = dataService.credentials.findByUID(executable.deviceUID);
 
+        if (executable != null) {
             if (executable instanceof Scene) {
                 Executable master = dataService.executables.findByUID(((Scene) executable).getMasterExecutableUid());
                 if (master != null)
                     credentials = dataService.credentials.findByUID(master.deviceUID);
-            }
+            } else
+                credentials = dataService.credentials.findByUID(executable.deviceUID);
         }
 
         if (executable == null) {
diff --git a/app/src/main/res/layout/activity_edit.xml b/app/src/main/res/layout/activity_edit.xml
@@ -31,7 +31,17 @@
             <!-- bottom space to make all options viewable -->
             <View
                 android:layout_width="match_parent"
-                android:layout_height="100dp" />
+                android:layout_height="50dp" />
+
+            <com.rey.material.widget.Button
+                android:id="@+id/btnHelp"
+                style="@style/FlatColorButtonRippleStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:text="@string/menu_help"
+                app:rd_delayClick="true" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -302,8 +302,8 @@ Du musst UDP auf den Geräten einschalten, im selben Netzwerk sein wie deine Ger
     <string name="device_timeout">Verbindungszeit überschritten, abgebrochen</string>
     <string name="jump_to_group">Springe zu Gruppe</string>
     <string name="scene">Szene</string>
-    <string name="help_scene">Eine Szene kombiniert mehrere Aktionen und kann mit einem Namen und einem Icon versehen werden.
-    Lege die Kopie einer Szene auf deinem Homescreen ab und führe diese von dort direkt aus.\nMache eine Szene zu einem Favoriten, so wird sie im Navigationsmenü aufgelistet. Wenn in den Einstellungen "In Statusbar anzeigen" aktiv ist, werden bis zu drei Favoriten-Szenen auch in der Android-Statusbar aufgelistet.
+    <string name="help_scene">Diese Hilfe erreichst du auch im Szenendialog.\n\nDie App bietet dir die Möglichkeit mehrere Schaltaktionen zugleich auszuführen. Diese Bündelung wird hier Szene genannt. Eine Schaltaktion kann das Einschalten, Ausschalten oder Umschalten einer Steckdose etc sein.
+    \n\nAuf dem Homescreen:\nLege die Kopie oder Verknüpfung einer Szene auf deinem Launcher ab und führe die Szene von dort direkt aus.\n\nSchnellzugriff:\nMache eine Szene zu einem Favoriten und wenn in den Einstellungen "In Statusbar anzeigen" aktiv ist, werden bis zu drei Favoriten-Szenen auch in der Android-Statusbar aufgelistet.
     \n\nMaster/Slave-Szenen:\nAlle Steckdosen/IOs in solch einer Szene richten sich in Ihrem Zustand nach einer ausgewählten.
     </string>
     <string name="open_google_market">Google Play</string>

Original file line number	Diff line number	Diff line change
`@@ -296,6 +296,13 @@ public void setOpenAutoIssues(long last_access) {`
`296`	`296`	`prefs.edit().putLong("open_auto_issues_last_access", last_access).apply();`
`297`	`297`	`}`
`298`	`298`
	`299`	`+ public boolean isFirstTimeSceneAdd() {`
	`300`	`+ SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);`
	`301`	`+ boolean first = prefs.getBoolean("isFirstTimeSceneAdd2", true);`
	`302`	`+ prefs.edit().putBoolean("isFirstTimeSceneAdd2", false).apply();`
	`303`	`+ return first;`
	`304`	`+ }`
	`305`	`+`
`299`	`306`	`private static class SingletonHolder {`
`300`	`307`	`public static final SharedPrefs instance = new SharedPrefs();`
`301`	`308`	`}`