From e7424cac3eb6deeeb5b996d17fdbb4119f8c118a Mon Sep 17 00:00:00 2001
From: Olga Miller <olga.rgb@gmail.com>
Date: Mon, 18 Dec 2023 11:56:45 +0100
Subject: [PATCH] Added to string resources: "Small", "Normal", "Large",
 "Huge", "Thin", "Normal", "Thick", "Default"

---
 .../java/om/sstvencoder/EditTextActivity.java   | 17 ++++++++++++++---
 .../main/java/om/sstvencoder/FontFamilySet.java |  8 ++++++--
 app/src/main/res/values-zh-rCN/strings.xml      |  8 ++++++++
 app/src/main/res/values/strings.xml             |  8 ++++++++
 4 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/om/sstvencoder/EditTextActivity.java b/app/src/main/java/om/sstvencoder/EditTextActivity.java
index fa7e398..0b5ce83 100644
--- a/app/src/main/java/om/sstvencoder/EditTextActivity.java
+++ b/app/src/main/java/om/sstvencoder/EditTextActivity.java
@@ -148,7 +148,7 @@ public class EditTextActivity extends AppCompatActivity
     private void initFontFamilySpinner(String familyName) {
         Spinner spinner = findViewById(R.id.edit_font_family);
         spinner.setOnItemSelectedListener(this);
-        mFontFamilySet = new FontFamilySet();
+        mFontFamilySet = new FontFamilySet(this);
         mSelectedFontFamily = mFontFamilySet.getFontFamily(familyName);
         mFontFamilyNameList = mFontFamilySet.getFontFamilyDisplayNameList();
         spinner.setAdapter(new ArrayAdapter<>(this,
@@ -159,7 +159,13 @@ public class EditTextActivity extends AppCompatActivity
     private void initTextSizeSpinner(float textSize) {
         Spinner spinner = findViewById(R.id.edit_text_size);
         spinner.setOnItemSelectedListener(this);
-        String[] sizeList = new String[]{"Small", "Normal", "Large", "Huge"};
+        String[] sizeList = new String[]
+                {
+                        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));
@@ -168,7 +174,12 @@ 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[]{"Thin", "Normal", "Thick"};
+        String[] sizeList = new String[]
+                {
+                        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));
diff --git a/app/src/main/java/om/sstvencoder/FontFamilySet.java b/app/src/main/java/om/sstvencoder/FontFamilySet.java
index 8d08949..0962f58 100644
--- a/app/src/main/java/om/sstvencoder/FontFamilySet.java
+++ b/app/src/main/java/om/sstvencoder/FontFamilySet.java
@@ -16,6 +16,8 @@ limitations under the License.
 package om.sstvencoder;
 
 import androidx.annotation.NonNull;
+
+import android.content.Context;
 import android.util.Xml;
 
 import org.xmlpull.v1.XmlPullParser;
@@ -37,8 +39,10 @@ class FontFamilySet {
     }
 
     private final List<FontFamily> mFamilySet;
+    private final Context mContext;
 
-    FontFamilySet() {
+    FontFamilySet(Context context) {
+        mContext = context;
         mFamilySet = new ArrayList<>();
         fillWithSystemFonts(mFamilySet);
         if (mFamilySet.size() == 0)
@@ -49,7 +53,7 @@ class FontFamilySet {
     private FontFamily getDefaultFontFamily() {
         FontFamily defaultFontFamily = new FontFamily();
         defaultFontFamily.name = null;
-        defaultFontFamily.displayName = "Default";
+        defaultFontFamily.displayName = mContext.getString(R.string.font_default);
         defaultFontFamily.bold = true;
         defaultFontFamily.italic = true;
         return defaultFontFamily;
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 072c642..4d4a6a8 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -32,6 +32,14 @@
     <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>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5bcf6d1..07a07b3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -60,6 +60,14 @@
     <string name="outline_color">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>
\ No newline at end of file