Notify on shortcut click, if option is set

davidgraeff · davidgraeff · commit 221e029ae011 · 2014-01-09T04:37:30.000+01:00
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
     <!-- Api level 16: Android 4.1 27. Juni 2012 -->
     <uses-sdk
         android:minSdkVersion="16"
-        android:targetSdkVersion="17" />
+        android:targetSdkVersion="19" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.NFC" />
@@ -60,6 +60,8 @@
         <activity
             android:name="oly.netpowerctrl.widget.WidgetConfig"
             android:label="@string/app_name"
+            android:description="@string/app_name_shortcut_desc"
+            android:icon="@drawable/widget"
             android:theme="@style/Theme.CustomLightTheme">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
diff --git a/app/src/main/java/oly/netpowerctrl/listadapter/CreateSceneOutletsAdapter.java b/app/src/main/java/oly/netpowerctrl/listadapter/CreateSceneOutletsAdapter.java
@@ -2,7 +2,6 @@
 
 import android.content.Context;
 import android.graphics.Typeface;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -24,11 +23,8 @@
 import oly.netpowerctrl.utils.ListItemMenu;
 
 public class CreateSceneOutletsAdapter extends BaseAdapter implements ListAdapter, View.OnClickListener {
-    private final Animation slideinleft;
-    private final Animation slideinright;
     private final Context context;
     private List<SceneOutlet> all_outlets;
-    private List<Boolean> running = new ArrayList<Boolean>();
     private LayoutInflater inflater;
     private ListItemMenu listItemMenu = null;
 
@@ -69,7 +65,6 @@ public static CreateSceneOutletsAdapter createByConfiguredDevices(Context contex
                 SceneOutlet so = SceneOutlet.fromOutletInfo(oi, false);
                 so.state = SceneOutlet.ON;
                 o.all_outlets.add(so);
-                o.running.add(false);
             }
         }
         return o;
