change last text styles over

3 files changed, 23 insertions, 57 deletions

diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 3df1ec353..687db3cea 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -236,8 +236,7 @@
                                 android:ellipsize="end"
                                 android:singleLine="true"
                                 android:text="@string/server_info_session_established"
-                                android:textColor="@color/black87"
-                                android:textSize="?attr/TextSizeBody" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
 
                             <TextView
                                 android:id="@+id/session_est"
@@ -245,9 +244,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="right"
                                 android:paddingLeft="4dp"
-                                android:textColor="@color/black87"
-                                android:textSize="?attr/TextSizeBody"
-                                tools:ignore="RtlHardcoded" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
                         </TableRow>
 
                     </TableLayout>
@@ -270,8 +267,7 @@
                                 android:ellipsize="end"
                                 android:singleLine="true"
                                 android:text="@string/server_info_pep"
-                                android:textColor="@color/black87"
-                                android:textSize="?attr/TextSizeBody" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
 
                             <TextView
                                 android:id="@+id/server_info_pep"
@@ -279,9 +275,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="right"
                                 android:paddingLeft="4dp"
-                                android:textColor="@color/black87"
-                                android:textSize="?attr/TextSizeBody"
-                                tools:ignore="RtlHardcoded" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
                         </TableRow>
 
                         <TableRow
@@ -294,8 +288,7 @@
                                 android:ellipsize="end"
                                 android:singleLine="true"
                                 android:text="@string/server_info_blocking"
-                                android:textColor="@color/black87"
-                                android:textSize="?attr/TextSizeBody" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
 
                             <TextView
                                 android:id="@+id/server_info_blocking"
@@ -303,9 +296,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="right"
                                 android:paddingLeft="4dp"
-                                android:textColor="@color/black87"
-                                android:textSize="?attr/TextSizeBody"
-                                tools:ignore="RtlHardcoded" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
                         </TableRow>
 
                         <TableRow
@@ -318,8 +309,7 @@
                                 android:ellipsize="end"
                                 android:singleLine="true"
                                 android:text="@string/server_info_stream_management"
-                                android:textColor="@color/black87"
-                                android:textSize="?attr/TextSizeBody" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
 
                             <TextView
                                 android:id="@+id/server_info_sm"
@@ -327,9 +317,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="right"
                                 android:paddingLeft="4dp"
-                                android:textColor="@color/black87"
-                                android:textSize="?attr/TextSizeBody"
-                                tools:ignore="RtlHardcoded" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
                         </TableRow>
 
                         <TableRow
@@ -342,8 +330,7 @@
                                 android:ellipsize="end"
                                 android:singleLine="true"
                                 android:text="@string/server_info_roster_version"
-                                android:textColor="@color/black87"
-                                android:textSize="?attr/TextSizeBody" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
 
                             <TextView
                                 android:id="@+id/server_info_roster_version"
@@ -351,9 +338,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="right"
                                 android:paddingLeft="4dp"
-                                android:textColor="@color/black87"
-                                android:textSize="?attr/TextSizeBody"
-                                tools:ignore="RtlHardcoded" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
                         </TableRow>
 
                         <TableRow
@@ -366,8 +351,7 @@
                                 android:ellipsize="end"
                                 android:singleLine="true"
                                 android:text="@string/server_info_carbon_messages"
-                                android:textColor="@color/black87"
-                                android:textSize="?attr/TextSizeBody" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
 
                             <TextView
                                 android:id="@+id/server_info_carbons"
@@ -375,9 +359,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="right"
                                 android:paddingLeft="4dp"
-                                android:textColor="@color/black87"
-                                android:textSize="?attr/TextSizeBody"
-                                tools:ignore="RtlHardcoded" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
                         </TableRow>
 
                         <TableRow
@@ -390,8 +372,7 @@
                                 android:ellipsize="end"
                                 android:singleLine="true"
                                 android:text="@string/server_info_mam"
-                                android:textColor="@color/black87"
-                                android:textSize="?attr/TextSizeBody" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
 
                             <TextView
                                 android:id="@+id/server_info_mam"
@@ -399,9 +380,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="right"
                                 android:paddingLeft="4dp"
-                                android:textColor="@color/black87"
-                                android:textSize="?attr/TextSizeBody"
-                                tools:ignore="RtlHardcoded" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
                         </TableRow>
 
                         <TableRow
@@ -414,8 +393,7 @@
                                 android:ellipsize="end"
                                 android:singleLine="true"
                                 android:text="@string/server_info_csi"
-                                android:textColor="@color/black87"
-                                android:textSize="?attr/TextSizeBody" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
 
                             <TextView
                                 android:id="@+id/server_info_csi"
@@ -423,9 +401,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="right"
                                 android:paddingLeft="4dp"
-                                android:textColor="@color/black87"
-                                android:textSize="?attr/TextSizeBody"
-                                tools:ignore="RtlHardcoded" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
                         </TableRow>
 
                         <TableRow
@@ -439,8 +415,7 @@
                                 android:ellipsize="end"
                                 android:singleLine="true"
                                 android:text="@string/server_info_push"
-                                android:textColor="@color/black87"
-                                android:textSize="?attr/TextSizeBody" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
 
                             <TextView
                                 android:id="@+id/server_info_push"
@@ -448,8 +423,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="right"
                                 android:paddingLeft="4dp"
-                                android:textColor="@color/black87"
-                                android:textSize="?attr/TextSizeBody" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
                         </TableRow>
 
                         <TableRow
@@ -462,8 +436,7 @@
                                 android:ellipsize="end"
                                 android:singleLine="true"
                                 android:text="@string/server_info_http_upload"
-                                android:textColor="@color/black87"
-                                android:textSize="?attr/TextSizeBody" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
 
                             <TextView
                                 android:id="@+id/server_info_http_upload"
@@ -471,8 +444,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="right"
                                 android:paddingLeft="4dp"
-                                android:textColor="@color/black87"
-                                android:textSize="?attr/TextSizeBody" />
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
 
                         </TableRow>
                     </TableLayout>
diff --git a/src/main/res/layout/form_boolean.xml b/src/main/res/layout/form_boolean.xml
index 6a1a3920a..73978f25a 100644
--- a/src/main/res/layout/form_boolean.xml
+++ b/src/main/res/layout/form_boolean.xml
@@ -8,7 +8,5 @@
     <CheckBox
         android:id="@+id/field"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textColor="@color/black87"
-        android:textSize="?attr/TextSizeBody" />
+        android:layout_height="wrap_content"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/form_text.xml b/src/main/res/layout/form_text.xml
index 398fa9bff..a9a790faa 100644
--- a/src/main/res/layout/form_text.xml
+++ b/src/main/res/layout/form_text.xml
@@ -9,14 +9,10 @@
         android:id="@+id/label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/black87"
-        android:textSize="?attr/TextSizeBody" />
+        android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
 
     <EditText
         android:id="@+id/field"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textColor="@color/black87"
-        android:textColorHint="@color/black54"
-        android:textSize="?attr/TextSizeBody" />
+        android:layout_height="wrap_content"/>
 </LinearLayout>
\ No newline at end of file