Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Tap avatar in chat preferences or group management to see full screen.
- Loading branch information
1 parent
0711a22
commit 69adcd1
Showing
5 changed files
with
222 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
152 changes: 152 additions & 0 deletions
152
app/src/main/java/org/thoughtcrime/securesms/AvatarPreviewActivity.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,152 @@ | ||
| package org.thoughtcrime.securesms; | ||
|
|
||
| import android.app.Activity; | ||
| import android.content.Context; | ||
| import android.content.Intent; | ||
| import android.graphics.drawable.Drawable; | ||
| import android.os.Bundle; | ||
| import android.view.View; | ||
| import android.view.Window; | ||
| import android.view.WindowManager; | ||
| import android.widget.ImageView; | ||
|
|
||
| import androidx.annotation.NonNull; | ||
| import androidx.annotation.Nullable; | ||
| import androidx.appcompat.widget.Toolbar; | ||
| import androidx.core.app.ActivityOptionsCompat; | ||
|
|
||
| import com.bumptech.glide.load.DataSource; | ||
| import com.bumptech.glide.load.engine.DiskCacheStrategy; | ||
| import com.bumptech.glide.load.engine.GlideException; | ||
| import com.bumptech.glide.request.RequestListener; | ||
| import com.bumptech.glide.request.target.Target; | ||
|
|
||
| import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto; | ||
| import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto; | ||
| import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto; | ||
| import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto; | ||
| import org.thoughtcrime.securesms.logging.Log; | ||
| import org.thoughtcrime.securesms.mms.GlideApp; | ||
| import org.thoughtcrime.securesms.recipients.Recipient; | ||
| import org.thoughtcrime.securesms.recipients.RecipientId; | ||
|
|
||
| /** | ||
| * Activity for displaying avatars full screen. | ||
| */ | ||
| public final class AvatarPreviewActivity extends PassphraseRequiredActionBarActivity { | ||
|
|
||
| private static final String TAG = Log.tag(AvatarPreviewActivity.class); | ||
|
|
||
| private static final String RECIPIENT_ID_EXTRA = "recipient_id"; | ||
|
|
||
| public static @NonNull Intent intentFromRecipientId(@NonNull Context context, | ||
| @NonNull RecipientId recipientId) | ||
| { | ||
| Intent intent = new Intent(context, AvatarPreviewActivity.class); | ||
| intent.putExtra(RECIPIENT_ID_EXTRA, recipientId.serialize()); | ||
| return intent; | ||
| } | ||
|
|
||
| public static Bundle createTransitionBundle(@NonNull Activity activity, @NonNull View from) { | ||
| return ActivityOptionsCompat.makeSceneTransitionAnimation(activity, from, "avatar").toBundle(); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onCreate(Bundle savedInstanceState, boolean ready) { | ||
| super.onCreate(savedInstanceState, ready); | ||
|
|
||
| setTheme(R.style.TextSecure_MediaPreview); | ||
| setContentView(R.layout.contact_photo_preview_activity); | ||
|
|
||
| Toolbar toolbar = findViewById(R.id.toolbar); | ||
| ImageView avatar = findViewById(R.id.avatar); | ||
|
|
||
| setSupportActionBar(toolbar); | ||
|
|
||
| getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, | ||
| WindowManager.LayoutParams.FLAG_FULLSCREEN); | ||
|
|
||
| showSystemUI(); | ||
|
|
||
| getSupportActionBar().setDisplayHomeAsUpEnabled(true); | ||
|
|
||
| Context context = getApplicationContext(); | ||
| RecipientId recipientId = RecipientId.from(getIntent().getStringExtra(RECIPIENT_ID_EXTRA)); | ||
|
|
||
| Recipient.live(recipientId).observe(this, recipient -> { | ||
| ContactPhoto contactPhoto = recipient.isLocalNumber() ? new ProfileContactPhoto(recipient, recipient.getProfileAvatar()) | ||
| : recipient.getContactPhoto(); | ||
| FallbackContactPhoto fallbackPhoto = recipient.isLocalNumber() ? new ResourceContactPhoto(R.drawable.ic_profile_outline_40, R.drawable.ic_profile_outline_20, R.drawable.ic_person_large) | ||
| : recipient.getFallbackContactPhoto(); | ||
|
|
||
| GlideApp.with(this).load(contactPhoto) | ||
| .fallback(fallbackPhoto.asCallCard(this)) | ||
| .error(fallbackPhoto.asCallCard(this)) | ||
| .diskCacheStrategy(DiskCacheStrategy.ALL) | ||
| .addListener(new RequestListener<Drawable>() { | ||
| @Override | ||
| public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) { | ||
| Log.w(TAG, "Unable to load avatar, or avatar removed, closing"); | ||
| finish(); | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) { | ||
| return false; | ||
| } | ||
| }) | ||
| .into(avatar); | ||
|
|
||
| toolbar.setTitle(recipient.toShortString(context)); | ||
| }); | ||
|
|
||
| avatar.setOnClickListener(v -> toggleUiVisibility()); | ||
|
|
||
| showAndHideWithSystemUI(getWindow(), findViewById(R.id.toolbar_layout)); | ||
| } | ||
|
|
||
| private static void showAndHideWithSystemUI(@NonNull Window window, @NonNull View... views) { | ||
| window.getDecorView().setOnSystemUiVisibilityChangeListener(visibility -> { | ||
| boolean hide = (visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) != 0; | ||
|
|
||
| for (View view : views) { | ||
| view.animate() | ||
| .alpha(hide ? 0 : 1) | ||
| .start(); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| private void toggleUiVisibility() { | ||
| int systemUiVisibility = getWindow().getDecorView().getSystemUiVisibility(); | ||
| if ((systemUiVisibility & View.SYSTEM_UI_FLAG_FULLSCREEN) != 0) { | ||
| showSystemUI(); | ||
| } else { | ||
| hideSystemUI(); | ||
| } | ||
| } | ||
|
|
||
| private void hideSystemUI() { | ||
| getWindow().getDecorView().setSystemUiVisibility( | ||
| View.SYSTEM_UI_FLAG_IMMERSIVE | | ||
| View.SYSTEM_UI_FLAG_LAYOUT_STABLE | | ||
| View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | | ||
| View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | | ||
| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | | ||
| View.SYSTEM_UI_FLAG_FULLSCREEN ); | ||
| } | ||
|
|
||
| private void showSystemUI() { | ||
| getWindow().getDecorView().setSystemUiVisibility( | ||
| View.SYSTEM_UI_FLAG_LAYOUT_STABLE | | ||
| View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | | ||
| View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN ); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean onSupportNavigateUp() { | ||
| onBackPressed(); | ||
| return true; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
app/src/main/res/layout/contact_photo_preview_activity.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:app="http://schemas.android.com/apk/res-auto" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:background="@color/core_grey_95"> | ||
|
|
||
| <ImageView | ||
| android:id="@+id/avatar" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:transitionName="avatar" /> | ||
|
|
||
| <com.google.android.material.appbar.AppBarLayout | ||
| android:id="@+id/toolbar_layout" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:background="@color/media_preview_bar_background" | ||
| app:elevation="0dp"> | ||
|
|
||
| <androidx.appcompat.widget.Toolbar | ||
| android:id="@+id/toolbar" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="?attr/actionBarSize" | ||
| android:background="@android:color/transparent" /> | ||
|
|
||
| </com.google.android.material.appbar.AppBarLayout> | ||
|
|
||
| </FrameLayout> |