From 10db274762a67db07fd66af312c10c7f9b2d5e5a Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sat, 4 Mar 2017 18:12:02 +0100
Subject: make notification icon size depend on 'Large Text' setting

---
 src/main/res/layout/conversation_list_row.xml | 6 ++++--
 src/main/res/values-v21/themes.xml            | 1 +
 src/main/res/values/attrs.xml                 | 1 +
 src/main/res/values/themes.xml                | 2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index c494e07d7..e10a4798f 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -75,6 +75,8 @@
                             android:layout_height="wrap_content"
                             android:scrollHorizontally="false"
                             android:singleLine="true"
+                            android:gravity="center_vertical"
+                            android:minHeight="?attr/IconSize"
                             android:text="This is a placeholder text to show the last messages"
                             android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody" />
@@ -93,8 +95,8 @@
 
                     <ImageView
                         android:id="@+id/notification_status"
-                        android:layout_width="16sp"
-                        android:layout_height="16sp"
+                        android:layout_width="?attr/IconSize"
+                        android:layout_height="?attr/IconSize"
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:layout_marginLeft="4dp"
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
index d85c4582a..c960f7c63 100644
--- a/src/main/res/values-v21/themes.xml
+++ b/src/main/res/values-v21/themes.xml
@@ -12,6 +12,7 @@
 
         <item name="TextSizeInfo">12sp</item>
         <item name="TextSizeBody">16sp</item>
+        <item name="IconSize">18sp</item>
         <item name="TextSizeHeadline">22sp</item>
 
         <item name="attr/dialog_horizontal_padding">24dp</item>
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 3babeff54..5a04cbbb4 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -4,6 +4,7 @@
     <attr name="TextSizeInfo" format="dimension" />
     <attr name="TextSizeBody" format="dimension" />
     <attr name="TextSizeHeadline" format="dimension" />
+    <attr name="IconSize" format="dimension" />
 
     <attr name="icon_add_group" format="reference" />
     <attr name="icon_add_person" format="reference" />
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index c028df7a7..6ae71b07f 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -8,6 +8,7 @@
         <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_white_24dp</item>
         <item name="TextSizeInfo">12sp</item>
         <item name="TextSizeBody">16sp</item>
+        <item name="IconSize">18sp</item>
         <item name="TextSizeHeadline">22sp</item>
 
         <item name="attr/icon_add_group">@drawable/ic_group_add_white_24dp</item>
@@ -47,6 +48,7 @@
     <style name="ConversationsTheme.LargerText" parent="ConversationsTheme">
         <item name="TextSizeInfo">14sp</item>
         <item name="TextSizeBody">18sp</item>
+        <item name="IconSize">20sp</item>
         <item name="TextSizeHeadline">24sp</item>
     </style>
 
-- 
cgit v1.2.3