diff options
19 files changed, 182 insertions, 116 deletions
diff --git a/build.gradle b/build.gradle index 045a38be6..93e4f3468 100644 --- a/build.gradle +++ b/build.gradle @@ -94,7 +94,7 @@ android { compileSdkVersion 28 defaultConfig { - minSdkVersion 18 + minSdkVersion 16 targetSdkVersion 28 versionCode 249 diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml index 9b638172a..eaacbde5e 100644 --- a/src/main/res/layout/account_row.xml +++ b/src/main/res/layout/account_row.xml @@ -4,14 +4,16 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?android:attr/activatedBackgroundIndicator" - android:paddingBottom="8dp" + android:paddingStart="8dp" android:paddingLeft="8dp" - android:paddingTop="8dp"> + android:paddingTop="8dp" + android:paddingBottom="8dp"> <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/account_image" android:layout_width="48dp" android:layout_height="48dp" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" android:contentDescription="@string/account_image_description" android:padding="1dp" @@ -21,10 +23,12 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_toStartOf="@+id/tgl_account_status" android:layout_toLeftOf="@+id/tgl_account_status" + android:layout_toEndOf="@+id/account_image" android:layout_toRightOf="@+id/account_image" - android:layout_toStartOf="@+id/tgl_account_status" android:orientation="vertical" + android:paddingStart="@dimen/avatar_item_distance" android:paddingLeft="@dimen/avatar_item_distance"> <TextView @@ -47,6 +51,7 @@ android:id="@+id/tgl_account_status" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:focusable="false" diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml index 4da63e957..f3bdb056f 100644 --- a/src/main/res/layout/activity_about.xml +++ b/src/main/res/layout/activity_about.xml @@ -21,10 +21,10 @@ android:id="@+id/LogoLayout" android:layout_width="match_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:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" card_view:cardBackgroundColor="?attr/color_background_secondary"> <ImageView @@ -42,10 +42,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/LogoLayout" - 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:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" android:orientation="vertical" card_view:cardBackgroundColor="?attr/color_background_secondary"> @@ -59,8 +59,8 @@ android:layout_width="wrap_content" 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_marginRight="@dimen/activity_horizontal_margin" android:autoLink="web" android:fontFamily="monospace" android:linksClickable="true" @@ -74,20 +74,18 @@ android:id="@+id/show_privacy_policy" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_centerHorizontal="true" android:layout_gravity="center_horizontal" - android:layout_marginBottom="4dp" android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" android:text="@string/show_privacy" /> <Button android:id="@+id/show_terms_of_use" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_centerHorizontal="true" android:layout_gravity="center_horizontal" - android:layout_marginBottom="4dp" android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" android:text="@string/show_termsofuse" /> </LinearLayout> @@ -98,10 +96,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/aboutLayout" - 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:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" card_view:cardBackgroundColor="?attr/color_background_secondary"> <TextView @@ -109,8 +107,8 @@ android:layout_width="wrap_content" 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_marginRight="@dimen/activity_horizontal_margin" android:autoLink="web" android:fontFamily="monospace" android:linksClickable="true" diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml index 4ff57e22b..7f79bffc8 100644 --- a/src/main/res/layout/activity_change_password.xml +++ b/src/main/res/layout/activity_change_password.xml @@ -16,10 +16,10 @@ <android.support.v7.widget.CardView android:layout_width="match_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:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" android:background="?attr/color_background_tertiary"> <LinearLayout @@ -75,9 +75,11 @@ android:id="@+id/button_bar" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentBottom="true" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" - android:layout_alignParentRight="true"> + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" + android:layout_alignParentBottom="true"> <Button android:id="@+id/left_button" @@ -90,8 +92,8 @@ <View android:layout_width="1dp" android:layout_height="fill_parent" - android:layout_marginBottom="7dp" android:layout_marginTop="7dp" + android:layout_marginBottom="7dp" android:background="?attr/divider" /> <Button diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index 58fe0c901..1aa6bd995 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -25,10 +25,10 @@ <android.support.v7.widget.CardView android:layout_width="match_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:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" card_view:cardBackgroundColor="?attr/color_background_secondary"> <LinearLayout @@ -65,12 +65,10 @@ android:id="@+id/details_contact_badge" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@+id/contact_display_name" - android:layout_centerHorizontal="true" android:adjustViewBounds="true" android:background="?attr/color_border" - android:maxHeight="384dp" android:maxWidth="384dp" + android:maxHeight="384dp" android:padding="1dp" android:scaleType="centerCrop" /> @@ -78,11 +76,6 @@ android:id="@+id/details_jidbox" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" - android:layout_alignParentStart="true" - android:layout_below="@+id/details_contact_badge" android:layout_marginTop="16dp" android:orientation="vertical"> @@ -100,18 +93,19 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:layout_marginBottom="4dp" + android:layout_marginStart="-2dp" android:layout_marginLeft="-2dp" android:layout_marginTop="4dp" - android:orientation="horizontal"></com.wefika.flowlayout.FlowLayout> + android:layout_marginBottom="4dp" + android:orientation="horizontal" /> <TextView android:id="@+id/details_lastseen" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:layout_marginBottom="4dp" android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" android:textAppearance="@style/TextAppearance.Conversations.Subhead" /> <TextView @@ -119,8 +113,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:layout_marginBottom="4dp" android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" android:gravity="center_horizontal" android:textAppearance="@style/TextAppearance.Conversations.Body1" /> @@ -129,8 +123,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:layout_marginBottom="4dp" android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" android:gravity="center_horizontal" android:textSize="?attr/TextSizeBody" android:textStyle="italic" /> @@ -139,11 +133,9 @@ android:id="@+id/add_contact_button" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_centerHorizontal="true" android:layout_gravity="center_horizontal" - android:layout_marginBottom="4dp" android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" android:text="@string/add_contact" /> <CheckBox @@ -151,9 +143,6 @@ style="@style/Widget.Conversations.CheckBox" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_below="@+id/add_contact_button" android:layout_marginTop="4dp" android:text="@string/send_presence_updates" android:textAppearance="@style/TextAppearance.Conversations.Body1" /> @@ -163,9 +152,6 @@ style="@style/Widget.Conversations.CheckBox" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_below="@+id/details_send_presence" android:text="@string/receive_presence_updates" android:textAppearance="@style/TextAppearance.Conversations.Body1" /> @@ -195,17 +181,17 @@ <android.support.v7.widget.CardView android:layout_width="match_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:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" card_view:cardBackgroundColor="?attr/color_background_secondary"> <RelativeLayout android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" + android:layout_alignParentLeft="true" android:padding="@dimen/card_padding_regular" android:touchscreenBlocksFocus="true"> @@ -213,8 +199,10 @@ android:id="@+id/notification_status_text" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" android:layout_centerVertical="true" + android:layout_toStartOf="@+id/notification_status_button" android:layout_toLeftOf="@+id/notification_status_button" android:text="@string/notify_on_all_messages" android:textSize="?attr/TextSizeBody" /> @@ -224,6 +212,7 @@ style="?android:attr/buttonStyleSmall" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_gravity="center_horizontal" @@ -239,10 +228,10 @@ android:id="@+id/media_wrapper" 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:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" card_view:cardBackgroundColor="?attr/color_background_secondary"> <LinearLayout @@ -254,13 +243,13 @@ android:id="@+id/media" android:layout_width="match_parent" android:layout_height="100dp" - android:layout_marginEnd="-2dp" android:layout_marginStart="-2dp" + android:layout_marginEnd="-2dp" android:orientation="horizontal" - android:paddingBottom="@dimen/card_padding_list" - android:paddingEnd="@dimen/card_padding_regular" android:paddingStart="@dimen/card_padding_regular" - android:paddingTop="@dimen/card_padding_regular" /> + android:paddingTop="@dimen/card_padding_regular" + android:paddingEnd="@dimen/card_padding_regular" + android:paddingBottom="@dimen/card_padding_list" /> <LinearLayout android:layout_width="wrap_content" @@ -286,10 +275,10 @@ android:id="@+id/keys_wrapper" android:layout_width="match_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:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" card_view:cardBackgroundColor="?attr/color_background_secondary"> <LinearLayout diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 011f89e5b..56d108b68 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -176,7 +176,6 @@ android:id="@+id/show_privacy_policy" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_centerHorizontal="true" android:layout_gravity="center_horizontal" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" @@ -187,7 +186,6 @@ android:id="@+id/show_terms_of_use" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_centerHorizontal="true" android:layout_gravity="center_horizontal" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" @@ -298,6 +296,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right" + android:paddingStart="4dp" android:paddingLeft="4dp" android:textAppearance="@style/TextAppearance.Conversations.Body1" /> </TableRow> @@ -329,6 +328,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right" + android:paddingStart="4dp" android:paddingLeft="4dp" android:textAppearance="@style/TextAppearance.Conversations.Body1" /> </TableRow> @@ -350,6 +350,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right" + android:paddingStart="4dp" android:paddingLeft="4dp" android:textAppearance="@style/TextAppearance.Conversations.Body1" /> </TableRow> @@ -371,6 +372,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right" + android:paddingStart="4dp" android:paddingLeft="4dp" android:textAppearance="@style/TextAppearance.Conversations.Body1" /> </TableRow> @@ -392,6 +394,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right" + android:paddingStart="4dp" android:paddingLeft="4dp" android:textAppearance="@style/TextAppearance.Conversations.Body1" /> </TableRow> @@ -413,6 +416,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right" + android:paddingStart="4dp" android:paddingLeft="4dp" android:textAppearance="@style/TextAppearance.Conversations.Body1" /> </TableRow> @@ -434,6 +438,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right" + android:paddingStart="4dp" android:paddingLeft="4dp" android:textAppearance="@style/TextAppearance.Conversations.Body1" /> </TableRow> @@ -455,6 +460,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right" + android:paddingStart="4dp" android:paddingLeft="4dp" android:textAppearance="@style/TextAppearance.Conversations.Body1" /> </TableRow> @@ -477,6 +483,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right" + android:paddingStart="4dp" android:paddingLeft="4dp" android:textAppearance="@style/TextAppearance.Conversations.Body1" /> </TableRow> @@ -499,6 +506,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right" + android:paddingStart="4dp" android:paddingLeft="4dp" android:textAppearance="@style/TextAppearance.Conversations.Body1" /> @@ -514,8 +522,10 @@ <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" android:layout_centerVertical="true" + android:layout_toStartOf="@+id/action_delete_pgp" android:layout_toLeftOf="@+id/action_delete_pgp" android:orientation="vertical"> @@ -537,6 +547,7 @@ android:id="@+id/action_delete_pgp" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:alpha="1.0" diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index bb5a375a4..04198908a 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -75,8 +75,6 @@ android:id="@+id/jid" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@+id/muc_subject" - android:layout_alignParentLeft="true" android:text="@string/account_settings_example_jabber_id" android:textAppearance="@style/TextAppearance.Conversations.Body1" android:textIsSelectable="true" @@ -168,8 +166,10 @@ android:id="@+id/muc_conference_type" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" android:layout_centerVertical="true" + android:layout_toStartOf="@+id/change_conference_button" android:layout_toLeftOf="@+id/change_conference_button" android:text="@string/private_conference" android:textAppearance="@style/TextAppearance.Conversations.Body1" /> @@ -179,6 +179,7 @@ style="?android:attr/buttonStyleSmall" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_gravity="center_horizontal" @@ -196,8 +197,10 @@ android:id="@+id/notification_status_text" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" android:layout_centerVertical="true" + android:layout_toStartOf="@+id/notification_status_button" android:layout_toLeftOf="@+id/notification_status_button" android:text="@string/notify_on_all_messages" android:textAppearance="@style/TextAppearance.Conversations.Body1" /> @@ -207,6 +210,7 @@ style="?android:attr/buttonStyleSmall" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_gravity="center_horizontal" @@ -224,8 +228,10 @@ <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" android:layout_centerVertical="true" + android:layout_toStartOf="@+id/muc_info_mam" android:layout_toLeftOf="@+id/muc_info_mam" android:ellipsize="end" android:singleLine="true" @@ -237,11 +243,13 @@ style="?android:attr/buttonStyleSmall" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_gravity="center_horizontal" android:background="?attr/selectableItemBackgroundBorderless" android:padding="@dimen/image_button_padding" + android:paddingStart="4dp" android:paddingLeft="4dp" android:textAppearance="@style/TextAppearance.Conversations.Body1" /> </RelativeLayout> @@ -295,8 +303,8 @@ android:id="@+id/media" android:layout_width="match_parent" android:layout_height="100dp" - android:layout_marginEnd="-2dp" android:layout_marginStart="-2dp" + android:layout_marginEnd="-2dp" android:orientation="horizontal" android:paddingStart="@dimen/card_padding_regular" android:paddingTop="@dimen/card_padding_regular" @@ -353,6 +361,7 @@ android:id="@+id/your_photo" android:layout_width="72dp" android:layout_height="72dp" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" android:layout_alignParentEnd="false" android:layout_alignParentRight="false" @@ -363,8 +372,10 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_toEndOf="@+id/your_photo" android:layout_toRightOf="@+id/your_photo" android:orientation="vertical" + android:paddingStart="@dimen/avatar_item_distance" android:paddingLeft="@dimen/avatar_item_distance"> <TextView @@ -386,6 +397,7 @@ android:id="@+id/edit_nick_button" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:alpha="?attr/icon_alpha" diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml index ecb82f17e..efb28411b 100644 --- a/src/main/res/layout/activity_publish_profile_picture.xml +++ b/src/main/res/layout/activity_publish_profile_picture.xml @@ -84,7 +84,9 @@ android:id="@+id/button_bar" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" + android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_alignParentBottom="true"> diff --git a/src/main/res/layout/activity_recording.xml b/src/main/res/layout/activity_recording.xml index e9dd345c6..916c8716f 100644 --- a/src/main/res/layout/activity_recording.xml +++ b/src/main/res/layout/activity_recording.xml @@ -10,9 +10,9 @@ android:id="@+id/button_bar" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" + android:layout_below="@+id/timer" android:layout_alignParentStart="true" - android:layout_below="@+id/timer"> + android:layout_alignParentLeft="true"> <Button android:id="@+id/cancel_button" @@ -26,8 +26,8 @@ <View android:layout_width="1dp" android:layout_height="fill_parent" - android:layout_marginBottom="7dp" android:layout_marginTop="7dp" + android:layout_marginBottom="7dp" android:textColor="?attr/colorAccent" /> <Button diff --git a/src/main/res/layout/activity_share_locaction.xml b/src/main/res/layout/activity_share_locaction.xml index 14be5b2e4..23fe1a4d1 100644 --- a/src/main/res/layout/activity_share_locaction.xml +++ b/src/main/res/layout/activity_share_locaction.xml @@ -32,9 +32,11 @@ android:id="@+id/button_bar" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentBottom="true" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" - android:layout_alignParentRight="true"> + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" + android:layout_alignParentBottom="true"> <Button android:id="@+id/cancel_button" @@ -47,8 +49,8 @@ <View android:layout_width="1dp" android:layout_height="fill_parent" - android:layout_marginBottom="7dp" - android:layout_marginTop="7dp" /> + android:layout_marginTop="7dp" + android:layout_marginBottom="7dp" /> <Button android:id="@+id/share_button" diff --git a/src/main/res/layout/activity_verify_otr.xml b/src/main/res/layout/activity_verify_otr.xml index 70f9d8e6c..222195261 100644 --- a/src/main/res/layout/activity_verify_otr.xml +++ b/src/main/res/layout/activity_verify_otr.xml @@ -12,11 +12,11 @@ <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"> + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" + android:orientation="vertical"> <TextView android:id="@+id/verification_explanation" @@ -34,10 +34,10 @@ android:id="@+id/your_fingerprint" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:fontFamily="monospace" android:textColor="?attr/text_Color_Main" android:textSize="?attr/TextSizeBody" - android:typeface="monospace" - android:fontFamily="monospace" /> + android:typeface="monospace" /> <TextView android:layout_width="wrap_content" @@ -51,10 +51,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="20dp" + android:fontFamily="monospace" android:textColor="?attr/text_Color_Main" android:textSize="?attr/TextSizeBody" - android:typeface="monospace" - android:fontFamily="monospace" /> + android:typeface="monospace" /> <TextView android:layout_width="wrap_content" @@ -123,9 +123,11 @@ android:id="@+id/button_bar" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentBottom="true" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" - android:layout_alignParentRight="true"> + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" + android:layout_alignParentBottom="true"> <Button android:id="@+id/left_button" @@ -137,8 +139,8 @@ <View android:layout_width="1dp" android:layout_height="fill_parent" - android:layout_marginBottom="7dp" android:layout_marginTop="7dp" + android:layout_marginBottom="7dp" android:background="?attr/color_background_primary" /> <Button diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml index a8f4ff499..d7d8956ec 100644 --- a/src/main/res/layout/contact.xml +++ b/src/main/res/layout/contact.xml @@ -12,6 +12,7 @@ android:id="@+id/contact_photo" android:layout_width="56dp" android:layout_height="56dp" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" app:riv_corner_radius="@dimen/rounded_image_border" /> @@ -19,8 +20,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_toEndOf="@+id/contact_photo" android:layout_toRightOf="@+id/contact_photo" android:orientation="vertical" + android:paddingStart="@dimen/avatar_item_distance" android:paddingLeft="@dimen/avatar_item_distance"> <TextView @@ -41,6 +44,7 @@ android:id="@+id/tags" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginStart="-2dp" android:layout_marginLeft="-2dp" android:orientation="horizontal" /> diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml index dec322f68..0b6f85f23 100644 --- a/src/main/res/layout/contact_key.xml +++ b/src/main/res/layout/contact_key.xml @@ -4,14 +4,17 @@ <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" android:padding="@dimen/list_padding"> <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" android:layout_centerVertical="true" + android:layout_toStartOf="@+id/action_container" android:layout_toLeftOf="@+id/action_container" android:orientation="vertical"> @@ -37,6 +40,7 @@ android:id="@+id/action_container" android:layout_width="@dimen/key_action_width" android:layout_height="48dp" + android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:gravity="center" diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index bfcf3bdca..ef39138fb 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -21,6 +21,7 @@ android:id="@+id/conversation_image" android:layout_width="56dp" android:layout_height="56dp" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" android:padding="1dp" android:scaleType="centerCrop" @@ -30,17 +31,22 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_toEndOf="@+id/conversation_image" android:layout_toRightOf="@+id/conversation_image" + android:paddingStart="@dimen/avatar_item_distance" android:paddingLeft="@dimen/avatar_item_distance"> <TextView android:id="@+id/conversation_name" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignStart="@+id/conversation_lastwrapper" android:layout_alignLeft="@+id/conversation_lastwrapper" + android:layout_toStartOf="@+id/conversation_failed" android:layout_toLeftOf="@+id/conversation_failed" android:ellipsize="end" android:maxLines="1" + android:paddingEnd="4dp" android:paddingRight="4dp" android:textAppearance="@style/TextAppearance.Conversations.Subhead" /> @@ -55,8 +61,10 @@ android:id="@+id/sender_name" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" android:layout_centerVertical="true" + android:layout_marginEnd="5sp" android:layout_marginRight="5sp" android:gravity="center_vertical" android:minHeight="?attr/IconSize" @@ -67,9 +75,12 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_alignParentStart="false" android:layout_alignParentLeft="false" android:layout_centerVertical="true" + android:layout_toStartOf="@+id/indicators" android:layout_toLeftOf="@+id/indicators" + android:layout_toEndOf="@+id/sender_name" android:layout_toRightOf="@+id/sender_name" android:orientation="horizontal"> @@ -77,6 +88,7 @@ android:id="@+id/conversation_lastmsg_img" android:layout_width="?attr/IconSize" android:layout_height="?attr/IconSize" + android:layout_marginEnd="?attr/TextSeparation" android:layout_marginRight="?attr/TextSeparation" /> <TextView @@ -95,7 +107,9 @@ android:id="@+id/indicators" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentStart="false" android:layout_alignParentLeft="false" + android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:orientation="horizontal"> @@ -105,8 +119,8 @@ android:layout_width="?attr/TextSizeInfo" android:layout_height="?attr/TextSizeInfo" android:layout_gravity="center_vertical" + android:layout_marginStart="4sp" android:layout_marginLeft="4sp" - android:layout_toLeftOf="@+id/indicator_read" android:gravity="center_vertical" android:src="@drawable/ic_received_indicator" /> @@ -115,8 +129,8 @@ android:layout_width="?attr/TextSizeInfo" android:layout_height="?attr/TextSizeInfo" android:layout_gravity="center_vertical" + android:layout_marginStart="-8sp" android:layout_marginLeft="-8sp" - android:layout_toLeftOf="@+id/notification_status" android:adjustViewBounds="false" android:gravity="center_vertical" android:src="@drawable/ic_read_indicator" /> @@ -125,7 +139,7 @@ android:id="@+id/notification_status" android:layout_width="?attr/IconSize" android:layout_height="?attr/IconSize" - android:layout_centerVertical="true" + android:layout_marginStart="4dp" android:layout_marginLeft="4dp" android:alpha="?attr/icon_alpha" android:src="@drawable/ic_notifications_grey600_24dp" /> @@ -137,10 +151,11 @@ android:layout_width="?attr/IconSize" android:layout_height="?attr/IconSize" android:layout_margin="1dp" + android:layout_toStartOf="@+id/conversation_lastupdate" android:layout_toLeftOf="@+id/conversation_lastupdate" - android:paddingBottom="2dp" android:paddingLeft="4dp" android:paddingRight="4dp" + android:paddingBottom="2dp" android:visibility="gone" app:backgroundColor="?attr/colorAccent" /> @@ -149,10 +164,11 @@ android:layout_width="?attr/IconSize" android:layout_height="?attr/IconSize" android:layout_margin="1dp" + android:layout_toStartOf="@+id/conversation_unread" android:layout_toLeftOf="@+id/conversation_unread" - android:paddingBottom="2dp" android:paddingLeft="4dp" android:paddingRight="4dp" + android:paddingBottom="2dp" android:visibility="gone" app:backgroundColor="?attr/color_warning" /> @@ -161,8 +177,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignBaseline="@+id/conversation_name" + android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:gravity="right" + android:paddingStart="4dp" android:paddingLeft="4dp" android:textAppearance="@style/TextAppearance.Conversations.Caption" /> </RelativeLayout> diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml index 3151f6401..b38cc72a5 100644 --- a/src/main/res/layout/fragment_conversation.xml +++ b/src/main/res/layout/fragment_conversation.xml @@ -13,8 +13,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_above="@+id/snackbar" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" + android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:background="?attr/color_background_tertiary" android:divider="@null" @@ -42,12 +42,12 @@ android:id="@+id/unread_count_custom_view" android:layout_width="?attr/IconSize" android:layout_height="?attr/IconSize" + android:layout_alignTop="@+id/scroll_to_bottom_button" android:layout_alignEnd="@+id/scroll_to_bottom_button" android:layout_alignRight="@+id/scroll_to_bottom_button" - android:layout_alignTop="@+id/scroll_to_bottom_button" + android:layout_marginTop="16dp" android:layout_marginEnd="8dp" android:layout_marginRight="8dp" - android:layout_marginTop="16dp" android:elevation="8dp" android:visibility="gone" app:backgroundColor="?attr/colorAccent" /> @@ -56,26 +56,29 @@ android:id="@+id/input" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentBottom="true" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" - android:layout_alignParentStart="true"> + android:layout_alignParentBottom="true"> <RelativeLayout android:id="@+id/textsend" android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" android:background="?attr/color_background_tertiary" android:clickable="true" - android:paddingBottom="2dp" + android:paddingStart="2dp" android:paddingLeft="2dp" - android:paddingTop="2dp"> + android:paddingTop="2dp" + android:paddingBottom="2dp"> <ImageButton android:id="@+id/recordVoiceButton" android:layout_width="48dp" android:layout_height="48dp" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" android:layout_centerVertical="true" android:background="?attr/color_background_tertiary" @@ -87,10 +90,10 @@ android:id="@+id/media_preview" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:layout_toLeftOf="@+id/textSendButton" + android:layout_alignParentLeft="true" android:layout_toStartOf="@+id/textSendButton" + android:layout_toLeftOf="@+id/textSendButton" android:background="@drawable/message_bubble_sent" android:orientation="horizontal" android:paddingTop="8dp" @@ -104,10 +107,10 @@ style="@style/Widget.Conversations.EditText" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toEndOf="@+id/recordVoiceButton" + android:layout_toStartOf="@+id/textSendButton" android:layout_toLeftOf="@+id/textSendButton" + android:layout_toEndOf="@+id/recordVoiceButton" android:layout_toRightOf="@+id/recordVoiceButton" - android:layout_toStartOf="@+id/textSendButton" android:background="@drawable/message_bubble_sent" android:ems="10" android:imeOptions="flagNoExtractUi|actionSend" @@ -115,10 +118,10 @@ android:maxLines="6" android:minHeight="48dp" android:minLines="1" - android:paddingBottom="12dp" android:paddingLeft="8dp" - android:paddingRight="8dp" android:paddingTop="12dp" + android:paddingRight="8dp" + android:paddingBottom="12dp" android:singleLine="false" android:textColor="?attr/text_Color_Main"> @@ -142,9 +145,9 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_above="@+id/input" - android:layout_marginBottom="4dp" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" + android:layout_marginBottom="4dp" android:background="@drawable/snackbar" android:minHeight="48dp" android:visibility="visible"> @@ -153,13 +156,13 @@ android:id="@+id/snackbar_message" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" + android:layout_alignParentLeft="true" android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/snackbar_action" android:layout_toStartOf="@+id/snackbar_action" - android:paddingLeft="24dp" + android:layout_toLeftOf="@+id/snackbar_action" android:paddingStart="24dp" + android:paddingLeft="24dp" android:textAppearance="@style/TextAppearance.Conversations.Body1.OnDark" /> <TextView @@ -169,10 +172,10 @@ android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:paddingBottom="16dp" android:paddingLeft="24dp" - android:paddingRight="24dp" android:paddingTop="16dp" + android:paddingRight="24dp" + android:paddingBottom="16dp" android:textAllCaps="true" android:textAppearance="@style/TextAppearance.Conversations.Body1.OnDark" android:textStyle="bold" /> @@ -183,8 +186,8 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" android:layout_marginTop="4dp" + android:layout_marginRight="8dp" android:background="@drawable/date_bubble" android:minHeight="48dp" android:visibility="gone"> @@ -193,11 +196,11 @@ android:id="@+id/messagehint_message" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" + android:layout_alignParentLeft="true" android:layout_centerVertical="true" - android:paddingLeft="24dp" android:paddingStart="24dp" + android:paddingLeft="24dp" android:textColor="@color/realblack" android:textSize="?attr/TextSizeBody" /> </RelativeLayout> diff --git a/src/main/res/layout/message_content.xml b/src/main/res/layout/message_content.xml index 296944565..67c993cac 100644 --- a/src/main/res/layout/message_content.xml +++ b/src/main/res/layout/message_content.xml @@ -6,12 +6,12 @@ android:id="@+id/message_image" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="4dp" android:layout_marginTop="2dp" + android:layout_marginBottom="4dp" android:adjustViewBounds="true" android:longClickable="true" - android:maxHeight="500dp" android:maxWidth="500dp" + android:maxHeight="500dp" android:scaleType="centerCrop" app:riv_corner_radius="@dimen/rounded_image_border" /> @@ -50,8 +50,9 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_alignParentRight="true" - android:paddingBottom="16dp" + android:paddingEnd="16dp" android:paddingRight="16dp" + android:paddingBottom="16dp" android:textAppearance="@style/TextAppearance.Conversations.Caption" /> <SeekBar @@ -60,6 +61,7 @@ android:layout_height="wrap_content" android:layout_below="@+id/runtime" android:layout_centerVertical="true" + android:layout_toEndOf="@+id/play_pause" android:layout_toRightOf="@+id/play_pause" android:progress="100" /> </RelativeLayout> diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml index dd4602b62..777da0195 100644 --- a/src/main/res/layout/message_received.xml +++ b/src/main/res/layout/message_received.xml @@ -4,15 +4,16 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingBottom="3dp" android:paddingLeft="8dp" + android:paddingTop="3dp" android:paddingRight="8dp" - android:paddingTop="3dp"> + android:paddingBottom="3dp"> <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/message_photo" android:layout_width="48dp" android:layout_height="48dp" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:scaleType="fitXY" @@ -25,6 +26,7 @@ android:layout_alignParentBottom="true" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" + android:layout_toEndOf="@+id/message_photo" android:layout_toRightOf="@+id/message_photo" android:background="@drawable/message_bubble_received_light" android:longClickable="true" @@ -51,6 +53,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" + android:layout_marginEnd="4sp" android:layout_marginRight="4sp" android:gravity="center_vertical" android:textAppearance="@style/TextAppearance.Conversations.Caption.OnDark.Bold" /> @@ -60,6 +63,7 @@ android:layout_width="?attr/TextSizeCaption" android:layout_height="?attr/TextSizeCaption" android:layout_gravity="center_vertical" + android:layout_marginEnd="4sp" android:layout_marginRight="4sp" android:alpha="0.70" android:gravity="center_vertical" @@ -70,6 +74,7 @@ android:layout_width="?attr/TextSizeCaption" android:layout_height="?attr/TextSizeCaption" android:layout_gravity="center_vertical" + android:layout_marginEnd="4sp" android:layout_marginRight="4sp" android:alpha="0.70" android:gravity="center_vertical" diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml index a0defa5a6..295a231b3 100644 --- a/src/main/res/layout/message_sent.xml +++ b/src/main/res/layout/message_sent.xml @@ -4,18 +4,18 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:paddingBottom="3dp" android:paddingLeft="8dp" + android:paddingTop="3dp" android:paddingRight="8dp" - android:paddingTop="3dp"> + android:paddingBottom="3dp"> <LinearLayout android:id="@+id/message_photo_box" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentBottom="true" android:layout_alignParentEnd="true" android:layout_alignParentRight="true" + android:layout_alignParentBottom="true" android:orientation="vertical"> <com.makeramen.roundedimageview.RoundedImageView @@ -38,8 +38,8 @@ android:layout_alignParentBottom="true" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" - android:layout_toLeftOf="@+id/message_photo_box" android:layout_toStartOf="@+id/message_photo_box" + android:layout_toLeftOf="@+id/message_photo_box" android:background="@drawable/message_bubble_sent" android:longClickable="true" android:minHeight="48dp"> @@ -81,6 +81,7 @@ android:layout_width="?attr/TextSizeCaption" android:layout_height="?attr/TextSizeCaption" android:layout_gravity="center_vertical" + android:layout_marginStart="4sp" android:layout_marginLeft="4sp" android:alpha="0.54" android:gravity="center_vertical" @@ -91,6 +92,7 @@ android:layout_width="?attr/TextSizeCaption" android:layout_height="?attr/TextSizeCaption" android:layout_gravity="center_vertical" + android:layout_marginStart="4sp" android:layout_marginLeft="4sp" android:alpha="0.54" android:gravity="center_vertical" @@ -101,6 +103,7 @@ android:layout_width="?attr/TextSizeCaption" android:layout_height="?attr/TextSizeCaption" android:layout_gravity="center_vertical" + android:layout_marginStart="4sp" android:layout_marginLeft="4sp" android:gravity="center_vertical" android:src="@drawable/ic_received_indicator" /> @@ -110,6 +113,7 @@ android:layout_width="?attr/TextSizeCaption" android:layout_height="?attr/TextSizeCaption" android:layout_gravity="center_vertical" + android:layout_marginStart="-8sp" android:layout_marginLeft="-8sp" android:adjustViewBounds="false" android:gravity="center_vertical" diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml index bd731cbe4..34dce2d46 100644 --- a/src/main/res/layout/message_status.xml +++ b/src/main/res/layout/message_status.xml @@ -4,10 +4,10 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingBottom="5dp" android:paddingLeft="8dp" + android:paddingTop="5dp" android:paddingRight="8dp" - android:paddingTop="5dp"> + android:paddingBottom="5dp"> <Button android:id="@+id/load_more_messages" @@ -23,8 +23,10 @@ android:id="@+id/message_photo" android:layout_width="32dp" android:layout_height="32dp" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" + android:layout_marginEnd="-1.5dp" android:layout_marginRight="-1.5dp" android:padding="0dp" android:scaleType="fitXY" @@ -36,6 +38,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_marginStart="8dp" android:layout_marginLeft="8dp" android:layout_toEndOf="@+id/message_photo" android:layout_toRightOf="@+id/message_photo" |