Skip to content

Commit 6965110

Browse files
author
Chris Bellew
committed
Fixed package name of Wear app.
Added ability to use "play" instead of "watch" to trigger playback.
1 parent 11cb7f8 commit 6965110

File tree

10 files changed

+24
-38
lines changed

10 files changed

+24
-38
lines changed

‎mobile/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ android {
103103
}
104104

105105
dependencies {
106+
wearApp project(':wear')
106107
compile 'com.loopj.android:android-async-http:1.4.4'
107108
compile files('libs/bugsense-3.6.jar')
108109
compile('org.simpleframework:simple-xml:2.7.1') {

‎mobile/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
package="com.atomjack.vcfp"
5-
android:versionCode="32"
6-
android:versionName="2.0b1" >
5+
android:versionCode="34"
6+
android:versionName="2.0b3" >
77

88
<uses-permission android:name="com.mohammadag.googlesearchapi.permission.ACCESS_GGOGLE_SEARCH_API" />
99
<uses-permission android:name="android.permission.INTERNET" />

‎mobile/src/main/res/values/patterns.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@ adding translations, please do not modify (.*), $1, ([0-9]+), etc.
99
a quite complicated regular expression. Plugging it into https://www.debuggex.com/ should help you figure out how
1010
it is constructed.
1111
-->
12-
<item name="pattern_recognition" type="string">^(((watch|resume watching|listen to|watch movie) (.+)( on (.+))?( on shuffle)?)|((offset|timecode) (.+)( on (.+))?)|((pause|stop|resume) playback( on (.+))?))|(connect to (.+)|disconnect)$</item>
12+
<item name="pattern_recognition" type="string">^(((watch|play|resume watching|listen to|watch movie|play movie) (.+)( on (.+))?( on shuffle)?)|((offset|timecode) (.+)( on (.+))?)|((pause|stop|resume) playback( on (.+))?))|(connect to (.+)|disconnect)$</item>
1313

1414
<item name="pattern_on_client" type="string">(.+) on (.+)$</item>
15-
<item name="pattern_resume_watching" type="string">^resume watching (.+)</item>
15+
<item name="pattern_resume_watching" type="string">^resume (watching|playing) (.+)</item>
1616
<item name="pattern_on_shuffle" type="string"> on shuffle$</item>
17-
<item name="pattern_watch" type="string">watch $1</item>
18-
<item name="pattern_watch_movie" type="string">watch movie (.+)</item>
19-
<item name="pattern_watch_season_episode_of_show" type="string">watch season ([0-9]+) episode ([0-9]+) of (.+)</item>
20-
<item name="pattern_watch_show_season_episode" type="string">watch (.+) season ([0-9]+) episode ([0-9]+)</item>
21-
<item name="pattern_watch_episode_of_show" type="string">watch episode (.+) of (.+)</item>
22-
<item name="pattern_watch_next_episode_of_show" type="string">watch the next episode of (.+)</item>
23-
<item name="pattern_watch_latest_episode_of_show" type="string">watch( the)? latest episode of (.+)</item>
24-
<item name="pattern_watch_show_episode_named" type="string">watch (.+) episode (.+)</item>
17+
<item name="pattern_watch" type="string">watch|play $1</item>
18+
<item name="pattern_watch_movie" type="string">watch|play movie (.+)</item>
19+
<item name="pattern_watch_season_episode_of_show" type="string">watch|play season ([0-9]+) episode ([0-9]+) of (.+)</item>
20+
<item name="pattern_watch_show_season_episode" type="string">watch|play (.+) season ([0-9]+) episode ([0-9]+)</item>
21+
<item name="pattern_watch_episode_of_show" type="string">watch|play episode (.+) of (.+)</item>
22+
<item name="pattern_watch_next_episode_of_show" type="string">watch|play the next episode of (.+)</item>
23+
<item name="pattern_watch_latest_episode_of_show" type="string">watch|play( the)? latest episode of (.+)</item>
24+
<item name="pattern_watch_show_episode_named" type="string">watch|play (.+) episode (.+)</item>
2525
<item name="pattern_connect_to" type="string">^connect to (.+)</item>
2626
<item name="pattern_disconnect" type="string">^disconnect$</item>
27-
<item name="pattern_watch2" type="string">watch (.+)</item>
27+
<item name="pattern_watch2" type="string">watch|play (.+)</item>
2828

2929
<!--
3030
The following pattern lets the user say "listen to <album> by <artist>" or

‎wear/src/main/AndroidManifest.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.atomjack.wear" >
3+
package="com.atomjack.vcfp"
4+
android:versionCode="34"
5+
android:versionName="2.0b3">
46

57
<uses-feature android:name="android.hardware.type.watch" />
68

‎wear/src/main/java/com/atomjack/wear/MainActivity.java‎ renamed to ‎wear/src/main/java/com/atomjack/vcfp/MainActivity.java‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
package com.atomjack.wear;
1+
package com.atomjack.vcfp;
22

33
import android.app.Activity;
4-
import android.app.NotificationManager;
54
import android.app.RemoteInput;
65
import android.content.Intent;
7-
import android.net.Uri;
86
import android.os.Bundle;
97
import android.speech.RecognizerIntent;
108
import android.support.wearable.view.WatchViewStub;
11-
import android.view.View;
129
import android.widget.TextView;
1310

1411
import com.atomjack.shared.Logger;
@@ -18,18 +15,9 @@
1815
import com.google.android.gms.common.api.GoogleApiClient;
1916
import com.google.android.gms.wearable.DataMap;
2017
import com.google.android.gms.wearable.Wearable;
21-
import com.google.gson.Gson;
22-
import com.google.gson.GsonBuilder;
23-
import com.google.gson.JsonElement;
24-
import com.google.gson.JsonPrimitive;
25-
import com.google.gson.JsonSerializationContext;
26-
import com.google.gson.JsonSerializer;
27-
28-
import java.lang.reflect.Type;
18+
2919
import java.util.ArrayList;
3020
import java.util.Arrays;
31-
import java.util.HashMap;
32-
import java.util.List;
3321

3422
public class MainActivity extends Activity implements
3523
GoogleApiClient.ConnectionCallbacks,

‎wear/src/main/java/com/atomjack/wear/NotificationActivity.java‎ renamed to ‎wear/src/main/java/com/atomjack/vcfp/NotificationActivity.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.atomjack.wear;
1+
package com.atomjack.vcfp;
22

33
import android.app.Activity;
44
import android.content.Context;
@@ -7,7 +7,6 @@
77
import android.graphics.BitmapFactory;
88
import android.os.AsyncTask;
99
import android.os.Bundle;
10-
import android.util.Log;
1110
import android.widget.ImageView;
1211
import android.widget.TextView;
1312

‎wear/src/main/java/com/atomjack/wear/PlexControlService.java‎ renamed to ‎wear/src/main/java/com/atomjack/vcfp/PlexControlService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.atomjack.wear;
1+
package com.atomjack.vcfp;
22

33
import android.app.IntentService;
44
import android.content.Intent;

‎wear/src/main/java/com/atomjack/wear/VoiceInputActivity.java‎ renamed to ‎wear/src/main/java/com/atomjack/vcfp/VoiceInputActivity.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
1-
package com.atomjack.wear;
1+
package com.atomjack.vcfp;
22

33
import android.app.Activity;
44
import android.content.Intent;
5-
import android.net.Uri;
65
import android.os.Bundle;
76
import android.speech.RecognizerIntent;
87

98
import com.atomjack.shared.Logger;
109
import com.atomjack.shared.SendToDataLayerThread;
11-
import com.atomjack.shared.UriSerializer;
1210
import com.atomjack.shared.WearConstants;
1311
import com.google.android.gms.wearable.DataMap;
14-
import com.google.gson.Gson;
15-
import com.google.gson.GsonBuilder;
1612

1713
public class VoiceInputActivity extends Activity {
1814
public static final String START_SPEECH_RECOGNITION = "com.atomjack.vcfp.intent.start_speech_recognition";

‎wear/src/main/java/com/atomjack/wear/WearApplication.java‎ renamed to ‎wear/src/main/java/com/atomjack/vcfp/WearApplication.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.atomjack.wear;
1+
package com.atomjack.vcfp;
22

33
import android.app.Application;
44
import android.app.NotificationManager;

‎wear/src/main/java/com/atomjack/wear/WearListenerService.java‎ renamed to ‎wear/src/main/java/com/atomjack/vcfp/WearListenerService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.atomjack.wear;
1+
package com.atomjack.vcfp;
22

33
import android.app.NotificationManager;
44
import android.content.Intent;

0 commit comments

Comments
 (0)