aboutsummaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/account_row.xml6
-rw-r--r--res/layout/activity_contact_details.xml12
-rw-r--r--res/layout/activity_muc_details.xml4
-rw-r--r--res/layout/cert_warning.xml8
-rw-r--r--res/layout/contact.xml1
-rw-r--r--res/layout/conversation_list_row.xml2
-rw-r--r--res/layout/dialog_clear_history.xml2
-rw-r--r--res/layout/dialog_verify_otr.xml6
-rw-r--r--res/layout/fragment_conversation.xml6
-rw-r--r--res/layout/message_recieved.xml15
-rw-r--r--res/layout/message_sent.xml15
-rw-r--r--res/layout/otr_fingerprint.xml4
12 files changed, 48 insertions, 33 deletions
diff --git a/res/layout/account_row.xml b/res/layout/account_row.xml
index 6cfbe9e3..248b17f7 100644
--- a/res/layout/account_row.xml
+++ b/res/layout/account_row.xml
@@ -19,7 +19,7 @@
android:id="@+id/account_jid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="20sp"
+ android:textSize="18sp"
android:singleLine="true"
android:scrollHorizontally="false"/>
@@ -35,7 +35,7 @@
android:layout_height="wrap_content"
android:text="@string/account_status"
android:textStyle="bold"
- android:textSize="16sp" />
+ android:textSize="14sp" />
<TextView
android:id="@+id/account_status"
@@ -45,7 +45,7 @@
android:textColor="#669900"
android:text="@string/account_status_unknown"
android:textStyle="bold"
- android:textSize="16sp"/>
+ android:textSize="14sp"/>
</LinearLayout>
diff --git a/res/layout/activity_contact_details.xml b/res/layout/activity_contact_details.xml
index 5eecfa87..ae3aaf7c 100644
--- a/res/layout/activity_contact_details.xml
+++ b/res/layout/activity_contact_details.xml
@@ -44,14 +44,14 @@
android:paddingLeft="8dp"
android:singleLine="true"
android:textColor="#5b5b5b"
- android:textSize="18sp" />
+ android:textSize="14sp" />
<TextView
android:id="@+id/details_contactstatus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="16dp"
- android:textSize="24sp"
+ android:textSize="18sp"
android:textStyle="bold" />
<TextView
android:id="@+id/details_lastseen"
@@ -77,7 +77,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
- android:textSize="18sp"
+ android:textSize="14sp"
android:textColor="#5b5b5b" />
<TextView
style="@style/sectionHeader"
@@ -91,7 +91,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/send_presence_updates"
- android:textSize="18sp"
+ android:textSize="14sp"
android:textColor="#5b5b5b" />
<CheckBox
@@ -99,7 +99,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/receive_presence_updates"
- android:textSize="18sp"
+ android:textSize="14sp"
android:textColor="#5b5b5b" />
<TextView
@@ -110,7 +110,7 @@
android:layout_height="wrap_content"
android:text="@string/ask_again"
android:textColor="#33B5E5"
- android:textSize="18sp"
+ android:textSize="14sp"
android:visibility="gone"
/>
<TextView
diff --git a/res/layout/activity_muc_details.xml b/res/layout/activity_muc_details.xml
index f866a485..ebd3db0f 100644
--- a/res/layout/activity_muc_details.xml
+++ b/res/layout/activity_muc_details.xml
@@ -53,7 +53,7 @@
android:padding="8dp"
android:singleLine="true"
android:textColor="#5b5b5b"
- android:textSize="18sp"/>
+ android:textSize="14sp"/>
<TextView
style="@style/sectionHeader"
@@ -102,7 +102,7 @@
android:layout_height="wrap_content"
android:padding="8dp"
android:singleLine="true"
- android:textSize="18sp"
+ android:textSize="14sp"
android:textColor="#5b5b5b"/>
<LinearLayout
diff --git a/res/layout/cert_warning.xml b/res/layout/cert_warning.xml
index 59d71803..fffe3266 100644
--- a/res/layout/cert_warning.xml
+++ b/res/layout/cert_warning.xml
@@ -9,14 +9,14 @@
android:id="@+id/hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="18sp"/>
+ android:textSize="14sp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFe92727"
android:textStyle="bold"
- android:textSize="18sp"
+ android:textSize="14sp"
android:text="Do not connect unless you know exactly what you are doing"
android:paddingTop="8dp"
android:paddingBottom="8dp"/>
@@ -24,7 +24,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="18sp"
+ android:textSize="14sp"
android:text="The SHA1 fingerprint is:" />
<TextView
@@ -36,6 +36,6 @@
android:layout_height="wrap_content"
android:typeface="monospace"
android:textStyle="bold"
- android:textSize="20sp"/>
+ android:textSize="18sp"/>
</LinearLayout>
diff --git a/res/layout/contact.xml b/res/layout/contact.xml
index 7303d2ba..e637e4b1 100644
--- a/res/layout/contact.xml
+++ b/res/layout/contact.xml
@@ -34,6 +34,7 @@
android:layout_height="wrap_content"
android:textColor="#5b5b5b"
android:singleLine="true"
+ android:textSize="14sp"
/>
<TextView
android:id="@+id/key"
diff --git a/res/layout/conversation_list_row.xml b/res/layout/conversation_list_row.xml
index dda09178..8b9c461d 100644
--- a/res/layout/conversation_list_row.xml
+++ b/res/layout/conversation_list_row.xml
@@ -26,7 +26,7 @@
android:layout_toLeftOf="@+id/conversation_lastupdate"
android:singleLine="true"
android:textColor="#636363"
- android:textSize="20sp"
+ android:textSize="18sp"
android:typeface="sans" />
<LinearLayout
diff --git a/res/layout/dialog_clear_history.xml b/res/layout/dialog_clear_history.xml
index 789bbae9..10ceaae5 100644
--- a/res/layout/dialog_clear_history.xml
+++ b/res/layout/dialog_clear_history.xml
@@ -8,7 +8,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/clear_histor_msg"
- android:textSize="18sp"
+ android:textSize="14sp"
android:paddingBottom="8dp"/>
<CheckBox
android:id="@+id/end_conversation_checkbox"
diff --git a/res/layout/dialog_verify_otr.xml b/res/layout/dialog_verify_otr.xml
index 6dfe149d..a55dce01 100644
--- a/res/layout/dialog_verify_otr.xml
+++ b/res/layout/dialog_verify_otr.xml
@@ -13,7 +13,7 @@
android:paddingTop="8dp"
android:text="Jabber ID"
android:textColor="#33B5E5"
- android:textSize="20sp"/>
+ android:textSize="18sp"/>
<TextView
android:id="@+id/verify_otr_jid"
@@ -27,7 +27,7 @@
android:paddingTop="8dp"
android:text="OTR fingerprint"
android:textColor="#33B5E5"
- android:textSize="20sp"/>
+ android:textSize="18sp"/>
<TextView
android:id="@+id/verify_otr_fingerprint"
@@ -42,7 +42,7 @@
android:paddingTop="8dp"
android:text="Your fingerprint"
android:textColor="#33B5E5"
- android:textSize="20sp"/>
+ android:textSize="18sp"/>
<TextView
android:id="@+id/verify_otr_yourprint"
diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml
index c09a7d5f..4bf93eab 100644
--- a/res/layout/fragment_conversation.xml
+++ b/res/layout/fragment_conversation.xml
@@ -78,7 +78,7 @@
android:layout_height="wrap_content"
android:padding="6dp"
android:textColor="#eee"
- android:textSize="20sp"
+ android:textSize="18sp"
android:textStyle="bold" />
<TextView
@@ -105,7 +105,7 @@
android:padding="6dp"
android:text="@string/unknown_otr_fingerprint"
android:textColor="#eee"
- android:textSize="20sp"
+ android:textSize="18sp"
android:textStyle="bold" />
<TextView
@@ -134,7 +134,7 @@
android:padding="6dp"
android:text="@string/openpgp_messages_found"
android:textColor="#eee"
- android:textSize="20sp"
+ android:textSize="18sp"
android:textStyle="bold" />
<TextView
diff --git a/res/layout/message_recieved.xml b/res/layout/message_recieved.xml
index 3b3df9e8..7949f2e1 100644
--- a/res/layout/message_recieved.xml
+++ b/res/layout/message_recieved.xml
@@ -3,7 +3,10 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:padding="8dp" >
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:paddingBottom="4dp"
+ android:paddingTop="4dp">
<LinearLayout
android:id="@+id/message_box"
@@ -20,7 +23,10 @@
android:background="#ededed"
android:orientation="vertical"
android:gravity="center_vertical"
- android:padding="3dp" >
+ android:paddingTop="4dp"
+ android:paddingBottom="4dp"
+ android:paddingRight="5dp"
+ android:paddingLeft="5dp">
<ImageView
android:id="@+id/message_image"
@@ -39,7 +45,7 @@
android:autoLink="web"
android:textIsSelectable="true"
android:textColor="#333333"
- android:textSize="16sp"/>
+ android:textSize="14sp"/>
<Button
android:id="@+id/download_button"
@@ -52,7 +58,8 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="horizontal" >
+ android:orientation="horizontal"
+ android:paddingTop="1dp">
<ImageView
android:id="@+id/security_indicator"
diff --git a/res/layout/message_sent.xml b/res/layout/message_sent.xml
index fbc95898..b9c2ee10 100644
--- a/res/layout/message_sent.xml
+++ b/res/layout/message_sent.xml
@@ -3,7 +3,10 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:padding="8dp" >
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:paddingBottom="4dp"
+ android:paddingTop="4dp">
<LinearLayout
android:id="@+id/message_box"
@@ -20,7 +23,10 @@
android:background="#ededed"
android:orientation="vertical"
android:gravity="center_vertical"
- android:padding="3dp" >
+ android:paddingTop="4dp"
+ android:paddingBottom="4dp"
+ android:paddingRight="5dp"
+ android:paddingLeft="5dp">
<ImageView
android:id="@+id/message_image"
@@ -39,13 +45,14 @@
android:autoLink="web"
android:textIsSelectable="true"
android:textColor="#333333"
- android:textSize="16sp" />
+ android:textSize="14sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layout_gravity="right">
+ android:layout_gravity="right"
+ android:paddingTop="1dp">
<TextView
android:id="@+id/message_time"
diff --git a/res/layout/otr_fingerprint.xml b/res/layout/otr_fingerprint.xml
index b9eafca4..d8f24151 100644
--- a/res/layout/otr_fingerprint.xml
+++ b/res/layout/otr_fingerprint.xml
@@ -9,7 +9,7 @@
android:id="@+id/otr_no_fingerprint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="20sp"
+ android:textSize="18sp"
android:text="@string/no_otr_fingerprint"
android:visibility="visible"/>
@@ -17,7 +17,7 @@
android:id="@+id/otr_fingerprint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="20sp"
+ android:textSize="18sp"
android:typeface="monospace"
android:visibility="gone"/>