From 27060910f62304f529ef697ae5be7f017587a5ac Mon Sep 17 00:00:00 2001 From: Olga Miller Date: Mon, 30 Jan 2017 22:11:52 +0100 Subject: [PATCH] Added Version to Label --- app/src/main/java/om/sstvencoder/TextOverlay/Label.java | 5 +++++ .../main/java/om/sstvencoder/TextOverlay/LabelContainer.java | 2 ++ 2 files changed, 7 insertions(+) diff --git a/app/src/main/java/om/sstvencoder/TextOverlay/Label.java b/app/src/main/java/om/sstvencoder/TextOverlay/Label.java index 94410eb..3a7d5cc 100644 --- a/app/src/main/java/om/sstvencoder/TextOverlay/Label.java +++ b/app/src/main/java/om/sstvencoder/TextOverlay/Label.java @@ -20,6 +20,7 @@ import android.graphics.Color; import java.io.Serializable; public class Label implements Serializable { + private final static int mVersion = 1; private String mText; private float mTextSize; private String mFamilyName; @@ -36,6 +37,10 @@ public class Label implements Serializable { mBackColor = Color.TRANSPARENT; } + public int getVersion() { + return mVersion; + } + public String getText() { return mText; } diff --git a/app/src/main/java/om/sstvencoder/TextOverlay/LabelContainer.java b/app/src/main/java/om/sstvencoder/TextOverlay/LabelContainer.java index 26df673..9006293 100644 --- a/app/src/main/java/om/sstvencoder/TextOverlay/LabelContainer.java +++ b/app/src/main/java/om/sstvencoder/TextOverlay/LabelContainer.java @@ -97,6 +97,7 @@ class LabelContainer { } private void writeLabel(IWriter writer, Label label) throws IOException { + writer.write("version", label.getVersion()); writer.write("text", label.getText()); writer.write("text_size", label.getTextSize()); writer.write("family_name", label.getFamilyName()); @@ -107,6 +108,7 @@ class LabelContainer { } private void readLabel(IReader reader, Label label) throws IOException { + reader.readInt(); label.setText(reader.readString()); label.setTextSize(reader.readFloat()); label.setFamilyName(reader.readString());