Move most anel specific stuff to anel. Add assets. Icons for widgets, scenes.

Author: David Gräff

README.md

@@ -1,5 +1,5 @@
 # netpowerctrl
-	netpowerctrl is an Android App for controlling ANEL NET-PwrCtrl's (http://www.anel-elektronik.de)
+	netpowerctrl is an Android App for controlling ANEL (http://www.anel-elektronik.de)
 	switchable network outlets.
 
 You can find a ready to install apk at [Github Releases](https://github.com/davidgraeff/Android-NetPowerctrl/releases)
@@ -28,12 +28,12 @@ For bugs and feature requests please use [Github Issues](https://github.com/davi
 ### Automatic device detection
 Devices are detected automatically if they are configured for UDP communication.
 Default send port 1077 / receive port 1075 (can be configured). Please be aware
-that you cannot use port numbers < 1024 because of android restrictions!
+that you cannot use port numbers < 1024!
 
 ### Support for automation apps like Tasker/Llama
 Most of the automation apps support shortcuts of other applications.
 Because a shortcut of this app refers to a scene, you may easily switch multiple
-outlets as an action within the automation app.
+outlets as an action within an automation app.
 
 Cool examples:
 * This way you can for instance switch on lights if your mobile gets in range of your wifi network.
@@ -47,7 +47,6 @@ support libraries (v13) and need at least android 4.0 (sdk version 14, released
 
 ### Authors
 * david.graeff(at)web_de
-* Based on http://sourceforge.net/projects/netpowerctrl/ (oly(at)nittka_com)
 
 ### License
-GPLv2
+Dual licensed: GPLv2+GPLv3

app/src/main/AndroidManifest.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="25"
-    android:versionName="2.4">
+    android:versionCode="26"
+    android:versionName="2.5">
 
     <!-- Api level 14: Android 4.0 15. Dezember 2011 -->
     <!-- Api level 16: Android 4.1 27. Juni 2012 -->
@@ -49,7 +49,7 @@
         </activity>
 
         <activity
-            android:name=".shortcut.ShortcutExecutionActivity"
+            android:name=".shortcut.ExecutionActivity"
             android:label="@string/app_name"
             android:icon="@drawable/netpowerctrl"
             android:launchMode="singleInstance"
@@ -71,7 +71,7 @@
         </activity>
 
         <activity
-            android:name="oly.netpowerctrl.shortcut.ShortcutCreatorActivity"
+            android:name=".shortcut.EditShortcutActivity"
             android:icon="@drawable/netpowerctrl"
             android:label="@string/app_name_shortcut"
             android:description="@string/app_name_shortcut_desc"
@@ -101,7 +101,7 @@
         </receiver>
 
         <service
-            android:name="oly.netpowerctrl.anelservice.NetpowerctrlService"
+            android:name="oly.netpowerctrl.network.NetpowerctrlService"
             android:permission="android.permission.INTERNET" />
 
         <service android:name="oly.netpowerctrl.widget.WidgetUpdateService" />