From 21f7b95f4fb4e8904d70d39529726dce61406fe9 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 29 Jun 2021 16:23:31 +0200
Subject: [PATCH] Fixed tab page icons for some Android versions

---
 app/src/main/java/eu/faircode/email/FragmentOptions.java | 3 ++-
 app/src/main/res/layout/fragment_options.xml             | 1 +
 app/src/main/res/values/styles.xml                       | 8 ++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java
index 805c813e5c..c605deed22 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptions.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java
@@ -495,6 +495,7 @@ public class FragmentOptions extends FragmentBase {
         }
 
         private CharSequence getTitle(int titleid, int iconid, int position) {
+            String title = getString(titleid).toUpperCase();
             Drawable icon = getResources().getDrawable(iconid);
 
             int iconSize = getResources().getDimensionPixelSize(R.dimen.menu_item_icon_size);
@@ -507,7 +508,7 @@ public class FragmentOptions extends FragmentBase {
 
             ImageSpan imageSpan = new ImageSpan(icon, DynamicDrawableSpan.ALIGN_BOTTOM);
 
-            SpannableStringBuilder ssb = new SpannableStringBuilder(getString(titleid));
+            SpannableStringBuilder ssb = new SpannableStringBuilder(title);
             if (position > 0)
                 ssb.setSpan(new RelativeSizeSpan(0.85f), 0, ssb.length(), 0);
             ssb.insert(0, "\uFFFC\u2002"); // object replacement character, en space
diff --git a/app/src/main/res/layout/fragment_options.xml b/app/src/main/res/layout/fragment_options.xml
index 32e7b0d9e7..1dccd9b559 100644
--- a/app/src/main/res/layout/fragment_options.xml
+++ b/app/src/main/res/layout/fragment_options.xml
@@ -15,6 +15,7 @@
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tab_layout"
+            style="@style/tabLayoutStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:tabMode="scrollable" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a6cfe15d7e..4075a43646 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -492,6 +492,14 @@
         <item name="android:fadeScrollbars">false</item>
     </style>
 
+    <style name="tabLayoutStyle" parent="Widget.Design.TabLayout">
+        <item name="tabTextAppearance">@style/tabLayoutStyleTextAppearance</item>
+    </style>
+
+    <style name="tabLayoutStyleTextAppearance" parent="TextAppearance.Design.Tab">
+        <item name="textAllCaps">false</item>
+    </style>
+
     <style name="fullScreenDialog" parent="android:Theme">
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsFloating">false</item>