From d92e8381db906c20ceb7f91914d63d514a873c8a Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Mon, 8 Sep 2014 23:58:37 +0200 Subject: setting to increase font size. fixed #420 --- res/layout/account_row.xml | 4 +- res/layout/activity_contact_details.xml | 12 ++-- res/layout/activity_edit_account.xml | 14 ++--- res/layout/activity_muc_details.xml | 6 +- res/layout/activity_publish_profile_picture.xml | 4 +- res/layout/contact.xml | 64 +++++++++++----------- res/layout/contact_key.xml | 2 +- res/layout/conversation_list_row.xml | 6 +- res/layout/create_contact_dialog.xml | 4 +- res/layout/dialog_clear_history.xml | 2 +- res/layout/dialog_verify_otr.xml | 12 ++-- res/layout/fragment_conversation.xml | 4 +- res/layout/join_conference_dialog.xml | 4 +- res/layout/message_received.xml | 8 +-- res/layout/message_sent.xml | 8 +-- res/values/attrs.xml | 6 ++ res/values/strings.xml | 3 + res/values/themes.xml | 9 +++ res/xml/preferences.xml | 8 +++ src/eu/siacs/conversations/Config.java | 4 +- src/eu/siacs/conversations/crypto/OtrEngine.java | 3 +- src/eu/siacs/conversations/crypto/PgpEngine.java | 6 +- src/eu/siacs/conversations/entities/Message.java | 10 ++-- .../siacs/conversations/entities/MucOptions.java | 18 +++--- .../siacs/conversations/parser/MessageParser.java | 14 ++--- .../siacs/conversations/parser/PresenceParser.java | 3 +- .../conversations/persistance/DatabaseBackend.java | 3 +- .../services/XmppConnectionService.java | 7 ++- .../conversations/ui/ChooseContactActivity.java | 5 +- .../conversations/ui/ContactDetailsActivity.java | 35 +++++++----- .../conversations/ui/ConversationActivity.java | 6 +- .../siacs/conversations/ui/SettingsActivity.java | 1 + .../ui/StartConversationActivity.java | 6 +- src/eu/siacs/conversations/ui/XmppActivity.java | 31 ++++++++--- .../conversations/ui/adapter/MessageAdapter.java | 3 +- src/eu/siacs/conversations/utils/UIHelper.java | 42 +++++++------- .../siacs/conversations/xmpp/XmppConnection.java | 11 ++-- .../xmpp/jingle/JingleConnection.java | 4 +- .../xmpp/jingle/JingleInbandTransport.java | 3 +- .../xmpp/jingle/JingleSocks5Transport.java | 6 +- 40 files changed, 229 insertions(+), 172 deletions(-) create mode 100644 res/values/attrs.xml diff --git a/res/layout/account_row.xml b/res/layout/account_row.xml index 5494e436..230a5a98 100644 --- a/res/layout/account_row.xml +++ b/res/layout/account_row.xml @@ -28,14 +28,14 @@ android:scrollHorizontally="false" android:singleLine="true" android:textColor="@color/primarytext" - android:textSize="18sp" /> + android:textSize="?attr/TextSizeHeadline" /> diff --git a/res/layout/activity_contact_details.xml b/res/layout/activity_contact_details.xml index a00b2340..b3672e59 100644 --- a/res/layout/activity_contact_details.xml +++ b/res/layout/activity_contact_details.xml @@ -44,7 +44,7 @@ android:layout_height="wrap_content" android:paddingLeft="8dp" android:singleLine="true" - android:textSize="14sp" + android:textSize="?attr/TextSizeBody" android:textColor="@color/primarytext"/> @@ -80,7 +80,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="8dp" - android:textSize="14sp" + android:textSize="?attr/TextSizeBody" android:textColor="@color/primarytext" /> + android:textSize="?attr/TextSizeBody" /> + android:textSize="?attr/TextSizeBody" /> + android:textSize="?attr/TextSizeBody" /> diff --git a/res/layout/activity_muc_details.xml b/res/layout/activity_muc_details.xml index 49b4cef3..c3eb263d 100644 --- a/res/layout/activity_muc_details.xml +++ b/res/layout/activity_muc_details.xml @@ -24,7 +24,7 @@ android:singleLine="true" android:text="@string/account_settings_example_jabber_id" android:textColor="@color/primarytext" - android:textSize="14sp"/> + android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeHeadline" /> + android:textSize="?attr/TextSizeBody" /> + android:textSize="?attr/TextSizeHeadline"/> diff --git a/res/layout/contact.xml b/res/layout/contact.xml index f16ad061..ff55ccac 100644 --- a/res/layout/contact.xml +++ b/res/layout/contact.xml @@ -1,10 +1,9 @@ + android:background="?android:attr/activatedBackgroundIndicator" + android:padding="8dp" > + android:src="@drawable/ic_profile" > + - - - + android:paddingLeft="8dp" > + + + + + + \ No newline at end of file diff --git a/res/layout/contact_key.xml b/res/layout/contact_key.xml index fdd1ddba..904523a1 100644 --- a/res/layout/contact_key.xml +++ b/res/layout/contact_key.xml @@ -16,7 +16,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/primarytext" - android:textSize="18sp" + android:textSize="?attr/TextSizeHeadline" android:typeface="monospace" /> @@ -42,7 +42,7 @@ android:id="@+id/conversation_lastmsg" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:textSize="14sp" + android:textSize="?attr/TextSizeBody" android:textColor="@color/primarytext" android:singleLine="true" android:scrollHorizontally="false" @@ -63,7 +63,7 @@ android:layout_alignBaseline="@+id/conversation_name" android:layout_alignParentRight="true" android:gravity="right" - android:textSize="12sp" + android:textSize="?attr/TextSizeInfo" android:textColor="@color/secondarytext"/> diff --git a/res/layout/create_contact_dialog.xml b/res/layout/create_contact_dialog.xml index 4b5b9a04..a1e6f6ad 100644 --- a/res/layout/create_contact_dialog.xml +++ b/res/layout/create_contact_dialog.xml @@ -9,7 +9,7 @@ android:id="@+id/your_account" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="14sp" + android:textSize="?attr/TextSizeBody" android:textColor="@color/primarytext" android:text="@string/your_account" /> diff --git a/res/layout/dialog_clear_history.xml b/res/layout/dialog_clear_history.xml index 10ceaae5..7edb4b87 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="14sp" + android:textSize="?attr/TextSizeBody" android:paddingBottom="8dp"/> + android:textSize="?attr/TextSizeHeadline"/> + android:textSize="?attr/TextSizeHeadline"/> diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml index 3f7f27e5..b16e4113 100644 --- a/res/layout/fragment_conversation.xml +++ b/res/layout/fragment_conversation.xml @@ -81,7 +81,7 @@ android:layout_centerVertical="true" android:paddingLeft="24dp" android:textColor="@color/ondarktext" - android:textSize="14sp" + android:textSize="?attr/TextSizeBody" android:layout_toLeftOf="@+id/snackbar_action"/> diff --git a/res/layout/join_conference_dialog.xml b/res/layout/join_conference_dialog.xml index 431bf59e..a36a5ef7 100644 --- a/res/layout/join_conference_dialog.xml +++ b/res/layout/join_conference_dialog.xml @@ -9,7 +9,7 @@ android:id="@+id/your_account" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="14sp" + android:textSize="?attr/TextSizeBody" android:textColor="@color/primarytext" android:text="@string/your_account" /> diff --git a/res/layout/message_received.xml b/res/layout/message_received.xml index f7ff44d5..d85a4f8d 100644 --- a/res/layout/message_received.xml +++ b/res/layout/message_received.xml @@ -44,7 +44,7 @@ android:autoLink="web" android:textColor="@color/primarytext" android:textIsSelectable="true" - android:textSize="14sp" /> + android:textSize="?attr/TextSizeBody" />