Skip to content

Commit 877fa4b

Browse files
committed
Update dicio-skill, see Stypox/dicio-skill#5
1 parent f4ee7a3 commit 877fa4b

File tree

9 files changed

+17
-13
lines changed

9 files changed

+17
-13
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ dependencies {
4444
implementation "io.reactivex.rxjava3:rxandroid:3.0.0"
4545

4646
// Dicio own libraries
47-
implementation 'com.github.Stypox:dicio-skill:56ead7944516ca8c8a0f22c6d1872deb7a4e1270'
47+
implementation 'com.github.Stypox:dicio-skill:243eec82467b8e1b37b75d36bf4694856b21ee7f'
4848
implementation 'com.github.Stypox:dicio-numbers:fcf12cf98e54e0fe054ca26bdf38e3b99ffd9ca9'
4949

5050
// Vosk

app/src/main/java/org/dicio/dicio_android/skills/calculator/CalculatorInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public boolean isAvailable(final SkillContext context) {
2828

2929
@Override
3030
public Skill build(SkillContext context) {
31-
return new ChainSkill.Builder()
31+
return new ChainSkill.Builder(this)
3232
.recognize(new StandardRecognizer(Sections.getSection(calculator)))
3333
.process(new CalculatorProcessor())
3434
.output(new CalculatorOutput());

app/src/main/java/org/dicio/dicio_android/skills/fallback/text/TextFallback.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
package org.dicio.dicio_android.skills.fallback.text;
22

3+
import androidx.annotation.Nullable;
4+
35
import org.dicio.dicio_android.R;
46
import org.dicio.dicio_android.output.graphical.GraphicalOutputUtils;
57
import org.dicio.skill.FallbackSkill;
68
import org.dicio.skill.SkillContext;
9+
import org.dicio.skill.SkillInfo;
710
import org.dicio.skill.output.GraphicalOutputDevice;
811
import org.dicio.skill.output.SpeechOutputDevice;
912

1013
import java.util.List;
1114

12-
public class TextFallback implements FallbackSkill {
15+
public class TextFallback extends FallbackSkill {
16+
17+
public TextFallback(@Nullable final SkillInfo skillInfo) {
18+
super(skillInfo);
19+
}
1320

1421
@Override
1522
public void setInput(final String input,

app/src/main/java/org/dicio/dicio_android/skills/fallback/text/TextFallbackInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public boolean isAvailable(final SkillContext context) {
2121

2222
@Override
2323
public Skill build(final SkillContext context) {
24-
return new TextFallback();
24+
return new TextFallback(this);
2525
}
2626

2727
@Nullable

app/src/main/java/org/dicio/dicio_android/skills/lyrics/LyricsInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public boolean isAvailable(final SkillContext context) {
2828

2929
@Override
3030
public Skill build(final SkillContext context) {
31-
return new ChainSkill.Builder()
31+
return new ChainSkill.Builder(this)
3232
.recognize(new StandardRecognizer(getSection(lyrics)))
3333
.process(new GeniusProcessor())
3434
.output(new LyricsOutput());

app/src/main/java/org/dicio/dicio_android/skills/open/OpenInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public boolean isAvailable(final SkillContext context) {
2828

2929
@Override
3030
public Skill build(final SkillContext context) {
31-
return new ChainSkill.Builder()
31+
return new ChainSkill.Builder(this)
3232
.recognize(new StandardRecognizer(getSection(open)))
3333
.output(new OpenOutput());
3434
}

app/src/main/java/org/dicio/dicio_android/skills/search/SearchInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public boolean isAvailable(final SkillContext context) {
3030

3131
@Override
3232
public Skill build(final SkillContext context) {
33-
final ChainSkill.Builder builder = new ChainSkill.Builder()
33+
final ChainSkill.Builder builder = new ChainSkill.Builder(this)
3434
.recognize(new StandardRecognizer(getSection(search)));
3535

3636
// Qwant was once available as a second search engine; restore this if adding a new engine

app/src/main/java/org/dicio/dicio_android/skills/search/SearchOutput.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.dicio.dicio_android.skills.search;
22

33
import static org.dicio.dicio_android.Sections.getSection;
4-
import static org.dicio.dicio_android.Sentences_en.search;
54
import static org.dicio.dicio_android.util.ShareUtils.openUrlInBrowser;
65

76
import android.text.Html;
@@ -17,15 +16,13 @@
1716
import org.dicio.dicio_android.R;
1817
import org.dicio.dicio_android.SectionsGenerated;
1918
import org.dicio.dicio_android.output.graphical.GraphicalOutputUtils;
20-
import org.dicio.dicio_android.util.ShareUtils;
2119
import org.dicio.skill.Skill;
2220
import org.dicio.skill.SkillContext;
2321
import org.dicio.skill.chain.ChainSkill;
2422
import org.dicio.skill.chain.InputRecognizer;
2523
import org.dicio.skill.chain.OutputGenerator;
2624
import org.dicio.skill.output.GraphicalOutputDevice;
2725
import org.dicio.skill.output.SpeechOutputDevice;
28-
import org.dicio.skill.standard.InputWordRange;
2926
import org.dicio.skill.standard.StandardRecognizer;
3027
import org.dicio.skill.standard.StandardResult;
3128

@@ -92,11 +89,11 @@ public List<Skill> nextSkills() {
9289
}
9390

9491
return Arrays.asList(
95-
new ChainSkill.Builder()
92+
new ChainSkill.Builder(null)
9693
.recognize(new StandardRecognizer(getSection(SectionsGenerated.search)))
9794
.process(new DuckDuckGoProcessor())
9895
.output(new SearchOutput()),
99-
new ChainSkill.Builder()
96+
new ChainSkill.Builder(null)
10097
.recognize(new InputRecognizer<StandardResult>() {
10198
private String input;
10299

app/src/main/java/org/dicio/dicio_android/skills/weather/WeatherInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public boolean isAvailable(final SkillContext context) {
3131

3232
@Override
3333
public Skill build(final SkillContext context) {
34-
return new ChainSkill.Builder()
34+
return new ChainSkill.Builder(this)
3535
.recognize(new StandardRecognizer(getSection(weather)))
3636
.process(new OpenWeatherMapProcessor())
3737
.output(new WeatherOutput());

0 commit comments

Comments
 (0)