Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Integrate buttler part (lot of work to do again)
  • Loading branch information
tikismoke committed Aug 1, 2015
1 parent 084ac59 commit 920fb3c
Show file tree
Hide file tree
Showing 18 changed files with 816 additions and 2 deletions.
9 changes: 9 additions & 0 deletions AndroidManifest.xml
Expand Up @@ -34,9 +34,18 @@
<activity android:name="activities.Activity_Cam"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:configChanges="orientation"></activity>
<activity android:name="mq.Main"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:configChanges="orientation"></activity>
<activity android:name="activities.Activity_Map"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:configChanges="orientation"></activity>
<service
android:name="mq.ZMQService"
class="mq.ZMQService"
android:exported="false"
android:process=":zmq_service" >
</service>

<provider
android:authorities="database.DmdContentProvider"
Expand Down
Binary file added res/drawable/domogik_icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable/icon_menu_butler.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions res/layout/activity_tts.xml
@@ -0,0 +1,25 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
android:layout_height="match_parent" tools:context="domogik.domodroid.main"
android:background="@android:color/black">

<ImageButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/speakbutton"
android:onClick="promptSpeechInput"
android:background="@android:color/black"
android:src="@drawable/domogik_icon"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" />

<ListView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/listView"
android:layout_above="@+id/speakbutton"
android:textColor="@android:color/white"
android:background="@android:color/black" />


</RelativeLayout>
11 changes: 11 additions & 0 deletions res/layout/list_view_theme.xml
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>

<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
android:paddingTop="2dip"
android:paddingBottom="3dip"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textColor="#ffffff" />


6 changes: 5 additions & 1 deletion res/menu/activity_main.xml
Expand Up @@ -8,7 +8,11 @@
android:icon="@drawable/icon_menu_house"
android:title="@string/house_settings"
/>

<!-- menu_butler -->
<item android:id="@+id/menu_butler"
android:icon="@drawable/icon_menu_butler"
android:title="@string/butler"
/>
<!-- menu_preferences -->
<item android:id="@+id/menu_preferences"
android:icon="@drawable/icon_menu_options"
Expand Down
6 changes: 6 additions & 0 deletions res/menu/menu_main.xml
@@ -0,0 +1,6 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" tools:context="domogik.domodroid.main">
<item android:id="@+id/action_settings" android:title="@string/action_settings"
android:orderInCategory="100" />
</menu>
7 changes: 7 additions & 0 deletions res/values/strings.xml
Expand Up @@ -308,4 +308,11 @@
<string name="info3200">Not available</string>
<string name="info48">--</string>

<string name="butler">butler</string>
<string name="action_settings">Settings</string>
<string name="title_activity_main">Domogik Butler</string>
<string name="title_activity_home">HomeActivity</string>
<string name="title_activity_settings">Settings</string>
<string name="pref_header_mq">MQ</string>

</resources>
16 changes: 15 additions & 1 deletion res/xml/preference.xml
Expand Up @@ -71,7 +71,21 @@ android:title="Préférences">
<Preference android:summary="@string/house_explain" android:selectable="false" android:shouldDisableView="false" android:enabled="false"/>
</PreferenceCategory>


<EditTextPreference android:title="Domogik IP"
android:key="dmg_ip"
android:summary="Set the Domogik address ip"></EditTextPreference>
<EditTextPreference android:title="Domogik MQ Pub port"
android:key="dmg_pub_port"
android:summary="Set the Domogik Message port used for publishing (usually 40411)"></EditTextPreference>
<EditTextPreference android:title="Domogik MQ Sub port"
android:key="dmg_sub_port"
android:summary="Set the Domogik Message port used for subscribing (usually 40412)"></EditTextPreference>
<EditTextPreference android:title="Butler name"
android:key="dmg_butler_name"
android:summary="Set the Domogik Butler name"></EditTextPreference>
<EditTextPreference android:title="Your name"
android:key="dmg_your_name"
android:summary="Set your name"></EditTextPreference>



Expand Down
7 changes: 7 additions & 0 deletions src/activities/Activity_Main.java
Expand Up @@ -34,7 +34,9 @@

import widgets.Basic_Graphical_zone;
import widgets.Entity_Feature;
import widgets.Graphical_butler;
import misc.tracerengine;
import mq.Main;
import database.Cache_management;
import database.WidgetUpdate;

Expand Down Expand Up @@ -794,6 +796,11 @@ public boolean onOptionsItemSelected(MenuItem item)

switch (item.getItemId())
{
case R.id.menu_butler:
Intent intent = new Intent(this,Main.class);
this.startActivity(intent);
return true;

case R.id.menu_exit:
//Disconnect all opened sessions....
Tracer.v(mytag+"Exit","Stopping WidgetUpdate thread !");
Expand Down
29 changes: 29 additions & 0 deletions src/mq/MQMessage.java
@@ -0,0 +1,29 @@
package mq;

/**
* Created by mpunie on 12/05/2015.
*/
import android.os.Parcelable;

public abstract class MQMessage implements Parcelable {
protected String message;
protected String id;

public MQMessage(){}

public String getMessage() {
return message;
}
public String getId() {
return id;
}
public void setMessage(String message) {
this.message = message;
}
public void setId(String id) {
this.id = id;
}
public String toString() {
return "Key: " + getId() + ", Value: " + getMessage();
}
}

0 comments on commit 920fb3c

Please sign in to comment.