Match text sizes from new snikket

Stephen Paul Weber created 5 months ago

Change summary

src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java |  5 
src/main/res/layout/item_message_content.xml                        |  6 
src/main/res/values/attrs.xml                                       |  3 
src/main/res/values/themes.xml                                      | 15 
4 files changed, 23 insertions(+), 6 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java

@@ -1973,11 +1973,10 @@ public class MessageAdapter extends ArrayAdapter<Message> {
     private static void setTextSize(final TextView textView, final boolean largeFont) {
         if (largeFont) {
             textView.setTextAppearance(
-                    com.google.android.material.R.style.TextAppearance_Material3_BodyLarge);
-            textView.setTextSize(android.util.TypedValue.COMPLEX_UNIT_SP, 18);
+                    R.style.TextAppearance_Snikket_MessageContentLarge);
         } else {
             textView.setTextAppearance(
-                    com.google.android.material.R.style.TextAppearance_Material3_BodyMedium);
+                    R.style.TextAppearance_Snikket_MessageContentNormal);
         }
     }
 

src/main/res/layout/item_message_content.xml

@@ -28,7 +28,7 @@
                 android:layout_marginEnd="10dp"
                 android:textStyle="bold|italic"
                 android:longClickable="false"
-                android:textAppearance="?textAppearanceBodyMedium" />
+                android:textAppearance="?textAppearanceMessageContentLarge" />
         </LinearLayout>
 
         <TextView
@@ -39,7 +39,7 @@
             android:layout_marginBottom="2dp"
             android:longClickable="false"
             android:visibility="gone"
-            android:textAppearance="?textAppearanceBodyMedium" />
+            android:textAppearance="?textAppearanceMessageContentLarge" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -67,7 +67,7 @@
             android:autoLink="web"
             android:longClickable="false"
             android:breakStrategy="simple"
-            android:textAppearance="?textAppearanceBodyMedium" />
+            android:textAppearance="?textAppearanceMessageContentLarge" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/download_button"

src/main/res/values/attrs.xml

@@ -4,4 +4,7 @@
         <attr name="backgroundColor" format="reference|color" />
         <attr name="textColor" format="reference|color" />
     </declare-styleable>
+
+    <attr name="textAppearanceMessageContentNormal" format="reference"/>
+    <attr name="textAppearanceMessageContentLarge" format="reference"/>
 </resources>

src/main/res/values/themes.xml

@@ -54,6 +54,9 @@
         <item name="materialDrawerStyle">@style/Widget.MaterialDrawerStyle</item>
         <item name="materialDrawerHeaderStyle">@style/Widget.MaterialDrawerHeaderStyle</item>
         <item name="preferenceTheme">@style/MaterialPreferenceThemeOverlay</item>
+
+        <item name="textAppearanceMessageContentNormal">@style/TextAppearance.Snikket.MessageContentNormal</item>
+        <item name="textAppearanceMessageContentLarge">@style/TextAppearance.Snikket.MessageContentLarge</item>
     </style>
 
     <style name="Theme.Conversations3.Dark" parent="Theme.Material3.Dark.NoActionBar">
@@ -85,6 +88,9 @@
         <item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
         <item name="preferenceTheme">@style/MaterialPreferenceThemeOverlay</item>
+
+        <item name="textAppearanceMessageContentNormal">@style/TextAppearance.Snikket.MessageContentNormal</item>
+        <item name="textAppearanceMessageContentLarge">@style/TextAppearance.Snikket.MessageContentLarge</item>
     </style>
 
     <style name="MaterialPreferenceThemeOverlay" parent="@style/PreferenceThemeOverlay">
@@ -95,4 +101,13 @@
         <item name="widgetLayout">@layout/preference_material_switch</item>
     </style>
 
+    <style name="TextAppearance.Snikket.MessageContentNormal" parent="TextAppearance.Material3.BodyMedium">
+        <item name="android:textSize">16sp</item>
+        <item name="android:letterSpacing">0</item>
+    </style>
+    <style name="TextAppearance.Snikket.MessageContentLarge" parent="TextAppearance.Material3.BodyLarge">
+        <item name="android:textSize">20sp</item>
+        <item name="android:letterSpacing">0</item>
+    </style>
+
 </resources>