From df2bc91e9f711276903c5a9240203f24b1cf4606 Mon Sep 17 00:00:00 2001 From: opyale Date: Sun, 12 Apr 2020 15:19:33 +0000 Subject: [PATCH] Setting Manrope as default font. (#379) Revert "store default if user didnt touch Font settings" This reverts commit 9c5f9731 store default if user didnt touch Font settings Setting translatable to false Last changes. Defaulting to Manrope in strings.xml Default to Manrope in settings. Changes in default value. Automatic formatting. Merge remote-tracking branch 'remotes/main/master' into manrope # Conflicts: # app/src/main/java/org/mian/gitnex/activities/BaseActivity.java Manrope just literally as default font. Reformatting code. Making optimizations. Moving initialization to BaseActivity Merge remote-tracking branch 'remotes/main/master' into manrope Setting Manrope as default font. Co-authored-by: opyale Co-authored-by: 6543 <6543@obermui.de> Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/379 Reviewed-by: 6543 <6543@noreply.gitea.io> Reviewed-by: M M Arif --- .../mian/gitnex/activities/BaseActivity.java | 102 ++++++++---------- .../activities/IssueDetailActivity.java | 2 +- .../mian/gitnex/activities/MainActivity.java | 25 ++--- .../OrganizationDetailActivity.java | 24 ++--- .../gitnex/activities/RepoDetailActivity.java | 24 ++--- .../adapters/RepoStargazersAdapter.java | 25 ++--- .../gitnex/adapters/RepoWatchersAdapter.java | 25 ++--- .../adapters/TeamMembersByOrgAdapter.java | 26 ++--- .../gitnex/fragments/ProfileFragment.java | 24 ++--- .../gitnex/fragments/SettingsFragment.java | 2 +- .../java/org/mian/gitnex/util/TinyDB.java | 4 + .../res/layout/layout_settings_appearance.xml | 2 +- app/src/main/res/values-ar/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fa/strings.xml | 2 +- app/src/main/res/values-fi/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-lv/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sr/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-zh/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 28 files changed, 141 insertions(+), 176 deletions(-) diff --git a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java index 65f2dc43..d6d5544a 100644 --- a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java @@ -13,75 +13,67 @@ import org.mian.gitnex.util.TinyDB; public abstract class BaseActivity extends AppCompatActivity { - @Override - public void onCreate(Bundle savedInstanceState) { + @Override + public void onCreate(Bundle savedInstanceState) { - final TinyDB tinyDb = new TinyDB(getApplicationContext()); + final TinyDB tinyDb = new TinyDB(getApplicationContext()); - if(tinyDb.getInt("themeId") == 1) { - setTheme(R.style.AppThemeLight); - } - else if(tinyDb.getInt("themeId") == 2) { + if(tinyDb.getInt("themeId") == 1) { + setTheme(R.style.AppThemeLight); + } + else if(tinyDb.getInt("themeId") == 2) { - boolean timeSetterFlag = TimeHelper.timeBetweenHours(18, 6); // 6pm to 6am + boolean timeSetterFlag = TimeHelper.timeBetweenHours(18, 6); // 6pm to 6am - if(timeSetterFlag) { - setTheme(R.style.AppTheme); - } - else { - setTheme(R.style.AppThemeLight); - } + if(timeSetterFlag) { + setTheme(R.style.AppTheme); + } + else { + setTheme(R.style.AppThemeLight); + } - } - else { - setTheme(R.style.AppTheme); - } + } + else { + setTheme(R.style.AppTheme); + } - super.onCreate(savedInstanceState); - setContentView(getLayoutResourceId()); + super.onCreate(savedInstanceState); + setContentView(getLayoutResourceId()); - if(tinyDb.getInt("customFontId") == 0) { + switch(tinyDb.getInt("customFontId", -1)) { - FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/roboto.ttf"); - FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/roboto.ttf"); - FontsOverride.setDefaultFont(this, "SERIF", "fonts/roboto.ttf"); - FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/roboto.ttf"); + case 0: + FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/roboto.ttf"); + FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/roboto.ttf"); + FontsOverride.setDefaultFont(this, "SERIF", "fonts/roboto.ttf"); + FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/roboto.ttf"); + break; - } - else if (tinyDb.getInt("customFontId") == 1) { + case 2: + FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/sourcecodeproregular.ttf"); + FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/sourcecodeproregular.ttf"); + FontsOverride.setDefaultFont(this, "SERIF", "fonts/sourcecodeproregular.ttf"); + FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/sourcecodeproregular.ttf"); + break; - FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/manroperegular.ttf"); - FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/manroperegular.ttf"); - FontsOverride.setDefaultFont(this, "SERIF", "fonts/manroperegular.ttf"); - FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/manroperegular.ttf"); + default: + FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/manroperegular.ttf"); + FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/manroperegular.ttf"); + FontsOverride.setDefaultFont(this, "SERIF", "fonts/manroperegular.ttf"); + FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/manroperegular.ttf"); + break; - } - else if (tinyDb.getInt("customFontId") == 2) { + } - FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/sourcecodeproregular.ttf"); - FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/sourcecodeproregular.ttf"); - FontsOverride.setDefaultFont(this, "SERIF", "fonts/sourcecodeproregular.ttf"); - FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/sourcecodeproregular.ttf"); + // enabling counter badges by default + if(tinyDb.getString("enableCounterBadgesInit").isEmpty()) { + tinyDb.putBoolean("enableCounterBadges", true); + tinyDb.putString("enableCounterBadgesInit", "yes"); + } - } - else { + } - FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/roboto.ttf"); - FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/roboto.ttf"); - FontsOverride.setDefaultFont(this, "SERIF", "fonts/roboto.ttf"); - FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/roboto.ttf"); - - } - - // enabling counter badges by default - if(tinyDb.getString("enableCounterBadgesInit").isEmpty()) { - tinyDb.putBoolean("enableCounterBadges", true); - tinyDb.putString("enableCounterBadgesInit", "yes"); - } - - } - - protected abstract int getLayoutResourceId(); + protected abstract int getLayoutResourceId(); } diff --git a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java index c5a736e9..2432ee1a 100644 --- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java @@ -186,7 +186,7 @@ public class IssueDetailActivity extends BaseActivity { Typeface myTypeface; - switch(tinyDb.getInt("customFontId")) { + switch(tinyDb.getInt("customFontId", -1)) { case 1: myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/manroperegular.ttf"); diff --git a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java index 7156d378..ff127df6 100644 --- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java @@ -109,24 +109,19 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig Toolbar toolbar = findViewById(R.id.toolbar); toolbarTitle = toolbar.findViewById(R.id.toolbar_title); - if(tinyDb.getInt("customFontId") == 0) { + switch(tinyDb.getInt("customFontId", -1)) { - myTypeface = Typeface.createFromAsset(getAssets(), "fonts/roboto.ttf"); + case 0: + myTypeface = Typeface.createFromAsset(getAssets(), "fonts/roboto.ttf"); + break; - } - else if (tinyDb.getInt("customFontId") == 1) { + case 2: + myTypeface = Typeface.createFromAsset(getAssets(), "fonts/sourcecodeproregular.ttf"); + break; - myTypeface = Typeface.createFromAsset(getAssets(), "fonts/manroperegular.ttf"); - - } - else if (tinyDb.getInt("customFontId") == 2) { - - myTypeface = Typeface.createFromAsset(getAssets(), "fonts/sourcecodeproregular.ttf"); - - } - else { - - myTypeface = Typeface.createFromAsset(getAssets(), "fonts/roboto.ttf"); + default: + myTypeface = Typeface.createFromAsset(getAssets(), "fonts/manroperegular.ttf"); + break; } diff --git a/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java index b41468e9..af4f3161 100644 --- a/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java @@ -58,24 +58,20 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh TabLayout tabLayout = findViewById(R.id.tabs); Typeface myTypeface; - if(tinyDb.getInt("customFontId") == 0) { - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf"); + switch(tinyDb.getInt("customFontId", -1)) { - } - else if (tinyDb.getInt("customFontId") == 1) { + case 0: + myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/roboto.ttf"); + break; - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/manroperegular.ttf"); + case 2: + myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/sourcecodeproregular.ttf"); + break; - } - else if (tinyDb.getInt("customFontId") == 2) { - - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/sourcecodeproregular.ttf"); - - } - else { - - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf"); + default: + myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/manroperegular.ttf"); + break; } diff --git a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java index 29033221..0d779989 100644 --- a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java @@ -92,24 +92,20 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF TabLayout tabLayout = findViewById(R.id.tabs); Typeface myTypeface; - if(tinyDb.getInt("customFontId") == 0) { - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf"); + switch(tinyDb.getInt("customFontId", -1)) { - } - else if (tinyDb.getInt("customFontId") == 1) { + case 0: + myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/roboto.ttf"); + break; - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/manroperegular.ttf"); + case 2: + myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/sourcecodeproregular.ttf"); + break; - } - else if (tinyDb.getInt("customFontId") == 2) { - - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/sourcecodeproregular.ttf"); - - } - else { - - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf"); + default: + myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/manroperegular.ttf"); + break; } diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java index 9b4d6e72..0a53b05f 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java @@ -84,24 +84,19 @@ public class RepoStargazersAdapter extends BaseAdapter { final TinyDB tinyDb = new TinyDB(mCtx); Typeface myTypeface; - if(tinyDb.getInt("customFontId") == 0) { + switch(tinyDb.getInt("customFontId", -1)) { - myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf"); + case 0: + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf"); + break; - } - else if (tinyDb.getInt("customFontId") == 1) { + case 2: + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf"); + break; - myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf"); - - } - else if (tinyDb.getInt("customFontId") == 2) { - - myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf"); - - } - else { - - myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf"); + default: + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf"); + break; } diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java index 0e46e049..35ca3393 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java @@ -84,24 +84,19 @@ public class RepoWatchersAdapter extends BaseAdapter { final TinyDB tinyDb = new TinyDB(mCtx); Typeface myTypeface; - if(tinyDb.getInt("customFontId") == 0) { + switch(tinyDb.getInt("customFontId", -1)) { - myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf"); + case 0: + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf"); + break; - } - else if (tinyDb.getInt("customFontId") == 1) { + case 2: + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf"); + break; - myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf"); - - } - else if (tinyDb.getInt("customFontId") == 2) { - - myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf"); - - } - else { - - myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf"); + default: + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf"); + break; } diff --git a/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java index 7e356bff..083e8fd8 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java @@ -11,6 +11,7 @@ import android.widget.ImageView; import android.widget.TextView; import org.mian.gitnex.R; import org.mian.gitnex.clients.PicassoService; +import org.mian.gitnex.helpers.FontsOverride; import org.mian.gitnex.helpers.RoundedTransformation; import org.mian.gitnex.models.UserInfo; import org.mian.gitnex.util.TinyDB; @@ -85,24 +86,19 @@ public class TeamMembersByOrgAdapter extends BaseAdapter { final TinyDB tinyDb = new TinyDB(mCtx); Typeface myTypeface; - if(tinyDb.getInt("customFontId") == 0) { + switch(tinyDb.getInt("customFontId", -1)) { - myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf"); + case 0: + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf"); + break; - } - else if (tinyDb.getInt("customFontId") == 1) { + case 2: + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf"); + break; - myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf"); - - } - else if (tinyDb.getInt("customFontId") == 2) { - - myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf"); - - } - else { - - myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf"); + default: + myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf"); + break; } diff --git a/app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java b/app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java index f8907a8e..1224ae67 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java @@ -58,24 +58,20 @@ public class ProfileFragment extends Fragment { mViewPager.setAdapter(mSectionsPagerAdapter); Typeface myTypeface; - if(tinyDb.getInt("customFontId") == 0) { - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/roboto.ttf"); + switch(tinyDb.getInt("customFontId", -1)) { - } - else if (tinyDb.getInt("customFontId") == 1) { + case 0: + myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/roboto.ttf"); + break; - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/manroperegular.ttf"); + case 2: + myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/sourcecodeproregular.ttf"); + break; - } - else if (tinyDb.getInt("customFontId") == 2) { - - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/sourcecodeproregular.ttf"); - - } - else { - - myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/roboto.ttf"); + default: + myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/manroperegular.ttf"); + break; } diff --git a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java index 74b7893a..4202d91a 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java @@ -124,7 +124,7 @@ public class SettingsFragment extends Fragment { } if(customFontSelectedChoice == 0) { - customFontSelectedChoice = tinyDb.getInt("customFontId"); + customFontSelectedChoice = tinyDb.getInt("customFontId", 1); } if(themeSelectedChoice == 0) { diff --git a/app/src/main/java/org/mian/gitnex/util/TinyDB.java b/app/src/main/java/org/mian/gitnex/util/TinyDB.java index 9646ac72..83bca480 100644 --- a/app/src/main/java/org/mian/gitnex/util/TinyDB.java +++ b/app/src/main/java/org/mian/gitnex/util/TinyDB.java @@ -171,6 +171,10 @@ public class TinyDB { return preferences.getInt(key, 0); } + public int getInt(String key, int defaultValue) { + return preferences.getInt(key, defaultValue); + } + /** * Get parsed ArrayList of Integers from SharedPreferences at 'key' * @param key SharedPreferences key diff --git a/app/src/main/res/layout/layout_settings_appearance.xml b/app/src/main/res/layout/layout_settings_appearance.xml index 7e902edb..23bf5d1c 100644 --- a/app/src/main/res/layout/layout_settings_appearance.xml +++ b/app/src/main/res/layout/layout_settings_appearance.xml @@ -73,7 +73,7 @@ android:textSize="14sp" android:layout_marginStart="44dp" android:layout_marginEnd="4dp" - android:text="@string/defaultCopy" + android:text="@string/settingsCustomFontDefault" android:textColor="?attr/selectedTextColor"/> diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 2339af8f..9601656d 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -206,7 +206,7 @@ Select Home Screen الخط اختر الخط - Roboto + Manrope اختر سمة التطبيق الحُلّة الوضع الليلي لـ PDF diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 8605a191..b22e4e08 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -206,7 +206,7 @@ Home Screen Auswählen Schriftart Wähle eine Schriftart - Roboto + Manrope App-Design auswählen Design PDF Nachtmodus diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 47edda0c..a80626e3 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -206,7 +206,7 @@ Select Home Screen Font Choose Font - Roboto + Manrope Select App Theme Theme PDF Night Mode diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 457fce1c..4a1731df 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -209,7 +209,7 @@ صفحه خانگی را انتخاب کنید Font Choose Font - Roboto + Manrope Select App Theme Theme PDF Night Mode diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 38afd862..13788dd9 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -206,7 +206,7 @@ Select Home Screen Font Choose Font - Roboto + Manrope Select App Theme Theme PDF Night Mode diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d4563092..c8bd66e3 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -206,7 +206,7 @@ Écran d’accueil Police Choisir la police - Roboto + Manrope Sélectionnez le thème de l’application Thème PDF mode nuit diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 496e5205..e130be1c 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -207,7 +207,7 @@ URL è richiesto Seleziona schermata Home Font Scegli un Font - Roboto + Manrope Select App Theme Theme PDF Night Mode diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 28a32085..39e3a1b5 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -206,7 +206,7 @@ Select Home Screen Font Choose Font - Roboto + Manrope Select App Theme Theme PDF Night Mode diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 90279f10..c2e1ee73 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -206,7 +206,7 @@ Wybierz ekran główny Czcionka Wybierz czcionkę - Roboto + Manrope Wybierz motyw aplikacji Motyw Tryb nocny PDF diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 1d47de96..6b68e862 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -206,7 +206,7 @@ Selecionar Tela Inicial Font Choose Font - Roboto + Manrope Select App Theme Theme PDF Night Mode diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 0fe3c0c9..e72b9c98 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -206,7 +206,7 @@ Выбрать главный экран Шрифт Выберите шрифт - Roboto + Manrope Выбрать тему приложения Тема Ночной режим PDF diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index f6e6f7e4..544daaf2 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -206,7 +206,7 @@ Одабери почетни екран Font Choose Font - Roboto + Manrope Select App Theme Theme PDF Night Mode diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 7e7932cc..21525162 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -206,7 +206,7 @@ Ana Ekranı Seç Font Choose Font - Roboto + Manrope Select App Theme Theme PDF Night Mode diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 29e60288..34ae1f64 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -206,7 +206,7 @@ Оберіть основний екран Font Choose Font - Roboto + Manrope Select App Theme Theme PDF Night Mode diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 6b1e43a9..6d16ea75 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -206,7 +206,7 @@ 选择主屏幕 Font Choose Font - Roboto + Manrope Select App Theme Theme PDF Night Mode diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0c84689d..144c78d7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -272,7 +272,7 @@ Select Home Screen Font Choose Font - Roboto + Manrope Select App Theme Theme Dark