diff --git a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java
index e5a624cb0a951907c9098257a30785361328427a..ddf70e4f2a953f945915fa8370c0fa39f26b7706 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java
@@ -33,7 +33,6 @@ import im.delight.android.identicons.IdenticonDrawable;
import static android.app.Activity.RESULT_OK;
import static android.view.View.GONE;
-import static android.view.View.VISIBLE;
import static android.widget.Toast.LENGTH_SHORT;
import static java.util.logging.Level.WARNING;
import static org.briarproject.briar.api.introduction.IntroductionConstants.MAX_INTRODUCTION_MESSAGE_LENGTH;
@@ -94,7 +93,6 @@ public class IntroductionMessageFragment extends BaseFragment
View v = inflater.inflate(R.layout.introduction_message, container,
false);
ui = new ViewHolder(v);
- ui.text.setVisibility(GONE);
ui.message.setSendButtonEnabled(false);
return v;
@@ -156,17 +154,11 @@ public class IntroductionMessageFragment extends BaseFragment
ui.contactName1.setText(c1.getAuthor().getName());
ui.contactName2.setText(c2.getAuthor().getName());
- // set introduction text
- ui.text.setText(String.format(
- getString(R.string.introduction_message_text),
- c1.getAuthor().getName(), c2.getAuthor().getName()));
-
// set button action
ui.message.setListener(IntroductionMessageFragment.this);
// hide progress bar and show views
ui.progressBar.setVisibility(GONE);
- ui.text.setVisibility(VISIBLE);
ui.message.setSendButtonEnabled(true);
ui.message.showSoftKeyboard();
}
@@ -234,7 +226,6 @@ public class IntroductionMessageFragment extends BaseFragment
private final ProgressBar progressBar;
private final CircleImageView avatar1, avatar2;
private final TextView contactName1, contactName2;
- private final TextView text;
private final TextInputView message;
private ViewHolder(View v) {
@@ -243,7 +234,6 @@ public class IntroductionMessageFragment extends BaseFragment
avatar2 = (CircleImageView) v.findViewById(R.id.avatarContact2);
contactName1 = (TextView) v.findViewById(R.id.nameContact1);
contactName2 = (TextView) v.findViewById(R.id.nameContact2);
- text = (TextView) v.findViewById(R.id.introductionText);
message = (TextInputView) v
.findViewById(R.id.introductionMessageView);
}
diff --git a/briar-android/src/main/res/layout/introduction_message.xml b/briar-android/src/main/res/layout/introduction_message.xml
index d7c5c9a33a26ea27a032fc5549ad6b5c0f3ba0f0..e78e1c63980169f266bef00394d1232bdf245bd4 100644
--- a/briar-android/src/main/res/layout/introduction_message.xml
+++ b/briar-android/src/main/res/layout/introduction_message.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@@ -7,119 +7,100 @@
android:layout_height="match_parent"
android:orientation="vertical">
- <ScrollView
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1">
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_activity_horizontal"
- android:orientation="vertical">
+ android:gravity="center"
+ android:orientation="horizontal">
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="top|center_horizontal"
+ android:orientation="vertical">
- <LinearLayout
+ <de.hdodenhof.circleimageview.CircleImageView
+ android:id="@+id/avatarContact1"
+ style="@style/BriarAvatar"
+ android:layout_width="@dimen/listitem_picture_size"
+ android:layout_height="@dimen/listitem_picture_size"
+ android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+ android:layout_marginLeft="@dimen/listitem_horizontal_margin"
+ android:layout_marginRight="@dimen/listitem_horizontal_margin"
+ android:layout_marginStart="@dimen/listitem_horizontal_margin"
+ tools:src="@mipmap/ic_launcher_round"/>
+
+ <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+ android:id="@+id/nameContact1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_toLeftOf="@+id/introductionIcon"
- android:gravity="top|center_horizontal"
- android:orientation="vertical">
-
- <de.hdodenhof.circleimageview.CircleImageView
- android:id="@+id/avatarContact1"
- style="@style/BriarAvatar"
- android:layout_width="@dimen/listitem_picture_size"
- android:layout_height="@dimen/listitem_picture_size"
- android:layout_marginEnd="@dimen/listitem_horizontal_margin"
- android:layout_marginLeft="@dimen/listitem_horizontal_margin"
- android:layout_marginRight="@dimen/listitem_horizontal_margin"
- android:layout_marginStart="@dimen/listitem_horizontal_margin"
- tools:src="@mipmap/ic_launcher_round"/>
-
- <org.thoughtcrime.securesms.components.emoji.EmojiTextView
- android:id="@+id/nameContact1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/margin_small"
- android:gravity="center"
- android:textColor="@color/briar_text_primary"
- android:textSize="@dimen/text_size_tiny"
- tools:text="Contact 1"/>
-
- </LinearLayout>
+ android:layout_marginTop="@dimen/margin_small"
+ android:gravity="center"
+ android:textColor="@color/briar_text_primary"
+ android:textSize="@dimen/text_size_small"
+ tools:text="Contact 1"/>
+
+ </LinearLayout>
+
+ <ImageView
+ android:id="@+id/introductionIcon"
+ android:layout_width="@dimen/listitem_picture_size"
+ android:layout_height="@dimen/listitem_picture_size"
+ android:src="@drawable/ic_contact_introduction"
+ tools:ignore="ContentDescription"/>
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="top|center_horizontal"
+ android:orientation="vertical">
- <ImageView
- android:id="@+id/introductionIcon"
+ <de.hdodenhof.circleimageview.CircleImageView
+ android:id="@+id/avatarContact2"
+ style="@style/BriarAvatar"
android:layout_width="@dimen/listitem_picture_size"
android:layout_height="@dimen/listitem_picture_size"
- android:layout_centerHorizontal="true"
- android:src="@drawable/ic_contact_introduction"
- tools:ignore="ContentDescription"/>
-
- <LinearLayout
+ android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+ android:layout_marginLeft="@dimen/listitem_horizontal_margin"
+ android:layout_marginRight="@dimen/listitem_horizontal_margin"
+ android:layout_marginStart="@dimen/listitem_horizontal_margin"
+ tools:src="@mipmap/ic_launcher_round"/>
+
+ <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+ android:id="@+id/nameContact2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_toEndOf="@+id/introductionIcon"
- android:layout_toRightOf="@+id/introductionIcon"
- android:gravity="top|center_horizontal"
- android:orientation="vertical">
-
- <de.hdodenhof.circleimageview.CircleImageView
- android:id="@+id/avatarContact2"
- style="@style/BriarAvatar"
- android:layout_width="@dimen/listitem_picture_size"
- android:layout_height="@dimen/listitem_picture_size"
- android:layout_marginEnd="@dimen/listitem_horizontal_margin"
- android:layout_marginLeft="@dimen/listitem_horizontal_margin"
- android:layout_marginRight="@dimen/listitem_horizontal_margin"
- android:layout_marginStart="@dimen/listitem_horizontal_margin"
- tools:src="@mipmap/ic_launcher_round"/>
+ android:layout_marginTop="@dimen/margin_small"
+ android:gravity="center"
+ android:textColor="@color/briar_text_primary"
+ android:textSize="@dimen/text_size_small"
+ tools:text="Contact 2"/>
- <org.thoughtcrime.securesms.components.emoji.EmojiTextView
- android:id="@+id/nameContact2"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/margin_small"
- android:gravity="center"
- android:textColor="@color/briar_text_primary"
- android:textSize="@dimen/text_size_tiny"
- tools:text="Contact 2"/>
-
- </LinearLayout>
-
- </RelativeLayout>
-
- <ProgressBar
- android:id="@+id/progressBar"
- style="?android:attr/progressBarStyleLarge"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- tools:visibility="gone"/>
-
- <org.thoughtcrime.securesms.components.emoji.EmojiTextView
- android:id="@+id/introductionText"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/margin_activity_horizontal"
- android:textColor="@color/briar_text_secondary"
- android:textSize="@dimen/text_size_medium"
- tools:text="@string/introduction_message_text"/>
+ </LinearLayout>
</LinearLayout>
- </ScrollView>
+ <ProgressBar
+ android:id="@+id/progressBar"
+ style="?android:attr/progressBarStyleLarge"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ tools:visibility="gone"/>
- <org.briarproject.briar.android.view.LargeTextInputView
- android:id="@+id/introductionMessageView"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- app:buttonText="@string/introduction_button"
- app:hint="@string/introduction_message_hint"
- app:maxLines="5"/>
+ <org.briarproject.briar.android.view.LargeTextInputView
+ android:id="@+id/introductionMessageView"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:buttonText="@string/introduction_button"
+ app:hint="@string/introduction_message_hint"
+ app:maxLines="5"/>
-</LinearLayout>
+ </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 42d6ba9f20868c07d5dd911c2aa25da3d6514d4e..a4088e19283af16b9f6ade8e0a813fa5bf7b5d8c 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -127,8 +127,7 @@
<string name="introduction_onboarding_text">You can introduce your contacts to each other, so they don\'t need to meet in person to connect on Briar.</string>
<string name="introduction_activity_title">Select Contact</string>
<string name="introduction_message_title">Introduce Contacts</string>
- <string name="introduction_message_text">You can compose a message that will be sent to %1$s and %2$s along with your introduction:</string>
- <string name="introduction_message_hint">Type message (optional)</string>
+ <string name="introduction_message_hint">Add a message (optional)</string>
<string name="introduction_button">Make Introduction</string>
<string name="introduction_sent">Your introduction has been sent.</string>
<string name="introduction_error">There was an error making the introduction.</string>
@@ -160,7 +159,7 @@
<string name="groups_create_group_title">Create Private Group</string>
<string name="groups_create_group_button">Create Group</string>
<string name="groups_create_group_invitation_button">Send Invitation</string>
- <string name="groups_create_group_hint">Add a name for your private group</string>
+ <string name="groups_create_group_hint">Choose a name for your private group</string>
<string name="groups_invitation_sent">Group invitation has been sent</string>
<string name="groups_message_sent">Message sent</string>
<string name="groups_member_list">Member List</string>
@@ -231,7 +230,7 @@
<string name="activity_share_toolbar_header">Choose Contacts</string>
<string name="no_contacts_selector">It seems that you are new here and have no contacts yet.\n\nPlease come back here after you added your first contact.</string>
<string name="forum_shared_snackbar">Forum shared with chosen contacts</string>
- <string name="forum_share_message">You may compose an optional invitation message that will be sent to the selected contacts.</string>
+ <string name="forum_share_message">Add a message (optional)</string>
<string name="forum_share_error">There was an error sharing this forum.</string>
<string name="forum_invitation_received">%1$s has shared the forum \"%2$s\" with you.</string>
<string name="forum_invitation_sent">You have shared the forum \"%1$s\" with %2$s.</string>
@@ -270,7 +269,7 @@
<string name="blogs_remove_blog_dialog_message">Are you sure that you want to remove this blog and all posts?\nNote that this will not remove the blog from other people\'s devices.</string>
<string name="blogs_remove_blog_ok">Remove Blog</string>
<string name="blogs_blog_removed">Blog Removed</string>
- <string name="blogs_reblog_comment_hint">Add an optional comment</string>
+ <string name="blogs_reblog_comment_hint">Add a comment (optional)</string>
<string name="blogs_reblog_button">Reblog</string>
<!-- Blog Sharing -->