@@ -96,8 +91,6 @@ private CreateSceneOutletsAdapter(Context context) {
         this.context = context;
         inflater = LayoutInflater.from(context);
         all_outlets = new ArrayList<SceneOutlet>();
-        slideinleft = AnimationUtils.loadAnimation(context, R.anim.animate_in);
-        slideinright = AnimationUtils.loadAnimation(context, R.anim.animate_out);
     }
 
     public int getCount() {
@@ -116,10 +109,9 @@ public View getView(int position, View convertView, ViewGroup parent) {
 
         if (convertView == null) {
             convertView = inflater.inflate(R.layout.create_scene_outlet_list_item, null);
-            assert convertView != null;
-            RadioGroup r = (RadioGroup) convertView.findViewById(R.id.radioGroup);
         }
         SceneOutlet command = all_outlets.get(position);
+        assert convertView != null;
         TextView tv = (TextView) convertView.findViewById(R.id.outlet_list_text);
         tv.setOnClickListener(this);
         tv.setText(command.description);
@@ -144,11 +136,13 @@ public View getView(int position, View convertView, ViewGroup parent) {
         if (r.getVisibility() == View.VISIBLE && !command.enabled) {
             r.clearAnimation();
             Animation a = AnimationUtils.loadAnimation(context, R.anim.animate_out);
+            assert a != null;
             a.setAnimationListener(new AnimationListenerWithRadioGroup(r, false));
             r.startAnimation(a);
         } else if (r.getVisibility() == View.INVISIBLE && command.enabled) {
             r.clearAnimation();
             Animation a = AnimationUtils.loadAnimation(context, R.anim.animate_in);
+            assert a != null;
             a.setAnimationListener(new AnimationListenerWithRadioGroup(r, true));
             r.startAnimation(a);
         }
@@ -172,9 +166,7 @@ public void onClick(View view) {
             int position = (Integer) view.getTag();
             SceneOutlet info = all_outlets.get(position);
             int buttonId = view.getId();
-            int sel = (buttonId == R.id.radio0) ? 0 : ((buttonId == R.id.radio1) ? 1 : 2);
-            Log.w("RADIO", "SEL" + Integer.valueOf(sel).toString());
-            info.state = sel; //1:off;2:on;3:toggle
+            info.state = (buttonId == R.id.radio0) ? 0 : ((buttonId == R.id.radio1) ? 1 : 2); //1:off;2:on;3:toggle
             if (listItemMenu != null)
                 listItemMenu.onMenuItemClicked(view, position);
         }
diff --git a/app/src/main/java/oly/netpowerctrl/main/NetpowerctrlActivity.java b/app/src/main/java/oly/netpowerctrl/main/NetpowerctrlActivity.java
@@ -100,6 +100,12 @@ public void run() {
         }
     };
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        pluginController.destroy();
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         instance = this;
diff --git a/app/src/main/java/oly/netpowerctrl/plugins/PluginController.java b/app/src/main/java/oly/netpowerctrl/plugins/PluginController.java
@@ -61,6 +61,10 @@ public PluginController(Context context, DrawerAdapter drawerAdapter) {
         mDrawerAdapter = drawerAdapter;
     }
 
+    public void destroy() {
+        context.unregisterReceiver(onBroadcast);
+    }
+
     private void removePlugin() {
 
     }
diff --git a/app/src/main/java/oly/netpowerctrl/shortcut/ShortcutCreatorActivity.java b/app/src/main/java/oly/netpowerctrl/shortcut/ShortcutCreatorActivity.java
@@ -30,6 +30,7 @@ public class ShortcutCreatorActivity extends Activity implements ListItemMenu {
     public static final String RESULT_SCENE = "commands";
     private CreateSceneOutletsAdapter adpOutlets = null;
     private Switch show_mainWindow;
+    private Switch enable_feedback;
     private EditText shortcutName;
     private final Context that = this;
     private Scene og;
@@ -42,6 +43,8 @@ protected void onCreate(final Bundle savedInstanceState) {
         setContentView(R.layout.create_scene_activity);
 
         show_mainWindow = (Switch) findViewById(R.id.shortcut_show_mainwindow);
+        enable_feedback = (Switch) findViewById(R.id.shortcut_enable_feedback);
+
         shortcutName = (EditText) findViewById(R.id.shortcut_name);
         shortcutName.addTextChangedListener(new TextWatcher() {
             @Override
@@ -90,6 +93,7 @@ public void afterTextChanged(Editable editable) {
 
         if (isForGroups) {
             show_mainWindow.setVisibility(View.GONE);
+            enable_feedback.setVisibility(View.GONE);
             if (isLoaded)
                 setTitle(R.string.title_scene_edit);
             else
@@ -112,7 +116,7 @@ public void onClick(View v) {
                 og.sceneName = shortcutName.getText().toString();
                 if (og.sceneName.isEmpty() || og.length() == 0)
                     return;
-                Intent extra = Shortcuts.createShortcutExecutionIntent(that, og, show_mainWindow.isChecked());
+                Intent extra = Shortcuts.createShortcutExecutionIntent(that, og, show_mainWindow.isChecked(), enable_feedback.isChecked());
                 // Return result
                 setResult(RESULT_OK, Shortcuts.createShortcut(that, extra, og.sceneName));
                 finish();
diff --git a/app/src/main/java/oly/netpowerctrl/shortcut/ShortcutExecutionActivity.java b/app/src/main/java/oly/netpowerctrl/shortcut/ShortcutExecutionActivity.java
@@ -80,6 +80,12 @@ protected void onCreate(final Bundle savedInstanceState) {
             Intent mainIt = new Intent(this, NetpowerctrlActivity.class);
             startActivity(mainIt);
         }
+
+        if (extra.getBoolean("enable_feedback")) {
+            //noinspection ConstantConditions
+            Toast.makeText(this,
+                    this.getString(R.string.scene_executed, g.sceneName), Toast.LENGTH_SHORT).show();
+        }
     }
 
     @Override
diff --git a/app/src/main/java/oly/netpowerctrl/shortcut/Shortcuts.java b/app/src/main/java/oly/netpowerctrl/shortcut/Shortcuts.java
@@ -12,7 +12,8 @@
 public class Shortcuts {
     static public Intent createShortcutExecutionIntent(Context context,
                                                        Scene og,
-                                                       boolean show_mainWindow) {
+                                                       boolean show_mainWindow,
+                                                       boolean enable_feedback) {
         if (og.length() == 0) {
             return null;
         }
@@ -27,6 +28,10 @@ static public Intent createShortcutExecutionIntent(Context context,
             shortcutIntent.putExtra("show_mainWindow", true);
         }
 
+        if (enable_feedback) {
+            shortcutIntent.putExtra("enable_feedback", true);
+        }
+
         return shortcutIntent;
     }
 
diff --git a/app/src/main/res/anim/animate_out.xml b/app/src/main/res/anim/animate_out.xml
@@ -1,5 +1,5 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/bounce_interpolator">
+    android:interpolator="@android:anim/accelerate_interpolator">
 
     <translate
         android:duration="500"
diff --git a/app/src/main/res/layout/create_scene_activity.xml b/app/src/main/res/layout/create_scene_activity.xml
@@ -23,6 +23,15 @@
         android:paddingLeft="16dip"
         android:text="@string/shortcut_show_mainwindow" />
 
+    <Switch
+        android:id="@+id/shortcut_enable_feedback"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
+        android:layout_marginTop="5dp"
+        android:paddingLeft="16dip"
+        android:text="@string/shortcut_enable_feedback" />
+
     <LinearLayout
         android:paddingLeft="16dip"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -183,4 +183,5 @@
     <string name="menu_showdragdrop">Starte Verschiebemodus</string>
     <string name="menu_hidedragdrop">Beende Verschiebemodus</string>
     <string name="scene_executed">Szene %1$s ausgeführt</string>
+    <string name="shortcut_enable_feedback">Benachrichtigung bei Ausführung</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -188,5 +188,6 @@
     <string name="menu_showdragdrop">Enter move mode</string>
     <string name="menu_hidedragdrop">Leave move mode</string>
     <string name="scene_executed">Scene %1$s executed</string>
+    <string name="shortcut_enable_feedback">Notification on execution</string>
 
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,10 @@ public PluginController(Context context, DrawerAdapter drawerAdapter) {`
`61`	`61`	`mDrawerAdapter = drawerAdapter;`
`62`	`62`	`}`
`63`	`63`
	`64`	`+ public void destroy() {`
	`65`	`+ context.unregisterReceiver(onBroadcast);`
	`66`	`+ }`
	`67`	`+`
`64`	`68`	`private void removePlugin() {`
`65`	`69`
`66`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,12 @@ protected void onCreate(final Bundle savedInstanceState) {`
`80`	`80`	`Intent mainIt = new Intent(this, NetpowerctrlActivity.class);`
`81`	`81`	`startActivity(mainIt);`
`82`	`82`	`}`
	`83`	`+`
	`84`	`+ if (extra.getBoolean("enable_feedback")) {`
	`85`	`+ //noinspection ConstantConditions`
	`86`	`+ Toast.makeText(this,`
	`87`	`+ this.getString(R.string.scene_executed, g.sceneName), Toast.LENGTH_SHORT).show();`
	`88`	`+ }`
`83`	`89`	`}`
`84`	`90`
`85`	`91`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@`
`12`	`12`	`public class Shortcuts {`
`13`	`13`	`static public Intent createShortcutExecutionIntent(Context context,`
`14`	`14`	`Scene og,`
`15`		`- boolean show_mainWindow) {`
	`15`	`+ boolean show_mainWindow,`
	`16`	`+ boolean enable_feedback) {`
`16`	`17`	`if (og.length() == 0) {`
`17`	`18`	`return null;`
`18`	`19`	`}`
`@@ -27,6 +28,10 @@ static public Intent createShortcutExecutionIntent(Context context,`
`27`	`28`	`shortcutIntent.putExtra("show_mainWindow", true);`
`28`	`29`	`}`
`29`	`30`
	`31`	`+ if (enable_feedback) {`
	`32`	`+ shortcutIntent.putExtra("enable_feedback", true);`
	`33`	`+ }`
	`34`	`+`
`30`	`35`	`return shortcutIntent;`
`31`	`36`	`}`
`32`	`37`