diff options
author | iNPUTmice <daniel@gultsch.de> | 2014-09-08 23:58:37 +0200 |
---|---|---|
committer | iNPUTmice <daniel@gultsch.de> | 2014-09-08 23:58:37 +0200 |
commit | d92e8381db906c20ceb7f91914d63d514a873c8a (patch) | |
tree | 94367a08152e5704eeb4b6b51747919669b46a55 /res | |
parent | d9c4637b31c79095d7acff43fee03daa83859ea3 (diff) |
setting to increase font size. fixed #420
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/account_row.xml | 4 | ||||
-rw-r--r-- | res/layout/activity_contact_details.xml | 12 | ||||
-rw-r--r-- | res/layout/activity_edit_account.xml | 14 | ||||
-rw-r--r-- | res/layout/activity_muc_details.xml | 6 | ||||
-rw-r--r-- | res/layout/activity_publish_profile_picture.xml | 4 | ||||
-rw-r--r-- | res/layout/contact.xml | 64 | ||||
-rw-r--r-- | res/layout/contact_key.xml | 2 | ||||
-rw-r--r-- | res/layout/conversation_list_row.xml | 6 | ||||
-rw-r--r-- | res/layout/create_contact_dialog.xml | 4 | ||||
-rw-r--r-- | res/layout/dialog_clear_history.xml | 2 | ||||
-rw-r--r-- | res/layout/dialog_verify_otr.xml | 12 | ||||
-rw-r--r-- | res/layout/fragment_conversation.xml | 4 | ||||
-rw-r--r-- | res/layout/join_conference_dialog.xml | 4 | ||||
-rw-r--r-- | res/layout/message_received.xml | 8 | ||||
-rw-r--r-- | res/layout/message_sent.xml | 8 | ||||
-rw-r--r-- | res/values/attrs.xml | 6 | ||||
-rw-r--r-- | res/values/strings.xml | 3 | ||||
-rw-r--r-- | res/values/themes.xml | 9 | ||||
-rw-r--r-- | res/xml/preferences.xml | 8 |
19 files changed, 103 insertions, 77 deletions
diff --git a/res/layout/account_row.xml b/res/layout/account_row.xml index 5494e4365..230a5a982 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" /> <TextView android:id="@+id/account_status" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/account_status_unknown" - android:textSize="14sp" + android:textSize="?attr/TextSizeBody" android:textColor="@color/secondarytext" android:textStyle="bold"/> </LinearLayout> diff --git a/res/layout/activity_contact_details.xml b/res/layout/activity_contact_details.xml index a00b23406..b3672e599 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"/> <TextView @@ -52,7 +52,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="16dp" - android:textSize="18sp" + android:textSize="?attr/TextSizeHeadline" android:textColor="@color/primarytext" android:textStyle="bold" /> <TextView @@ -61,7 +61,7 @@ android:layout_height="wrap_content" android:paddingLeft="8dp" android:singleLine="true" - android:textSize="14sp" + android:textSize="?attr/TextSizeBody" android:textColor="@color/primarytext"/> </LinearLayout> @@ -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" /> <TextView style="@style/sectionHeader" @@ -95,7 +95,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/send_presence_updates" - android:textSize="14sp" + android:textSize="?attr/TextSizeBody" android:textColor="@color/primarytext" /> <CheckBox @@ -103,7 +103,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/receive_presence_updates" - android:textSize="14sp" + android:textSize="?attr/TextSizeBody" android:textColor="@color/primarytext" /> <TextView style="@style/sectionHeader" diff --git a/res/layout/activity_edit_account.xml b/res/layout/activity_edit_account.xml index 2c08b9261..04f63795a 100644 --- a/res/layout/activity_edit_account.xml +++ b/res/layout/activity_edit_account.xml @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:text="@string/account_settings_jabber_id" android:textColor="@color/primarytext" - android:textSize="14sp" /> + android:textSize="?attr/TextSizeBody" /> <AutoCompleteTextView android:id="@+id/account_jid" @@ -42,7 +42,7 @@ android:layout_marginTop="8dp" android:text="@string/account_settings_password" android:textColor="@color/primarytext" - android:textSize="14sp" /> + android:textSize="?attr/TextSizeBody" /> <EditText android:id="@+id/account_password" @@ -58,7 +58,7 @@ android:layout_marginTop="8dp" android:text="@string/register_account" android:textColor="@color/primarytext" - android:textSize="14sp" /> + android:textSize="?attr/TextSizeBody" /> <TextView android:id="@+id/account_confirm_password_desc" @@ -66,7 +66,7 @@ android:layout_height="wrap_content" android:text="@string/account_settings_confirm_password" android:textColor="@color/primarytext" - android:textSize="14sp" + android:textSize="?attr/TextSizeBody" android:visibility="gone" /> <EditText @@ -94,7 +94,7 @@ android:gravity="center_horizontal" android:text="@string/additional_information" android:textColor="@color/secondarytext" - android:textSize="18sp" + android:textSize="?attr/TextSizeHeadline" android:textStyle="bold" /> <TableLayout @@ -177,7 +177,7 @@ android:gravity="center_horizontal" android:text="@string/otr_fingerprint" android:textColor="@color/secondarytext" - android:textSize="18sp" + android:textSize="?attr/TextSizeHeadline" android:textStyle="bold" /> <TextView @@ -185,7 +185,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:textSize="14sp" + android:textSize="?attr/TextSizeBody" android:typeface="monospace" /> </LinearLayout> </LinearLayout> diff --git a/res/layout/activity_muc_details.xml b/res/layout/activity_muc_details.xml index 49b4cef3a..c3eb263dc 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"/> <TextView style="@style/sectionHeader" @@ -64,7 +64,7 @@ android:layout_height="wrap_content" android:singleLine="true" android:textColor="@color/primarytext" - android:textSize="18sp" /> + android:textSize="?attr/TextSizeHeadline" /> <TextView android:id="@+id/muc_role" @@ -72,7 +72,7 @@ android:layout_height="wrap_content" android:singleLine="true" android:textColor="@color/primarytext" - android:textSize="14sp" /> + android:textSize="?attr/TextSizeBody" /> </LinearLayout> <ImageButton diff --git a/res/layout/activity_publish_profile_picture.xml b/res/layout/activity_publish_profile_picture.xml index e5d9d1a05..f23ae6c41 100644 --- a/res/layout/activity_publish_profile_picture.xml +++ b/res/layout/activity_publish_profile_picture.xml @@ -90,7 +90,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/primarytext" - android:textSize="18sp"/> + android:textSize="?attr/TextSizeHeadline"/> <TextView android:id="@+id/hint_or_warning" @@ -99,7 +99,7 @@ android:layout_height="wrap_content" android:text="@string/publish_avatar_explanation" android:textColor="@color/primarytext" - android:textSize="14sp" + android:textSize="?attr/TextSizeBody" android:minLines="3" /> </LinearLayout> diff --git a/res/layout/contact.xml b/res/layout/contact.xml index f16ad0618..ff55ccac1 100644 --- a/res/layout/contact.xml +++ b/res/layout/contact.xml @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="8dp" - android:paddingBottom="8dp" - android:background="?android:attr/activatedBackgroundIndicator"> + android:background="?android:attr/activatedBackgroundIndicator" + android:padding="8dp" > <ImageView android:id="@+id/contact_photo" @@ -12,40 +11,41 @@ android:layout_height="48dp" android:layout_alignParentLeft="true" android:scaleType="centerCrop" - android:src="@drawable/ic_profile"> + android:src="@drawable/ic_profile" > </ImageView> + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_toRightOf="@+id/contact_photo" android:layout_centerVertical="true" + android:layout_toRightOf="@+id/contact_photo" android:orientation="vertical" - android:paddingLeft="8dp"> - <TextView - android:id="@+id/contact_display_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="18sp" - android:textColor="@color/primarytext" - android:singleLine="true" - /> - <TextView - android:id="@+id/contact_jid" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:singleLine="true" - android:textSize="14sp" - android:textColor="@color/primarytext" - /> - <TextView - android:id="@+id/key" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="18sp" - android:textColor="@color/primarytext" - android:typeface="monospace" - android:visibility="gone" - /> + android:paddingLeft="8dp" > + + <TextView + android:id="@+id/contact_display_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:singleLine="true" + android:textSize="?attr/TextSizeHeadline" + android:textColor="@color/primarytext" /> + + <TextView + android:id="@+id/contact_jid" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:singleLine="true" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/key" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeHeadline" + android:typeface="monospace" + android:visibility="gone" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/res/layout/contact_key.xml b/res/layout/contact_key.xml index fdd1ddba0..904523a10 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" /> <TextView diff --git a/res/layout/conversation_list_row.xml b/res/layout/conversation_list_row.xml index a6001e5fb..8fdd64b7c 100644 --- a/res/layout/conversation_list_row.xml +++ b/res/layout/conversation_list_row.xml @@ -26,7 +26,7 @@ android:layout_alignLeft="@+id/conversation_lastwrapper" android:layout_toLeftOf="@+id/conversation_lastupdate" android:singleLine="true" - android:textSize="18sp" + android:textSize="?attr/TextSizeHeadline" android:textColor="@color/primarytext" android:typeface="sans" /> @@ -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"/> </RelativeLayout> diff --git a/res/layout/create_contact_dialog.xml b/res/layout/create_contact_dialog.xml index 4b5b9a04a..a1e6f6ad2 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" /> <Spinner @@ -22,7 +22,7 @@ android:layout_marginTop="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="14sp" + android:textSize="?attr/TextSizeBody" android:textColor="@color/primarytext" android:text="@string/account_settings_jabber_id" /> diff --git a/res/layout/dialog_clear_history.xml b/res/layout/dialog_clear_history.xml index 10ceaae57..7edb4b87a 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"/> <CheckBox android:id="@+id/end_conversation_checkbox" diff --git a/res/layout/dialog_verify_otr.xml b/res/layout/dialog_verify_otr.xml index c518c6470..301f465a0 100644 --- a/res/layout/dialog_verify_otr.xml +++ b/res/layout/dialog_verify_otr.xml @@ -13,14 +13,14 @@ android:paddingTop="8dp" android:text="Jabber ID" android:textColor="@color/primarytext" - android:textSize="18sp"/> + android:textSize="?attr/TextSizeHeadline"/> <TextView android:id="@+id/verify_otr_jid" android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="8dp" - android:textSize="14sp" + android:textSize="?attr/TextSizeBody" android:textColor="@color/secondarytext"/> <TextView android:layout_width="wrap_content" @@ -28,14 +28,14 @@ android:paddingTop="8dp" android:text="@string/otr_fingerprint" android:textColor="@color/primarytext" - android:textSize="18sp"/> + android:textSize="?attr/TextSizeHeadline"/> <TextView android:id="@+id/verify_otr_fingerprint" android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="8dp" - android:textSize="14sp" + android:textSize="?attr/TextSizeBody" android:typeface="monospace" android:textColor="@color/secondarytext"/> <TextView @@ -43,7 +43,7 @@ android:layout_height="wrap_content" android:paddingTop="8dp" android:text="@string/your_fingerprint" - android:textSize="18sp" + android:textSize="?attr/TextSizeHeadline" android:textColor="@color/primarytext"/> <TextView @@ -51,7 +51,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="8dp" - android:textSize="14sp" + android:textSize="?attr/TextSizeBody" android:typeface="monospace" android:textColor="@color/secondarytext"/> </LinearLayout> diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml index 3f7f27e50..b16e41132 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"/> <TextView @@ -96,7 +96,7 @@ android:paddingTop="16dp" android:textAllCaps="true" android:textColor="@color/ondarktext" - android:textSize="14sp" + android:textSize="?attr/TextSizeBody" android:textStyle="bold" /> </RelativeLayout> diff --git a/res/layout/join_conference_dialog.xml b/res/layout/join_conference_dialog.xml index 431bf59e7..a36a5ef78 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" /> <Spinner @@ -22,7 +22,7 @@ android:layout_marginTop="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="14sp" + android:textSize="?attr/TextSizeBody" android:textColor="@color/primarytext" android:text="@string/conference_address" /> diff --git a/res/layout/message_received.xml b/res/layout/message_received.xml index f7ff44d57..d85a4f8d0 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" /> <Button android:id="@+id/download_button" @@ -62,8 +62,8 @@ <ImageView android:id="@+id/security_indicator" - android:layout_width="12sp" - android:layout_height="12sp" + android:layout_width="?attr/TextSizeInfo" + android:layout_height="?attr/TextSizeInfo" android:layout_gravity="center_vertical" android:layout_marginRight="6sp" android:layout_marginTop="2sp" @@ -78,7 +78,7 @@ android:gravity="center_vertical" android:text="@string/sending" android:textColor="@color/secondarytext" - android:textSize="12sp" /> + android:textSize="?attr/TextSizeInfo" /> </LinearLayout> </LinearLayout> </LinearLayout> diff --git a/res/layout/message_sent.xml b/res/layout/message_sent.xml index 115140195..9728dc56d 100644 --- a/res/layout/message_sent.xml +++ b/res/layout/message_sent.xml @@ -44,7 +44,7 @@ android:autoLink="web" android:textColor="@color/primarytext" android:textIsSelectable="true" - android:textSize="14sp" /> + android:textSize="?attr/TextSizeBody" /> <LinearLayout android:layout_width="wrap_content" @@ -61,12 +61,12 @@ android:gravity="center_vertical" android:text="@string/sending" android:textColor="@color/secondarytext" - android:textSize="12sp" /> + android:textSize="?attr/TextSizeInfo" /> <ImageView android:id="@+id/security_indicator" - android:layout_width="12sp" - android:layout_height="12sp" + android:layout_width="?attr/TextSizeInfo" + android:layout_height="?attr/TextSizeInfo" android:layout_gravity="center_vertical" android:layout_marginLeft="6sp" android:layout_marginTop="2sp" diff --git a/res/values/attrs.xml b/res/values/attrs.xml new file mode 100644 index 000000000..793b5604b --- /dev/null +++ b/res/values/attrs.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <attr name="TextSizeInfo" format="dimension"/> + <attr name="TextSizeBody" format="dimension"/> + <attr name="TextSizeHeadline" format="dimension"/> +</resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 841620e25..75ddbbc45 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -108,6 +108,7 @@ <string name="pref_never_send_crash_summary">By sending in stack traces you are helping the ongoing development of Conversations</string> <string name="pref_confirm_messages">Confirm Messages</string> <string name="pref_confirm_messages_summary">Let your contact know when you have received and read a message</string> + <string name="pref_ui_options">UI Options</string> <string name="openpgp_error">OpenKeychain reported an error</string> <string name="error_decrypting_file">I/O Error decrypting file</string> <string name="accept">Accept</string> @@ -251,4 +252,6 @@ <string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string> <string name="pref_expert_options">Expert options</string> <string name="pref_expert_options_summary">Please be very careful with those</string> + <string name="pref_use_larger_font">Increase font size</string> + <string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</string> </resources>
\ No newline at end of file diff --git a/res/values/themes.xml b/res/values/themes.xml index 97f1db8f8..e2d4dcbe4 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -5,6 +5,15 @@ <item name="android:actionBarStyle">@style/ConversationsActionBar</item> <item name="android:actionBarWidgetTheme">@style/ConversationsActionBarWidget</item> <item name="android:actionBarTabStyle">@style/ConversationsActionBarTabs</item> + <item name="TextSizeInfo">12sp</item> + <item name="TextSizeBody">14sp</item> + <item name="TextSizeHeadline">20sp</item> + </style> + + <style name="ConversationsTheme.LargerText" parent="ConversationsTheme"> + <item name="TextSizeInfo">14sp</item> + <item name="TextSizeBody">16sp</item> + <item name="TextSizeHeadline">22sp</item> </style> <style name="ConversationsActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse"> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 3d2f85c98..f0d64e39c 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -62,6 +62,14 @@ android:summary="@string/pref_notification_grace_period_summary" android:title="@string/pref_notification_grace_period" /> </PreferenceCategory> + <PreferenceCategory + android:title="@string/pref_ui_options"> + <CheckBoxPreference + android:defaultValue="false" + android:key="use_larger_font" + android:title="@string/pref_use_larger_font" + android:summary="@string/pref_use_larger_font_summary"/> + </PreferenceCategory> <PreferenceCategory android:title="@string/pref_advanced_options" > <PreferenceScreen android:summary="@string/pref_expert_options_summary" |