From 090c400037b06c7ebd7b8569941b04421230383f Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Tue, 26 May 2020 12:06:30 -0300 Subject: [PATCH] Collapse title into toolbar on scroll in ManageGroupFragment. --- .../ui/managegroup/ManageGroupActivity.java | 11 - .../ui/managegroup/ManageGroupFragment.java | 9 +- .../main/res/layout/group_manage_activity.xml | 9 - .../main/res/layout/group_manage_fragment.xml | 695 +++++++++--------- 4 files changed, 367 insertions(+), 357 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupActivity.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupActivity.java index a859b81940..b6b02b02d4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupActivity.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.os.Bundle; import androidx.annotation.NonNull; -import androidx.appcompat.widget.Toolbar; import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity; import org.thoughtcrime.securesms.R; @@ -39,10 +38,6 @@ public class ManageGroupActivity extends PassphraseRequiredActionBarActivity { .replace(R.id.container, ManageGroupFragment.newInstance(getIntent().getStringExtra(GROUP_ID))) .commitNow(); } - Toolbar toolbar = findViewById(R.id.toolbar); - setSupportActionBar(toolbar); - //noinspection ConstantConditions - getSupportActionBar().setDisplayHomeAsUpEnabled(true); } @Override @@ -50,10 +45,4 @@ public class ManageGroupActivity extends PassphraseRequiredActionBarActivity { super.onResume(); dynamicTheme.onResume(this); } - - @Override - public boolean onSupportNavigateUp() { - onBackPressed(); - return true; - } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java index c60a5f2211..373e7e0322 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java @@ -16,6 +16,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.appcompat.widget.Toolbar; import androidx.core.view.ViewCompat; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; @@ -62,7 +63,7 @@ public class ManageGroupFragment extends Fragment { private ManageGroupViewModel viewModel; private GroupMemberListView groupMemberList; private View listPending; - private TextView groupTitle; + private Toolbar toolbar; private TextView memberCountUnderAvatar; private TextView memberCountAboveList; private AvatarImageView avatar; @@ -119,7 +120,7 @@ public class ManageGroupFragment extends Fragment { View view = inflater.inflate(R.layout.group_manage_fragment, container, false); avatar = view.findViewById(R.id.group_avatar); - groupTitle = view.findViewById(R.id.group_title); + toolbar = view.findViewById(R.id.toolbar); memberCountUnderAvatar = view.findViewById(R.id.member_count); memberCountAboveList = view.findViewById(R.id.member_count_2); groupMemberList = view.findViewById(R.id.group_members); @@ -185,7 +186,9 @@ public class ManageGroupFragment extends Fragment { avatar.setFallbackPhotoProvider(fallbackPhotoProvider); - viewModel.getTitle().observe(getViewLifecycleOwner(), groupTitle::setText); + toolbar.setNavigationOnClickListener(v -> requireActivity().finish()); + + viewModel.getTitle().observe(getViewLifecycleOwner(), toolbar::setTitle); viewModel.getMemberCountSummary().observe(getViewLifecycleOwner(), memberCountUnderAvatar::setText); viewModel.getFullMemberCountSummary().observe(getViewLifecycleOwner(), memberCountAboveList::setText); viewModel.getGroupRecipient().observe(getViewLifecycleOwner(), avatar::setRecipient); diff --git a/app/src/main/res/layout/group_manage_activity.xml b/app/src/main/res/layout/group_manage_activity.xml index 9bc5e51f35..7c7d00a6bc 100644 --- a/app/src/main/res/layout/group_manage_activity.xml +++ b/app/src/main/res/layout/group_manage_activity.xml @@ -7,15 +7,6 @@ android:orientation="vertical" tools:context=".groups.ui.managegroup.ManageGroupActivity"> - - - - + android:layout_height="wrap_content" + android:background="?android:attr/windowBackground" + android:elevation="4dp" + android:fitsSystemWindows="true"> - + android:background="@null" + app:scrimAnimationDuration="200" + app:contentScrim="?android:attr/windowBackground" + app:expandedTitleGravity="center_horizontal" + app:expandedTitleMarginTop="156dp" + app:expandedTitleTextAppearance="@style/TextAppearance.Signal.Body1.Bold" + app:layout_scrollFlags="scroll|exitUntilCollapsed"> + tools:text=" " /> - - - - - - + android:layout_height="?attr/actionBarSize" + app:layout_collapseMode="pin" + app:navigationIcon="@drawable/ic_arrow_left_24" + tools:title="Parkdake Run Crew" /> - + - + - + - - - + android:layout_height="wrap_content"> - - - - - - - - - - - + android:layout_marginTop="@dimen/group_manage_fragment_card_vertical_padding" + app:cardBackgroundColor="?android:attr/windowBackground" + app:layout_constraintTop_toTopOf="parent"> + android:layout_gravity="center_horizontal" + android:gravity="center_vertical" + android:text="@string/ManageGroupActivity_disappearing_messages" + android:textAppearance="@style/TextAppearance.Signal.Body2" /> - + - - - - - + android:layout_marginTop="@dimen/group_manage_fragment_card_vertical_padding" + app:cardBackgroundColor="?android:attr/windowBackground" + app:layout_constraintTop_toBottomOf="@id/group_disappearing_messages_card"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +