diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/account_row.xml | 61 | ||||
| -rw-r--r-- | res/layout/activity_contact_details.xml | 2 | ||||
| -rw-r--r-- | res/layout/activity_edit_account.xml | 229 | ||||
| -rw-r--r-- | res/layout/activity_publish_profile_picture.xml | 106 | ||||
| -rw-r--r-- | res/layout/contact.xml | 1 | ||||
| -rw-r--r-- | res/layout/conversation_list_row.xml | 3 | ||||
| -rw-r--r-- | res/layout/fragment_conversation.xml | 8 | ||||
| -rw-r--r-- | res/layout/manage_accounts.xml | 3 | ||||
| -rw-r--r-- | res/layout/message_recieved.xml | 2 | ||||
| -rw-r--r-- | res/layout/message_sent.xml | 2 | ||||
| -rw-r--r-- | res/layout/otr_fingerprint.xml | 24 | ||||
| -rw-r--r-- | res/layout/server_info.xml | 157 |
12 files changed, 371 insertions, 227 deletions
diff --git a/res/layout/account_row.xml b/res/layout/account_row.xml index 0c18d9b2..5494e436 100644 --- a/res/layout/account_row.xml +++ b/res/layout/account_row.xml @@ -2,55 +2,42 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="8dp" - android:background="?android:attr/activatedBackgroundIndicator"> + android:background="?android:attr/activatedBackgroundIndicator" + android:padding="8dp" > - + <ImageView + android:id="@+id/account_image" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_alignParentLeft="true" + android:src="@drawable/ic_profile" > + </ImageView> <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" - android:layout_alignParentTop="true" - android:orientation="vertical"> + android:layout_toRightOf="@+id/account_image" + android:layout_centerVertical="true" + android:orientation="vertical" + android:paddingLeft="8dp" > <TextView android:id="@+id/account_jid" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="18sp" - android:textColor="@color/primarytext" + android:scrollHorizontally="false" android:singleLine="true" - android:scrollHorizontally="false"/> + android:textColor="@color/primarytext" + android:textSize="18sp" /> - <LinearLayout - android:layout_width="match_parent" + <TextView + android:id="@+id/account_status" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingTop="3dp"> - - <TextView - android:id="@+id/textView2" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/account_status" - android:textStyle="bold" - android:textSize="14sp" - android:textColor="@color/primarytext"/> - - <TextView - android:id="@+id/account_status" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingLeft="4dp" - android:text="@string/account_status_unknown" - android:textStyle="bold" - android:textSize="14sp"/> - - </LinearLayout> - + android:text="@string/account_status_unknown" + android:textSize="14sp" + android:textColor="@color/secondarytext" + android:textStyle="bold"/> </LinearLayout> - -</RelativeLayout> +</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/activity_contact_details.xml b/res/layout/activity_contact_details.xml index 8f0b42c1..a00b2340 100644 --- a/res/layout/activity_contact_details.xml +++ b/res/layout/activity_contact_details.xml @@ -27,7 +27,7 @@ android:layout_width="72dp" android:layout_height="72dp" android:layout_centerVertical="true" - android:scaleType="fitXY"/> + android:scaleType="centerCrop"/> <LinearLayout android:id="@+id/details_jidbox" diff --git a/res/layout/activity_edit_account.xml b/res/layout/activity_edit_account.xml new file mode 100644 index 00000000..2c08b926 --- /dev/null +++ b/res/layout/activity_edit_account.xml @@ -0,0 +1,229 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/primarybackground" > + + <ScrollView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_above="@+id/button_bar" + android:layout_alignParentTop="true" > + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <LinearLayout + android:id="@+id/editor" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:padding="8dp" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/account_settings_jabber_id" + android:textColor="@color/primarytext" + android:textSize="14sp" /> + + <AutoCompleteTextView + android:id="@+id/account_jid" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/account_settings_example_jabber_id" + android:inputType="textEmailAddress" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:text="@string/account_settings_password" + android:textColor="@color/primarytext" + android:textSize="14sp" /> + + <EditText + android:id="@+id/account_password" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/password" + android:inputType="textPassword" /> + + <CheckBox + android:id="@+id/account_register_new" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:text="@string/register_account" + android:textColor="@color/primarytext" + android:textSize="14sp" /> + + <TextView + android:id="@+id/account_confirm_password_desc" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/account_settings_confirm_password" + android:textColor="@color/primarytext" + android:textSize="14sp" + android:visibility="gone" /> + + <EditText + android:id="@+id/account_password_confirm" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:hint="@string/confirm_password" + android:inputType="textPassword" + android:visibility="gone" /> + </LinearLayout> + + <LinearLayout + android:id="@+id/stats" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_marginTop="8dp" + android:orientation="vertical" + android:padding="16dp" + android:visibility="gone" > + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:gravity="center_horizontal" + android:text="@string/additional_information" + android:textColor="@color/secondarytext" + android:textSize="18sp" + android:textStyle="bold" /> + + <TableLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:stretchColumns="1" > + + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/server_info_session_established" /> + + <TextView + android:id="@+id/session_est" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" /> + </TableRow> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/server_info_pep" + android:textColor="@color/primarytext" /> + + <TextView + android:id="@+id/server_info_pep" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" /> + </TableRow> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/server_info_stream_management" /> + + <TextView + android:id="@+id/server_info_sm" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" /> + </TableRow> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/server_info_carbon_messages" /> + + <TextView + android:id="@+id/server_info_carbons" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" /> + </TableRow> + </TableLayout> + + <TextView + android:id="@+id/otr_fingerprint_headline" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:gravity="center_horizontal" + android:text="@string/otr_fingerprint" + android:textColor="@color/secondarytext" + android:textSize="18sp" + android:textStyle="bold" /> + + <TextView + android:id="@+id/otr_fingerprint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:textSize="14sp" + android:typeface="monospace" /> + </LinearLayout> + </LinearLayout> + </ScrollView> + + <LinearLayout + android:id="@+id/button_bar" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:layout_alignParentRight="true" > + + <Button + android:id="@+id/cancel_button" + style="?android:attr/borderlessButtonStyle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/cancel" + android:textColor="@color/primarytext" /> + + <View + android:layout_width="1dp" + android:layout_height="fill_parent" + android:layout_marginBottom="7dp" + android:layout_marginTop="7dp" + android:background="@color/divider" /> + + <Button + android:id="@+id/save_button" + style="?android:attr/borderlessButtonStyle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:enabled="false" + android:text="@string/save" + android:textColor="@color/secondarytext" /> + </LinearLayout> + +</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/activity_publish_profile_picture.xml b/res/layout/activity_publish_profile_picture.xml new file mode 100644 index 00000000..b3c6c427 --- /dev/null +++ b/res/layout/activity_publish_profile_picture.xml @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/primarybackground" > + + <LinearLayout + android:id="@+id/account_image_wrapper" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" + android:layout_marginBottom="8dp" + android:layout_marginTop="24dp" + android:background="@drawable/message_border" > + + <ImageView + android:id="@+id/account_image" + android:layout_width="194dp" + android:layout_height="194dp" /> + </LinearLayout> + + <TextView + android:id="@+id/hint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/account_image_wrapper" + android:layout_centerHorizontal="true" + android:text="@string/touch_to_choose_picture" + android:textColor="@color/secondarytext" /> + + <TextView + android:id="@+id/secondary_hint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/hint" + android:layout_centerHorizontal="true" + android:text="@string/or_long_press_for_default" + android:textColor="@color/secondarytext" /> + + <LinearLayout + android:id="@+id/button_bar" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:layout_alignParentRight="true" > + + <Button + android:id="@+id/cancel_button" + style="?android:attr/borderlessButtonStyle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/cancel" + android:textColor="@color/primarytext" /> + + <View + android:layout_width="1dp" + android:layout_height="fill_parent" + android:layout_marginBottom="7dp" + android:layout_marginTop="7dp" + android:background="@color/divider" /> + + <Button + android:id="@+id/publish_button" + style="?android:attr/borderlessButtonStyle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:enabled="false" + android:text="@string/publish_avatar" + android:textColor="@color/secondarytext" /> + </LinearLayout> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="fill_parent" + android:layout_above="@+id/button_bar" + android:layout_below="@+id/secondary_hint" + android:layout_alignParentLeft="true" + android:layout_alignParentRight="true" + android:gravity="center_vertical" + android:orientation="vertical" + android:paddingLeft="8dp" + android:paddingRight="8dp" > + + <TextView + android:id="@+id/account" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/primarytext" + android:textSize="18sp"/> + + <TextView + android:id="@+id/hint_or_warning" + android:layout_marginTop="8dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/publish_avatar_explanation" + android:textColor="@color/primarytext" + android:textSize="14sp" + android:minLines="3" /> + </LinearLayout> + +</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/contact.xml b/res/layout/contact.xml index 8432c7a3..f16ad061 100644 --- a/res/layout/contact.xml +++ b/res/layout/contact.xml @@ -11,6 +11,7 @@ android:layout_width="48dp" android:layout_height="48dp" android:layout_alignParentLeft="true" + android:scaleType="centerCrop" android:src="@drawable/ic_profile"> </ImageView> <LinearLayout diff --git a/res/layout/conversation_list_row.xml b/res/layout/conversation_list_row.xml index 97985737..a6001e5f 100644 --- a/res/layout/conversation_list_row.xml +++ b/res/layout/conversation_list_row.xml @@ -9,7 +9,8 @@ android:id="@+id/conversation_image" android:layout_width="56dp" android:layout_height="56dp" - android:layout_alignParentLeft="true"/> + android:layout_alignParentLeft="true" + android:scaleType="centerCrop"/> <RelativeLayout android:layout_toRightOf="@+id/conversation_image" diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml index 2d612984..3f7f27e5 100644 --- a/res/layout/fragment_conversation.xml +++ b/res/layout/fragment_conversation.xml @@ -31,7 +31,7 @@ android:layout_alignParentLeft="true" android:background="@color/primarybackground" > - <EditText + <eu.siacs.conversations.ui.EditMessage android:id="@+id/textinput" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -46,10 +46,10 @@ android:paddingLeft="8dp" android:paddingRight="8dp" android:paddingTop="12dp" - android:textColor="@color/primarytext"> - + android:textColor="@color/primarytext" + android:imeOptions="flagNoExtractUi"> <requestFocus /> - </EditText> + </eu.siacs.conversations.ui.EditMessage> <ImageButton android:id="@+id/textSendButton" diff --git a/res/layout/manage_accounts.xml b/res/layout/manage_accounts.xml index a2a01bf1..71eb7572 100644 --- a/res/layout/manage_accounts.xml +++ b/res/layout/manage_accounts.xml @@ -2,7 +2,8 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="fill_parent" - android:layout_height="fill_parent" > + android:layout_height="fill_parent" + android:background="@color/primarybackground"> <ListView android:id="@+id/account_list" diff --git a/res/layout/message_recieved.xml b/res/layout/message_recieved.xml index 563d730d..ec003920 100644 --- a/res/layout/message_recieved.xml +++ b/res/layout/message_recieved.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" android:adjustViewBounds="true" android:paddingBottom="2dp" - android:scaleType="fitXY" + android:scaleType="centerCrop" android:background="@color/primarytext" /> diff --git a/res/layout/message_sent.xml b/res/layout/message_sent.xml index d4970e6f..21563eb4 100644 --- a/res/layout/message_sent.xml +++ b/res/layout/message_sent.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" android:adjustViewBounds="true" android:paddingBottom="2dp" - android:scaleType="fitXY" + android:scaleType="centerCrop" android:background="@color/primarytext" /> diff --git a/res/layout/otr_fingerprint.xml b/res/layout/otr_fingerprint.xml deleted file mode 100644 index d8f24151..00000000 --- a/res/layout/otr_fingerprint.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="8dp"> - - <TextView - android:id="@+id/otr_no_fingerprint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="18sp" - android:text="@string/no_otr_fingerprint" - android:visibility="visible"/> - - <TextView - android:id="@+id/otr_fingerprint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="18sp" - android:typeface="monospace" - android:visibility="gone"/> - -</LinearLayout> diff --git a/res/layout/server_info.xml b/res/layout/server_info.xml deleted file mode 100644 index 499a20de..00000000 --- a/res/layout/server_info.xml +++ /dev/null @@ -1,157 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="match_parent" - android:padding="8dp" > - - <TextView - android:id="@+id/stats_header" - style="@style/sectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:paddingBottom="8dp" - android:text="@string/server_info_statistics" /> - - <TextView - android:layout_below="@+id/stats_header" - android:id="@+id/textView1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/server_info_connection_age" - android:textSize="18sp"/> - <TextView - android:id="@+id/connection" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignBaseline="@+id/textView1" - android:layout_alignBottom="@+id/textView1" - android:layout_alignParentRight="true" - android:textSize="18sp"/> - - <TextView - android:id="@+id/textView2" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_below="@+id/textView1" - android:text="@string/server_info_session_age" - android:textSize="18sp"/> - <TextView - android:id="@+id/session" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignBaseline="@+id/textView2" - android:layout_alignBottom="@+id/textView2" - android:layout_alignParentRight="true" - android:textSize="18sp"/> - - <TextView - android:id="@+id/textView3" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_below="@+id/textView2" - android:text="@string/server_info_packets_sent" - android:textSize="18sp"/> - <TextView - android:id="@+id/pcks_sent" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignBaseline="@+id/textView3" - android:layout_alignBottom="@+id/textView3" - android:layout_alignParentRight="true" - android:textSize="18sp"/> - - <TextView - android:id="@+id/textView4" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@+id/textView3" - android:text="@string/server_info_packets_received" - android:textSize="18sp"/> - <TextView - android:id="@+id/pcks_received" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignBaseline="@+id/textView4" - android:layout_alignBottom="@+id/textView4" - android:layout_alignParentRight="true" - android:textSize="18sp"/> - - <TextView - android:id="@+id/textView10" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@+id/textView4" - android:text="@string/server_info_connected_accounts" - android:textSize="18sp"/> - <TextView - android:id="@+id/number_presences" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignBaseline="@+id/textView10" - android:layout_alignBottom="@+id/textView10" - android:layout_alignParentRight="true" - android:textSize="18sp"/> - - <TextView - android:id="@+id/features_header" - android:layout_below="@+id/textView10" - style="@style/sectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="8dp" - android:text="@string/server_info_server_features" /> - - <TextView - android:layout_below="@+id/features_header" - android:id="@+id/textView5" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/server_info_roster_versioning" - android:textSize="18sp"/> - <TextView - android:id="@+id/roster" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignBaseline="@+id/textView5" - android:layout_alignBottom="@+id/textView5" - android:layout_alignParentRight="true" - android:textSize="18sp"/> - - <TextView - android:id="@+id/textView6" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_below="@+id/textView5" - android:text="@string/server_info_carbon_messages" - android:textSize="18sp"/> - <TextView - android:id="@+id/carbon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignBaseline="@+id/textView6" - android:layout_alignBottom="@+id/textView6" - android:layout_alignParentRight="true" - android:textSize="18sp"/> - - <TextView - android:id="@+id/textView7" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_below="@+id/textView6" - android:text="@string/server_info_stream_management" - android:textSize="18sp"/> - <TextView - android:id="@+id/stream" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignBaseline="@+id/textView7" - android:layout_alignBottom="@+id/textView7" - android:layout_alignParentRight="true" - android:textSize="18sp"/> -</RelativeLayout>
\ No newline at end of file |