README.md

@@ -1,62 +1,60 @@
 ![Icon](app/src/main/res/mipmap-xhdpi/ic_launcher.png)
 # SSTV Encoder 2
 
-Image encoder for Slow-Scan Television (SSTV) audio signals
+This app sends images via Slow-Scan Television (SSTV).
 
-### Modes
+### Supported Modes
 
-Supported SSTV modes:
+**Martin Modes:**  Martin 1, Martin 2  
-* **Martin Modes**:  Martin 1, Martin 2  
+**PD Modes:**      PD 50, PD 90, PD 120, PD 160, PD 180, PD 240, PD 290  
-* **PD Modes**:      PD 50, PD 90, PD 120, PD 160, PD 180, PD 240, PD 290   
+**Scottie Modes:** Scottie 1, Scottie 2, Scottie DX  
-* **Robot Modes**:   Robot 36 Color, Robot 72 Color  
+**Robot Modes:**   Robot 36 Color, Robot 72 Color  
-* **Scottie Modes**: Scottie 1, Scottie 2, Scottie DX 
+**Wraase Modes:**  Wraase SC2 180
-* **Wraase Modes**:  Wraase SC2 180
 
 The mode specifications are taken from the Dayton Paper, JL Barber, "Proposal for SSTV Mode Specifications", 2000:  
 http://www.barberdsp.com/downloads/Dayton%20Paper.pdf
 
 ### Image
 
-To load an image:
+Tap "Take Picture" or "Pick Picture" menu button or  
-* tap **"Take Picture"** or **"Pick Picture"** menu button, or  
+use the Share option of any app like Gallery to load an image.
-* use the **Share** option of an app like e.g. Gallery.
 
 To keep the aspect ratio, black borders will be added if necessary.  
-Original image can be resend using another mode without reloading.  
+Original image can be resend using another mode without reloading.
-After image rotation or mode changing the image will be scaled to that mode's native size.  
+
+After image rotation or mode changing the image  
+will be scaled to that mode's native size.
+
 After closing the app the loaded image will not be stored.
 
 ### Text Overlay
 
-Actions for working with text overlays:
+Single tap **to add** a text overlay.  
-* Single tap **to add** a text overlay.  
+Single tap on text overlay **to edit** it.  
-* Single tap on text overlay **to edit** it.  
+Long press **to move** text overlay.  
-* Long press **to move** text overlay.  
+Remove the text **to remove** a text overlay.
-* Remove the text **to remove** a text overlay.
 
-After closing the app all text overlays will be stored and reloaded when restarting.
+After closing the app all text overlays  
+will be stored and reloaded when restarting.
 
 ### Menu
 
-Available menu options:
+* **"Play"** - Sends the image.
-* **"Play"**: Sends the image
+* **"Stop"** - Stops the current sending and empties the queue.
-* **"Stop"**: Stops the current sending and empties the queue
+* **"Pick Picture"** - Opens an image viewer app to select a picture.
-* **"Pick Picture"**: Opens an image viewer app to select a picture
+* **"Take Picture"** - Starts a camera app to take a picture.
-* **"Take Picture"**: Starts a camera app to take a picture
+* **"Save as WAVE File"** - Creates a wave file in the Music folder in SSTV Encoder album.
-* **"Save as WAVE File"**: Creates a wave file in the Music folder in SSTV Encoder album
+* **"Rotate Image"** - Rotates the image by 90 degrees.
-* **"Transform Image"**:
+* **"Modes"** - Lists all supported modes.
-  * **"Rotate"**: Rotates the image by 90 degrees
-  * **"Reset"**: Resets image rotation and scaling
-* **"Modes"**: Lists all supported modes
 
 ### Installation
 
 The working app "SSTV Encoder" can be installed 
 
-on Google Play:  
+on Google Play:
 https://play.google.com/store/apps/details?id=om.sstvencoder
 
-or on F-Droid:  
+or on F-Droid:
 https://f-droid.org/packages/om.sstvencoder/
 
 # SSTV Image Decoder
@@ -68,8 +66,8 @@ https://github.com/xdsopl/robot36/tree/android
 
 The working app "Robot36 - SSTV Image Decoder" can be installed
 
-on Google Play:  
+on Google Play:
 https://play.google.com/store/apps/details?id=xdsopl.robot36
 
-or on F-Droid:  
+or on F-Droid:
 https://f-droid.org/packages/xdsopl.robot36/

