From 34706a5e024df16027a292953606114db7e12dbe Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sun, 1 Apr 2018 17:52:14 +0200
Subject: use text styles in more places

---
 src/main/res/layout/message_content.xml | 119 +++++++++++++++-----------------
 1 file changed, 57 insertions(+), 62 deletions(-)

(limited to 'src/main/res/layout/message_content.xml')

diff --git a/src/main/res/layout/message_content.xml b/src/main/res/layout/message_content.xml
index df6e8500d..e1b06913e 100644
--- a/src/main/res/layout/message_content.xml
+++ b/src/main/res/layout/message_content.xml
@@ -1,73 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-<com.makeramen.roundedimageview.RoundedImageView
-    android:id="@+id/message_image"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="4dp"
-    android:layout_marginTop="2dp"
-    android:adjustViewBounds="true"
-    android:longClickable="true"
-    android:maxHeight="500dp"
-    android:maxWidth="500dp"
-    android:scaleType="centerCrop"
-    app:riv_border_color="@color/grey500"
-    app:riv_border_width="1dp"
-    app:riv_corner_radius="5dp" />
+    <com.makeramen.roundedimageview.RoundedImageView
+        android:id="@+id/message_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:layout_marginTop="2dp"
+        android:adjustViewBounds="true"
+        android:longClickable="true"
+        android:maxHeight="500dp"
+        android:maxWidth="500dp"
+        android:scaleType="centerCrop"
+        app:riv_border_color="@color/grey500"
+        app:riv_border_width="1dp"
+        app:riv_corner_radius="5dp" />
 
-<de.pixart.messenger.ui.widget.CopyTextView
-    android:id="@+id/message_body"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:autoLink="web"
-    android:longClickable="true"
-    android:textColor="@color/dark"
-    android:textColorHighlight="@color/grey800"
-    android:textColorLink="@color/dark"
-    android:textSize="?attr/TextSizeBody" />
+    <de.pixart.messenger.ui.widget.CopyTextView
+        android:id="@+id/message_body"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:autoLink="web"
+        android:longClickable="true"
+        android:textAppearance="@style/TextAppearance.Conversations.Body1" />
 
-<Button
-    android:id="@+id/download_button"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:longClickable="true"
-    android:visibility="gone" />
+    <Button
+        android:id="@+id/download_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:longClickable="true"
+        android:visibility="gone" />
 
     <RelativeLayout
-            android:id="@+id/audio_player"
-            android:layout_width="@dimen/audio_player_width"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            >
+        android:id="@+id/audio_player"
+        android:layout_width="@dimen/audio_player_width"
+        android:layout_height="wrap_content"
+        android:visibility="gone">
 
-            <ImageButton
-                android:id="@+id/play_pause"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:alpha="1.0"
-                android:background="?attr/selectableItemBackgroundBorderless"/>
+        <ImageButton
+            android:id="@+id/play_pause"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:alpha="1.0"
+            android:background="?attr/selectableItemBackgroundBorderless" />
 
-            <TextView
-                android:id="@+id/runtime"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:paddingBottom="16dp"
-                android:paddingRight="16dp"
-                android:textColor="@color/primary"
-                android:textSize="?attr/TextSizeInfo"/>
+        <TextView
+            android:id="@+id/runtime"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:paddingBottom="16dp"
+            android:paddingRight="16dp"
+            android:textAppearance="@style/TextAppearance.Conversations.Caption" />
 
-            <SeekBar
-                android:id="@+id/progress"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/runtime"
-                android:layout_centerVertical="true"
-                android:layout_toRightOf="@+id/play_pause"
-                android:progress="100"/>
-        </RelativeLayout>
+        <SeekBar
+            android:id="@+id/progress"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/runtime"
+            android:layout_centerVertical="true"
+            android:layout_toRightOf="@+id/play_pause"
+            android:progress="100" />
+    </RelativeLayout>
 </merge> 
\ No newline at end of file
-- 
cgit v1.2.3