keejef
/
session-android
mirror of https://github.com/oxen-io/session-android
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Redesign conversation and conversation preferences layouts

Browse Source 
Remove avatars from conversation items unless in a group chat.

// FREEBIE
pull/1/head
Moxie Marlinspike 8 years ago
parent 30916d8e19
commit 65124fd1f2
19 changed files with 256 additions and 184 deletions
Show Stats Download Patch File Download Diff File

BIN
res/drawable-hdpi/ic_arrow_back_white_24dp.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 148 B

BIN
res/drawable-ldrtl-hdpi/ic_arrow_back_white_24dp.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 149 B

BIN
res/drawable-ldrtl-mdpi/ic_arrow_back_white_24dp.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 119 B

BIN
res/drawable-ldrtl-xhdpi/ic_arrow_back_white_24dp.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 140 B

BIN
res/drawable-ldrtl-xxhdpi/ic_arrow_back_white_24dp.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 195 B

BIN
res/drawable-ldrtl-xxxhdpi/ic_arrow_back_white_24dp.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 200 B

BIN
res/drawable-mdpi/ic_arrow_back_white_24dp.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 115 B

BIN
res/drawable-xhdpi/ic_arrow_back_white_24dp.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 131 B

BIN
res/drawable-xxhdpi/ic_arrow_back_white_24dp.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 191 B

BIN
res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 194 B

8
res/drawable/recipient_preference_scrim_bottom.xml
Unescape Escape View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="90"
android:startColor="#3A000000"
android:centerColor="#1D000000"
android:endColor="@android:color/transparent"/>
</shape>

8
res/drawable/recipient_preference_scrim_top.xml
Unescape Escape View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="270"
android:startColor="#26000000"
android:centerColor="#0C000000"
android:endColor="@android:color/transparent"/>
</shape>

116
res/layout/conversation_title_view.xml
Unescape Escape View File

@ -1,52 +1,94 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<org.thoughtcrime.securesms.ConversationTitleView <org.thoughtcrime.securesms.ConversationTitleView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="match_parent"
android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:gravity="center_vertical"> android:gravity="center_vertical">
<org.thoughtcrime.securesms.components.emoji.EmojiTextView <ImageView android:id="@+id/up_button"
android:id="@+id/title" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:src="@drawable/ic_arrow_back_white_24dp"
android:singleLine="true" android:clickable="true"
android:ellipsize="end" android:layout_marginRight="15dp"
android:transitionName="recipient_name" android:layout_marginEnd="15dp"
android:drawablePadding="5dp" android:layout_alignParentLeft="true"
android:gravity="center_vertical" android:layout_alignParentStart="true"
android:layout_gravity="center_vertical" android:layout_centerVertical="true"
style="@style/TextSecure.TitleTextStyle" android:visibility="visible"/>
tools:ignore="UnusedAttribute"/>
<org.thoughtcrime.securesms.components.AvatarImageView
<LinearLayout android:orientation="horizontal" android:id="@+id/contact_photo_image"
android:layout_width="wrap_content" android:foreground="@drawable/contact_photo_background"
android:layout_height="wrap_content" android:layout_width="48dp"
android:gravity="center_vertical"> android:layout_height="48dp"
android:layout_toRightOf="@id/up_button"
android:layout_toEndOf="@id/up_button"
android:layout_centerVertical="true"
android:layout_marginRight="10dp"
android:layout_marginEnd="10dp"
android:cropToPadding="true"
android:transitionName="contact_photo"
app:inverted="true"
tools:src="@drawable/ic_contact_picture"
android:contentDescription="@string/conversation_list_item_view__contact_photo_image"/>
<RelativeLayout android:id="@+id/content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/contact_photo_image"
android:layout_toEndOf="@id/contact_photo_image"
android:layout_centerVertical="true">
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="end"
android:textSize="18dp"
android:transitionName="recipient_name"
android:drawablePadding="5dp"
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
style="@style/TextSecure.TitleTextStyle"
tools:ignore="UnusedAttribute"/>
<ImageView android:id="@+id/verified_indicator" <ImageView android:id="@+id/verified_indicator"
android:src="@drawable/ic_check_circle_white_18dp" android:src="@drawable/ic_check_circle_white_18dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="3dp" android:layout_marginRight="3dp"
android:layout_marginEnd="3dp"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@id/title"
android:alpha="0.7" android:alpha="0.7"
android:visibility="gone"/> android:visibility="gone"/>
<org.thoughtcrime.securesms.components.emoji.EmojiTextView <org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/subtitle" android:id="@+id/subtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:ellipsize="end" android:ellipsize="end"
android:layout_gravity="center_vertical|start" android:layout_gravity="center_vertical|start"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textDirection="ltr" android:layout_toRightOf="@id/verified_indicator"
tools:text="(123) 123-1234" android:layout_toEndOf="@id/verified_indicator"
style="@style/TextSecure.SubtitleTextStyle"/> android:layout_below="@id/title"
android:textDirection="ltr"
</LinearLayout> android:textSize="13dp"
tools:text="(123) 123-1234"
style="@style/TextSecure.SubtitleTextStyle"/>
</RelativeLayout>
</org.thoughtcrime.securesms.ConversationTitleView> </org.thoughtcrime.securesms.ConversationTitleView>

117
res/layout/recipient_preference_activity.xml
Unescape Escape View File

@ -1,69 +1,72 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.design.widget.CoordinatorLayout
xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="match_parent"
android:layout_height="match_parent"> android:background="@color/transparent"
xmlns:tools="http://schemas.android.com/tools">
<android.support.v7.widget.Toolbar <android.support.design.widget.AppBarLayout
android:id="@+id/toolbar" android:id="@+id/app_bar_layout"
android:layout_height="130dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:minHeight="?attr/actionBarSize" android:layout_height="300dp"
android:background="?attr/colorPrimary" android:background="@color/transparent">
android:theme="@style/TextSecure.LightActionBar">
<LinearLayout android:layout_width="match_parent" <android.support.design.widget.CollapsingToolbarLayout
android:layout_height="match_parent" android:id="@+id/collapsing_toolbar"
android:orientation="horizontal" android:layout_width="match_parent"
android:gravity="center_vertical"> android:layout_height="match_parent"
android:background="@color/transparent"
app:layout_scrollFlags="scroll|exitUntilCollapsed">
<org.thoughtcrime.securesms.components.AvatarImageView <ImageView android:id="@+id/avatar"
android:id="@+id/avatar" android:layout_width="match_parent"
android:foreground="@drawable/contact_photo_background" android:layout_height="match_parent"
android:layout_width="50dp" android:scaleType="centerCrop"
android:layout_height="50dp" android:background="@color/black"
android:cropToPadding="true" android:transitionName="avatar"
app:inverted="true" /> app:layout_collapseMode="parallax"
app:layout_collapseParallaxMultiplier="0.7"/>
<LinearLayout android:layout_width="wrap_content" <View
android:layout_height="wrap_content" android:layout_width="match_parent"
android:orientation="vertical" android:layout_height="88dp"
android:paddingLeft="10dp"> android:background="@drawable/recipient_preference_scrim_top"
app:layout_collapseMode="pin"/>
<org.thoughtcrime.securesms.components.emoji.EmojiTextView <View
android:id="@+id/name" android:layout_width="match_parent"
android:layout_width="wrap_content" android:layout_height="98dp"
android:layout_height="wrap_content" android:layout_gravity="bottom"
android:ellipsize="end" android:layout_alignBottom="@+id/image"
android:transitionName="recipient_name" android:background="@drawable/recipient_preference_scrim_bottom"/>
style="@style/TextSecure.TitleTextStyle"
tools:ignore="UnusedAttribute" />
<TextView android:id="@+id/blocked_indicator" <android.support.v7.widget.Toolbar
android:layout_width="wrap_content" android:id="@+id/toolbar"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:text="@string/recipient_preference_activity__blocked" android:layout_height="?attr/actionBarSize"
android:textSize="12sp" android:theme="@style/TextSecure.LightActionBar"
android:textStyle="bold" android:background="@color/transparent"
android:textColor="?recipient_preference_blocked" android:layout_marginTop="24dp"
android:textAllCaps="true" app:layout_collapseMode="pin" >
android:background="@drawable/blocked_indicator_background"
android:paddingTop="3dp"
android:paddingBottom="3dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:layout_marginTop="2dp"
tools:ignore="UnusedAttribute" />
</LinearLayout> </android.support.v7.widget.Toolbar>
</LinearLayout> </android.support.design.widget.CollapsingToolbarLayout>
</android.support.v7.widget.Toolbar> </android.support.design.widget.AppBarLayout>
<FrameLayout android:id="@+id/preference_fragment" <android.support.v4.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent"
</LinearLayout> android:fillViewport="true"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<FrameLayout android:id="@+id/preference_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</android.support.v4.widget.NestedScrollView>
</android.support.design.widget.CoordinatorLayout>

