diff options
Diffstat (limited to 'src/main/res')
-rw-r--r-- | src/main/res/layout/account_row.xml | 4 | ||||
-rw-r--r-- | src/main/res/layout/activity_contact_details.xml | 34 | ||||
-rw-r--r-- | src/main/res/layout/activity_edit_account.xml | 15 | ||||
-rw-r--r-- | src/main/res/layout/activity_muc_details.xml | 9 | ||||
-rw-r--r-- | src/main/res/layout/contact.xml | 8 | ||||
-rw-r--r-- | src/main/res/layout/conversation_list_row.xml | 4 | ||||
-rw-r--r-- | src/main/res/layout/message_received.xml | 8 | ||||
-rw-r--r-- | src/main/res/layout/message_sent.xml | 8 | ||||
-rw-r--r-- | src/main/res/layout/message_status.xml | 5 | ||||
-rw-r--r-- | src/main/res/menu/conversations.xml | 7 | ||||
-rw-r--r-- | src/main/res/values-de/strings.xml | 2 | ||||
-rw-r--r-- | src/main/res/xml/preferences.xml | 10 |
12 files changed, 76 insertions, 38 deletions
diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml index 06716a10a..1d94586ec 100644 --- a/src/main/res/layout/account_row.xml +++ b/src/main/res/layout/account_row.xml @@ -13,7 +13,9 @@ android:layout_height="48dp" android:layout_alignParentLeft="true" android:src="@drawable/ic_profile" - android:contentDescription="@string/account_image_description"> + android:contentDescription="@string/account_image_description" + android:background="@drawable/message_border" + android:padding="1dp"> </ImageView> <LinearLayout diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index 5f6a2dd09..e1a967c07 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -21,18 +21,25 @@ <QuickContactBadge android:id="@+id/details_contact_badge" - android:layout_width="72dp" - android:layout_height="72dp" + android:layout_width="300dp" + android:layout_height="300dp" + android:scaleType="centerCrop" android:layout_alignParentTop="true" - android:scaleType="centerCrop" /> + android:layout_centerHorizontal="true" + android:background="@drawable/message_border" + android:padding="1dp" /> <LinearLayout android:id="@+id/details_jidbox" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="16dp" - android:layout_toRightOf="@+id/details_contact_badge" - android:orientation="vertical" > + android:orientation="vertical" + android:layout_below="@+id/details_contact_badge" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:layout_marginTop="16dp" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true"> <TextView android:id="@+id/details_contactjid" @@ -41,12 +48,14 @@ android:text="@string/account_settings_example_jabber_id" android:textColor="@color/black87" android:textSize="?attr/TextSizeHeadline" - android:textStyle="bold" /> + android:textStyle="bold" + android:layout_gravity="center_horizontal" /> <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="vertical" > + android:orientation="vertical" + android:layout_gravity="center_horizontal"> <LinearLayout android:id="@+id/tags" @@ -54,7 +63,8 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" - android:orientation="horizontal"> + android:orientation="horizontal" + android:layout_gravity="center_horizontal"> </LinearLayout> <TextView @@ -62,7 +72,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/black54" - android:textSize="?attr/TextSizeBody" /> + android:textSize="?attr/TextSizeBody" + android:layout_gravity="center_horizontal" /> </LinearLayout> <Button @@ -70,7 +81,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:text="@string/add_contact"/> + android:text="@string/add_contact" + android:layout_gravity="center_horizontal" /> <CheckBox android:id="@+id/details_send_presence" diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 98de84f56..b99e3e7be 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -28,16 +28,21 @@ android:orientation="vertical" android:padding="@dimen/infocard_padding"> <ImageView android:id="@+id/avater" - android:layout_width="72dp" - android:layout_height="72dp" + android:layout_width="200dp" + android:layout_height="200dp" + android:contentDescription="@string/account_image_description" + android:background="@drawable/message_border" + android:padding="1dp" android:layout_alignParentTop="true" - android:layout_marginRight="16dp" - android:contentDescription="@string/account_image_description"/> + android:layout_centerHorizontal="true" /> <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:layout_toRightOf="@+id/avater"> + android:layout_below="@+id/avater" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_marginTop="16dp"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index b89c9945b..671215eaa 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -37,10 +37,13 @@ <ImageView android:id="@+id/your_photo" - android:layout_width="48dp" - android:layout_height="48dp" + android:layout_width="72dp" + android:layout_height="72dp" android:layout_alignParentLeft="true" - android:src="@drawable/ic_profile"> + android:src="@drawable/ic_profile" + android:background="@drawable/message_border" + android:padding="1dp" + android:layout_alignParentEnd="false"> </ImageView> <LinearLayout diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml index a7f5bef58..d42782dd8 100644 --- a/src/main/res/layout/contact.xml +++ b/src/main/res/layout/contact.xml @@ -7,11 +7,13 @@ <ImageView android:id="@+id/contact_photo" - android:layout_width="48dp" - android:layout_height="48dp" + android:layout_width="56dp" + android:layout_height="56dp" android:layout_alignParentLeft="true" android:scaleType="centerCrop" - android:src="@drawable/ic_profile" > + android:src="@drawable/ic_profile" + android:background="@drawable/message_border" + android:padding="1dp"> </ImageView> <LinearLayout diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index 28e526e0b..5f1c5047d 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -26,7 +26,9 @@ android:layout_width="56dp" android:layout_height="56dp" android:layout_alignParentLeft="true" - android:scaleType="centerCrop" /> + android:scaleType="centerCrop" + android:background="@drawable/message_border" + android:padding="1dp" /> <RelativeLayout android:layout_width="fill_parent" diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml index 988fb593d..07c515066 100644 --- a/src/main/res/layout/message_received.xml +++ b/src/main/res/layout/message_received.xml @@ -90,8 +90,12 @@ android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:layout_marginRight="-1.5dp" - android:padding="0dp" android:scaleType="fitXY" - android:src="@drawable/ic_profile" /> + android:src="@drawable/ic_profile" + android:background="@drawable/message_border" + android:paddingLeft="1dp" + android:paddingTop="1dp" + android:paddingBottom="1dp" + android:paddingRight="0dp" /> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml index e0a82df8e..7d9c10fc2 100644 --- a/src/main/res/layout/message_sent.xml +++ b/src/main/res/layout/message_sent.xml @@ -101,8 +101,12 @@ android:layout_alignParentBottom="true" android:layout_alignParentRight="true" android:layout_marginLeft="-1.5dp" - android:padding="0dp" android:scaleType="fitXY" - android:src="@drawable/ic_profile" /> + android:src="@drawable/ic_profile" + android:background="@drawable/message_border" + android:paddingTop="1dp" + android:paddingRight="1dp" + android:paddingBottom="1dp" + android:paddingLeft="0dp" /> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml index 2816f475c..393b672fb 100644 --- a/src/main/res/layout/message_status.xml +++ b/src/main/res/layout/message_status.xml @@ -15,9 +15,10 @@ android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:layout_marginRight="-1.5dp" - android:padding="0dp" + android:padding="1dp" android:scaleType="fitXY" - android:src="@drawable/ic_profile" /> + android:src="@drawable/ic_profile" + android:background="@drawable/message_border" /> <TextView android:id="@+id/status_message" diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml index 4c724d27d..fe2ff834d 100644 --- a/src/main/res/menu/conversations.xml +++ b/src/main/res/menu/conversations.xml @@ -10,7 +10,7 @@ android:id="@+id/action_security" android:icon="?attr/icon_not_secure" android:orderInCategory="20" - android:showAsAction="always" + android:showAsAction="never" android:title="@string/action_secure"/> <item android:id="@+id/action_attach_file" @@ -20,14 +20,15 @@ android:title="@string/attach_file"/> <item android:id="@+id/action_contact_details" + android:icon="?attr/icon_group" android:orderInCategory="40" - android:showAsAction="never" + android:showAsAction="always" android:title="@string/action_contact_details"/> <item android:id="@+id/action_muc_details" android:icon="?attr/icon_group" android:orderInCategory="40" - android:showAsAction="ifRoom" + android:showAsAction="always" android:title="@string/action_muc_details"/> <item android:id="@+id/action_invite" diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 000c253b2..daf4a6b5b 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -451,4 +451,6 @@ <string name="none">keine</string> <string name="recently_used">zuletzt verwendet</string> <string name="choose_quick_action">wähle Schnell-Taste</string> + <string name="check_x_filesize">Prüfe %s-Größe</string> + <string name="file_url">Datei-URL</string> </resources> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 5b7d69040..388f5089b 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -16,7 +16,7 @@ android:summary="@string/pref_xmpp_resource_summary" android:title="@string/pref_xmpp_resource" /> <ListPreference - android:defaultValue="524288" + android:defaultValue="1048576" android:entries="@array/filesizes" android:entryValues="@array/filesizes_values" android:key="auto_accept_file_size" @@ -101,7 +101,7 @@ android:summary="@string/pref_use_larger_font_summary" android:title="@string/pref_use_larger_font" /> <CheckBoxPreference - android:defaultValue="false" + android:defaultValue="true" android:key="send_button_status" android:summary="@string/pref_use_send_button_to_indicate_status_summary" android:title="@string/pref_use_send_button_to_indicate_status" /> @@ -163,12 +163,12 @@ </PreferenceCategory> <PreferenceCategory android:title="@string/pref_expert_options_other" > <CheckBoxPreference - android:defaultValue="false" + android:defaultValue="true" android:key="indicate_received" android:summary="@string/pref_use_indicate_received_summary" android:title="@string/pref_use_indicate_received" /> <CheckBoxPreference - android:defaultValue="false" + android:defaultValue="true" android:key="keep_foreground_service" android:title="@string/pref_keep_foreground_service" android:summary="@string/pref_keep_foreground_service_summary" /> @@ -176,7 +176,7 @@ </PreferenceScreen> <CheckBoxPreference - android:defaultValue="false" + android:defaultValue="true" android:key="never_send" android:summary="@string/pref_never_send_crash_summary" android:title="@string/pref_never_send_crash" /> |