diff --git a/QKSMS/src/main/assets/fonts/Lato-Bold.ttf b/QKSMS/src/main/assets/fonts/Lato-Bold.ttf new file mode 100644 index 00000000..74343694 Binary files /dev/null and b/QKSMS/src/main/assets/fonts/Lato-Bold.ttf differ diff --git a/QKSMS/src/main/assets/fonts/Lato-Hairline.ttf b/QKSMS/src/main/assets/fonts/Lato-Hairline.ttf new file mode 100644 index 00000000..288be295 Binary files /dev/null and b/QKSMS/src/main/assets/fonts/Lato-Hairline.ttf differ diff --git a/QKSMS/src/main/assets/fonts/Lato-Light.ttf b/QKSMS/src/main/assets/fonts/Lato-Light.ttf new file mode 100644 index 00000000..a958067a Binary files /dev/null and b/QKSMS/src/main/assets/fonts/Lato-Light.ttf differ diff --git a/QKSMS/src/main/assets/fonts/Lato-Regular.ttf b/QKSMS/src/main/assets/fonts/Lato-Regular.ttf new file mode 100644 index 00000000..04ea8efb Binary files /dev/null and b/QKSMS/src/main/assets/fonts/Lato-Regular.ttf differ diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/FontManager.java b/QKSMS/src/main/java/com/moez/QKSMS/common/FontManager.java index ea3d0291..11b231fc 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/FontManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/FontManager.java @@ -121,12 +121,12 @@ public class FontManager { } // Otherwise, get the heavy font weight. - if (fontWeight == RobotoTypefaceManager.TextWeight.LIGHT) { - return RobotoTypefaceManager.TextWeight.NORMAL; - } else if (fontFamily == RobotoTypefaceManager.FontFamily.ROBOTO) { - return RobotoTypefaceManager.TextWeight.MEDIUM; + if (fontWeight == TypefaceManager.TextWeight.LIGHT) { + return TypefaceManager.TextWeight.NORMAL; + } else if (fontFamily == TypefaceManager.FontFamily.ROBOTO || fontFamily == TypefaceManager.FontFamily.LATO) { + return TypefaceManager.TextWeight.MEDIUM; } else { - return RobotoTypefaceManager.TextWeight.BOLD; + return TypefaceManager.TextWeight.BOLD; } } } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/RobotoTextViewUtils.java b/QKSMS/src/main/java/com/moez/QKSMS/common/TextViewUtils.java similarity index 85% rename from QKSMS/src/main/java/com/moez/QKSMS/common/RobotoTextViewUtils.java rename to QKSMS/src/main/java/com/moez/QKSMS/common/TextViewUtils.java index af4713f6..23f667a3 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/RobotoTextViewUtils.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/TextViewUtils.java @@ -29,13 +29,13 @@ import com.moez.QKSMS.R; * * @author Evgeny Shishkin */ -public class RobotoTextViewUtils { +public class TextViewUtils { - private RobotoTextViewUtils() { + private TextViewUtils() { } /** - * Typeface initialization using the attributes. Used in RobotoTextView constructor. + * Typeface initialization using the attributes. Used in TextView constructor. * * @param textView The roboto text view * @param context The context the widget is running in, through which it can @@ -49,15 +49,15 @@ public class RobotoTextViewUtils { TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.RobotoTextView); if (a.hasValue(R.styleable.RobotoTextView_typeface)) { - int typefaceValue = a.getInt(R.styleable.RobotoTextView_typeface, RobotoTypefaceManager.Typeface.ROBOTO_REGULAR); - typeface = RobotoTypefaceManager.obtainTypeface(context, typefaceValue); + int typefaceValue = a.getInt(R.styleable.RobotoTextView_typeface, TypefaceManager.Typeface.ROBOTO_REGULAR); + typeface = TypefaceManager.obtainTypeface(context, typefaceValue); } a.recycle(); } if (typeface == null) { - typeface = RobotoTypefaceManager.obtainTypeface(context, RobotoTypefaceManager.Typeface.ROBOTO_REGULAR); + typeface = TypefaceManager.obtainTypeface(context, TypefaceManager.Typeface.ROBOTO_REGULAR); } setTypeface(textView, typeface); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/RobotoTypefaceManager.java b/QKSMS/src/main/java/com/moez/QKSMS/common/TypefaceManager.java similarity index 70% rename from QKSMS/src/main/java/com/moez/QKSMS/common/RobotoTypefaceManager.java rename to QKSMS/src/main/java/com/moez/QKSMS/common/TypefaceManager.java index 392a1ff3..a49895ed 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/RobotoTypefaceManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/TypefaceManager.java @@ -6,7 +6,7 @@ import android.util.SparseArray; /** * Stripped down version of https://github.com/johnkil/Android-RobotoTextView/blob/master/robototextview/src/main/java/com/devspark/robototextview/util/RobotoTypefaceManager.java */ -public class RobotoTypefaceManager { +public class TypefaceManager { private final static SparseArray mTypefaces = new SparseArray<>(); @@ -113,6 +113,58 @@ public class RobotoTypefaceManager { throw new IllegalArgumentException("`textWeight` attribute value " + textWeight + " is not supported for this font family " + fontFamily); } + } else if (fontFamily == FontFamily.LATO) { + if (textWeight == TextWeight.NORMAL) { + switch (textStyle) { + case TextStyle.NORMAL: + typeface = Typeface.LATO_REGULAR; + break; + default: + throw new IllegalArgumentException("`textStyle` attribute value " + textStyle + + " is not supported for this fontFamily " + fontFamily + + " and textWeight " + textWeight); + } + } else if (textWeight == TextWeight.THIN) { + switch (textStyle) { + case TextStyle.NORMAL: + typeface = Typeface.LATO_THIN; + break; + default: + throw new IllegalArgumentException("`textStyle` attribute value " + textStyle + + " is not supported for this fontFamily " + fontFamily + + " and textWeight " + textWeight); + } + } else if (textWeight == TextWeight.LIGHT) { + switch (textStyle) { + case TextStyle.NORMAL: + typeface = Typeface.LATO_LIGHT; + break; + default: + throw new IllegalArgumentException("`textStyle` attribute value " + textStyle + + " is not supported for this fontFamily " + fontFamily + + " and textWeight " + textWeight); + } + } else if (textWeight == TextWeight.MEDIUM) { + switch (textStyle) { + case TextStyle.NORMAL: + typeface = Typeface.LATO_MEDIUM; + break; + default: + throw new IllegalArgumentException("`textStyle` attribute value " + textStyle + + " is not supported for this fontFamily " + fontFamily + + " and textWeight " + textWeight); + } + } else if (textWeight == TextWeight.BOLD) { + switch (textStyle) { + default: + throw new IllegalArgumentException("`textStyle` attribute value " + textStyle + + " is not supported for this fontFamily " + fontFamily + + " and textWeight " + textWeight); + } + } else { + throw new IllegalArgumentException("`textWeight` attribute value " + textWeight + + " is not supported for this font family " + fontFamily); + } } else { throw new IllegalArgumentException("Unknown `fontFamily` attribute value " + fontFamily); } @@ -143,6 +195,18 @@ public class RobotoTypefaceManager { case Typeface.ROBOTO_CONDENSED_BOLD: typefacePath = "fonts/RobotoCondensed-Bold.ttf"; break; + case Typeface.LATO_THIN: + typefacePath = "fonts/Lato-Hairline.ttf"; + break; + case Typeface.LATO_LIGHT: + typefacePath = "fonts/Lato-Light.ttf"; + break; + case Typeface.LATO_REGULAR: + typefacePath = "fonts/Lato-Regular.ttf"; + break; + case Typeface.LATO_MEDIUM: + typefacePath = "fonts/Lato-Bold.ttf"; + break; default: throw new IllegalArgumentException("Unknown `typeface` attribute value " + typefaceValue); } @@ -158,11 +222,16 @@ public class RobotoTypefaceManager { public final static int ROBOTO_CONDENSED_LIGHT = 12; public final static int ROBOTO_CONDENSED_REGULAR = 14; public final static int ROBOTO_CONDENSED_BOLD = 16; + public final static int LATO_THIN = 22; + public final static int LATO_LIGHT = 24; + public final static int LATO_REGULAR = 26; + public final static int LATO_MEDIUM = 28; } public class FontFamily { public static final int ROBOTO = 0; public static final int ROBOTO_CONDENSED = 1; + public static final int LATO = 2; } public class TextWeight { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/data/ContactHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/data/ContactHelper.java index 742176b3..dd382386 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/data/ContactHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/data/ContactHelper.java @@ -17,7 +17,7 @@ import android.provider.BaseColumns; import android.provider.ContactsContract; import android.telephony.PhoneNumberUtils; import android.util.Log; -import com.moez.QKSMS.common.RobotoTypefaceManager; +import com.moez.QKSMS.common.TypefaceManager; import com.moez.QKSMS.common.utils.Units; import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.ThemeManager; @@ -205,7 +205,7 @@ public class ContactHelper { Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG); paint.setColor(Color.WHITE); - paint.setTypeface(RobotoTypefaceManager.obtainTypeface(context, RobotoTypefaceManager.Typeface.ROBOTO_LIGHT)); + paint.setTypeface(TypefaceManager.obtainTypeface(context, TypefaceManager.Typeface.ROBOTO_LIGHT)); paint.setTextSize(length / 2); Rect bounds = new Rect(); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AutoCompleteContactView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AutoCompleteContactView.java index 7b7c3753..4bce5f11 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AutoCompleteContactView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AutoCompleteContactView.java @@ -10,7 +10,7 @@ import com.android.ex.chips.RecipientEditTextView; import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.common.FontManager; import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.common.RobotoTypefaceManager; +import com.moez.QKSMS.common.TypefaceManager; import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.settings.SettingsFragment; @@ -57,8 +57,8 @@ public class AutoCompleteContactView extends RecipientEditTextView implements Li @Override public void refresh() { - setTypeface(RobotoTypefaceManager.obtainTypeface(mContext, FontManager.getFontFamily(mContext), - FontManager.getFontWeight(mContext, false), RobotoTypefaceManager.TextStyle.NORMAL)); + setTypeface(TypefaceManager.obtainTypeface(mContext, FontManager.getFontFamily(mContext), + FontManager.getFontWeight(mContext, false), TypefaceManager.TextStyle.NORMAL)); setTextSize(TypedValue.COMPLEX_UNIT_SP, FontManager.getTextSize(mContext, FontManager.TEXT_TYPE_PRIMARY)); setTextColor(ThemeManager.getTextOnBackgroundPrimary()); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AvatarView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AvatarView.java index 167624ad..4e726f25 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AvatarView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AvatarView.java @@ -24,7 +24,7 @@ import android.widget.ImageView; import com.moez.QKSMS.R; import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.common.RobotoTypefaceManager; +import com.moez.QKSMS.common.TypefaceManager; import com.moez.QKSMS.common.utils.ImageUtils; import com.moez.QKSMS.common.utils.PhoneNumberUtils; import com.moez.QKSMS.common.utils.Units; @@ -77,7 +77,7 @@ public class AvatarView extends ImageView implements View.OnClickListener, LiveV mPaint.setTextSize(Units.dpToPx(context, 32)); mPaint.setTextAlign(Paint.Align.CENTER); mPaint.setAntiAlias(true); - mPaint.setTypeface(RobotoTypefaceManager.obtainTypeface(context, RobotoTypefaceManager.Typeface.ROBOTO_LIGHT)); + mPaint.setTypeface(TypefaceManager.obtainTypeface(context, TypefaceManager.Typeface.ROBOTO_LIGHT)); final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.AvatarView, defStyle, 0); for (int i = 0; i < a.getIndexCount(); i++) { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKEditText.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKEditText.java index 2b5f6c3b..df966063 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKEditText.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKEditText.java @@ -11,7 +11,7 @@ import android.util.TypedValue; import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.common.FontManager; import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.common.RobotoTypefaceManager; +import com.moez.QKSMS.common.TypefaceManager; import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.settings.SettingsFragment; @@ -97,8 +97,8 @@ public class QKEditText extends android.widget.EditText implements LiveView { // Typeface and colors int fontFamily = FontManager.getFontFamily(mContext); int fontWeight = FontManager.getFontWeight(mContext, false); - setTypeface(RobotoTypefaceManager.obtainTypeface(mContext, fontFamily, fontWeight, - RobotoTypefaceManager.TextStyle.NORMAL)); + setTypeface(TypefaceManager.obtainTypeface(mContext, fontFamily, fontWeight, + TypefaceManager.TextStyle.NORMAL)); setTextColor(ThemeManager.getTextOnBackgroundPrimary()); setHintTextColor(ThemeManager.getTextOnBackgroundSecondary()); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKTextView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKTextView.java index 382f9974..9cddea2c 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKTextView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKTextView.java @@ -11,7 +11,7 @@ import android.widget.TextView; import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.common.FontManager; import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.common.RobotoTypefaceManager; +import com.moez.QKSMS.common.TypefaceManager; import com.moez.QKSMS.common.utils.MessageUtils; import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.ThemeManager; @@ -162,8 +162,8 @@ public class QKTextView extends TextView implements LiveView { // Typeface int fontFamily = FontManager.getFontFamily(mContext); int fontWeight = FontManager.getFontWeight(mContext, FontManager.getIsFontHeavy(mType)); - setTypeface(RobotoTypefaceManager.obtainTypeface(mContext, fontFamily, fontWeight, - RobotoTypefaceManager.TextStyle.NORMAL)); + setTypeface(TypefaceManager.obtainTypeface(mContext, fontFamily, fontWeight, + TypefaceManager.TextStyle.NORMAL)); // Text size and color setTextSize(TypedValue.COMPLEX_UNIT_SP, FontManager.getTextSize(mContext, mType)); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/RobotoTextView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/RobotoTextView.java index 80aadbc3..742e568a 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/RobotoTextView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/RobotoTextView.java @@ -3,7 +3,7 @@ package com.moez.QKSMS.ui.view; import android.content.Context; import android.support.v7.widget.AppCompatTextView; import android.util.AttributeSet; -import com.moez.QKSMS.common.RobotoTextViewUtils; +import com.moez.QKSMS.common.TextViewUtils; public class RobotoTextView extends AppCompatTextView { @@ -15,7 +15,7 @@ public class RobotoTextView extends AppCompatTextView { super(context, attrs); if (!isInEditMode()) { - RobotoTextViewUtils.initTypeface(this, context, attrs); + TextViewUtils.initTypeface(this, context, attrs); } } @@ -23,7 +23,7 @@ public class RobotoTextView extends AppCompatTextView { super(context, attrs, defStyle); if (!isInEditMode()) { - RobotoTextViewUtils.initTypeface(this, context, attrs); + TextViewUtils.initTypeface(this, context, attrs); } } diff --git a/QKSMS/src/main/res/values-bs/strings.xml b/QKSMS/src/main/res/values-bs/strings.xml index cd7003fa..be060c66 100644 --- a/QKSMS/src/main/res/values-bs/strings.xml +++ b/QKSMS/src/main/res/values-bs/strings.xml @@ -280,8 +280,9 @@ Largest - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Light diff --git a/QKSMS/src/main/res/values-cs/strings.xml b/QKSMS/src/main/res/values-cs/strings.xml index 24e36238..4926104d 100755 --- a/QKSMS/src/main/res/values-cs/strings.xml +++ b/QKSMS/src/main/res/values-cs/strings.xml @@ -451,8 +451,9 @@ Největší - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Light diff --git a/QKSMS/src/main/res/values-da/strings.xml b/QKSMS/src/main/res/values-da/strings.xml index 93ec6918..bb41385c 100755 --- a/QKSMS/src/main/res/values-da/strings.xml +++ b/QKSMS/src/main/res/values-da/strings.xml @@ -452,6 +452,7 @@ Almindelig Sammentrængt + Lato Tynd diff --git a/QKSMS/src/main/res/values-de/strings.xml b/QKSMS/src/main/res/values-de/strings.xml index 433d97e7..5a27a960 100755 --- a/QKSMS/src/main/res/values-de/strings.xml +++ b/QKSMS/src/main/res/values-de/strings.xml @@ -455,6 +455,7 @@ Normal Zusammengefasst + Lato Dünn diff --git a/QKSMS/src/main/res/values-el/strings.xml b/QKSMS/src/main/res/values-el/strings.xml index 24974b58..cebd549d 100644 --- a/QKSMS/src/main/res/values-el/strings.xml +++ b/QKSMS/src/main/res/values-el/strings.xml @@ -279,8 +279,9 @@ Largest - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Light diff --git a/QKSMS/src/main/res/values-es/strings.xml b/QKSMS/src/main/res/values-es/strings.xml index f50c1050..9fff312e 100755 --- a/QKSMS/src/main/res/values-es/strings.xml +++ b/QKSMS/src/main/res/values-es/strings.xml @@ -450,8 +450,9 @@ Más grande - Regular - Condensada + Roboto Regular + Roboto Condensada + Lato Ligera diff --git a/QKSMS/src/main/res/values-fi/strings.xml b/QKSMS/src/main/res/values-fi/strings.xml index 735e8b91..5417d820 100755 --- a/QKSMS/src/main/res/values-fi/strings.xml +++ b/QKSMS/src/main/res/values-fi/strings.xml @@ -452,6 +452,7 @@ Tavallinen Tiivistetty + Lato Kevyt diff --git a/QKSMS/src/main/res/values-fr/strings.xml b/QKSMS/src/main/res/values-fr/strings.xml index 6bf858b5..9c48c73b 100755 --- a/QKSMS/src/main/res/values-fr/strings.xml +++ b/QKSMS/src/main/res/values-fr/strings.xml @@ -450,8 +450,9 @@ Très grande - Régulier - Condensé + Roboto Régulier + Roboto Condensé + Lato Léger diff --git a/QKSMS/src/main/res/values-hi/strings.xml b/QKSMS/src/main/res/values-hi/strings.xml index 741ed006..b202e644 100755 --- a/QKSMS/src/main/res/values-hi/strings.xml +++ b/QKSMS/src/main/res/values-hi/strings.xml @@ -452,6 +452,7 @@ नियमित संक्षिप्त + Lato प्रकाश diff --git a/QKSMS/src/main/res/values-hr/strings.xml b/QKSMS/src/main/res/values-hr/strings.xml index cd7003fa..be060c66 100644 --- a/QKSMS/src/main/res/values-hr/strings.xml +++ b/QKSMS/src/main/res/values-hr/strings.xml @@ -280,8 +280,9 @@ Largest - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Light diff --git a/QKSMS/src/main/res/values-in/strings.xml b/QKSMS/src/main/res/values-in/strings.xml index 534b7bfb..cbc6ed93 100755 --- a/QKSMS/src/main/res/values-in/strings.xml +++ b/QKSMS/src/main/res/values-in/strings.xml @@ -449,8 +449,9 @@ Largest - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Light diff --git a/QKSMS/src/main/res/values-it/strings.xml b/QKSMS/src/main/res/values-it/strings.xml index 2e1001ec..016b3c1a 100755 --- a/QKSMS/src/main/res/values-it/strings.xml +++ b/QKSMS/src/main/res/values-it/strings.xml @@ -452,8 +452,9 @@ Moez Bhatti\Shane Creighton-Young Più grande - Regolare - Condensato + Roboto Regolare + Roboto Condensato + Lato Sottile diff --git a/QKSMS/src/main/res/values-iw/strings.xml b/QKSMS/src/main/res/values-iw/strings.xml index a7764954..651e5f2c 100755 --- a/QKSMS/src/main/res/values-iw/strings.xml +++ b/QKSMS/src/main/res/values-iw/strings.xml @@ -450,8 +450,9 @@ גדול מאד - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Light diff --git a/QKSMS/src/main/res/values-ko/strings.xml b/QKSMS/src/main/res/values-ko/strings.xml index 9937bb81..716352c2 100755 --- a/QKSMS/src/main/res/values-ko/strings.xml +++ b/QKSMS/src/main/res/values-ko/strings.xml @@ -449,8 +449,9 @@ 매우크게 - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Light diff --git a/QKSMS/src/main/res/values-lt/strings.xml b/QKSMS/src/main/res/values-lt/strings.xml index dc9debe4..1aa4b5db 100755 --- a/QKSMS/src/main/res/values-lt/strings.xml +++ b/QKSMS/src/main/res/values-lt/strings.xml @@ -453,6 +453,7 @@ Įprastas Suspaustas + Lato Plonesnis diff --git a/QKSMS/src/main/res/values-ne/strings.xml b/QKSMS/src/main/res/values-ne/strings.xml index e61c379c..999d7e45 100755 --- a/QKSMS/src/main/res/values-ne/strings.xml +++ b/QKSMS/src/main/res/values-ne/strings.xml @@ -450,8 +450,9 @@ Largest - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Light diff --git a/QKSMS/src/main/res/values-nl/strings.xml b/QKSMS/src/main/res/values-nl/strings.xml index 47027865..da310cf4 100755 --- a/QKSMS/src/main/res/values-nl/strings.xml +++ b/QKSMS/src/main/res/values-nl/strings.xml @@ -450,8 +450,9 @@ Grootste - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Light diff --git a/QKSMS/src/main/res/values-no/strings.xml b/QKSMS/src/main/res/values-no/strings.xml index 5f106085..c0bb619b 100755 --- a/QKSMS/src/main/res/values-no/strings.xml +++ b/QKSMS/src/main/res/values-no/strings.xml @@ -450,8 +450,9 @@ Største - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Light diff --git a/QKSMS/src/main/res/values-pl/strings.xml b/QKSMS/src/main/res/values-pl/strings.xml index 00493c1f..a32f3820 100755 --- a/QKSMS/src/main/res/values-pl/strings.xml +++ b/QKSMS/src/main/res/values-pl/strings.xml @@ -451,8 +451,9 @@ Największy - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Cienka diff --git a/QKSMS/src/main/res/values-pt-rBR/strings.xml b/QKSMS/src/main/res/values-pt-rBR/strings.xml index a22541a3..8f66d514 100755 --- a/QKSMS/src/main/res/values-pt-rBR/strings.xml +++ b/QKSMS/src/main/res/values-pt-rBR/strings.xml @@ -452,8 +452,9 @@ Plural form: Conversas serão excluídas. Maior - Regular - Condensado + Roboto Regular + Roboto Condensado + Lato Leve diff --git a/QKSMS/src/main/res/values-pt/strings.xml b/QKSMS/src/main/res/values-pt/strings.xml index 0b6cde31..632c0c47 100755 --- a/QKSMS/src/main/res/values-pt/strings.xml +++ b/QKSMS/src/main/res/values-pt/strings.xml @@ -450,8 +450,9 @@ Ainda Maior - Regular - Condensado + Roboto Regular + Roboto Condensado + Lato Simples diff --git a/QKSMS/src/main/res/values-ro/strings.xml b/QKSMS/src/main/res/values-ro/strings.xml index 7b00c3dd..87c181eb 100755 --- a/QKSMS/src/main/res/values-ro/strings.xml +++ b/QKSMS/src/main/res/values-ro/strings.xml @@ -453,6 +453,7 @@ Obișnuit Condensat + Lato Slab diff --git a/QKSMS/src/main/res/values-ru/strings.xml b/QKSMS/src/main/res/values-ru/strings.xml index f01caf8d..43085c76 100755 --- a/QKSMS/src/main/res/values-ru/strings.xml +++ b/QKSMS/src/main/res/values-ru/strings.xml @@ -452,8 +452,9 @@ Самый крупный - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Тонкий diff --git a/QKSMS/src/main/res/values-sk/strings.xml b/QKSMS/src/main/res/values-sk/strings.xml index 57ed0ee0..61aca135 100755 --- a/QKSMS/src/main/res/values-sk/strings.xml +++ b/QKSMS/src/main/res/values-sk/strings.xml @@ -451,8 +451,9 @@ Obrovské - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Tenké diff --git a/QKSMS/src/main/res/values-sv/strings.xml b/QKSMS/src/main/res/values-sv/strings.xml index e963aaf0..4e812335 100755 --- a/QKSMS/src/main/res/values-sv/strings.xml +++ b/QKSMS/src/main/res/values-sv/strings.xml @@ -450,8 +450,9 @@ Störst - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Light diff --git a/QKSMS/src/main/res/values-tl/strings.xml b/QKSMS/src/main/res/values-tl/strings.xml index 1db60b97..14db8451 100755 --- a/QKSMS/src/main/res/values-tl/strings.xml +++ b/QKSMS/src/main/res/values-tl/strings.xml @@ -452,6 +452,7 @@ Karaniwan Makipot + Lato Manipis diff --git a/QKSMS/src/main/res/values-tr/strings.xml b/QKSMS/src/main/res/values-tr/strings.xml index 9af8dc20..8389288b 100755 --- a/QKSMS/src/main/res/values-tr/strings.xml +++ b/QKSMS/src/main/res/values-tr/strings.xml @@ -452,6 +452,7 @@ Normal Yakınlaştırılmış + Lato İnce diff --git a/QKSMS/src/main/res/values-zh-rCN/strings.xml b/QKSMS/src/main/res/values-zh-rCN/strings.xml index 120ec88d..7defea9a 100755 --- a/QKSMS/src/main/res/values-zh-rCN/strings.xml +++ b/QKSMS/src/main/res/values-zh-rCN/strings.xml @@ -451,6 +451,7 @@ 常规 紧缩 + Lato 纤细 diff --git a/QKSMS/src/main/res/values-zh/strings.xml b/QKSMS/src/main/res/values-zh/strings.xml index 680620f4..e4e30209 100755 --- a/QKSMS/src/main/res/values-zh/strings.xml +++ b/QKSMS/src/main/res/values-zh/strings.xml @@ -452,8 +452,9 @@ 最大 - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Light diff --git a/QKSMS/src/main/res/values/attrs.xml b/QKSMS/src/main/res/values/attrs.xml index fc207164..8ede7a86 100644 --- a/QKSMS/src/main/res/values/attrs.xml +++ b/QKSMS/src/main/res/values/attrs.xml @@ -45,6 +45,18 @@ + + + + + + + + + + + + diff --git a/QKSMS/src/main/res/values/integers.xml b/QKSMS/src/main/res/values/integers.xml index 8027d931..0d48446c 100644 --- a/QKSMS/src/main/res/values/integers.xml +++ b/QKSMS/src/main/res/values/integers.xml @@ -11,6 +11,7 @@ 0 1 + 2 diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index 331257bc..9cf570f3 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -758,8 +758,9 @@ - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato