olgamiller/SSTVEncoder2
1
0
Fork 0
mirror of https://github.com/olgamiller/SSTVEncoder2.git synced 2025-12-06 06:52:01 +01:00
Code Issues Actions Packages Projects Releases 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
Show stats Download patch file Download diff file Expand all files Collapse all files

64
app/src/main/java/om/sstvencoder/EditTextActivity.java
View file

@ -38,11 +38,11 @@ public class EditTextActivity extends AppCompatActivity implements AdapterView.O
public static final String EXTRA = "EDIT_TEXT_EXTRA"; public static final String EXTRA = "EDIT_TEXT_EXTRA";
private EditText mEditText; private EditText mEditText;
private ColorPaletteView mColorPaletteView; private ColorPaletteView mColorPaletteView;
private float mTextSize, mBorderSize; private float mTextSize, mOutlineSize;
private FontFamilySet mFontFamilySet; private FontFamilySet mFontFamilySet;
private FontFamilySet.FontFamily mSelectedFontFamily; private FontFamilySet.FontFamily mSelectedFontFamily;
private List<String> mFontFamilyNameList; private List<String> mFontFamilyNameList;
private CheckBox mEditItalic, mEditBold, mEditBorder; private CheckBox mEditItalic, mEditBold, mEditOutline;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -52,7 +52,7 @@ public class EditTextActivity extends AppCompatActivity implements AdapterView.O
mColorPaletteView = (ColorPaletteView) findViewById(R.id.edit_color); mColorPaletteView = (ColorPaletteView) findViewById(R.id.edit_color);
mEditBold = (CheckBox) findViewById(R.id.edit_bold); mEditBold = (CheckBox) findViewById(R.id.edit_bold);
mEditItalic = (CheckBox) findViewById(R.id.edit_italic); mEditItalic = (CheckBox) findViewById(R.id.edit_italic);
mEditBorder = (CheckBox) findViewById(R.id.edit_border); mEditOutline = (CheckBox) findViewById(R.id.edit_outline);
} }
@Override @Override
@ -66,39 +66,39 @@ public class EditTextActivity extends AppCompatActivity implements AdapterView.O
mColorPaletteView.setColor(label.getForeColor()); mColorPaletteView.setColor(label.getForeColor());
initFontFamilySpinner(label.getFamilyName()); initFontFamilySpinner(label.getFamilyName());
updateBoldAndItalic(); updateBoldAndItalic();
mEditBorder.setChecked(label.getBorder()); mEditOutline.setChecked(label.getOutline());
initBorderSizeSpinner(label.getBorderSize()); initOutlineSizeSpinner(label.getOutlineSize());
} }
private void initFontFamilySpinner(String familyName) { private void initFontFamilySpinner(String familyName) {
Spinner editFontFamily = (Spinner) findViewById(R.id.edit_font_family); Spinner spinner = (Spinner) findViewById(R.id.edit_font_family);
editFontFamily.setOnItemSelectedListener(this); spinner.setOnItemSelectedListener(this);
mFontFamilySet = new FontFamilySet(); mFontFamilySet = new FontFamilySet();
mSelectedFontFamily = mFontFamilySet.getFontFamily(familyName); mSelectedFontFamily = mFontFamilySet.getFontFamily(familyName);
mFontFamilyNameList = mFontFamilySet.getFontFamilyDisplayNameList(); mFontFamilyNameList = mFontFamilySet.getFontFamilyDisplayNameList();
editFontFamily.setAdapter(new ArrayAdapter<>(this, spinner.setAdapter(new ArrayAdapter<>(this,
android.R.layout.simple_spinner_dropdown_item, mFontFamilyNameList)); android.R.layout.simple_spinner_dropdown_item, mFontFamilyNameList));
editFontFamily.setSelection(mFontFamilyNameList.indexOf(mSelectedFontFamily.displayName)); spinner.setSelection(mFontFamilyNameList.indexOf(mSelectedFontFamily.displayName));
} }
private void initTextSizeSpinner(float textSize) { private void initTextSizeSpinner(float textSize) {
mTextSize = textSize; mTextSize = textSize;
Spinner editTextSize = (Spinner) findViewById(R.id.edit_text_size); Spinner spinner = (Spinner) findViewById(R.id.edit_text_size);
editTextSize.setOnItemSelectedListener(this); spinner.setOnItemSelectedListener(this);
String[] textSizeList = new String[]{"Small", "Normal", "Large", "Huge"}; String[] sizeList = new String[]{"Small", "Normal", "Large", "Huge"};
editTextSize.setAdapter(new ArrayAdapter<>(this, spinner.setAdapter(new ArrayAdapter<>(this,
android.R.layout.simple_spinner_dropdown_item, textSizeList)); android.R.layout.simple_spinner_dropdown_item, sizeList));
editTextSize.setSelection(textSizeToPosition(textSize)); spinner.setSelection(textSizeToPosition(textSize));
} }
private void initBorderSizeSpinner(float borderSize) { private void initOutlineSizeSpinner(float outlineSize) {
mBorderSize = borderSize; mOutlineSize = outlineSize;
Spinner editBorderSize = (Spinner) findViewById(R.id.edit_border_size); Spinner spinner = (Spinner) findViewById(R.id.edit_outline_size);
editBorderSize.setOnItemSelectedListener(this); spinner.setOnItemSelectedListener(this);
String[] borderSizeList = new String[]{"Thin", "Normal", "Thick"}; String[] sizeList = new String[]{"Thin", "Normal", "Thick"};
editBorderSize.setAdapter(new ArrayAdapter<>(this, spinner.setAdapter(new ArrayAdapter<>(this,
android.R.layout.simple_spinner_dropdown_item, borderSizeList)); android.R.layout.simple_spinner_dropdown_item, sizeList));
editBorderSize.setSelection(borderSizeToPosition(borderSize)); spinner.setSelection(outlineSizeToPosition(outlineSize));
} }
private int textSizeToPosition(float textSize) { private int textSizeToPosition(float textSize) {
@ -113,16 +113,16 @@ public class EditTextActivity extends AppCompatActivity implements AdapterView.O
return position + 1f; return position + 1f;
} }
private int borderSizeToPosition(float borderSize) { private int outlineSizeToPosition(float outlineSize) {
int position = (int) (borderSize * 2f / Label.BORDER_SIZE_NORMAL - 1f); int position = (int) (outlineSize * 2f / Label.OUTLINE_SIZE_NORMAL - 1f);
if (0 <= position && position <= 2) if (0 <= position && position <= 2)
return position; return position;
mBorderSize = Label.BORDER_SIZE_NORMAL; mOutlineSize = Label.OUTLINE_SIZE_NORMAL;
return 1; return 1;
} }
private float positionToBorderSize(int position) { private float positionToOutlineSize(int position) {
return Label.BORDER_SIZE_NORMAL * 0.5f * (position + 1f); return Label.OUTLINE_SIZE_NORMAL * 0.5f * (position + 1f);
} }
@Override @Override
@ -131,8 +131,8 @@ public class EditTextActivity extends AppCompatActivity implements AdapterView.O
case R.id.edit_text_size: case R.id.edit_text_size:
mTextSize = positionToTextSize(position); mTextSize = positionToTextSize(position);
break; break;
case R.id.edit_border_size: case R.id.edit_outline_size:
mBorderSize = positionToBorderSize(position); mOutlineSize = positionToOutlineSize(position);
break; break;
case R.id.edit_font_family: case R.id.edit_font_family:
String displayName = mFontFamilyNameList.get(position); String displayName = mFontFamilyNameList.get(position);
@ -190,8 +190,8 @@ public class EditTextActivity extends AppCompatActivity implements AdapterView.O
label.setItalic(mEditItalic.isChecked()); label.setItalic(mEditItalic.isChecked());
label.setBold(mEditBold.isChecked()); label.setBold(mEditBold.isChecked());
label.setForeColor(mColorPaletteView.getColor()); label.setForeColor(mColorPaletteView.getColor());
label.setBorder(mEditBorder.isChecked()); label.setOutline(mEditOutline.isChecked());
label.setBorderSize(mBorderSize); label.setOutlineSize(mOutlineSize);
return label; return label;
} }
} }

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 class Label implements Serializable {
public static final float TEXT_SIZE_NORMAL = 2f; 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 String mText;
private float mTextSize, mBorderSize; private float mTextSize, mOutlineSize;
private String mFamilyName; private String mFamilyName;
private boolean mBold, mItalic, mBorder; private boolean mBold, mItalic, mOutline;
private int mForeColor, mBackColor, mBorderColor; private int mForeColor, mBackColor, mOutlineColor;
public Label() { public Label() {
mText = ""; mText = "";
@ -36,9 +36,9 @@ public class Label implements Serializable {
mItalic = false; mItalic = false;
mForeColor = Color.BLACK; mForeColor = Color.BLACK;
mBackColor = Color.TRANSPARENT; mBackColor = Color.TRANSPARENT;
mBorder = true; mOutline = true;
mBorderSize = BORDER_SIZE_NORMAL; mOutlineSize = OUTLINE_SIZE_NORMAL;
mBorderColor = Color.WHITE; mOutlineColor = Color.WHITE;
} }
public String getText() { public String getText() {
@ -99,27 +99,27 @@ public class Label implements Serializable {
mBackColor = color; mBackColor = color;
} }
public boolean getBorder() { public boolean getOutline() {
return mBorder; return mOutline;
} }
public void setBorder(boolean border) { public void setOutline(boolean outline) {
mBorder = border; mOutline = outline;
} }
public float getBorderSize() { public float getOutlineSize() {
return mBorderSize; return mOutlineSize;
} }
public void setBorderSize(float size) { public void setOutlineSize(float size) {
mBorderSize = size; mOutlineSize = size;
} }
public int getBorderColor() { public int getOutlineColor() {
return mBorderColor; return mOutlineColor;
} }
public void setBorderColor(int color) { public void setOutlineColor(int color) {
mBorderColor = 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("italic", label.getItalic());
writer.write("fore_color", label.getForeColor()); writer.write("fore_color", label.getForeColor());
writer.write("back_color", label.getBackColor()); writer.write("back_color", label.getBackColor());
writer.write("border", label.getBorder()); writer.write("outline", label.getOutline());
writer.write("border_size", label.getBorderSize()); writer.write("outline_size", label.getOutlineSize());
writer.write("border_color", label.getBorderColor()); writer.write("outline_color", label.getOutlineColor());
} }
private void readLabel(IReader reader, Label label) throws IOException { private void readLabel(IReader reader, Label label) throws IOException {
@ -117,9 +117,9 @@ class LabelContainer {
label.setItalic(reader.readBoolean()); label.setItalic(reader.readBoolean());
label.setForeColor(reader.readInt()); label.setForeColor(reader.readInt());
label.setBackColor(reader.readInt()); label.setBackColor(reader.readInt());
label.setBorder(reader.readBoolean()); label.setOutline(reader.readBoolean());
label.setBorderSize(reader.readFloat()); label.setOutlineSize(reader.readFloat());
label.setBorderColor(reader.readInt()); 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) { private void drawBorder(Canvas canvas, float x, float y) {
if (mLabel.getBorder()) { if (mLabel.getOutline()) {
setBorderPaintSettings(); setBorderPaintSettings();
canvas.drawText(mLabel.getText(), x, y, mPaint); canvas.drawText(mLabel.getText(), x, y, mPaint);
setTextPaintSettings(); setTextPaintSettings();
@ -134,7 +134,7 @@ class LabelPainter {
private void setBorderPaintSettings() { private void setBorderPaintSettings() {
mPaint.setStyle(Paint.Style.STROKE); mPaint.setStyle(Paint.Style.STROKE);
mPaint.setColor(mLabel.getBorderColor()); mPaint.setColor(mLabel.getOutlineColor());
} }
private void setTextPaintSettings() { private void setTextPaintSettings() {
@ -145,7 +145,7 @@ class LabelPainter {
private void setSizePaintSettings(float sizeFactor) { private void setSizePaintSettings(float sizeFactor) {
float textSize = mLabel.getTextSize() * sizeFactor; float textSize = mLabel.getTextSize() * sizeFactor;
mPaint.setTextSize(textSize); mPaint.setTextSize(textSize);
mPaint.setStrokeWidth(mLabel.getBorderSize() * textSize); mPaint.setStrokeWidth(mLabel.getOutlineSize() * textSize);
} }
private int getTypeface() { private int getTypeface() {

6
app/src/main/res/layout/activity_edit_text.xml
View file

@ -65,14 +65,14 @@
android:orientation="horizontal"> android:orientation="horizontal">
<CheckBox <CheckBox
android:id="@+id/edit_border" android:id="@+id/edit_outline"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.3" android:layout_weight="0.3"
android:text="@string/border"/> android:text="@string/outline"/>
<Spinner <Spinner
android:id="@+id/edit_border_size" android:id="@+id/edit_outline_size"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.7" android:layout_weight="0.7"

2
app/src/main/res/values/strings.xml
View file

@ -35,5 +35,5 @@
<string name="chooser_title">Send Bug Report:</string> <string name="chooser_title">Send Bug Report:</string>
<string name="bold">Bold</string> <string name="bold">Bold</string>
<string name="italic">Italic</string> <string name="italic">Italic</string>
<string name="border">Border</string> <string name="outline">Outline</string>
</resources> </resources>