mirror
/
SSTVEncoder2
kopia lustrzana https://github.com/olgamiller/SSTVEncoder2
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Replaced resource strings with constants for Mode names (to comply with requirements in updated Android Studio)

master
Olga Miller 2024-08-14 19:36:46 +02:00
rodzic a7fe39fa73
commit 88823b2787
19 zmienionych plików z 48 dodań i 48 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
app/src/main/java/om/sstvencoder/ModeInterfaces/IModeInfo.java
Wyświetl plik

@ -16,7 +16,7 @@ limitations under the License.
package om.sstvencoder.ModeInterfaces;
public interface IModeInfo {
int getModeName();
String getModeName();
String getModeClassName();

5
app/src/main/java/om/sstvencoder/Modes/Martin1.java
Wyświetl plik

@ -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;

5
app/src/main/java/om/sstvencoder/Modes/Martin2.java
Wyświetl plik

@ -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;

2
app/src/main/java/om/sstvencoder/Modes/ModeDescription.java
Wyświetl plik

@ -23,5 +23,5 @@ import java.lang.annotation.Target;
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@interface ModeDescription {
int name();
String name();
}

2
app/src/main/java/om/sstvencoder/Modes/ModeInfo.java
Wyświetl plik

@ -25,7 +25,7 @@ class ModeInfo implements IModeInfo {
mModeClass = modeClass;
}
public int getModeName() {
public String getModeName() {
return mModeClass.getAnnotation(ModeDescription.class).name();
}

5
app/src/main/java/om/sstvencoder/Modes/PD120.java
Wyświetl plik

@ -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;

5
app/src/main/java/om/sstvencoder/Modes/PD160.java
Wyświetl plik

@ -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;

5
app/src/main/java/om/sstvencoder/Modes/PD180.java
Wyświetl plik

@ -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;

5
app/src/main/java/om/sstvencoder/Modes/PD240.java
Wyświetl plik

@ -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;

5
app/src/main/java/om/sstvencoder/Modes/PD290.java
Wyświetl plik

@ -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;

5
app/src/main/java/om/sstvencoder/Modes/PD50.java
Wyświetl plik

@ -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;

5
app/src/main/java/om/sstvencoder/Modes/PD90.java
Wyświetl plik

@ -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;

5
app/src/main/java/om/sstvencoder/Modes/Robot36.java
Wyświetl plik

@ -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;

5
app/src/main/java/om/sstvencoder/Modes/Robot72.java
Wyświetl plik

@ -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;

5
app/src/main/java/om/sstvencoder/Modes/Scottie1.java
Wyświetl plik

@ -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;

5
app/src/main/java/om/sstvencoder/Modes/Scottie2.java
Wyświetl plik

@ -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;

5
app/src/main/java/om/sstvencoder/Modes/ScottieDX.java
Wyświetl plik

@ -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;

5
app/src/main/java/om/sstvencoder/Modes/Wraase.java
Wyświetl plik

@ -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;

15
app/src/main/res/values/strings.xml
Wyświetl plik

@ -11,21 +11,6 @@
<string name="action_reset">Reset</string>
<string name="action_done">Done</string>
<string name="action_modes">Modes</string>
<string name="action_martin1" translatable="false">Martin 1</string>
<string name="action_martin2" translatable="false">Martin 2</string>
<string name="action_pd50" translatable="false">PD 50</string>
<string name="action_pd90" translatable="false">PD 90</string>
<string name="action_pd120" translatable="false">PD 120</string>
<string name="action_pd160" translatable="false">PD 160</string>
<string name="action_pd180" translatable="false">PD 180</string>
<string name="action_pd240" translatable="false">PD 240</string>
<string name="action_pd290" translatable="false">PD 290</string>
<string name="action_scottie1" translatable="false">Scottie 1</string>
<string name="action_scottie2" translatable="false">Scottie 2</string>
<string name="action_scottie_dx" translatable="false">Scottie DX</string>
<string name="action_robot36" translatable="false">Robot 36</string>
<string name="action_robot72" translatable="false">Robot 72</string>
<string name="action_wraaseSC2_180" translatable="false">Wraase SC2 180</string>
<string name="action_privacy_policy">Privacy Policy</string>
<string name="action_about">About SSTV Encoder</string>
<string name="action_about_text">