app/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk 35
+    compileSdkVersion 33
     defaultConfig {
         applicationId "om.sstvencoder"
-        minSdk 21
+        minSdkVersion 21
-        targetSdk 35
+        targetSdkVersion 33
-        versionCode 34
+        versionCode 30
-        versionName "2.13"
+        versionName "2.9"
     }
     buildTypes {
         release {
@@ -15,14 +15,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    namespace 'om.sstvencoder'
-    buildFeatures {
-        buildConfig true
-    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation "androidx.exifinterface:exifinterface:1.3.7"
+    implementation "androidx.exifinterface:exifinterface:1.3.6"
 }

app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="om.sstvencoder">
 
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
@@ -19,11 +20,6 @@
             <action android:name="android.intent.action.PICK" />
             <data android:mimeType="image/*"/>
         </intent>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <category android:name="android.intent.category.BROWSABLE" />
-            <data android:scheme="https" />
-        </intent>
     </queries>
     <application
         android:requestLegacyExternalStorage="true"

app/src/main/java/om/sstvencoder/EditTextActivity.java

@@ -18,12 +18,10 @@ package om.sstvencoder;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
-
 import androidx.annotation.ColorInt;
 import androidx.fragment.app.DialogFragment;
 import androidx.core.content.ContextCompat;
 import androidx.appcompat.app.AppCompatActivity;
-
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -54,6 +52,8 @@ public class EditTextActivity extends AppCompatActivity
     public static final String EXTRA = "EDIT_TEXT_EXTRA";
     private Label mLabel;
     private EditColorMode mEditColor;
+    private FontFamilySet mFontFamilySet;
+    private FontFamilySet.FontFamily mSelectedFontFamily;
     private List<String> mFontFamilyNameList;
     private CheckBox mEditItalic, mEditBold, mEditOutline;
     private int mClearTextButtonWidth;
@@ -77,6 +77,7 @@ public class EditTextActivity extends AppCompatActivity
         mEditBold.setChecked(mLabel.getBold());
         mEditItalic.setChecked(mLabel.getItalic());
         initFontFamilySpinner(mLabel.getFamilyName());
+        updateBoldAndItalic();
         mEditOutline.setChecked(mLabel.getOutline());
         initOutlineSizeSpinner(mLabel.getOutlineSize());
         findViewById(R.id.edit_color).setBackgroundColor(mLabel.getForeColor());
@@ -147,22 +148,18 @@ public class EditTextActivity extends AppCompatActivity
     private void initFontFamilySpinner(String familyName) {
         Spinner spinner = findViewById(R.id.edit_font_family);
         spinner.setOnItemSelectedListener(this);
-        mFontFamilyNameList = Utility.getSystemFontFamilyList();
+        mFontFamilySet = new FontFamilySet();
+        mSelectedFontFamily = mFontFamilySet.getFontFamily(familyName);
+        mFontFamilyNameList = mFontFamilySet.getFontFamilyDisplayNameList();
         spinner.setAdapter(new ArrayAdapter<>(this,
                 android.R.layout.simple_spinner_dropdown_item, mFontFamilyNameList));
-        spinner.setSelection(mFontFamilyNameList.indexOf(familyName));
+        spinner.setSelection(mFontFamilyNameList.indexOf(mSelectedFontFamily.displayName));
     }
 
     private void initTextSizeSpinner(float textSize) {
         Spinner spinner = findViewById(R.id.edit_text_size);
         spinner.setOnItemSelectedListener(this);
-        String[] sizeList = new String[]
+        String[] sizeList = new String[]{"Small", "Normal", "Large", "Huge"};
-                {
-                        getString(R.string.font_size_small),
-                        getString(R.string.font_size_normal),
-                        getString(R.string.font_size_large),
-                        getString(R.string.font_size_huge)
-                };
         spinner.setAdapter(new ArrayAdapter<>(this,
                 android.R.layout.simple_spinner_dropdown_item, sizeList));
         spinner.setSelection(textSizeToPosition(textSize));
@@ -171,12 +168,7 @@ public class EditTextActivity extends AppCompatActivity
     private void initOutlineSizeSpinner(float outlineSize) {
         Spinner spinner = findViewById(R.id.edit_outline_size);
         spinner.setOnItemSelectedListener(this);
-        String[] sizeList = new String[]
+        String[] sizeList = new String[]{"Thin", "Normal", "Thick"};
-                {
-                        getString(R.string.outline_size_thin),
-                        getString(R.string.outline_size_normal),
-                        getString(R.string.outline_size_thick)
-                };
         spinner.setAdapter(new ArrayAdapter<>(this,
                 android.R.layout.simple_spinner_dropdown_item, sizeList));
         spinner.setSelection(outlineSizeToPosition(outlineSize));
@@ -216,7 +208,28 @@ public class EditTextActivity extends AppCompatActivity
             mLabel.setOutlineSize(positionToOutlineSize(position));
         }
         else if (parentId == R.id.edit_font_family) {
-            mLabel.setFamilyName(mFontFamilyNameList.get(position));
+            String displayName = mFontFamilyNameList.get(position);
+            mSelectedFontFamily = mFontFamilySet.getFontFamilyFromDisplayName(displayName);
+            mLabel.setFamilyName(mSelectedFontFamily.name);
+            updateBoldAndItalic();
+        }
+    }
+
+    private void updateBoldAndItalic() {
+        boolean bold = mSelectedFontFamily.bold;
+        mEditBold.setEnabled(bold);
+        findViewById(R.id.text_bold).setEnabled(bold);
+        if (!mEditBold.isEnabled()) {
+            mEditBold.setChecked(false);
+            mLabel.setBold(false);
+        }
+
+        boolean italic = mSelectedFontFamily.italic;
+        mEditItalic.setEnabled(italic);
+        findViewById(R.id.text_italic).setEnabled(italic);
+        if (!mEditItalic.isEnabled()) {
+            mEditItalic.setChecked(false);
+            mLabel.setItalic(false);
         }
     }
 

app/src/main/java/om/sstvencoder/Encoder.java

@@ -66,8 +66,7 @@ class Encoder {
                         mode = mQueue.remove(0);
                     }
                     mode.init();
-                    mProgressBar.begin(mode.getProcessCount(),
+                    mProgressBar.begin(mode.getProcessCount(), "Sending...");
-                            mMessenger.getString(R.string.progressbar_message_sending));
 
                     while (mode.process()) {
                         mProgressBar.step();
@@ -123,8 +122,7 @@ class Encoder {
             @Override
             public void run() {
                 mode.init();
-                mProgressBar2.begin(mode.getProcessCount(),
+                mProgressBar2.begin(mode.getProcessCount(), context.getFileName() + " saving...");
-                        mMessenger.getString(R.string.progressbar_message_saving_to_file, context.getFileName()));
 
                 while (mode.process()) {
                     mProgressBar2.step();

app/src/main/java/om/sstvencoder/FontFamilySet.java

@@ -16,8 +16,6 @@ limitations under the License.
 package om.sstvencoder;
 
 import androidx.annotation.NonNull;
-
-import android.content.Context;
 import android.util.Xml;
 
 import org.xmlpull.v1.XmlPullParser;
@@ -39,10 +37,8 @@ class FontFamilySet {
     }
 
     private final List<FontFamily> mFamilySet;
-    private final Context mContext;
 
-    FontFamilySet(Context context) {
+    FontFamilySet() {
-        mContext = context;
         mFamilySet = new ArrayList<>();
         fillWithSystemFonts(mFamilySet);
         if (mFamilySet.size() == 0)
@@ -53,7 +49,7 @@ class FontFamilySet {
     private FontFamily getDefaultFontFamily() {
         FontFamily defaultFontFamily = new FontFamily();
         defaultFontFamily.name = null;
-        defaultFontFamily.displayName = mContext.getString(R.string.font_default);
+        defaultFontFamily.displayName = "Default";
         defaultFontFamily.bold = true;
         defaultFontFamily.italic = true;
         return defaultFontFamily;

app/src/main/java/om/sstvencoder/MainActivity.java

@@ -336,7 +336,7 @@ public class MainActivity extends AppCompatActivity {
             mCropView.resetImage();
         }
         else if (id == R.id.action_privacy_policy) {
-            openLinkInBrowser("https://sites.google.com/view/olgamiller/sstvencoder/privacypolicy/");
+            showTextPage(getString(R.string.action_privacy_policy), getString(R.string.action_privacy_policy_text));
         }
         else if (id == R.id.action_about) {
             showTextPage(getString(R.string.action_about), getString(R.string.action_about_text, BuildConfig.VERSION_NAME));
@@ -348,16 +348,6 @@ public class MainActivity extends AppCompatActivity {
         return true;
     }
 
-    private void openLinkInBrowser(String link) {
-        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(link));
-        if (intent.resolveActivity(getPackageManager()) != null) {
-            startActivity(intent);
-        }
-        else {
-            showErrorMessage(getString(R.string.another_activity_start_err), link, "");
-        }
-    }
-
     private void showTextPage(String title, String message) {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setTitle(title);

app/src/main/java/om/sstvencoder/MainActivityMessenger.java

@@ -36,8 +36,4 @@ class MainActivityMessenger {
             }
         });
     }
-
-    public String getString(int resId, Object... formatArgs) {
-        return mMainActivity.getString(resId, formatArgs);
-    }
 }

app/src/main/java/om/sstvencoder/ModeInterfaces/IModeInfo.java

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

app/src/main/java/om/sstvencoder/Modes/Martin1.java

@@ -19,12 +19,11 @@ 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 = Martin1.Name)
+@ModeDescription(name = R.string.action_martin1)
 class Martin1 extends Martin {
-    public static final String Name = "Martin 1";
-
     Martin1(Bitmap bitmap, IOutput output) {
         super(bitmap, output);
         mVISCode = 44;

app/src/main/java/om/sstvencoder/Modes/Martin2.java

@@ -19,12 +19,11 @@ 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 = Martin2.Name)
+@ModeDescription(name = R.string.action_martin2)
 class Martin2 extends Martin {
-    public static final String Name = "Martin 2";
-
     Martin2(Bitmap bitmap, IOutput output) {
         super(bitmap, output);
         mVISCode = 40;

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 {
-    String name();
+    int name();
 }

app/src/main/java/om/sstvencoder/Modes/ModeInfo.java

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

app/src/main/java/om/sstvencoder/Modes/PD120.java

@@ -19,12 +19,11 @@ 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 = PD120.Name)
+@ModeDescription(name = R.string.action_pd120)
 class PD120 extends PD {
-    public static final String Name = "PD 120";
-
     PD120(Bitmap bitmap, IOutput output) {
         super(bitmap, output);
         mVISCode = 95;

app/src/main/java/om/sstvencoder/Modes/PD160.java

@@ -19,12 +19,11 @@ 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 = PD160.Name)
+@ModeDescription(name = R.string.action_pd160)
 class PD160 extends PD {
-    public static final String Name = "PD 160";
-
     PD160(Bitmap bitmap, IOutput output) {
         super(bitmap, output);
         mVISCode = 98;

app/src/main/java/om/sstvencoder/Modes/PD180.java

@@ -19,12 +19,11 @@ 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 = PD180.Name)
+@ModeDescription(name = R.string.action_pd180)
 class PD180 extends PD {
-    public static final String Name = "PD 180";
-
     PD180(Bitmap bitmap, IOutput output) {
         super(bitmap, output);
         mVISCode = 96;

app/src/main/java/om/sstvencoder/Modes/PD240.java

@@ -19,12 +19,11 @@ 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 = PD240.Name)
+@ModeDescription(name = R.string.action_pd240)
 class PD240 extends PD {
-    public static final String Name = "PD 240";
-
     PD240(Bitmap bitmap, IOutput output) {
         super(bitmap, output);
         mVISCode = 97;

app/src/main/java/om/sstvencoder/Modes/PD290.java

@@ -19,12 +19,11 @@ 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 = PD290.Name)
+@ModeDescription(name = R.string.action_pd290)
 class PD290 extends PD {
-    public static final String Name = "PD 290";
-
     PD290(Bitmap bitmap, IOutput output) {
         super(bitmap, output);
         mVISCode = 94;

app/src/main/java/om/sstvencoder/Modes/PD50.java

@@ -19,12 +19,11 @@ 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 = PD50.Name)
+@ModeDescription(name = R.string.action_pd50)
 class PD50 extends PD {
-    public static final String Name = "PD 50";
-
     PD50(Bitmap bitmap, IOutput output) {
         super(bitmap, output);
         mVISCode = 93;

app/src/main/java/om/sstvencoder/Modes/PD90.java

@@ -19,12 +19,11 @@ 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 = PD90.Name)
+@ModeDescription(name = R.string.action_pd90)
 class PD90 extends PD {
-    public static final String Name = "PD 90";
-
     PD90(Bitmap bitmap, IOutput output) {
         super(bitmap, output);
         mVISCode = 99;

app/src/main/java/om/sstvencoder/Modes/Robot36.java

@@ -22,12 +22,11 @@ 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 = Robot36.Name)
+@ModeDescription(name = R.string.action_robot36)
 class Robot36 extends Mode {
-    public static final String Name = "Robot 36";
-
     private final Yuv mYuv;
 
     private final int mLumaScanSamples;

app/src/main/java/om/sstvencoder/Modes/Robot72.java

@@ -22,12 +22,11 @@ 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 = Robot72.Name)
+@ModeDescription(name = R.string.action_robot72)
 class Robot72 extends Mode {
-    public static final String Name = "Robot 72";
-
     private final Yuv mYuv;
 
     private final int mLumaScanSamples;

app/src/main/java/om/sstvencoder/Modes/Scottie1.java

@@ -19,12 +19,11 @@ 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 = Scottie1.Name)
+@ModeDescription(name = R.string.action_scottie1)
 class Scottie1 extends Scottie {
-    public static final String Name = "Scottie 1";
-
     Scottie1(Bitmap bitmap, IOutput output) {
         super(bitmap, output);
         mVISCode = 60;

app/src/main/java/om/sstvencoder/Modes/Scottie2.java

@@ -19,12 +19,11 @@ 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 = Scottie2.Name)
+@ModeDescription(name = R.string.action_scottie2)
 class Scottie2 extends Scottie {
-    public static final String Name = "Scottie 2";
-
     Scottie2(Bitmap bitmap, IOutput output){
         super(bitmap, output);
         mVISCode = 56;

app/src/main/java/om/sstvencoder/Modes/ScottieDX.java

@@ -19,12 +19,11 @@ 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 = ScottieDX.Name)
+@ModeDescription(name = R.string.action_scottie_dx)
 class ScottieDX extends Scottie {
-    public static final String Name = "Scottie DX";
-
     ScottieDX(Bitmap bitmap, IOutput output) {
         super(bitmap, output);
         mVISCode = 76;

app/src/main/java/om/sstvencoder/Modes/Wraase.java

@@ -20,12 +20,11 @@ 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 = Wraase.Name)
+@ModeDescription(name = R.string.action_wraaseSC2_180)
 class Wraase extends Mode {
-    public static final String Name = "Wraase SC2 180";
-
     private final int mSyncPulseSamples;
     private final double mSyncPulseFrequency;
 

app/src/main/java/om/sstvencoder/TextOverlay/LabelPainter.java

@@ -22,9 +22,7 @@ import android.graphics.Path;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Typeface;
-
 import androidx.annotation.NonNull;
-import om.sstvencoder.Utility;
 
 class LabelPainter {
     private interface IDrawer {
@@ -132,10 +130,7 @@ class LabelPainter {
 
         private void setPaintSettings(float sizeFactor) {
             mPaint.setAlpha(255);
-            try {
+            mPaint.setTypeface(Typeface.create(mLabel.getFamilyName(), getTypeface()));
-                mPaint.setTypeface(createTypeface());
-            } catch (Exception ignore) {
-            }
             setTextPaintSettings();
             setSizePaintSettings(sizeFactor);
         }
@@ -156,22 +151,18 @@ class LabelPainter {
             mPaint.setStrokeWidth(mLabel.getOutlineSize() * textSize);
         }
 
-        private Typeface createTypeface() {
+        private int getTypeface() {
-            int style = Typeface.NORMAL;
+            int typeface = Typeface.NORMAL;
 
             if (mLabel.getBold() && mLabel.getItalic())
-                style = Typeface.BOLD_ITALIC;
+                typeface = Typeface.BOLD_ITALIC;
             else {
                 if (mLabel.getBold())
-                    style = Typeface.BOLD;
+                    typeface = Typeface.BOLD;
                 else if (mLabel.getItalic())
-                    style = Typeface.ITALIC;
+                    typeface = Typeface.ITALIC;
             }
-
+            return typeface;
-            String fontFilePath = Utility.getFontFilePath(mLabel.getFamilyName(), style);
-            Typeface family = Typeface.createFromFile(fontFilePath);
-
-            return Typeface.create(family, style);
         }
     }
 

app/src/main/java/om/sstvencoder/Utility.java

@@ -18,10 +18,7 @@ package om.sstvencoder;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Rect;
-
 import androidx.exifinterface.media.ExifInterface;
-
-import android.graphics.Typeface;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
@@ -31,15 +28,10 @@ import androidx.core.content.FileProvider;
 
 import java.io.File;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 import java.util.Locale;
 
-public final class Utility {
+final class Utility {
-    private static final String DIRECTORY_SYSTEM_FONTS = "/system/fonts";
-    private static final String DEFAULT_FONT_FAMILY = "Default";
-
     @NonNull
     static Rect getEmbeddedRect(int w, int h, int iw, int ih) {
         Rect rect;
@@ -121,94 +113,4 @@ public final class Utility {
         String state = Environment.getExternalStorageState();
         return Environment.MEDIA_MOUNTED.equals(state);
     }
-
-    static List<String> getSystemFontFamilyList() {
-        List<String> fontFamilyNameList = new ArrayList<>();
-        File fontsDir = new File(DIRECTORY_SYSTEM_FONTS);
-
-        if (fontsDir.exists() && fontsDir.isDirectory()) {
-            File[] files = fontsDir.listFiles();
-            if (files != null) {
-                for (File file : files) {
-                    String fileName = file.getName();
-                    if (file.isFile() && isSupportedFontFileFormat(fileName)) {
-                        String fontFamilyName = getFontFamilyName(fileName);
-                        if (!fontFamilyNameList.contains(fontFamilyName))
-                            fontFamilyNameList.add(fontFamilyName);
-                    }
-                }
-            }
-        }
-
-        fontFamilyNameList.add(0, Utility.DEFAULT_FONT_FAMILY);
-        return fontFamilyNameList;
-    }
-
-    private static boolean isSupportedFontFileFormat(String fileName) {
-        return fileName.endsWith(".ttf") || fileName.endsWith(".otf");
-    }
-
-    private static String getFontFamilyName(String fileName) {
-        String fontFamilyName = fileName;
-        int lastIndex = fileName.length() - 1;
-
-        int charIndex = fileName.indexOf('-');
-        if (0 < charIndex && charIndex < lastIndex) {
-            fontFamilyName = fileName.substring(0, charIndex);
-        } else {
-            charIndex = fileName.lastIndexOf('.');
-            if (0 < charIndex && charIndex < lastIndex) {
-                fontFamilyName = fileName.substring(0, charIndex);
-            }
-        }
-        return fontFamilyName;
-    }
-
-    public static String getFontFilePath(String fontFamilyName, int style) {
-        List<String> fontFamilyFilePathList = getFontFamilyFilePathList(fontFamilyName);
-        String fontFilePath = fontFamilyFilePathList.get(0);
-
-        String styleString = getFontFileStyleString(style);
-        if (!styleString.isEmpty()) {
-            for (String path : fontFamilyFilePathList) {
-                if (path.contains(styleString)) {
-                    fontFilePath = path;
-                    break;
-                }
-            }
-        }
-        return fontFilePath;
-    }
-
-    private static List<String> getFontFamilyFilePathList(String fontFamilyName) {
-        List<String> fontFamilyFilePathList = new ArrayList<>();
-        File fontsDir = new File(DIRECTORY_SYSTEM_FONTS);
-
-        if (fontsDir.exists() && fontsDir.isDirectory()) {
-            File[] files = fontsDir.listFiles();
-            if (files != null) {
-                for (File file : files) {
-                    if (file.isFile()) {
-                        String path = file.getAbsolutePath();
-                        if (path.contains(fontFamilyName)) {
-                            fontFamilyFilePathList.add(path);
-                        }
-                    }
-                }
-            }
-        }
-        return fontFamilyFilePathList;
-    }
-
-    private static String getFontFileStyleString(int style) {
-        if (style == Typeface.NORMAL)
-            return "-Regular";
-        if (style == Typeface.BOLD_ITALIC)
-            return "-BoldItalic";
-        if (style == Typeface.BOLD)
-            return "-Bold";
-        if (style == Typeface.ITALIC)
-            return "-Italic";
-        return "";
-    }
 }

app/src/main/res/layout/activity_edit_text.xml

@@ -91,7 +91,7 @@
 
             <TextView
                 android:id="@+id/text_outline_size"
-                android:text="@string/outline_size" />
+                android:text="@string/size"/>
 
             <Spinner
                 android:id="@+id/edit_outline_size"
@@ -126,7 +126,7 @@
 
             <TextView
                 android:id="@+id/text_outline_color"
-                android:text="@string/outline_color" />
+                android:text="@string/color"/>
 
             <LinearLayout
                 android:clickable="true"

app/src/main/res/values-v35/styles.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<style name="AppTheme" parent="Base.Theme.AppCompat">
-		<item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
-	</style>
-</resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="action_pick_picture">选择照片</string>
-    <string name="action_take_picture">拍摄照片</string>
-    <string name="action_save_wave">保存为波形(.wav)文件</string>
-    <string name="action_stop">停止</string>
-    <string name="action_play">播放</string>
-    <string name="action_transform">更改图片</string>
-    <string name="action_rotate">旋转</string>
-    <string name="action_reset">重置</string>
-    <string name="action_done">完成</string>
-    <string name="action_modes">编码模式</string>
-    <string name="action_privacy_policy">隐私政策</string>
-    <string name="action_about">关于SSTV Encoder</string>
-    <string name="action_about_text">"\n        SSTV Encoder %1$s\n版权所有 2017 Olga Miller\n        \n\nSSTV Encoder通过慢扫描电视/Slow Scan Television (SSTV)发送图片.\n        \n\n要获取详细信息，请参阅本软件源码: \nhttps://github.com/olgamiller/SSTVEncoder2\n        \n\nDISCLAIMER:\nTHE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.\n    "</string>
-    <string name="load_img_err_title">加载图像时出错</string>
-    <string name="load_img_orientation_err_title">定位图像时出错</string>
-    <string name="load_img_err_txt_unsupported">不受支持的内容</string>
-    <string name="message_prev_img_not_loaded">先前所使用的图像未能被加载</string>
-    <string name="message_no_camera">这个设备没有摄像头</string>
-    <string name="progressbar_message_sending">发送…</string>
-    <string name="progressbar_message_saving_to_file">%1$s 另存为文件…</string>
-    <string name="another_activity_resolve_err">未能解析另一个活动</string>
-    <string name="another_activity_start_err">另一个活动未能被启动</string>
-    <string name="btn_send_email">发送邮件</string>
-    <string name="btn_ok">好的</string>
-    <string name="email_subject">SSTV Encoder - BUG反馈</string>
-    <string name="chooser_title">发送BUG反馈</string>
-    <string name="bold">粗体</string>
-    <string name="italic">斜体</string>
-    <string name="outline">描边</string>
-    <string name="color">颜色</string>
-    <string name="outline_color">描边颜色</string>
-    <string name="size">大小</string>
-    <string name="font">字体</string>
-    <string name="font_default">默认字体</string>
-    <string name="text">文本</string>
-    <string name="font_size_small">小</string>
-    <string name="font_size_normal">常规</string>
-    <string name="font_size_large">大</string>
-    <string name="font_size_huge">很大</string>
-    <string name="outline_size">描边大小</string>
-    <string name="outline_size_thin">细</string>
-    <string name="outline_size_normal">常规</string>
-    <string name="outline_size_thick">粗</string>
-</resources>

app/src/main/res/values/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name" translatable="false">SSTV Encoder</string>
+    <string name="app_name">SSTV Encoder</string>
     <string name="action_pick_picture">Pick Picture</string>
     <string name="action_take_picture">Take Picture</string>
     <string name="action_save_wave">Save as WAVE File</string>
@@ -11,7 +11,30 @@
     <string name="action_reset">Reset</string>
     <string name="action_done">Done</string>
     <string name="action_modes">Modes</string>
+    <string name="action_martin1">Martin 1</string>
+    <string name="action_martin2">Martin 2</string>
+    <string name="action_pd50">PD 50</string>
+    <string name="action_pd90">PD 90</string>
+    <string name="action_pd120">PD 120</string>
+    <string name="action_pd160">PD 160</string>
+    <string name="action_pd180">PD 180</string>
+    <string name="action_pd240">PD 240</string>
+    <string name="action_pd290">PD 290</string>
+    <string name="action_scottie1">Scottie 1</string>
+    <string name="action_scottie2">Scottie 2</string>
+    <string name="action_scottie_dx">Scottie DX</string>
+    <string name="action_robot36">Robot 36</string>
+    <string name="action_robot72">Robot 72</string>
+    <string name="action_wraaseSC2_180">Wraase SC2 180</string>
     <string name="action_privacy_policy">Privacy Policy</string>
+    <string name="action_privacy_policy_text">
+        SSTV Encoder converts images to audio.
+        \n\nTo convert the image, it will be loaded into temporary memory.
+        \n\nThe loaded image can be scaled and rotated. Neither the modified image nor the modifications will be stored. The link to the last loaded image will be stored in the app settings locally.
+        \n\nA text overlay can be added. It will be stored in the app settings locally.
+        \n\nThe modified image with text overlays will be encoded to audio using the selected mode. The selected mode will be stored in the app settings locally.
+        \n\nThe resulting audio can either be played back by pressing the play button or saved locally on the device by pressing the save button.
+    </string>
     <string name="action_about">About SSTV Encoder</string>
     <string name="action_about_text">
         SSTV Encoder %1$s\nCopyright 2017 Olga Miller
@@ -24,8 +47,6 @@
     <string name="load_img_err_txt_unsupported">Unsupported content.</string>
     <string name="message_prev_img_not_loaded">Previous image could not be loaded.</string>
     <string name="message_no_camera">Device has no camera.</string>
-    <string name="progressbar_message_sending">Sending…</string>
-    <string name="progressbar_message_saving_to_file">%1$s saving…</string>
     <string name="another_activity_resolve_err">Another activity could not be resolved.</string>
     <string name="another_activity_start_err">Another activity could not be started.</string>
     <string name="btn_send_email">Send Email</string>
@@ -36,17 +57,8 @@
     <string name="italic">Italic</string>
     <string name="outline">Outline</string>
     <string name="color">Color</string>
-    <string name="outline_color">Color</string>
+    <string name="outline_color">Outline Color</string>
     <string name="size">Size</string>
     <string name="font">Font</string>
-    <string name="font_default">Default</string>
     <string name="text">Text</string>
-    <string name="font_size_small">Small</string>
-    <string name="font_size_normal">Normal</string>
-    <string name="font_size_large">Large</string>
-    <string name="font_size_huge">Huge</string>
-    <string name="outline_size">Size</string>
-    <string name="outline_size_thin">Thin</string>
-    <string name="outline_size_normal">Normal</string>
-    <string name="outline_size_thick">Thick</string>
 </resources>

build.gradle

@@ -4,24 +4,17 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.3'
+        classpath 'com.android.tools.build:gradle:7.3.1'
     }
 }
 
 allprojects {
-    configurations.configureEach {
-        resolutionStrategy.eachDependency { details ->
-            if (details.requested.group == 'org.jetbrains.kotlin') {
-                details.useVersion "1.8.22"
-            }
-        }
-    }
     repositories {
         google()
         mavenCentral()
     }
 }
 
-tasks.register('clean', Delete) {
+task clean(type: Delete) {
-    delete rootProject.layout.buildDirectory.get().asFile
+    delete rootProject.buildDir
 }

fastlane/metadata/android/en-US/full_description.txt

@@ -1,53 +1,68 @@
 
-<h3>Modes</h3>
+<h3>Supported Modes</h3>
 
-Supported SSTV modes:
 <ul>
-    <li><b>Martin Modes</b>: Martin 1, Martin 2</li>
+    <li><b>Martin Modes:</b> Martin 1, Martin 2</li>
-    <li><b>PD Modes</b>: PD 50, PD 90, PD 120, PD 160, PD 180, PD 240, PD 290</li>
+    <li><b>PD Modes:</b> PD 50, PD 90, PD 120, PD 160, PD 180, PD 240, PD 290</li>
-    <li><b>Robot Modes</b>: Robot 36 Color, Robot 72 Color</li>
+    <li><b>Scottie Modes:</b> Scottie 1, Scottie 2, Scottie DX</li>
-    <li><b>Scottie Modes</b>: Scottie 1, Scottie 2, Scottie DX</li>
+    <li><b>Robot Modes:</b> Robot 36 Color, Robot 72 Color</li>
-    <li><b>Wraase Modes</b>: Wraase SC2 180</li>
+    <li><b>Wraase Modes:</b> Wraase SC2 180</li>
 </ul>
-The mode specifications are taken from the Dayton Paper, JL Barber, "Proposal for SSTV Mode Specifications", 2000:<br>
+
-<a href='http://www.barberdsp.com/downloads/Dayton%20Paper.pdf'>http://www.barberdsp.com/downloads/Dayton%20Paper.pdf</a>
+<p>
+    The mode specifications are taken from the Dayton Paper, JL Barber, "Proposal for SSTV Mode
+    Specifications", 2000:
+    <br>
+    <a href='http://www.barberdsp.com/downloads/Dayton%20Paper.pdf'>http://www.barberdsp.com/downloads/Dayton%20Paper.pdf</a>
+</p>
 
 <h3>Image</h3>
 
-To load an image:
+<p>
-<ul>
+    Tap "Take Picture" or "Pick Picture" menu button or
-    <li>tap <b>"Take Picture"</b> or <b>"Pick Picture"</b> menu button, or
+    <br>
-    <li>use the <b>Share</b> option of an app like e.g. Gallery.
+    use the Share option of any app like Gallery to load an image.
-</ul>
+    <br>
-To keep the aspect ratio, black borders will be added if necessary.<br>
+    <br>
-Original image can be resend using another mode without reloading.<br>
+    To keep the aspect ratio, black borders will be added if necessary.
-After image rotation or mode changing the image will be scaled to that mode's native size.<br>
+    <br>
-After closing the app the loaded image will not be stored.
+    Original image can be resend using another mode without reloading.
+    <br>
+    <br>
+    After image rotation or mode changing the image
+    <br>
+    will be scaled to that mode's native size.
+    <br>
+    <br>
+    After closing the app the loaded image will not be stored.
+</p>
 
 <h3>Text Overlay</h3>
 
-Actions for working with text overlays:
+<p>
-<ul>
+    Single tap <b>to add</b> a text overlay.
-    <li>Single tap <b>to add</b> a text overlay.</li>
+    <br>
-    <li>Single tap on text overlay <b>to edit</b> it.</li>
+    Single tap on text overlay <b>to edit</b> it.
-    <li>Long press <b>to move</b> text overlay.</li>
+    <br>
-    <li>Remove the text <b>to remove</b> a text overlay.</li>
+    Long press <b>to move</b> text overlay.
-</ul>
+    <br>
-After closing the app all text overlays will be stored and reloaded when restarting.
+    Remove the text <b>to remove</b> a text overlay.
+    <br>
+    <br>
+    After closing the app all text overlays
+    <br>
+    will be stored and reloaded when restarting.
+</p>
 
 <h3>Menu</h3>
 
-Available menu options:
 <ul>
-    <li><b>"Play"</b>: Sends the image</li>
+    <li><b>"Play"</b> - Sends the image.</li>
-    <li><b>"Stop"</b>: Stops the current sending and empties the queue</li>
+    <li><b>"Stop"</b> - Stops the current sending and empties the queue.</li>
-    <li><b>"Pick Picture"</b>: Opens an image viewer app to select a picture</li>
+    <li><b>"Pick Picture"</b> - Opens an image viewer app to select a picture.</li>
-    <li><b>"Take Picture"</b>: Starts a camera app to take a picture</li>
+    <li><b>"Take Picture"</b> - Starts a camera app to take a picture.</li>
-    <li><b>"Save as WAVE File"</b>: Creates a wave file in the Music folder in SSTV Encoder album</li>
+    <li><b>"Save as WAVE File"</b> - Creates a wave file in the Music folder in SSTV Encoder album.
-    <li><b>"Transform Image"</b>:</li>
+    </li>
-    <ul>
+    <li><b>"Rotate Image"</b> - Rotates the image by 90 degrees.</li>
-        <li><b>"Rotate"</b>: Rotates the image by 90 degrees</li>
+    <li><b>"Modes"</b> - Lists all supported modes.</li>
-        <li><b>"Reset"</b>: Resets image rotation and scaling</li>
-    </ul>
-    <li><b>"Modes"</b>: Lists all supported modes</li>
 </ul>

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists