diff --git a/app/src/main/java/om/sstvencoder/ModeInterfaces/IModeInfo.java b/app/src/main/java/om/sstvencoder/ModeInterfaces/IModeInfo.java index 54363a8..8627067 100644 --- a/app/src/main/java/om/sstvencoder/ModeInterfaces/IModeInfo.java +++ b/app/src/main/java/om/sstvencoder/ModeInterfaces/IModeInfo.java @@ -16,7 +16,7 @@ limitations under the License. package om.sstvencoder.ModeInterfaces; public interface IModeInfo { - int getModeName(); + String getModeName(); String getModeClassName(); diff --git a/app/src/main/java/om/sstvencoder/Modes/Martin1.java b/app/src/main/java/om/sstvencoder/Modes/Martin1.java index 652d5f1..2700529 100644 --- a/app/src/main/java/om/sstvencoder/Modes/Martin1.java +++ b/app/src/main/java/om/sstvencoder/Modes/Martin1.java @@ -19,11 +19,12 @@ import android.graphics.Bitmap; import om.sstvencoder.ModeInterfaces.ModeSize; import om.sstvencoder.Output.IOutput; -import om.sstvencoder.R; @ModeSize(width = 320, height = 256) -@ModeDescription(name = R.string.action_martin1) +@ModeDescription(name = Martin1.Name) class Martin1 extends Martin { + public static final String Name = "Martin 1"; + Martin1(Bitmap bitmap, IOutput output) { super(bitmap, output); mVISCode = 44; diff --git a/app/src/main/java/om/sstvencoder/Modes/Martin2.java b/app/src/main/java/om/sstvencoder/Modes/Martin2.java index 0760baa..47bca0d 100644 --- a/app/src/main/java/om/sstvencoder/Modes/Martin2.java +++ b/app/src/main/java/om/sstvencoder/Modes/Martin2.java @@ -19,11 +19,12 @@ import android.graphics.Bitmap; import om.sstvencoder.ModeInterfaces.ModeSize; import om.sstvencoder.Output.IOutput; -import om.sstvencoder.R; @ModeSize(width = 320, height = 256) -@ModeDescription(name = R.string.action_martin2) +@ModeDescription(name = Martin2.Name) class Martin2 extends Martin { + public static final String Name = "Martin 2"; + Martin2(Bitmap bitmap, IOutput output) { super(bitmap, output); mVISCode = 40; diff --git a/app/src/main/java/om/sstvencoder/Modes/ModeDescription.java b/app/src/main/java/om/sstvencoder/Modes/ModeDescription.java index b0d9e38..3e091d7 100644 --- a/app/src/main/java/om/sstvencoder/Modes/ModeDescription.java +++ b/app/src/main/java/om/sstvencoder/Modes/ModeDescription.java @@ -23,5 +23,5 @@ import java.lang.annotation.Target; @Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) @interface ModeDescription { - int name(); + String name(); } diff --git a/app/src/main/java/om/sstvencoder/Modes/ModeInfo.java b/app/src/main/java/om/sstvencoder/Modes/ModeInfo.java index 0aeff01..b1edf1a 100644 --- a/app/src/main/java/om/sstvencoder/Modes/ModeInfo.java +++ b/app/src/main/java/om/sstvencoder/Modes/ModeInfo.java @@ -25,7 +25,7 @@ class ModeInfo implements IModeInfo { mModeClass = modeClass; } - public int getModeName() { + public String getModeName() { return mModeClass.getAnnotation(ModeDescription.class).name(); } diff --git a/app/src/main/java/om/sstvencoder/Modes/PD120.java b/app/src/main/java/om/sstvencoder/Modes/PD120.java index 982f605..6de6a48 100644 --- a/app/src/main/java/om/sstvencoder/Modes/PD120.java +++ b/app/src/main/java/om/sstvencoder/Modes/PD120.java @@ -19,11 +19,12 @@ import android.graphics.Bitmap; import om.sstvencoder.ModeInterfaces.ModeSize; import om.sstvencoder.Output.IOutput; -import om.sstvencoder.R; @ModeSize(width = 640, height = 496) -@ModeDescription(name = R.string.action_pd120) +@ModeDescription(name = PD120.Name) class PD120 extends PD { + public static final String Name = "PD 120"; + PD120(Bitmap bitmap, IOutput output) { super(bitmap, output); mVISCode = 95; diff --git a/app/src/main/java/om/sstvencoder/Modes/PD160.java b/app/src/main/java/om/sstvencoder/Modes/PD160.java index aff7a0d..d0c48f2 100644 --- a/app/src/main/java/om/sstvencoder/Modes/PD160.java +++ b/app/src/main/java/om/sstvencoder/Modes/PD160.java @@ -19,11 +19,12 @@ import android.graphics.Bitmap; import om.sstvencoder.ModeInterfaces.ModeSize; import om.sstvencoder.Output.IOutput; -import om.sstvencoder.R; @ModeSize(width = 512, height = 400) -@ModeDescription(name = R.string.action_pd160) +@ModeDescription(name = PD160.Name) class PD160 extends PD { + public static final String Name = "PD 160"; + PD160(Bitmap bitmap, IOutput output) { super(bitmap, output); mVISCode = 98; diff --git a/app/src/main/java/om/sstvencoder/Modes/PD180.java b/app/src/main/java/om/sstvencoder/Modes/PD180.java index d03380c..9fe7ea2 100644 --- a/app/src/main/java/om/sstvencoder/Modes/PD180.java +++ b/app/src/main/java/om/sstvencoder/Modes/PD180.java @@ -19,11 +19,12 @@ import android.graphics.Bitmap; import om.sstvencoder.ModeInterfaces.ModeSize; import om.sstvencoder.Output.IOutput; -import om.sstvencoder.R; @ModeSize(width = 640, height = 496) -@ModeDescription(name = R.string.action_pd180) +@ModeDescription(name = PD180.Name) class PD180 extends PD { + public static final String Name = "PD 180"; + PD180(Bitmap bitmap, IOutput output) { super(bitmap, output); mVISCode = 96; diff --git a/app/src/main/java/om/sstvencoder/Modes/PD240.java b/app/src/main/java/om/sstvencoder/Modes/PD240.java index a8ba5dd..405c0ab 100644 --- a/app/src/main/java/om/sstvencoder/Modes/PD240.java +++ b/app/src/main/java/om/sstvencoder/Modes/PD240.java @@ -19,11 +19,12 @@ import android.graphics.Bitmap; import om.sstvencoder.ModeInterfaces.ModeSize; import om.sstvencoder.Output.IOutput; -import om.sstvencoder.R; @ModeSize(width = 640, height = 496) -@ModeDescription(name = R.string.action_pd240) +@ModeDescription(name = PD240.Name) class PD240 extends PD { + public static final String Name = "PD 240"; + PD240(Bitmap bitmap, IOutput output) { super(bitmap, output); mVISCode = 97; diff --git a/app/src/main/java/om/sstvencoder/Modes/PD290.java b/app/src/main/java/om/sstvencoder/Modes/PD290.java index b50ccee..3befef6 100644 --- a/app/src/main/java/om/sstvencoder/Modes/PD290.java +++ b/app/src/main/java/om/sstvencoder/Modes/PD290.java @@ -19,11 +19,12 @@ import android.graphics.Bitmap; import om.sstvencoder.ModeInterfaces.ModeSize; import om.sstvencoder.Output.IOutput; -import om.sstvencoder.R; @ModeSize(width = 800, height = 616) -@ModeDescription(name = R.string.action_pd290) +@ModeDescription(name = PD290.Name) class PD290 extends PD { + public static final String Name = "PD 290"; + PD290(Bitmap bitmap, IOutput output) { super(bitmap, output); mVISCode = 94; diff --git a/app/src/main/java/om/sstvencoder/Modes/PD50.java b/app/src/main/java/om/sstvencoder/Modes/PD50.java index f5f0f4e..49e2052 100644 --- a/app/src/main/java/om/sstvencoder/Modes/PD50.java +++ b/app/src/main/java/om/sstvencoder/Modes/PD50.java @@ -19,11 +19,12 @@ import android.graphics.Bitmap; import om.sstvencoder.ModeInterfaces.ModeSize; import om.sstvencoder.Output.IOutput; -import om.sstvencoder.R; @ModeSize(width = 320, height = 256) -@ModeDescription(name = R.string.action_pd50) +@ModeDescription(name = PD50.Name) class PD50 extends PD { + public static final String Name = "PD 50"; + PD50(Bitmap bitmap, IOutput output) { super(bitmap, output); mVISCode = 93; diff --git a/app/src/main/java/om/sstvencoder/Modes/PD90.java b/app/src/main/java/om/sstvencoder/Modes/PD90.java index 5f746fe..eba70ad 100644 --- a/app/src/main/java/om/sstvencoder/Modes/PD90.java +++ b/app/src/main/java/om/sstvencoder/Modes/PD90.java @@ -19,11 +19,12 @@ import android.graphics.Bitmap; import om.sstvencoder.ModeInterfaces.ModeSize; import om.sstvencoder.Output.IOutput; -import om.sstvencoder.R; @ModeSize(width = 320, height = 256) -@ModeDescription(name = R.string.action_pd90) +@ModeDescription(name = PD90.Name) class PD90 extends PD { + public static final String Name = "PD 90"; + PD90(Bitmap bitmap, IOutput output) { super(bitmap, output); mVISCode = 99; diff --git a/app/src/main/java/om/sstvencoder/Modes/Robot36.java b/app/src/main/java/om/sstvencoder/Modes/Robot36.java index 9945e50..506b475 100644 --- a/app/src/main/java/om/sstvencoder/Modes/Robot36.java +++ b/app/src/main/java/om/sstvencoder/Modes/Robot36.java @@ -22,11 +22,12 @@ import om.sstvencoder.Modes.ImageFormats.YuvFactory; import om.sstvencoder.Modes.ImageFormats.YuvImageFormat; import om.sstvencoder.ModeInterfaces.ModeSize; import om.sstvencoder.Output.IOutput; -import om.sstvencoder.R; @ModeSize(width = 320, height = 240) -@ModeDescription(name = R.string.action_robot36) +@ModeDescription(name = Robot36.Name) class Robot36 extends Mode { + public static final String Name = "Robot 36"; + private final Yuv mYuv; private final int mLumaScanSamples; diff --git a/app/src/main/java/om/sstvencoder/Modes/Robot72.java b/app/src/main/java/om/sstvencoder/Modes/Robot72.java index 8e02045..2440153 100644 --- a/app/src/main/java/om/sstvencoder/Modes/Robot72.java +++ b/app/src/main/java/om/sstvencoder/Modes/Robot72.java @@ -22,11 +22,12 @@ import om.sstvencoder.Modes.ImageFormats.YuvFactory; import om.sstvencoder.Modes.ImageFormats.YuvImageFormat; import om.sstvencoder.ModeInterfaces.ModeSize; import om.sstvencoder.Output.IOutput; -import om.sstvencoder.R; @ModeSize(width = 320, height = 240) -@ModeDescription(name = R.string.action_robot72) +@ModeDescription(name = Robot72.Name) class Robot72 extends Mode { + public static final String Name = "Robot 72"; + private final Yuv mYuv; private final int mLumaScanSamples; diff --git a/app/src/main/java/om/sstvencoder/Modes/Scottie1.java b/app/src/main/java/om/sstvencoder/Modes/Scottie1.java index 086ce97..9c3f96a 100644 --- a/app/src/main/java/om/sstvencoder/Modes/Scottie1.java +++ b/app/src/main/java/om/sstvencoder/Modes/Scottie1.java @@ -19,11 +19,12 @@ import android.graphics.Bitmap; import om.sstvencoder.ModeInterfaces.ModeSize; import om.sstvencoder.Output.IOutput; -import om.sstvencoder.R; @ModeSize(width = 320, height = 256) -@ModeDescription(name = R.string.action_scottie1) +@ModeDescription(name = Scottie1.Name) class Scottie1 extends Scottie { + public static final String Name = "Scottie 1"; + Scottie1(Bitmap bitmap, IOutput output) { super(bitmap, output); mVISCode = 60; diff --git a/app/src/main/java/om/sstvencoder/Modes/Scottie2.java b/app/src/main/java/om/sstvencoder/Modes/Scottie2.java index 4d05d19..e5372b4 100644 --- a/app/src/main/java/om/sstvencoder/Modes/Scottie2.java +++ b/app/src/main/java/om/sstvencoder/Modes/Scottie2.java @@ -19,11 +19,12 @@ import android.graphics.Bitmap; import om.sstvencoder.ModeInterfaces.ModeSize; import om.sstvencoder.Output.IOutput; -import om.sstvencoder.R; @ModeSize(width = 320, height = 256) -@ModeDescription(name = R.string.action_scottie2) +@ModeDescription(name = Scottie2.Name) class Scottie2 extends Scottie { + public static final String Name = "Scottie 2"; + Scottie2(Bitmap bitmap, IOutput output){ super(bitmap, output); mVISCode = 56; diff --git a/app/src/main/java/om/sstvencoder/Modes/ScottieDX.java b/app/src/main/java/om/sstvencoder/Modes/ScottieDX.java index a2dd57f..36579d7 100644 --- a/app/src/main/java/om/sstvencoder/Modes/ScottieDX.java +++ b/app/src/main/java/om/sstvencoder/Modes/ScottieDX.java @@ -19,11 +19,12 @@ import android.graphics.Bitmap; import om.sstvencoder.ModeInterfaces.ModeSize; import om.sstvencoder.Output.IOutput; -import om.sstvencoder.R; @ModeSize(width = 320, height = 256) -@ModeDescription(name = R.string.action_scottie_dx) +@ModeDescription(name = ScottieDX.Name) class ScottieDX extends Scottie { + public static final String Name = "Scottie DX"; + ScottieDX(Bitmap bitmap, IOutput output) { super(bitmap, output); mVISCode = 76; diff --git a/app/src/main/java/om/sstvencoder/Modes/Wraase.java b/app/src/main/java/om/sstvencoder/Modes/Wraase.java index 702ee65..967a138 100644 --- a/app/src/main/java/om/sstvencoder/Modes/Wraase.java +++ b/app/src/main/java/om/sstvencoder/Modes/Wraase.java @@ -20,11 +20,12 @@ import android.graphics.Color; import om.sstvencoder.ModeInterfaces.ModeSize; import om.sstvencoder.Output.IOutput; -import om.sstvencoder.R; @ModeSize(width = 320, height = 256) -@ModeDescription(name = R.string.action_wraaseSC2_180) +@ModeDescription(name = Wraase.Name) class Wraase extends Mode { + public static final String Name = "Wraase SC2 180"; + private final int mSyncPulseSamples; private final double mSyncPulseFrequency; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2aa9caf..f7ec834 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -11,21 +11,6 @@ Reset Done Modes - Martin 1 - Martin 2 - PD 50 - PD 90 - PD 120 - PD 160 - PD 180 - PD 240 - PD 290 - Scottie 1 - Scottie 2 - Scottie DX - Robot 36 - Robot 72 - Wraase SC2 180 Privacy Policy About SSTV Encoder