blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New group button behind new Group UI feature flag.

master
Alan Evans 2020-04-24 10:13:07 -03:00 committed by Greyson Parrelli
parent d5419ec9fa
commit 8e0fba7992
14 changed files with 128 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
View File

@ -55,6 +55,7 @@ import org.thoughtcrime.securesms.permissions.Permissions;
import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientId;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.thoughtcrime.securesms.util.StickyHeaderDecoration;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.UsernameUtil;
@ -100,15 +101,16 @@ public final class ContactSelectionListFragment extends Fragment
private RecyclerViewFastScroller fastScroller;
private ContactSelectionListAdapter cursorRecyclerViewAdapter;
@Nullable private FixedViewsAdapter headerAdapter;
@Nullable private FixedViewsAdapter footerAdapter;
@Nullable private InviteCallback inviteCallback;
@Nullable private ListCallback listCallback;
@Override
public void onAttach(@NonNull Context context) {
super.onAttach(context);
if (context instanceof InviteCallback) {
inviteCallback = (InviteCallback) context;
if (context instanceof ListCallback) {
listCallback = (ListCallback) context;
}
}
@ -192,9 +194,16 @@ public final class ContactSelectionListFragment extends Fragment
RecyclerViewConcatenateAdapterStickyHeader concatenateAdapter = new RecyclerViewConcatenateAdapterStickyHeader();
if (listCallback != null && FeatureFlags.newGroupUI()) {
headerAdapter = new FixedViewsAdapter(createNewGroupItem(listCallback));
headerAdapter.hide();
concatenateAdapter.addAdapter(headerAdapter);
}
concatenateAdapter.addAdapter(cursorRecyclerViewAdapter);
if (inviteCallback != null) {
footerAdapter = new FixedViewsAdapter(createInviteActionView(inviteCallback));
if (listCallback != null) {
footerAdapter = new FixedViewsAdapter(createInviteActionView(listCallback));
footerAdapter.hide();
concatenateAdapter.addAdapter(footerAdapter);
}
@ -203,10 +212,17 @@ public final class ContactSelectionListFragment extends Fragment
recyclerView.addItemDecoration(new StickyHeaderDecoration(concatenateAdapter, true, true));
}
private View createInviteActionView(@NonNull InviteCallback inviteCallback) {
private View createInviteActionView(@NonNull ListCallback listCallback) {
View view = LayoutInflater.from(requireContext())
.inflate(R.layout.contact_selection_invite_action_item, (ViewGroup) requireView(), false);
view.setOnClickListener(v -> inviteCallback.onInvite());
view.setOnClickListener(v -> listCallback.onInvite());
return view;
}
private View createNewGroupItem(@NonNull ListCallback listCallback) {
View view = LayoutInflater.from(requireContext())
.inflate(R.layout.contact_selection_new_group_item, (ViewGroup) requireView(), false);
view.setOnClickListener(v -> listCallback.onNewGroup());
return view;
}
@ -272,6 +288,10 @@ public final class ContactSelectionListFragment extends Fragment
footerAdapter.show();
}
if (headerAdapter != null) {
headerAdapter.show();
}
emptyText.setText(R.string.contact_selection_group_activity__no_contacts);
boolean useFastScroller = data != null && data.getCount() > 20;
recyclerView.setVerticalScrollBarEnabled(!useFastScroller);
@ -392,7 +412,8 @@ public final class ContactSelectionListFragment extends Fragment
void onContactDeselected(Optional<RecipientId> recipientId, String number);
}
public interface InviteCallback {
public interface ListCallback {
void onInvite();
void onNewGroup();
}
}

24
app/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java
View File

@ -22,29 +22,14 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.widget.Toast;
import org.thoughtcrime.securesms.conversation.ConversationActivity;
import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.ThreadDatabase;
import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientId;
import org.whispersystems.libsignal.util.guava.Optional;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.thoughtcrime.securesms.util.UsernameUtil;
import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
import org.whispersystems.libsignal.util.guava.Optional;
import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
import org.whispersystems.signalservice.api.util.UuidUtil;
import java.io.IOException;
import java.util.UUID;
/**
* Activity container for starting a new conversation.
@ -53,7 +38,7 @@ import java.util.UUID;
*
*/
public class NewConversationActivity extends ContactSelectionActivity
implements ContactSelectionListFragment.InviteCallback
implements ContactSelectionListFragment.ListCallback
{
@SuppressWarnings("unused")
@ -131,5 +116,12 @@ public class NewConversationActivity extends ContactSelectionActivity
@Override
public void onInvite() {
handleInvite();
finish();
}
@Override
public void onNewGroup() {
handleCreateGroup();
finish();
}
}

5
app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
View File

@ -242,6 +242,11 @@ public final class FeatureFlags {
return getValue(CALLING_PIP, false);
}
/** New group UI elements. */
public static boolean newGroupUI() {
return getValue(NEW_GROUP_UI, false);
}
/** Only for rendering debug info. */
public static synchronized @NonNull Map<String, Boolean> getMemoryValues() {
return new TreeMap<>(REMOTE_VALUES);

9
app/src/main/res/drawable/ic_group_outline_ultramarine_28.xml 100644
View File

File diff suppressed because one or more lines are too long

4
app/src/main/res/drawable/ic_invite_circle.xml → app/src/main/res/drawable/ic_invite_circle_dark.xml
View File

@ -2,12 +2,12 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="oval">
<solid android:color="#70707C" />
<solid android:color="@color/core_grey_75" />
</shape>
</item>
<item
android:bottom="10dp"
android:drawable="@drawable/ic_invite_28dp"
android:drawable="@drawable/ic_invite_ultramarine_28"
android:left="10dp"
android:right="10dp"
android:top="10dp" />

14
app/src/main/res/drawable/ic_invite_circle_light.xml 100644
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="oval">
<solid android:color="@color/core_grey_05" />
</shape>
</item>
<item
android:bottom="10dp"
android:drawable="@drawable/ic_invite_ultramarine_28"
android:left="10dp"
android:right="10dp"
android:top="10dp" />
</layer-list>

8
app/src/main/res/drawable/ic_invite_28dp.xml → app/src/main/res/drawable/ic_invite_ultramarine_28.xml
View File

File diff suppressed because one or more lines are too long

14
app/src/main/res/drawable/ic_new_group_circle_dark.xml 100644
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="oval">
<solid android:color="@color/core_grey_75" />
</shape>
</item>
<item
android:bottom="10dp"
android:drawable="@drawable/ic_group_outline_ultramarine_28"
android:left="10dp"
android:right="10dp"
android:top="10dp" />
</layer-list>

14
app/src/main/res/drawable/ic_new_group_circle_light.xml 100644
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="oval">
<solid android:color="@color/core_grey_05" />
</shape>
</item>
<item
android:bottom="10dp"
android:drawable="@drawable/ic_group_outline_ultramarine_28"
android:left="10dp"
android:right="10dp"
android:top="10dp" />
</layer-list>

3
app/src/main/res/layout/contact_selection_invite_action_item.xml
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView 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"
style="@style/Signal.Text.Body"
android:layout_width="match_parent"
android:layout_height="@dimen/contact_selection_item_height"
android:drawableStart="@drawable/ic_invite_circle"
android:drawablePadding="16dp"
android:ellipsize="marquee"
android:fontFamily="sans-serif-medium"
@ -14,4 +14,5 @@
android:singleLine="true"
android:text="@string/contact_selection_activity__invite_to_signal"
android:textAlignment="viewStart"
app:drawableStartCompat="?attr/contact_selection_invite_icon"
tools:ignore="RtlSymmetry" />

18
app/src/main/res/layout/contact_selection_new_group_item.xml 100644
View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView 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"
style="@style/Signal.Text.Body"
android:layout_width="match_parent"
android:layout_height="@dimen/contact_selection_item_height"
android:drawablePadding="16dp"
android:ellipsize="marquee"
android:fontFamily="sans-serif-medium"
android:gravity="center_vertical|start"
android:labelFor="@id/action_icon"
android:paddingStart="@dimen/selection_item_header_width"
android:singleLine="true"
android:text="@string/contact_selection_activity__new_group"
android:textAlignment="viewStart"
app:drawableStartCompat="?attr/contact_selection_new_group_icon"
tools:ignore="RtlSymmetry" />

2
app/src/main/res/values/attrs.xml
View File

@ -150,6 +150,8 @@
<attr name="contact_selection_lay_user" format="reference|color" />
<attr name="contact_selection_label_text" format="reference|color" />
<attr name="contact_selection_header_text" format="reference|color" />
<attr name="contact_selection_invite_icon" format="reference" />
<attr name="contact_selection_new_group_icon" format="reference" />
<attr name="contact_filter_toolbar_icon_tint" format="color" />
<attr name="contact_filter_toolbar_keyboard_icon" format="reference" />

1
app/src/main/res/values/strings.xml
View File

@ -1266,6 +1266,7 @@
<!-- contact_selection_activity -->
<string name="contact_selection_activity__enter_name_or_number">Enter name or number</string>
<string name="contact_selection_activity__invite_to_signal">Invite to Signal</string>
<string name="contact_selection_activity__new_group">New group</string>
<!-- contact_filter_toolbar -->
<string name="contact_filter_toolbar__clear_entered_text_description">Clear entered text</string>

6
app/src/main/res/values/themes.xml
View File

@ -418,6 +418,9 @@
<item name="pending_member_background">@color/core_grey_02</item>
<item name="pending_member_empty_text_color">@color/core_grey_60</item>
<item name="contact_selection_new_group_icon">@drawable/ic_new_group_circle_light</item>
<item name="contact_selection_invite_icon">@drawable/ic_invite_circle_light</item>
<item name="colorControlNormal">@color/core_grey_90</item>
</style>
@ -693,6 +696,9 @@
<item name="pending_member_background">@color/core_grey_80</item>
<item name="pending_member_empty_text_color">@color/core_grey_25</item>
<item name="contact_selection_new_group_icon">@drawable/ic_new_group_circle_dark</item>
<item name="contact_selection_invite_icon">@drawable/ic_invite_circle_dark</item>
<item name="colorControlNormal">@color/core_white</item>
</style>