diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/JoinMessageItemViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/JoinMessageItemViewHolder.java index 6d6a1f216d22c85bda435444355ca5fe21f729e0..f61f964038e701d1dc06e3154c7dd57fe2d71ac0 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/JoinMessageItemViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/JoinMessageItemViewHolder.java @@ -1,25 +1,15 @@ package org.briarproject.briar.android.privategroup.conversation; import android.content.Context; -import android.content.Intent; import android.support.annotation.UiThread; import android.view.View; -import android.widget.Button; -import android.widget.ImageView; -import android.widget.TextView; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; -import org.briarproject.briar.android.privategroup.reveal.RevealContactsActivity; import org.briarproject.briar.android.threaded.BaseThreadItemViewHolder; import org.briarproject.briar.android.threaded.ThreadItemAdapter.ThreadItemListener; import static org.briarproject.bramble.api.identity.Author.Status.OURSELVES; -import static org.briarproject.bramble.api.identity.Author.Status.UNKNOWN; -import static org.briarproject.briar.android.activity.BriarActivity.GROUP_ID; -import static org.briarproject.briar.android.privategroup.VisibilityHelper.getVisibilityIcon; -import static org.briarproject.briar.android.privategroup.VisibilityHelper.getVisibilityString; -import static org.briarproject.briar.api.privategroup.Visibility.INVISIBLE; @UiThread @NotNullByDefault @@ -27,16 +17,10 @@ class JoinMessageItemViewHolder extends BaseThreadItemViewHolder<GroupMessageItem> { private final boolean isCreator; - private final ImageView icon; - private final TextView info; - private final Button options; JoinMessageItemViewHolder(View v, boolean isCreator) { super(v); this.isCreator = isCreator; - icon = (ImageView) v.findViewById(R.id.icon); - info = (TextView) v.findViewById(R.id.info); - options = (Button) v.findViewById(R.id.optionsButton); } @Override @@ -56,9 +40,6 @@ class JoinMessageItemViewHolder getContext().getString(R.string.groups_member_joined, item.getAuthor().getName())); } - icon.setVisibility(View.GONE); - info.setVisibility(View.GONE); - options.setVisibility(View.GONE); } private void bind(final JoinMessageItem item) { @@ -75,32 +56,6 @@ class JoinMessageItemViewHolder item.getAuthor().getName())); } } - - if (item.getStatus() == OURSELVES || item.getStatus() == UNKNOWN) { - icon.setVisibility(View.GONE); - info.setVisibility(View.GONE); - options.setVisibility(View.GONE); - } else { - icon.setVisibility(View.VISIBLE); - icon.setImageResource(getVisibilityIcon(item.getVisibility())); - info.setVisibility(View.VISIBLE); - info.setText(getVisibilityString(getContext(), item.getVisibility(), - item.getAuthor().getName())); - if (item.getVisibility() == INVISIBLE) { - options.setVisibility(View.VISIBLE); - options.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Intent i = - new Intent(ctx, RevealContactsActivity.class); - i.putExtra(GROUP_ID, item.getGroupId().getBytes()); - ctx.startActivity(i); - } - }); - } else { - options.setVisibility(View.GONE); - } - } } } diff --git a/briar-android/src/main/res/layout/list_item_group_join_notice.xml b/briar-android/src/main/res/layout/list_item_group_join_notice.xml index 02e0b4b4b2db1bba5642cb39bf7bbddb0e7eb933..ee57435fb1a01b3fe95757e673128b4f43c0389e 100644 --- a/briar-android/src/main/res/layout/list_item_group_join_notice.xml +++ b/briar-android/src/main/res/layout/list_item_group_join_notice.xml @@ -19,57 +19,15 @@ android:textStyle="italic" tools:text="@string/groups_member_joined"/> - <ImageView - android:id="@+id/icon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignBottom="@+id/info" - android:layout_alignLeft="@+id/text" - android:layout_alignTop="@+id/info" - android:layout_below="@+id/text" - android:layout_marginRight="@dimen/margin_medium" - android:scaleType="center" - tools:ignore="ContentDescription" - tools:src="@drawable/ic_visibility"/> - - <TextView - android:id="@+id/info" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignEnd="@+id/text" - android:layout_alignRight="@+id/text" - android:layout_below="@+id/text" - android:layout_marginBottom="@dimen/margin_medium" - android:layout_toRightOf="@+id/icon" - android:gravity="center_vertical" - android:minHeight="24dp" - android:textColor="@color/briar_text_secondary" - android:textIsSelectable="true" - android:textSize="@dimen/text_size_tiny" - android:textStyle="italic" - tools:text="@string/groups_reveal_visible_revealed_by_contact"/> - <org.briarproject.briar.android.view.AuthorView android:id="@+id/author" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignLeft="@+id/text" - android:layout_below="@+id/info" - android:layout_toLeftOf="@+id/optionsButton" + android:layout_alignStart="@+id/text" + android:layout_below="@+id/text" app:persona="commenter"/> - <Button - android:id="@+id/optionsButton" - style="@style/BriarButtonFlat.Positive.Tiny" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignBottom="@+id/author" - android:layout_alignEnd="@+id/text" - android:layout_alignRight="@+id/text" - android:layout_below="@+id/info" - android:gravity="right|center_vertical" - android:text="@string/options"/> - <View style="@style/Divider.ThreadItem" android:layout_below="@+id/author"