olgamiller/SSTVEncoder2
1
0
Fork 0
mirror of https://github.com/olgamiller/SSTVEncoder2.git synced 2026-04-21 06:03:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Renamed "border" to "outline"

Browse source 
Renamed local variables in init*Spinner in EditTextActivity
This commit is contained in:
Olga Miller 2017-03-04 16:02:17 +01:00
parent 7371ada115
commit b5915841fb
6 changed files with 64 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

38
app/src/main/java/om/sstvencoder/TextOverlay/Label.java
View file

@ -21,12 +21,12 @@ import java.io.Serializable;
public class Label implements Serializable {
public static final float TEXT_SIZE_NORMAL = 2f;
public static final float BORDER_SIZE_NORMAL = 0.05f;
public static final float OUTLINE_SIZE_NORMAL = 0.05f;
private String mText;
private float mTextSize, mBorderSize;
private float mTextSize, mOutlineSize;
private String mFamilyName;
private boolean mBold, mItalic, mBorder;
private int mForeColor, mBackColor, mBorderColor;
private boolean mBold, mItalic, mOutline;
private int mForeColor, mBackColor, mOutlineColor;
public Label() {
mText = "";
@ -36,9 +36,9 @@ public class Label implements Serializable {
mItalic = false;
mForeColor = Color.BLACK;
mBackColor = Color.TRANSPARENT;
mBorder = true;
mBorderSize = BORDER_SIZE_NORMAL;
mBorderColor = Color.WHITE;
mOutline = true;
mOutlineSize = OUTLINE_SIZE_NORMAL;
mOutlineColor = Color.WHITE;
}
public String getText() {
@ -99,27 +99,27 @@ public class Label implements Serializable {
mBackColor = color;
}
public boolean getBorder() {
return mBorder;
public boolean getOutline() {
return mOutline;
}
public void setBorder(boolean border) {
mBorder = border;
public void setOutline(boolean outline) {
mOutline = outline;
}
public float getBorderSize() {
return mBorderSize;
public float getOutlineSize() {
return mOutlineSize;
}
public void setBorderSize(float size) {
mBorderSize = size;
public void setOutlineSize(float size) {
mOutlineSize = size;
}
public int getBorderColor() {
return mBorderColor;
public int getOutlineColor() {
return mOutlineColor;
}
public void setBorderColor(int color) {
mBorderColor = color;
public void setOutlineColor(int color) {
mOutlineColor = color;
}
}

12
app/src/main/java/om/sstvencoder/TextOverlay/LabelContainer.java
View file

@ -104,9 +104,9 @@ class LabelContainer {
writer.write("italic", label.getItalic());
writer.write("fore_color", label.getForeColor());
writer.write("back_color", label.getBackColor());
writer.write("border", label.getBorder());
writer.write("border_size", label.getBorderSize());
writer.write("border_color", label.getBorderColor());
writer.write("outline", label.getOutline());
writer.write("outline_size", label.getOutlineSize());
writer.write("outline_color", label.getOutlineColor());
}
private void readLabel(IReader reader, Label label) throws IOException {
@ -117,9 +117,9 @@ class LabelContainer {
label.setItalic(reader.readBoolean());
label.setForeColor(reader.readInt());
label.setBackColor(reader.readInt());
label.setBorder(reader.readBoolean());
label.setBorderSize(reader.readFloat());
label.setBorderColor(reader.readInt());
label.setOutline(reader.readBoolean());
label.setOutlineSize(reader.readFloat());
label.setOutlineColor(reader.readInt());
}
}

6
app/src/main/java/om/sstvencoder/TextOverlay/LabelPainter.java
View file

@ -118,7 +118,7 @@ class LabelPainter {
}
private void drawBorder(Canvas canvas, float x, float y) {
if (mLabel.getBorder()) {
if (mLabel.getOutline()) {
setBorderPaintSettings();
canvas.drawText(mLabel.getText(), x, y, mPaint);
setTextPaintSettings();
@ -134,7 +134,7 @@ class LabelPainter {
private void setBorderPaintSettings() {
mPaint.setStyle(Paint.Style.STROKE);
mPaint.setColor(mLabel.getBorderColor());
mPaint.setColor(mLabel.getOutlineColor());
}
private void setTextPaintSettings() {
@ -145,7 +145,7 @@ class LabelPainter {
private void setSizePaintSettings(float sizeFactor) {
float textSize = mLabel.getTextSize() * sizeFactor;
mPaint.setTextSize(textSize);
mPaint.setStrokeWidth(mLabel.getBorderSize() * textSize);
mPaint.setStrokeWidth(mLabel.getOutlineSize() * textSize);
}
private int getTypeface() {