diff --git a/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java b/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java index 2e180509..af55d6d7 100644 --- a/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java @@ -66,10 +66,19 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab accountManager.setActiveAccount(accountId); } + int style = textStyle(preferences.getString("statusTextSize", "medium")); + getTheme().applyStyle(style, false); + + redirectIfNotLoggedIn(); + + callList = new ArrayList<>(); + } + + private int textStyle(String name) { int style; - switch (preferences.getString("statusTextSize", "medium")) { - case "large": - style = R.style.TextSizeLarge; + switch (name) { + case "smallest": + style = R.style.TextSizeSmallest; break; case "small": style = R.style.TextSizeSmall; @@ -78,14 +87,14 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab default: style = R.style.TextSizeMedium; break; - + case "large": + style = R.style.TextSizeLarge; + break; + case "largest": + style = R.style.TextSizeLargest; + break; } - getTheme().applyStyle(style, false); - - redirectIfNotLoggedIn(); - - callList = new ArrayList<>(); - + return style; } @Override diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index c3669a3a..99c7bce5 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -207,11 +207,11 @@ حجم الخط - - صغير - متوسط - كبير - + + + + + إشارات جديدة الإخطارات عندما يشار إليك diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 8295a78b..9633fb5a 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -184,11 +184,11 @@ Mida de text de l\'estat - - Petita - Mitjana - Gran - + + + + + Mencions noves Notificacions sobre mencions noves diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 8aa45acd..21ae83a5 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -152,11 +152,11 @@ Schriftgröße - - Klein - Normal - Groß - + + + + + %s hat dich erwähnt %1$s, %2$s, %3$s und %4$d andere diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index f5593009..2e1a411c 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -207,11 +207,11 @@ Tamaño del texto - - Pequeño - Medio - Grande - + + + + + Nuevas menciones Notificaciones de nuevas menciones diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 336b8dc4..08e484a8 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -216,11 +216,11 @@ Taille du texte pour les status - - Petit - Moyen - Grand - + + + + + Toujours afficher le contenu sensible diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 77d1b23a..10694537 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -202,11 +202,11 @@ トゥートのテキストサイズ - - - - - + + + + + 新しい返信 新しい返信の通知 diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index be0683d7..6ae93f73 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -202,11 +202,11 @@ Tekstgrootte status - - Klein - Medium - Groot - + + + + + Nieuwe vermeldingen Meldingen over nieuwe vermeldingen diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml index 9807d102..26c4b22d 100644 --- a/app/src/main/res/values-oc/strings.xml +++ b/app/src/main/res/values-oc/strings.xml @@ -212,11 +212,11 @@ Talha de text de l\'estatut - - Pichona - Mejana - Granda - + + + + + Mencions nòvas Notificacions de mencions noves diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index ac195a1b..7a6ee18b 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -225,11 +225,11 @@ Rozmiar tekstu wpisów - - Mały - Średni - Duży - + + + + + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index b73413c8..57d43a78 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -211,11 +211,11 @@ Размер текста статусов - - Маленький - Средний - Большой - + + + + + Новые упоминания Уведомлять о новых упоминаниях diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index a0811398..c81fd2a2 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -195,11 +195,11 @@ நிலை உரை அளவு - - சிறிய - நடுதர - பெரிய - + + + + + புதிய குறிப்புகள் புதிய குறிப்புகள் பற்றிய அறிவிப்புகள் diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 3ea9110c..1e91341c 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -203,11 +203,11 @@ 字体大小 - - - - - + + + + + 被提及 当有用户在嘟文中提及我时 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 9c8efddb..4fb3ae0a 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -203,11 +203,11 @@ 字體大小 - - - - - + + + + + 被提及 當有用户在嘟文中提及我時 diff --git a/app/src/main/res/values-zh-rMO/strings.xml b/app/src/main/res/values-zh-rMO/strings.xml index 9c8efddb..4fb3ae0a 100644 --- a/app/src/main/res/values-zh-rMO/strings.xml +++ b/app/src/main/res/values-zh-rMO/strings.xml @@ -203,11 +203,11 @@ 字體大小 - - - - - + + + + + 被提及 當有用户在嘟文中提及我時 diff --git a/app/src/main/res/values-zh-rSG/strings.xml b/app/src/main/res/values-zh-rSG/strings.xml index 3ea9110c..1e91341c 100644 --- a/app/src/main/res/values-zh-rSG/strings.xml +++ b/app/src/main/res/values-zh-rSG/strings.xml @@ -203,11 +203,11 @@ 字体大小 - - - - - + + + + + 被提及 当有用户在嘟文中提及我时 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 127b06c9..f96fc59b 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -203,11 +203,11 @@ 字體大小 - - - - - + + + + + 被提及 當有用戶在嘟文中提及我時 diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 542a0b3c..9cda52a8 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -25,9 +25,11 @@ + smallest small medium large + largest diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5545f828..f3edee20 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -214,9 +214,11 @@ Status text size + Smallest Small Medium Large + Largest New Mentions diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 03fadc2c..b3b140be 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,19 +1,33 @@ + + + + + + - + -