2
res/values/dimens.xml
Unescape Escape View File

@ -13,7 +13,7 @@
<dimen name="transport_selection_popup_width">200sp</dimen> <dimen name="transport_selection_popup_width">200sp</dimen>
<dimen name="transport_selection_popup_xoff">2dp</dimen> <dimen name="transport_selection_popup_xoff">2dp</dimen>
<dimen name="transport_selection_popup_yoff">2dp</dimen> <dimen name="transport_selection_popup_yoff">2dp</dimen>
<dimen name="contact_photo_target_size">64dp</dimen> <dimen name="contact_photo_target_size">300dp</dimen>
<dimen name="contact_selection_photo_size">50dp</dimen> <dimen name="contact_selection_photo_size">50dp</dimen>
<dimen name="thumbnail_max_size">230dp</dimen> <dimen name="thumbnail_max_size">230dp</dimen>
<dimen name="preference_fragment_padding_side">8dp</dimen> <dimen name="preference_fragment_padding_side">8dp</dimen>

33
src/org/thoughtcrime/securesms/ConversationActivity.java
Unescape Escape View File

@ -1201,31 +1201,18 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
} }
}); });
titleView.setOnClickListener(new OnClickListener() { titleView.setOnClickListener(v -> {
@Override Intent intent = new Intent(ConversationActivity.this, RecipientPreferenceActivity.class);
public void onClick(View v) { intent.putExtra(RecipientPreferenceActivity.ADDRESS_EXTRA, recipient.getAddress());
Intent intent = new Intent(ConversationActivity.this, RecipientPreferenceActivity.class); intent.putExtra(RecipientPreferenceActivity.CAN_HAVE_SAFETY_NUMBER_EXTRA,
intent.putExtra(RecipientPreferenceActivity.ADDRESS_EXTRA, recipient.getAddress()); isSecureText && !isSelfConversation());
intent.putExtra(RecipientPreferenceActivity.CAN_HAVE_SAFETY_NUMBER_EXTRA,
isSecureText && !isSelfConversation());
startActivitySceneTransition(intent, titleView.findViewById(R.id.title), "recipient_name"); startActivitySceneTransition(intent, titleView.findViewById(R.id.contact_photo_image), "avatar");
}
}); });
unblockButton.setOnClickListener(new OnClickListener() { titleView.setOnBackClickedListener(view -> onBackPressed());
@Override unblockButton.setOnClickListener(v -> handleUnblock());
public void onClick(View v) { makeDefaultSmsButton.setOnClickListener(v -> handleMakeDefaultSms());
handleUnblock();
}
});
makeDefaultSmsButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
handleMakeDefaultSms();
}
});
composeText.setOnKeyListener(composeKeyPressedListener); composeText.setOnKeyListener(composeKeyPressedListener);
composeText.addTextChangedListener(composeKeyPressedListener); composeText.addTextChangedListener(composeKeyPressedListener);
@ -1243,7 +1230,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
} }
protected void initializeActionBar() { protected void initializeActionBar() {
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(false);
getSupportActionBar().setCustomView(R.layout.conversation_title_view); getSupportActionBar().setCustomView(R.layout.conversation_title_view);
getSupportActionBar().setDisplayShowCustomEnabled(true); getSupportActionBar().setDisplayShowCustomEnabled(true);
getSupportActionBar().setDisplayShowTitleEnabled(false); getSupportActionBar().setDisplayShowTitleEnabled(false);

37
src/org/thoughtcrime/securesms/ConversationItem.java
Unescape Escape View File

@ -123,7 +123,7 @@ public class ConversationItem extends LinearLayout
private AlertView alertView; private AlertView alertView;
private @NonNull Set<MessageRecord> batchSelected = new HashSet<>(); private @NonNull Set<MessageRecord> batchSelected = new HashSet<>();
private @Nullable Recipient conversationRecipient; private @NonNull Recipient conversationRecipient;
private @NonNull Stub<ThumbnailView> mediaThumbnailStub; private @NonNull Stub<ThumbnailView> mediaThumbnailStub;
private @NonNull Stub<AudioView> audioViewStub; private @NonNull Stub<AudioView> audioViewStub;
private @NonNull Stub<DocumentView> documentViewStub; private @NonNull Stub<DocumentView> documentViewStub;
@ -404,9 +404,14 @@ public class ConversationItem extends LinearLayout
} }
} }
private void setContactPhoto(Recipient recipient) { private void setContactPhoto(@NonNull Recipient recipient) {
if (! messageRecord.isOutgoing()) { if (contactPhoto == null) return;
setContactPhotoForRecipient(recipient);
if (messageRecord.isOutgoing() || !groupThread) {
contactPhoto.setVisibility(View.GONE);
} else {
contactPhoto.setAvatar(recipient, true);
contactPhoto.setVisibility(View.VISIBLE);
} }
} }
@ -547,15 +552,6 @@ public class ConversationItem extends LinearLayout
} }
} }
/// Helper Methods
private void setContactPhotoForRecipient(final Recipient recipient) {
if (contactPhoto == null) return;
contactPhoto.setAvatar(recipient, true);
contactPhoto.setVisibility(View.VISIBLE);
}
/// Event handlers /// Event handlers
private void handleApproveIdentity() { private void handleApproveIdentity() {
@ -570,15 +566,12 @@ public class ConversationItem extends LinearLayout
@Override @Override
public void onModified(final Recipient modified) { public void onModified(final Recipient modified) {
Util.runOnMain(new Runnable() { Util.runOnMain(() -> {
@Override setBubbleState(messageRecord, recipient);
public void run() { setContactPhoto(recipient);
setBubbleState(messageRecord, recipient); setGroupMessageStatus(messageRecord, recipient);
setContactPhoto(recipient); setAudioViewTint(messageRecord, conversationRecipient);
setGroupMessageStatus(messageRecord, recipient); setDocumentViewTint(messageRecord, conversationRecipient);
setAudioViewTint(messageRecord, conversationRecipient);
setDocumentViewTint(messageRecord, conversationRecipient);
}
}); });
} }

54
src/org/thoughtcrime/securesms/ConversationTitleView.java
Unescape Escape View File

@ -1,24 +1,36 @@
package org.thoughtcrime.securesms; package org.thoughtcrime.securesms;
import android.content.Context; import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import com.annimon.stream.Collectors;
import com.annimon.stream.Stream;
import org.thoughtcrime.securesms.components.AvatarImageView;
import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.ViewUtil; import org.thoughtcrime.securesms.util.ViewUtil;
public class ConversationTitleView extends LinearLayout { import java.lang.ref.WeakReference;
public class ConversationTitleView extends RelativeLayout {
private static final String TAG = ConversationTitleView.class.getSimpleName(); private static final String TAG = ConversationTitleView.class.getSimpleName();
private TextView title; private View content;
private TextView subtitle; private ImageView back;
private ImageView verified; private AvatarImageView avatar;
private TextView title;
private TextView subtitle;
private ImageView verified;
public ConversationTitleView(Context context) { public ConversationTitleView(Context context) {
this(context, null); this(context, null);
@ -33,9 +45,12 @@ public class ConversationTitleView extends LinearLayout {
public void onFinishInflate() { public void onFinishInflate() {
super.onFinishInflate(); super.onFinishInflate();
this.title = (TextView) findViewById(R.id.title); this.back = ViewUtil.findById(this, R.id.up_button);
this.subtitle = (TextView) findViewById(R.id.subtitle); this.content = ViewUtil.findById(this, R.id.content);
this.verified = (ImageView) findViewById(R.id.verified_indicator); this.title = ViewUtil.findById(this, R.id.title);
this.subtitle = ViewUtil.findById(this, R.id.subtitle);
this.verified = ViewUtil.findById(this, R.id.verified_indicator);
this.avatar = ViewUtil.findById(this, R.id.contact_photo_image);
ViewUtil.setTextViewGravityStart(this.title, getContext()); ViewUtil.setTextViewGravityStart(this.title, getContext());
ViewUtil.setTextViewGravityStart(this.subtitle, getContext()); ViewUtil.setTextViewGravityStart(this.subtitle, getContext());
@ -52,12 +67,25 @@ public class ConversationTitleView extends LinearLayout {
} else { } else {
title.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); title.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
} }
if (recipient != null) {
this.avatar.setAvatar(recipient, false);
}
} }
public void setVerified(boolean verified) { public void setVerified(boolean verified) {
this.verified.setVisibility(verified ? View.VISIBLE : View.GONE); this.verified.setVisibility(verified ? View.VISIBLE : View.GONE);
} }
@Override
public void setOnClickListener(@Nullable OnClickListener listener) {
this.content.setOnClickListener(listener);
}
public void setOnBackClickedListener(@Nullable OnClickListener listener) {
this.back.setOnClickListener(listener);
}
private void setComposeTitle() { private void setComposeTitle() {
this.title.setText(R.string.ConversationActivity_compose_message); this.title.setText(R.string.ConversationActivity_compose_message);
this.subtitle.setText(null); this.subtitle.setText(null);
@ -71,9 +99,15 @@ public class ConversationTitleView extends LinearLayout {
} }
private void setGroupRecipientTitle(Recipient recipient) { private void setGroupRecipientTitle(Recipient recipient) {
String localNumber = TextSecurePreferences.getLocalNumber(getContext());
this.title.setText(recipient.getName()); this.title.setText(recipient.getName());
this.subtitle.setText(null); this.subtitle.setText(Stream.of(recipient.getParticipants())
this.subtitle.setVisibility(View.GONE); .filter(r -> !r.getAddress().serialize().equals(localNumber))
.map(Recipient::toShortString)
.collect(Collectors.joining(",")));
this.subtitle.setVisibility(View.VISIBLE);
} }
private void setNonContactRecipientTitle(Recipient recipient) { private void setNonContactRecipientTitle(Recipient recipient) {

65
src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
Unescape Escape View File

@ -5,30 +5,30 @@ import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.graphics.Color;
import android.media.Ringtone; import android.media.Ringtone;
import android.media.RingtoneManager; import android.media.RingtoneManager;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler;
import android.preference.CheckBoxPreference; import android.preference.CheckBoxPreference;
import android.preference.ListPreference; import android.preference.ListPreference;
import android.preference.Preference; import android.preference.Preference;
import android.provider.Settings; import android.provider.Settings;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.design.widget.CollapsingToolbarLayout;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.preference.PreferenceFragment; import android.support.v4.preference.PreferenceFragment;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import android.util.Log; import android.util.Log;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.WindowManager;
import android.widget.TextView; import android.widget.ImageView;
import org.thoughtcrime.securesms.color.MaterialColor; import org.thoughtcrime.securesms.color.MaterialColor;
import org.thoughtcrime.securesms.color.MaterialColors; import org.thoughtcrime.securesms.color.MaterialColors;
import org.thoughtcrime.securesms.components.AvatarImageView;
import org.thoughtcrime.securesms.crypto.IdentityKeyParcelable; import org.thoughtcrime.securesms.crypto.IdentityKeyParcelable;
import org.thoughtcrime.securesms.crypto.MasterSecret; import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.Address;
@ -49,6 +49,7 @@ import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
import org.thoughtcrime.securesms.util.DynamicTheme; import org.thoughtcrime.securesms.util.DynamicTheme;
import org.thoughtcrime.securesms.util.IdentityUtil; import org.thoughtcrime.securesms.util.IdentityUtil;
import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.Util;
import org.thoughtcrime.securesms.util.ViewUtil;
import org.thoughtcrime.securesms.util.concurrent.ListenableFuture; import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
import org.whispersystems.libsignal.util.guava.Optional; import org.whispersystems.libsignal.util.guava.Optional;
@ -71,11 +72,9 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme(); private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme();
private final DynamicLanguage dynamicLanguage = new DynamicLanguage(); private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
private AvatarImageView avatar; private ImageView avatar;
private Toolbar toolbar; private CollapsingToolbarLayout toolbarLayout;
private TextView title; private BroadcastReceiver staleReceiver;
private TextView blockedIndicator;
private BroadcastReceiver staleReceiver;
@Override @Override
public void onPreCreate() { public void onPreCreate() {
@ -125,25 +124,35 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
super.onOptionsItemSelected(item); super.onOptionsItemSelected(item);
switch (item.getItemId()) { switch (item.getItemId()) {
case android.R.id.home: case android.R.id.home:
super.onBackPressed(); onBackPressed();
return true; return true;
} }
return false; return false;
} }
@Override
public void onBackPressed() {
finish();
overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
}
private void initializeToolbar() { private void initializeToolbar() {
this.toolbar = (Toolbar) findViewById(R.id.toolbar); this.toolbarLayout = ViewUtil.findById(this, R.id.collapsing_toolbar);
this.toolbar.setLogo(null); this.avatar = ViewUtil.findById(this, R.id.avatar);
setSupportActionBar(toolbar); this.toolbarLayout.setExpandedTitleColor(getResources().getColor(R.color.white));
this.toolbarLayout.setCollapsedTitleTextColor(getResources().getColor(R.color.white));
Toolbar toolbar = ViewUtil.findById(this, R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setDisplayShowTitleEnabled(false); getSupportActionBar().setLogo(null);
this.avatar = (AvatarImageView) toolbar.findViewById(R.id.avatar); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
this.title = (TextView) toolbar.findViewById(R.id.name); getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
this.blockedIndicator = (TextView) toolbar.findViewById(R.id.blocked_indicator); getWindow().setStatusBarColor(Color.TRANSPARENT);
}
} }
private void initializeReceivers() { private void initializeReceivers() {
@ -163,27 +172,15 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
registerReceiver(staleReceiver, staleFilter); registerReceiver(staleReceiver, staleFilter);
} }
private void setHeader(Recipient recipient) { private void setHeader(@NonNull Recipient recipient) {
this.avatar.setAvatar(recipient, true); this.avatar.setImageDrawable(recipient.getContactPhoto().asCallCard(this));
this.title.setText(recipient.toShortString()); this.toolbarLayout.setTitle(recipient.toShortString());
this.toolbar.setBackgroundColor(recipient.getColor().toActionBarColor(this)); this.toolbarLayout.setContentScrimColor(recipient.getColor().toActionBarColor(this));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
getWindow().setStatusBarColor(recipient.getColor().toStatusBarColor(this));
}
if (recipient.isBlocked()) this.blockedIndicator.setVisibility(View.VISIBLE);
else this.blockedIndicator.setVisibility(View.GONE);
} }
@Override @Override
public void onModified(final Recipient recipient) { public void onModified(final Recipient recipient) {
title.post(new Runnable() { Util.runOnMain(() -> setHeader(recipient));
@Override
public void run() {
setHeader(recipient);
}
});
} }
public static class RecipientPreferenceFragment public static class RecipientPreferenceFragment

Write Preview
Loading…
Cancel
Save