diff options
Diffstat (limited to 'src/main/res/layout')
44 files changed, 712 insertions, 664 deletions
diff --git a/src/main/res/layout/ab_title.xml b/src/main/res/layout/ab_title.xml index 1143ad798..2886a4716 100644 --- a/src/main/res/layout/ab_title.xml +++ b/src/main/res/layout/ab_title.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" android:layout_width="match_parent" + android:orientation="vertical" + android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="start|center_vertical"> @@ -17,6 +18,7 @@ android:clickable="true" android:onClick="onClick" android:paddingTop="1dp" /> + <github.ankushsachdeva.emojicon.EmojiconTextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text2" style="@style/Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle" diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml index fbb05a274..b953b6d31 100644 --- a/src/main/res/layout/account_row.xml +++ b/src/main/res/layout/account_row.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?android:attr/activatedBackgroundIndicator" - android:paddingLeft="8dp" - android:paddingBottom="8dp" - android:paddingTop="8dp"> + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?android:attr/activatedBackgroundIndicator" + android:paddingLeft="8dp" + android:paddingBottom="8dp" + android:paddingTop="8dp"> <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/account_image" diff --git a/src/main/res/layout/actionview_search.xml b/src/main/res/layout/actionview_search.xml index 50becfc68..64588959c 100644 --- a/src/main/res/layout/actionview_search.xml +++ b/src/main/res/layout/actionview_search.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:addStatesFromChildren="true" android:focusable="true" android:gravity="center" android:paddingLeft="5dp" - android:paddingRight="5dp" > + android:paddingRight="5dp"> <EditText android:id="@+id/search_field" @@ -17,6 +17,6 @@ android:imeOptions="actionSearch" android:textColor="@color/white" android:textColorHint="@color/white70" - android:hint="@string/search_for_contacts_or_groups"/> + android:hint="@string/search_for_contacts_or_groups" /> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml index 47204b430..2d9f9a691 100644 --- a/src/main/res/layout/activity_about.xml +++ b/src/main/res/layout/activity_about.xml @@ -18,5 +18,5 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:typeface="monospace" - android:fontFamily="monospace"/> + android:fontFamily="monospace" /> </ScrollView> diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml index 6fb1d0131..8808227e3 100644 --- a/src/main/res/layout/activity_change_password.xml +++ b/src/main/res/layout/activity_change_password.xml @@ -1,110 +1,111 @@ <?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/grey200"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/grey200"> - <ScrollView - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_above="@+id/button_bar"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:layout_marginBottom="@dimen/activity_vertical_margin" - android:background="@drawable/infocard_border" - android:padding="@dimen/infocard_padding" - android:orientation="vertical"> + <ScrollView + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_above="@+id/button_bar"> - <TextView - android:id="@+id/current_password_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/current_password" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" + android:background="@drawable/infocard_border" + android:padding="@dimen/infocard_padding" + android:orientation="vertical"> - <EditText - android:id="@+id/current_password" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="8dp" - android:hint="@string/password" - android:inputType="textPassword" - android:textColor="@color/black87" - android:textColorHint="@color/black54" - android:textSize="?attr/TextSizeBody"/> + <TextView + android:id="@+id/current_password_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/current_password" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/new_password" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + <EditText + android:id="@+id/current_password" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:hint="@string/password" + android:inputType="textPassword" + android:textColor="@color/black87" + android:textColorHint="@color/black54" + android:textSize="?attr/TextSizeBody" /> - <EditText - android:id="@+id/new_password" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="8dp" - android:hint="@string/password" - android:inputType="textPassword" - android:textColor="@color/black87" - android:textColorHint="@color/black54" - android:textSize="?attr/TextSizeBody"/> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/new_password" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/account_settings_confirm_password" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + <EditText + android:id="@+id/new_password" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:hint="@string/password" + android:inputType="textPassword" + android:textColor="@color/black87" + android:textColorHint="@color/black54" + android:textSize="?attr/TextSizeBody" /> - <EditText - android:id="@+id/new_password_confirm" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/password" - android:inputType="textPassword" - android:textColor="@color/black87" - android:textColorHint="@color/black54" - android:textSize="?attr/TextSizeBody"/> - </LinearLayout> - </ScrollView> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/account_settings_confirm_password" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + + <EditText + android:id="@+id/new_password_confirm" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/password" + android:inputType="textPassword" + android:textColor="@color/black87" + android:textColorHint="@color/black54" + android:textSize="?attr/TextSizeBody" /> + </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"> + <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/left_button" - style="?android:attr/borderlessButtonStyle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/cancel"/> + <Button + android:id="@+id/left_button" + style="?android:attr/borderlessButtonStyle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/cancel" /> - <View - android:layout_width="1dp" - android:layout_height="fill_parent" - android:layout_marginBottom="7dp" - android:layout_marginTop="7dp" - android:background="@color/black12"/> + <View + android:layout_width="1dp" + android:layout_height="fill_parent" + android:layout_marginBottom="7dp" + android:layout_marginTop="7dp" + android:background="@color/black12" /> - <Button - android:id="@+id/right_button" - style="?android:attr/borderlessButtonStyle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/change_password"/> - </LinearLayout> + <Button + android:id="@+id/right_button" + style="?android:attr/borderlessButtonStyle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/change_password" /> + </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/activity_choose_contact.xml b/src/main/res/layout/activity_choose_contact.xml index 248a7822c..66e416de5 100644 --- a/src/main/res/layout/activity_choose_contact.xml +++ b/src/main/res/layout/activity_choose_contact.xml @@ -2,7 +2,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" > + android:layout_height="match_parent"> <ListView android:id="@+id/choose_contact_list" diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index eb479b96b..ca641886e 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -2,13 +2,13 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:background="@color/grey200" > + android:background="@color/grey200"> <LinearLayout android:id="@+id/details_main_layout" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="vertical" > + android:orientation="vertical"> <RelativeLayout android:layout_width="fill_parent" @@ -18,7 +18,7 @@ android:layout_marginTop="@dimen/activity_vertical_margin" android:layout_marginBottom="@dimen/activity_vertical_margin" android:background="@drawable/infocard_border" - android:padding="@dimen/infocard_padding" > + android:padding="@dimen/infocard_padding"> <QuickContactBadge android:id="@+id/details_contact_badge" @@ -64,8 +64,7 @@ android:layout_marginLeft="-2dp" android:layout_marginBottom="4dp" android:orientation="horizontal" - android:layout_gravity="center_horizontal"> - </com.wefika.flowlayout.FlowLayout> + android:layout_gravity="center_horizontal"></com.wefika.flowlayout.FlowLayout> <TextView android:id="@+id/details_lastseen" @@ -109,7 +108,7 @@ android:layout_marginTop="@dimen/activity_vertical_margin" android:layout_marginBottom="@dimen/activity_vertical_margin" android:background="@drawable/infocard_border" - android:padding="@dimen/infocard_padding" > + android:padding="@dimen/infocard_padding"> <Button android:id="@+id/add_contact_button" @@ -156,8 +155,7 @@ android:divider="?android:dividerHorizontal" android:orientation="vertical" android:padding="@dimen/infocard_padding" - android:showDividers="middle" > - </LinearLayout> + android:showDividers="middle"></LinearLayout> </LinearLayout> </ScrollView> diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 808834d22..7747055ec 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -189,6 +189,7 @@ android:orientation="vertical" android:padding="@dimen/infocard_padding" android:visibility="gone"> + <TextView android:id="@+id/os_optimization_headline" android:layout_width="wrap_content" @@ -196,7 +197,8 @@ android:text="@string/battery_optimizations_enabled" android:textColor="@color/black87" android:textSize="?attr/TextSizeHeadline" - android:textStyle="bold"/> + android:textStyle="bold" /> + <TextView android:id="@+id/os_optimization_body" android:layout_width="wrap_content" @@ -206,7 +208,8 @@ android:layout_marginTop="8dp" android:text="@string/battery_optimizations_enabled_explained" android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <Button android:id="@+id/os_optimization_disable" style="?android:attr/borderlessButtonStyle" @@ -215,9 +218,10 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" android:layout_below="@+id/os_optimization_body" + android:layout_alignParentRight="true" + android:layout_below="@+id/os_optimization_body" android:text="@string/disable" - android:textColor="@color/accent"/> + android:textColor="@color/accent" /> </RelativeLayout> <LinearLayout @@ -251,7 +255,7 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:singleLine="true" - android:ellipsize="end"/> + android:ellipsize="end" /> <TextView android:id="@+id/session_est" @@ -285,7 +289,7 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:singleLine="true" - android:ellipsize="end"/> + android:ellipsize="end" /> <TextView android:id="@+id/server_info_pep" @@ -309,7 +313,7 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:singleLine="true" - android:ellipsize="end"/> + android:ellipsize="end" /> <TextView android:id="@+id/server_info_blocking" @@ -333,7 +337,7 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:singleLine="true" - android:ellipsize="end"/> + android:ellipsize="end" /> <TextView android:id="@+id/server_info_sm" @@ -357,7 +361,7 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:singleLine="true" - android:ellipsize="end"/> + android:ellipsize="end" /> <TextView android:id="@+id/server_info_roster_version" @@ -381,7 +385,7 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:singleLine="true" - android:ellipsize="end"/> + android:ellipsize="end" /> <TextView android:id="@+id/server_info_carbons" @@ -405,7 +409,7 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:singleLine="true" - android:ellipsize="end"/> + android:ellipsize="end" /> <TextView android:id="@+id/server_info_mam" @@ -429,7 +433,7 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:singleLine="true" - android:ellipsize="end"/> + android:ellipsize="end" /> <TextView android:id="@+id/server_info_csi" @@ -454,7 +458,7 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:singleLine="true" - android:ellipsize="end"/> + android:ellipsize="end" /> <TextView android:id="@+id/server_info_push" @@ -463,8 +467,9 @@ android:layout_gravity="right" android:textColor="@color/black87" android:paddingLeft="4dp" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> </TableRow> + <TableRow android:layout_width="fill_parent" android:layout_height="wrap_content"> @@ -476,7 +481,7 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:singleLine="true" - android:ellipsize="end"/> + android:ellipsize="end" /> <TextView android:id="@+id/server_info_http_upload" @@ -485,7 +490,7 @@ android:layout_gravity="right" android:textColor="@color/black87" android:paddingLeft="4dp" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> </TableRow> </TableLayout> @@ -624,8 +629,7 @@ android:layout_height="wrap_content" android:divider="?android:dividerHorizontal" android:orientation="vertical" - android:showDividers="middle"> - </LinearLayout> + android:showDividers="middle"></LinearLayout> </LinearLayout> </LinearLayout> </ScrollView> @@ -647,14 +651,14 @@ android:layout_height="wrap_content" android:layout_weight="1" android:text="@string/cancel" - android:textColor="@color/black87"/> + android:textColor="@color/black87" /> <View android:layout_width="1dp" android:layout_height="fill_parent" android:layout_marginBottom="7dp" android:layout_marginTop="7dp" - android:background="@color/black12"/> + android:background="@color/black12" /> <Button android:id="@+id/save_button" @@ -664,7 +668,7 @@ android:layout_weight="1" android:enabled="false" android:text="@string/save" - android:textColor="@color/black54"/> + android:textColor="@color/black54" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/activity_fullscreen_message.xml b/src/main/res/layout/activity_fullscreen_message.xml index 69e6f3d6a..a4d30f902 100644 --- a/src/main/res/layout/activity_fullscreen_message.xml +++ b/src/main/res/layout/activity_fullscreen_message.xml @@ -7,8 +7,7 @@ <include android:id="@+id/toolbar" - layout="@layout/tool_bar"> - </include> + layout="@layout/tool_bar"></include> <uk.co.senab.photoview.PhotoView android:id="@id/message_image_view" diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index df7737ea0..1fce6b608 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -51,30 +51,31 @@ </RelativeLayout> <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content"> - <TextView - android:id="@+id/notification_status_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/notify_on_all_messages" - android:layout_centerVertical="true" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - android:layout_alignParentLeft="true" - android:layout_toLeftOf="@+id/notification_status_button" - /> - <ImageButton - android:id="@+id/notification_status_button" - style="?android:attr/buttonStyleSmall" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" - android:background="?android:selectableItemBackground" - android:padding="@dimen/image_button_padding" - android:src="@drawable/ic_notifications_grey600_24dp"/> + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/notification_status_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/notify_on_all_messages" + android:layout_centerVertical="true" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + android:layout_alignParentLeft="true" + android:layout_toLeftOf="@+id/notification_status_button" /> + + <ImageButton + android:id="@+id/notification_status_button" + style="?android:attr/buttonStyleSmall" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:background="?android:selectableItemBackground" + android:padding="@dimen/image_button_padding" + android:src="@drawable/ic_notifications_grey600_24dp" /> </RelativeLayout> <TextView @@ -129,7 +130,7 @@ android:padding="1dp" android:src="@drawable/ic_profile" app:riv_corner_radius="5dp" - android:layout_alignParentRight="false"/> + android:layout_alignParentRight="false" /> <LinearLayout android:layout_width="fill_parent" @@ -174,8 +175,7 @@ android:layout_weight="1" android:divider="?android:dividerHorizontal" android:orientation="vertical" - android:showDividers="middle"> - </LinearLayout> + android:showDividers="middle"></LinearLayout> <Button android:id="@+id/invite" @@ -188,52 +188,52 @@ </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/activity_vertical_margin" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:background="@drawable/infocard_border" - android:orientation="vertical" - android:padding="@dimen/infocard_padding" - android:id="@+id/muc_info_more" - android:shrinkColumns="0" - android:stretchColumns="1" - android:visibility="gone"> - - - <TableLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:stretchColumns="1"> - - <TableRow - android:layout_width="fill_parent" - android:layout_height="match_parent"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/server_info_mam" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - android:singleLine="true" - android:ellipsize="end" /> - - <TextView - android:id="@+id/muc_info_mam" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:paddingLeft="4dp" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> - </TableRow> - - </TableLayout> - </LinearLayout> + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/activity_vertical_margin" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:background="@drawable/infocard_border" + android:orientation="vertical" + android:padding="@dimen/infocard_padding" + android:id="@+id/muc_info_more" + android:shrinkColumns="0" + android:stretchColumns="1" + android:visibility="gone"> + + + <TableLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:stretchColumns="1"> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="match_parent"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/server_info_mam" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + android:singleLine="true" + android:ellipsize="end" /> + + <TextView + android:id="@+id/muc_info_mam" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:paddingLeft="4dp" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + </TableRow> + + </TableLayout> + </LinearLayout> </LinearLayout> </ScrollView>
\ No newline at end of file diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml index 8690509e9..7051233b5 100644 --- a/src/main/res/layout/activity_publish_profile_picture.xml +++ b/src/main/res/layout/activity_publish_profile_picture.xml @@ -4,116 +4,119 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/grey200"> + <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" - android:gravity="center_horizontal"> + android:layout_alignParentTop="true"> <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_above="@+id/button_bar" - android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" - android:layout_below="@+id/secondary_hint" - android:gravity="center_vertical" - android:orientation="vertical" - android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:layout_marginBottom="@dimen/activity_vertical_margin" - android:background="@drawable/infocard_border" - android:padding="@dimen/infocard_padding"> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:gravity="center_horizontal"> <LinearLayout - android:id="@+id/account_image_wrapper" - android:layout_width="wrap_content" + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_centerHorizontal="true" - android:layout_gravity="center_horizontal"> + android:layout_above="@+id/button_bar" + android:layout_alignParentLeft="true" + android:layout_alignParentRight="true" + android:layout_below="@+id/secondary_hint" + android:gravity="center_vertical" + android:orientation="vertical" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" + android:background="@drawable/infocard_border" + android:padding="@dimen/infocard_padding"> - <com.makeramen.roundedimageview.RoundedImageView - android:id="@+id/account_image" + <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="16dp" - android:adjustViewBounds="true" - android:background="@drawable/message_border" - android:contentDescription="@string/account_image_description" - android:maxHeight="384dp" - android:maxWidth="384dp" - android:padding="1dp" - app:riv_corner_radius="5dp" /> - </LinearLayout> + android:layout_gravity="center_horizontal"> - <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/black54" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:layout_marginBottom="@dimen/activity_vertical_margin" - android:layout_gravity="center_horizontal" - android:textAlignment="center" /> + <com.makeramen.roundedimageview.RoundedImageView + android:id="@+id/account_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" + android:layout_marginBottom="16dp" + android:adjustViewBounds="true" + android:background="@drawable/message_border" + android:contentDescription="@string/account_image_description" + android:maxHeight="384dp" + android:maxWidth="384dp" + android:padding="1dp" + app:riv_corner_radius="5dp" /> + </LinearLayout> - <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/black54" - android:layout_marginBottom="@dimen/activity_vertical_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_gravity="center_horizontal" - android:textAlignment="center" /> + <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/black54" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" + android:layout_gravity="center_horizontal" + android:textAlignment="center" /> - <TextView - android:id="@+id/account" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeHeadline" - android:visibility="gone" /> + <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/black54" + android:layout_marginBottom="@dimen/activity_vertical_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_gravity="center_horizontal" + android:textAlignment="center" /> - <TextView - android:id="@+id/hint_or_warning" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:minLines="3" - android:text="@string/publish_avatar_explanation" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - android:textAlignment="center" - android:layout_gravity="center_horizontal" /> - </LinearLayout> -</LinearLayout> + <TextView + android:id="@+id/account" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeHeadline" + android:visibility="gone" /> + + <TextView + android:id="@+id/hint_or_warning" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:minLines="3" + android:text="@string/publish_avatar_explanation" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + android:textAlignment="center" + android:layout_gravity="center_horizontal" /> + </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" > + android:layout_alignParentRight="true"> <Button android:id="@+id/cancel_button" diff --git a/src/main/res/layout/activity_recording.xml b/src/main/res/layout/activity_recording.xml index 2e5ea7307..b1bcb2a65 100644 --- a/src/main/res/layout/activity_recording.xml +++ b/src/main/res/layout/activity_recording.xml @@ -1,8 +1,8 @@ <?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="wrap_content" - android:background="@color/grey50"> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/grey50"> <LinearLayout android:id="@+id/button_bar" @@ -48,5 +48,5 @@ android:textStyle="bold" android:id="@+id/timer" android:layout_alignParentTop="true" - android:layout_centerHorizontal="true"/> + android:layout_centerHorizontal="true" /> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/activity_set_presence.xml b/src/main/res/layout/activity_set_presence.xml index d7ada8539..517654093 100644 --- a/src/main/res/layout/activity_set_presence.xml +++ b/src/main/res/layout/activity_set_presence.xml @@ -20,6 +20,7 @@ android:background="@drawable/infocard_border" android:padding="@dimen/infocard_padding" android:orientation="vertical"> + <github.ankushsachdeva.emojicon.EmojiconEditText android:layout_width="match_parent" android:layout_height="wrap_content" @@ -28,12 +29,14 @@ android:id="@+id/presence_status_message" android:textColor="@color/black87" android:layout_marginBottom="8dp" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <Spinner android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/presence_show" - android:layout_gravity="center_horizontal"/> + android:layout_gravity="center_horizontal" /> + <CheckBox android:layout_marginTop="16dp" android:layout_marginBottom="16dp" @@ -43,7 +46,8 @@ android:id="@+id/all_accounts" android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" - android:visibility="gone"/> + android:visibility="gone" /> + <Button android:id="@+id/change_presence" style="?android:attr/borderlessButtonStyle" @@ -51,8 +55,9 @@ android:layout_height="wrap_content" android:layout_gravity="right" android:text="@string/change_presence" - android:textColor="@color/accent"/> + android:textColor="@color/accent" /> </LinearLayout> + <LinearLayout android:id="@+id/templates" android:layout_width="match_parent" @@ -65,7 +70,6 @@ android:padding="@dimen/infocard_padding" android:orientation="vertical" android:divider="?android:dividerHorizontal" - android:showDividers="middle"> - </LinearLayout> + android:showDividers="middle"></LinearLayout> </LinearLayout> </ScrollView>
\ No newline at end of file diff --git a/src/main/res/layout/activity_share_locaction.xml b/src/main/res/layout/activity_share_locaction.xml index df3e08a95..7505e9b99 100644 --- a/src/main/res/layout/activity_share_locaction.xml +++ b/src/main/res/layout/activity_share_locaction.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:map="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/ripple_material_dark"> + xmlns:map="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/ripple_material_dark"> + <fragment android:name="com.google.android.gms.maps.MapFragment" android:id="@+id/map_fragment" @@ -18,7 +19,7 @@ map:uiTiltGestures="false" map:uiZoomControls="false" map:uiZoomGestures="true" - tools:ignore="MissingPrefix"/> + tools:ignore="MissingPrefix" /> <RelativeLayout android:id="@+id/snackbar" @@ -31,7 +32,7 @@ android:layout_above="@+id/button_bar" android:background="@drawable/snackbar" android:minHeight="48dp" - android:visibility="visible" > + android:visibility="visible"> <TextView android:layout_width="wrap_content" @@ -42,7 +43,7 @@ android:paddingLeft="24dp" android:textColor="@color/grey50" android:textSize="?attr/TextSizeBody" - android:text="@string/location_sharing_disabled"/> + android:text="@string/location_sharing_disabled" /> <TextView android:id="@+id/snackbar_action" @@ -59,7 +60,7 @@ android:text="@string/enable" android:layout_alignParentTop="true" android:layout_alignParentRight="true" - android:layout_alignParentEnd="true"/> + android:layout_alignParentEnd="true" /> </RelativeLayout> <RelativeLayout @@ -73,7 +74,7 @@ android:layout_above="@+id/button_bar" android:background="@drawable/snackbar" android:minHeight="24dp" - android:visibility="gone" > + android:visibility="gone"> <TextView android:id="@id/snackbar_location_message" @@ -93,7 +94,7 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" > + android:layout_alignParentRight="true"> <Button android:id="@+id/cancel_button" diff --git a/src/main/res/layout/activity_show_locaction.xml b/src/main/res/layout/activity_show_locaction.xml index 95c22e09d..32e177b33 100644 --- a/src/main/res/layout/activity_show_locaction.xml +++ b/src/main/res/layout/activity_show_locaction.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:map="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent"> + xmlns:map="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent"> <fragment @@ -18,6 +18,6 @@ map:uiTiltGestures="false" map:uiZoomControls="false" map:uiZoomGestures="true" - tools:ignore="MissingPrefix"/> + tools:ignore="MissingPrefix" /> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/activity_start_conversation.xml b/src/main/res/layout/activity_start_conversation.xml index d55ec196f..28e954b99 100644 --- a/src/main/res/layout/activity_start_conversation.xml +++ b/src/main/res/layout/activity_start_conversation.xml @@ -3,6 +3,6 @@ android:id="@+id/start_conversation_view_pager" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/grey50" > + android:background="@color/grey50"> </android.support.v4.view.ViewPager>
\ No newline at end of file diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml index 1e95099f9..2ebffb5be 100644 --- a/src/main/res/layout/activity_trust_keys.xml +++ b/src/main/res/layout/activity_trust_keys.xml @@ -3,11 +3,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/grey200"> + <ScrollView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_above="@+id/button_bar" - android:layout_alignParentTop="true" > + android:layout_alignParentTop="true"> <LinearLayout android:layout_width="match_parent" @@ -34,7 +35,7 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeHeadline" android:textStyle="bold" - android:text="@string/error_trustkeys_title"/> + android:text="@string/error_trustkeys_title" /> <TextView android:id="@+id/key_error_message" @@ -42,7 +43,7 @@ android:layout_height="wrap_content" android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" - android:padding="8dp"/> + android:padding="8dp" /> </LinearLayout> @@ -65,7 +66,7 @@ android:layout_height="wrap_content" android:textColor="@color/black87" android:textSize="?attr/TextSizeHeadline" - android:textStyle="bold"/> + android:textStyle="bold" /> <LinearLayout android:id="@+id/own_keys_details" @@ -73,8 +74,7 @@ android:layout_height="wrap_content" android:divider="?android:dividerHorizontal" android:showDividers="middle" - android:orientation="vertical"> - </LinearLayout> + android:orientation="vertical"></LinearLayout> </LinearLayout> @@ -89,6 +89,7 @@ </LinearLayout> </ScrollView> + <LinearLayout android:id="@+id/button_bar" android:layout_width="wrap_content" @@ -97,7 +98,7 @@ android:layout_alignParentStart="true" android:layout_alignParentEnd="true" android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" > + android:layout_alignParentRight="true"> <Button android:id="@+id/cancel_button" @@ -123,6 +124,6 @@ android:layout_weight="1" android:enabled="true" android:textColor="@color/black54" - android:text="@string/done"/> + android:text="@string/done" /> </LinearLayout> </RelativeLayout> diff --git a/src/main/res/layout/activity_updater.xml b/src/main/res/layout/activity_updater.xml index ccc147361..8613b978a 100644 --- a/src/main/res/layout/activity_updater.xml +++ b/src/main/res/layout/activity_updater.xml @@ -1,13 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" android:layout_height="match_parent" tools:context="de.pixart.messenger.ui.UpdaterActivity"> - <TextView android:id="@+id/updater" android:layout_width="wrap_content" - android:layout_height="wrap_content" android:layout_alignParentLeft="true" - android:layout_alignParentTop="true" android:layout_marginTop="6dp" - android:text="Current" android:textAppearance="?android:attr/textAppearanceMedium" + <TextView + android:id="@+id/updater" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_alignParentTop="true" + android:layout_marginTop="6dp" + android:text="Current" + android:textAppearance="?android:attr/textAppearanceMedium" android:textStyle="normal" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" /> diff --git a/src/main/res/layout/activity_verify_otr.xml b/src/main/res/layout/activity_verify_otr.xml index c15f19d5e..1617b8e26 100644 --- a/src/main/res/layout/activity_verify_otr.xml +++ b/src/main/res/layout/activity_verify_otr.xml @@ -1,152 +1,152 @@ <?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/grey50"> - - <ScrollView - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_above="@+id/button_bar"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:layout_marginBottom="@dimen/activity_vertical_margin"> - - <TextView - android:id="@+id/verification_explanation" - android:layout_width="wrap_content" - android:layout_height="wrap_content"/> - - <LinearLayout - android:id="@+id/manual_verification_area" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:orientation="vertical"> - - <TextView - android:id="@+id/your_fingerprint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - android:typeface="monospace" - android:fontFamily="monospace"/> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/your_fingerprint" - android:textColor="@color/black54" - android:textSize="?attr/TextSizeInfo"/> - - <TextView - android:id="@+id/remote_fingerprint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="20dp" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - android:typeface="monospace" - android:fontFamily="monospace"/> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="20dp" - android:text="@string/remote_fingerprint" - android:textColor="@color/black54" - android:textSize="?attr/TextSizeInfo"/> - - </LinearLayout> - - <LinearLayout - android:id="@+id/smp_verification_area" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_marginTop="16dp" - android:orientation="vertical"> - - <TextView - android:id="@+id/status_message" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:text="@string/verified" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeHeadline" - android:textStyle="bold" - android:visibility="gone"/> - - <TextView - android:id="@+id/shared_secret_hint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="8dp" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - android:textStyle="bold" - android:visibility="gone"/> - - <EditText - android:id="@+id/shared_secret_hint_editable" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="8dp" - android:hint="@string/shared_secret_hint" - android:inputType="textAutoComplete" - android:textColor="@color/black87" - android:textColorHint="@color/black54" - android:textSize="?attr/TextSizeBody"/> - - <EditText - android:id="@+id/shared_secret_secret" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:hint="@string/shared_secret_secret" - android:inputType="textPassword" - android:textColor="@color/black87" - android:textColorHint="@color/black54" - android:textSize="?attr/TextSizeBody"/> - </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/left_button" - style="?android:attr/borderlessButtonStyle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1"/> - - <View - android:layout_width="1dp" - android:layout_height="fill_parent" - android:layout_marginBottom="7dp" - android:layout_marginTop="7dp" - android:background="@color/black12"/> - - <Button - android:id="@+id/right_button" - style="?android:attr/borderlessButtonStyle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1"/> - </LinearLayout> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/grey50"> + + <ScrollView + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_above="@+id/button_bar"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin"> + + <TextView + android:id="@+id/verification_explanation" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + + <LinearLayout + android:id="@+id/manual_verification_area" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:orientation="vertical"> + + <TextView + android:id="@+id/your_fingerprint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + android:typeface="monospace" + android:fontFamily="monospace" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/your_fingerprint" + android:textColor="@color/black54" + android:textSize="?attr/TextSizeInfo" /> + + <TextView + android:id="@+id/remote_fingerprint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="20dp" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + android:typeface="monospace" + android:fontFamily="monospace" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="20dp" + android:text="@string/remote_fingerprint" + android:textColor="@color/black54" + android:textSize="?attr/TextSizeInfo" /> + + </LinearLayout> + + <LinearLayout + android:id="@+id/smp_verification_area" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_marginTop="16dp" + android:orientation="vertical"> + + <TextView + android:id="@+id/status_message" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:text="@string/verified" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeHeadline" + android:textStyle="bold" + android:visibility="gone" /> + + <TextView + android:id="@+id/shared_secret_hint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + android:textStyle="bold" + android:visibility="gone" /> + + <EditText + android:id="@+id/shared_secret_hint_editable" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:hint="@string/shared_secret_hint" + android:inputType="textAutoComplete" + android:textColor="@color/black87" + android:textColorHint="@color/black54" + android:textSize="?attr/TextSizeBody" /> + + <EditText + android:id="@+id/shared_secret_secret" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:hint="@string/shared_secret_secret" + android:inputType="textPassword" + android:textColor="@color/black87" + android:textColorHint="@color/black54" + android:textSize="?attr/TextSizeBody" /> + </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/left_button" + style="?android:attr/borderlessButtonStyle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" /> + + <View + android:layout_width="1dp" + android:layout_height="fill_parent" + android:layout_marginBottom="7dp" + android:layout_marginTop="7dp" + android:background="@color/black12" /> + + <Button + android:id="@+id/right_button" + style="?android:attr/borderlessButtonStyle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" /> + </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/captcha.xml b/src/main/res/layout/captcha.xml index ea77b8354..08e685db4 100644 --- a/src/main/res/layout/captcha.xml +++ b/src/main/res/layout/captcha.xml @@ -3,13 +3,14 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:padding="16dp" > + android:padding="16dp"> <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/captcha" - android:layout_gravity="center_horizontal"/> + android:layout_gravity="center_horizontal" /> + <EditText android:id="@+id/input" android:layout_marginTop="8dp" diff --git a/src/main/res/layout/certificate_information.xml b/src/main/res/layout/certificate_information.xml index 4c085459b..18925c82b 100644 --- a/src/main/res/layout/certificate_information.xml +++ b/src/main/res/layout/certificate_information.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" android:padding="16dp"> <TextView @@ -10,73 +10,84 @@ android:layout_height="wrap_content" android:text="@string/certificate_subject" android:textColor="@color/black87" - android:textSize="?attr/TextSizeHeadline"/> + android:textSize="?attr/TextSizeHeadline" /> + <TextView android:layout_marginTop="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/certificate_cn" android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/subject_cn" android:textColor="@color/black54" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <TextView android:layout_marginTop="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/certificate_o" android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/subject_o" android:textColor="@color/black54" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <TextView android:layout_marginTop="16dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/certificate_issuer" android:textColor="@color/black87" - android:textSize="?attr/TextSizeHeadline"/> + android:textSize="?attr/TextSizeHeadline" /> + <TextView android:layout_marginTop="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/certificate_cn" android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/issuer_cn" android:textColor="@color/black54" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <TextView android:layout_marginTop="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/certificate_o" android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/issuer_o" android:textColor="@color/black54" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <TextView android:layout_marginTop="16dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/certificate_sha1" android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -84,5 +95,5 @@ android:textColor="@color/black54" android:textSize="?attr/TextSizeBody" android:typeface="monospace" - android:fontFamily="monospace"/> + android:fontFamily="monospace" /> </LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml index 445f16567..92e6020c9 100644 --- a/src/main/res/layout/contact.xml +++ b/src/main/res/layout/contact.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?android:attr/activatedBackgroundIndicator" - android:padding="8dp"> + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?android:attr/activatedBackgroundIndicator" + android:padding="8dp"> <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/contact_photo" @@ -22,7 +22,7 @@ android:layout_centerVertical="true" android:layout_toRightOf="@+id/contact_photo" android:orientation="vertical" - android:paddingLeft="8dp" > + android:paddingLeft="8dp"> <github.ankushsachdeva.emojicon.EmojiconTextView android:id="@+id/contact_display_name" @@ -39,13 +39,14 @@ android:singleLine="true" android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" /> + <com.wefika.flowlayout.FlowLayout android:id="@+id/tags" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="-2dp" - android:orientation="horizontal"> - </com.wefika.flowlayout.FlowLayout> + android:orientation="horizontal"></com.wefika.flowlayout.FlowLayout> + <TextView android:id="@+id/key" android:layout_width="wrap_content" diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml index ec8ca1996..63a4e8518 100644 --- a/src/main/res/layout/contact_key.xml +++ b/src/main/res/layout/contact_key.xml @@ -23,7 +23,7 @@ android:textSize="?attr/TextSizeBody" android:typeface="monospace" android:fontFamily="monospace" - android:longClickable="true"/> + android:longClickable="true" /> <TextView android:id="@+id/key_type" @@ -34,7 +34,7 @@ android:layout_below="@+id/key" android:maxLines="1" android:textSize="?attr/TextSizeInfo" - android:longClickable="true"/> + android:longClickable="true" /> <TextView android:id="@+id/key_trust" @@ -45,7 +45,7 @@ android:visibility="gone" android:textColor="@color/black54" android:textSize="?attr/TextSizeInfo" - android:longClickable="true"/> + android:longClickable="true" /> <LinearLayout android:id="@+id/action_container" @@ -55,6 +55,7 @@ android:orientation="vertical" android:layout_alignParentRight="true" android:layout_centerVertical="true"> + <ImageButton android:layout_gravity="center_horizontal" android:id="@+id/button_remove" @@ -82,7 +83,7 @@ android:layout_height="wrap_content" android:layout_alignParentRight="true" android:layout_centerVertical="true" - style="@style/MD"/> + style="@style/MD" /> </LinearLayout> </RelativeLayout> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index 42a55d09f..5a8f0736f 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -1,13 +1,13 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:descendantFocusability="blocksDescendants"> + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:descendantFocusability="blocksDescendants"> <View android:layout_width="fill_parent" android:layout_height="match_parent" - android:background="@color/primary"/> + android:background="@color/primary" /> <FrameLayout android:id="@+id/swipeable_item" @@ -32,7 +32,7 @@ android:padding="1dp" app:riv_border_color="@color/black12" app:riv_border_width="1dp" - app:riv_corner_radius="5dp"/> + app:riv_corner_radius="5dp" /> <RelativeLayout android:layout_width="fill_parent" @@ -52,7 +52,7 @@ android:text="Awesome groupchat" android:textColor="@color/black87" android:textSize="?attr/TextSizeHeadline" - android:typeface="sans"/> + android:typeface="sans" /> <RelativeLayout android:id="@+id/conversation_lastwrapper" @@ -61,12 +61,14 @@ android:layout_below="@id/conversation_name" android:layout_marginTop="4dp"> - <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/notification_status" - android:orientation="vertical"> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:layout_toLeftOf="@+id/notification_status" + android:orientation="vertical"> + <github.ankushsachdeva.emojicon.EmojiconTextView android:id="@+id/conversation_lastmsg" android:layout_width="match_parent" @@ -75,7 +77,7 @@ android:singleLine="true" android:text="This is a placeholder text to show the last messages" android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/conversation_lastimage" @@ -88,6 +90,7 @@ app:riv_corner_radius="5dp" android:maxWidth="400dp" /> </LinearLayout> + <ImageView android:id="@+id/notification_status" android:layout_width="16sp" @@ -95,8 +98,7 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_marginLeft="4dp" - android:src="@drawable/ic_notifications_grey600_24dp" - /> + android:src="@drawable/ic_notifications_grey600_24dp" /> </RelativeLayout> <TextView @@ -108,7 +110,7 @@ android:gravity="right" android:text="23:42" android:textColor="@color/black54" - android:textSize="?attr/TextSizeInfo"/> + android:textSize="?attr/TextSizeInfo" /> </RelativeLayout> </RelativeLayout> </FrameLayout> diff --git a/src/main/res/layout/dialog_block_contact.xml b/src/main/res/layout/dialog_block_contact.xml index fd15a4665..2e43f6af8 100644 --- a/src/main/res/layout/dialog_block_contact.xml +++ b/src/main/res/layout/dialog_block_contact.xml @@ -13,7 +13,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="?attr/TextSizeBody" - android:textColor="@color/black87"/> + android:textColor="@color/black87" /> + <CheckBox android:layout_marginTop="8dp" android:id="@+id/report_spam" diff --git a/src/main/res/layout/dialog_show_password.xml b/src/main/res/layout/dialog_show_password.xml index 167659637..299b65dca 100644 --- a/src/main/res/layout/dialog_show_password.xml +++ b/src/main/res/layout/dialog_show_password.xml @@ -16,7 +16,6 @@ android:textSize="?attr/TextSizeHeadline" android:fontFamily="monospace" android:layout_gravity="center_horizontal" - android:textColor="@color/black87" > - </TextView> + android:textColor="@color/black87"></TextView> </LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/form_boolean.xml b/src/main/res/layout/form_boolean.xml index fd553acb2..6a1a3920a 100644 --- a/src/main/res/layout/form_boolean.xml +++ b/src/main/res/layout/form_boolean.xml @@ -1,13 +1,14 @@ <?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:paddingTop="8dp" - android:orientation="vertical"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingTop="8dp" + android:orientation="vertical"> + <CheckBox android:id="@+id/field" android:layout_width="match_parent" android:layout_height="wrap_content" android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> </LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/form_text.xml b/src/main/res/layout/form_text.xml index 31b521e89..398fa9bff 100644 --- a/src/main/res/layout/form_text.xml +++ b/src/main/res/layout/form_text.xml @@ -1,15 +1,16 @@ <?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:paddingTop="8dp" - android:orientation="vertical"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingTop="8dp" + android:orientation="vertical"> + <TextView android:id="@+id/label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> <EditText android:id="@+id/field" @@ -17,5 +18,5 @@ android:layout_height="wrap_content" android:textColor="@color/black87" android:textColorHint="@color/black54" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> </LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml index 70ee276b7..eff7afa8f 100644 --- a/src/main/res/layout/fragment_conversation.xml +++ b/src/main/res/layout/fragment_conversation.xml @@ -19,8 +19,7 @@ android:listSelector="@android:color/transparent" android:stackFromBottom="true" android:transcriptMode="normal" - tools:listitem="@layout/message_sent"> - </ListView> + tools:listitem="@layout/message_sent"></ListView> <RelativeLayout android:id="@+id/textsend" @@ -53,6 +52,7 @@ android:paddingTop="12dp" android:textColor="@color/black87" android:singleLine="false"> + <requestFocus /> </de.pixart.messenger.ui.EditMessage> @@ -76,7 +76,7 @@ android:layout_marginRight="8dp" android:background="@drawable/snackbar" android:minHeight="48dp" - android:visibility="gone" > + android:visibility="gone"> <TextView android:id="@+id/snackbar_message" diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml index 9494fa067..90327136b 100644 --- a/src/main/res/layout/fragment_conversations_overview.xml +++ b/src/main/res/layout/fragment_conversations_overview.xml @@ -1,15 +1,14 @@ <android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content_view_spl" android:layout_width="match_parent" - android:layout_height="match_parent" > + android:layout_height="match_parent"> - <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_weight="1" android:layout_height="match_parent" android:background="@color/grey50" - android:orientation="vertical" > + android:orientation="vertical"> <de.timroes.android.listview.EnhancedListView android:id="@+id/list" @@ -25,7 +24,6 @@ android:layout_width="fill_parent" android:layout_height="match_parent" android:layout_weight="1" - android:orientation="vertical" > - </LinearLayout> + android:orientation="vertical"></LinearLayout> </android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file diff --git a/src/main/res/layout/join_conference_dialog.xml b/src/main/res/layout/join_conference_dialog.xml index 9ef2dc047..a615346fc 100644 --- a/src/main/res/layout/join_conference_dialog.xml +++ b/src/main/res/layout/join_conference_dialog.xml @@ -1,12 +1,12 @@ <?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:paddingBottom="8dp" - android:paddingLeft="24dp" - android:paddingRight="24dp" - android:paddingTop="16dp"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingBottom="8dp" + android:paddingLeft="24dp" + android:paddingRight="24dp" + android:paddingTop="16dp"> <TextView android:id="@+id/your_account" @@ -40,7 +40,7 @@ android:inputType="textEmailAddress" android:textColor="@color/black87" android:textColorHint="@color/black54" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> <CheckBox android:id="@+id/bookmark" @@ -50,6 +50,6 @@ android:checked="true" android:text="@string/save_as_bookmark" android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> </LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/keys_card.xml b/src/main/res/layout/keys_card.xml index d3271d1bc..89c47c904 100644 --- a/src/main/res/layout/keys_card.xml +++ b/src/main/res/layout/keys_card.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout android:id="@+id/foreign_keys_card" - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/activity_vertical_margin" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:background="@drawable/infocard_border" - android:orientation="vertical" - android:padding="@dimen/infocard_padding"> + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/activity_vertical_margin" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:background="@drawable/infocard_border" + android:orientation="vertical" + android:padding="@dimen/infocard_padding"> <TextView android:id="@+id/foreign_keys_title" @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:textColor="@color/black87" android:textSize="?attr/TextSizeHeadline" - android:textStyle="bold"/> + android:textStyle="bold" /> <LinearLayout android:id="@+id/foreign_keys_details" @@ -25,8 +25,7 @@ android:layout_height="wrap_content" android:divider="?android:dividerHorizontal" android:orientation="vertical" - android:showDividers="middle"> - </LinearLayout> + android:showDividers="middle"></LinearLayout> <TextView android:layout_marginTop="8dp" @@ -35,5 +34,5 @@ android:layout_height="wrap_content" android:textColor="@color/black87" android:text="@string/no_keys_just_confirm" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> </LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/list_item_tag.xml b/src/main/res/layout/list_item_tag.xml index 5042d8d16..fcb7dd984 100644 --- a/src/main/res/layout/list_item_tag.xml +++ b/src/main/res/layout/list_item_tag.xml @@ -10,5 +10,4 @@ android:textColor="@color/white" android:textAllCaps="true" android:maxLines="1" - android:layout_margin="2dp" -/>
\ No newline at end of file + android:layout_margin="2dp" />
\ No newline at end of file diff --git a/src/main/res/layout/magic_create.xml b/src/main/res/layout/magic_create.xml index c4adc0297..3330a7cbb 100644 --- a/src/main/res/layout/magic_create.xml +++ b/src/main/res/layout/magic_create.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:fillViewport="true"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="true"> + <RelativeLayout android:layout_width="match_parent" android:layout_height="match_parent" @@ -20,24 +21,28 @@ android:paddingBottom="8dp" android:paddingLeft="16dp" android:paddingRight="16dp"> + <Space android:layout_width="match_parent" android:layout_height="0dp" - android:layout_weight="1"/> + android:layout_weight="1" /> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/pick_your_username" android:textColor="@color/black87" android:textSize="?attr/TextSizeHeadline" - android:textStyle="bold"/> + android:textStyle="bold" /> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/magic_create_text" android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <EditText android:id="@+id/username" android:layout_width="match_parent" @@ -45,7 +50,8 @@ android:layout_gravity="center_horizontal" android:hint="@string/username_hint" android:inputType="textNoSuggestions" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <TextView android:id="@+id/full_jid" android:layout_width="wrap_content" @@ -54,7 +60,8 @@ android:text="@string/your_full_jid_will_be" android:textColor="@color/black54" android:textSize="?attr/TextSizeInfo" - android:visibility="invisible"/> + android:visibility="invisible" /> + <Button android:id="@+id/create_account" style="?android:attr/borderlessButtonStyle" @@ -62,8 +69,9 @@ android:layout_height="wrap_content" android:layout_gravity="right" android:text="@string/next" - android:textColor="@color/accent"/> + android:textColor="@color/accent" /> </LinearLayout> + <RelativeLayout android:layout_width="match_parent" android:layout_height="match_parent" @@ -71,13 +79,14 @@ android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:layout_alignParentTop="true"> + <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerHorizontal="true" android:layout_centerVertical="true" android:padding="8dp" - android:src="@drawable/main_logo"/> + android:src="@drawable/main_logo" /> </RelativeLayout> </RelativeLayout> </ScrollView>
\ No newline at end of file diff --git a/src/main/res/layout/manage_accounts.xml b/src/main/res/layout/manage_accounts.xml index e55d8d40a..8d7167ea6 100644 --- a/src/main/res/layout/manage_accounts.xml +++ b/src/main/res/layout/manage_accounts.xml @@ -9,7 +9,6 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:divider="@color/black12" - android:dividerHeight="1dp" > - </ListView> + android:dividerHeight="1dp"></ListView> </LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml index 5d5fb7c43..9717081a8 100644 --- a/src/main/res/layout/message_received.xml +++ b/src/main/res/layout/message_received.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:emojicon="http://schemas.android.com/apk/res-auto" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingBottom="3dp" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:paddingTop="3dp"> + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:emojicon="http://schemas.android.com/apk/res-auto" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingBottom="3dp" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingTop="3dp"> <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/message_photo" diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml index 5c414ed2c..c44a216bd 100644 --- a/src/main/res/layout/message_sent.xml +++ b/src/main/res/layout/message_sent.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:emojicon="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:paddingBottom="3dp" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:paddingTop="3dp"> + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:emojicon="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingBottom="3dp" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingTop="3dp"> <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/message_photo" @@ -125,6 +125,7 @@ android:layout_marginLeft="4sp" android:gravity="center_vertical" android:src="@drawable/ic_received_indicator" /> + <ImageView android:id="@+id/indicator_read" android:layout_width="?attr/TextSizeInfo" diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml index 0a5804a2e..117f31264 100644 --- a/src/main/res/layout/message_status.xml +++ b/src/main/res/layout/message_status.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingBottom="5dp" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:paddingTop="5dp"> + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingBottom="5dp" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingTop="5dp"> <Button android:id="@+id/load_more_messages" @@ -15,8 +15,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/load_more_messages" - android:textColor="@color/accent" android:layout_centerVertical="true" - android:layout_centerHorizontal="true"/> + android:textColor="@color/accent" + android:layout_centerVertical="true" + android:layout_centerHorizontal="true" /> <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/message_photo" @@ -29,7 +30,7 @@ android:scaleType="fitXY" android:src="@drawable/ic_profile" android:background="@drawable/message_border" - app:riv_corner_radius="5dp"/> + app:riv_corner_radius="5dp" /> <TextView android:id="@+id/status_message" @@ -42,6 +43,6 @@ android:text="@string/contact_has_read_up_to_this_point" android:textColor="@color/black54" android:textSize="?attr/TextSizeInfo" - android:textStyle="italic"/> + android:textStyle="italic" /> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/password.xml b/src/main/res/layout/password.xml index 5de9baa23..db8d82505 100644 --- a/src/main/res/layout/password.xml +++ b/src/main/res/layout/password.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" android:layout_width="match_parent" + android:orientation="vertical" + android:layout_width="match_parent" android:layout_height="match_parent"> <EditText diff --git a/src/main/res/layout/presence_template.xml b/src/main/res/layout/presence_template.xml index ea1d05bd8..ef6f01643 100644 --- a/src/main/res/layout/presence_template.xml +++ b/src/main/res/layout/presence_template.xml @@ -1,12 +1,13 @@ <?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="?android:attr/activatedBackgroundIndicator" - android:paddingTop="8dp" - android:paddingLeft="8dp" - android:paddingBottom="8dp" - android:id="@+id/presence_template"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?android:attr/activatedBackgroundIndicator" + android:paddingTop="8dp" + android:paddingLeft="8dp" + android:paddingBottom="8dp" + android:id="@+id/presence_template"> + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" @@ -17,25 +18,28 @@ android:layout_toLeftOf="@+id/delete_button" android:layout_toStartOf="@+id/delete_button" android:layout_marginRight="8dp"> - <github.ankushsachdeva.emojicon.EmojiconTextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/presence_status_message" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> - <github.ankushsachdeva.emojicon.EmojiconTextView - android:id="@+id/status" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingBottom="1dp" - android:paddingLeft="4dp" - android:paddingRight="4dp" - android:paddingTop="1dp" - android:textAllCaps="true" - android:textColor="@color/white" - android:textSize="?attr/TextSizeInfo" - android:layout_marginTop="4dp"/> + + <github.ankushsachdeva.emojicon.EmojiconTextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:id="@+id/presence_status_message" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + + <github.ankushsachdeva.emojicon.EmojiconTextView + android:id="@+id/status" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingBottom="1dp" + android:paddingLeft="4dp" + android:paddingRight="4dp" + android:paddingTop="1dp" + android:textAllCaps="true" + android:textColor="@color/white" + android:textSize="?attr/TextSizeInfo" + android:layout_marginTop="4dp" /> </LinearLayout> + <ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -45,5 +49,5 @@ android:layout_alignParentEnd="true" android:background="?android:selectableItemBackground" android:padding="@dimen/image_button_padding" - android:src="?attr/icon_remove"/> + android:src="?attr/icon_remove" /> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/quickedit.xml b/src/main/res/layout/quickedit.xml index fb0b7d58f..5bbf7dad9 100644 --- a/src/main/res/layout/quickedit.xml +++ b/src/main/res/layout/quickedit.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:padding="16dp" > + android:padding="16dp"> <github.ankushsachdeva.emojicon.EmojiconEditText android:id="@+id/editor" @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:ems="10" android:inputType="textPersonName" - android:textColor="@color/black87" > + android:textColor="@color/black87"> <requestFocus /> </github.ankushsachdeva.emojicon.EmojiconEditText> diff --git a/src/main/res/layout/share_with.xml b/src/main/res/layout/share_with.xml index 41b6033da..162d02efe 100644 --- a/src/main/res/layout/share_with.xml +++ b/src/main/res/layout/share_with.xml @@ -2,7 +2,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" > + android:layout_height="match_parent"> <ListView android:id="@+id/choose_conversation_list" diff --git a/src/main/res/layout/show_location_infowindow.xml b/src/main/res/layout/show_location_infowindow.xml index 0793ba7d5..a4bdf108f 100644 --- a/src/main/res/layout/show_location_infowindow.xml +++ b/src/main/res/layout/show_location_infowindow.xml @@ -14,12 +14,13 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="?attr/TextSizeBody" - android:textStyle="bold"/> + android:textStyle="bold" /> + <TextView android:id="@+id/snippet" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="?attr/TextSizeInfo"/> + android:textSize="?attr/TextSizeInfo" /> </LinearLayout> </LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/simple_list_item.xml b/src/main/res/layout/simple_list_item.xml index 8cbc1f923..c54fd7833 100644 --- a/src/main/res/layout/simple_list_item.xml +++ b/src/main/res/layout/simple_list_item.xml @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2006 The Android Open Source Project +<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2006 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,12 +14,12 @@ --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@android:id/text1" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - android:gravity="center_vertical" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:minHeight="?android:attr/listPreferredItemHeightSmall" /> + android:id="@android:id/text1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + android:gravity="center_vertical" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:minHeight="?android:attr/listPreferredItemHeightSmall" /> |