Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-25 03:11:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add support for Group V2 description field.

Browse Source
This commit is contained in:
Cody Henthorne
2021-05-07 13:43:31 -04:00
committed by Greyson Parrelli
parent b3aec58e69
commit 8c9df8d3be
56 changed files with 892 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/res/layout/group_description_dialog.xml Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="?attr/dialogPreferredPadding">
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/group_description_dialog_text"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textAppearance="@style/TextAppearance.Signal.Body1"
tools:text="This is a test." />
</FrameLayout>

24
app/src/main/res/layout/group_join_bottom_sheet.xml
View File

@@ -28,7 +28,7 @@
app:layout_constraintTop_toTopOf="@+id/group_join_recipient_avatar"
tools:visibility="visible" />
<TextView
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/group_join_group_name"
style="@style/TextAppearance.Signal.Body1.Bold"
android:layout_width="wrap_content"
@@ -53,6 +53,24 @@
app:layout_constraintTop_toBottomOf="@+id/group_join_group_name"
tools:text="Group · 12 members" />
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/group_join_group_description"
style="@style/Signal.Text.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:gravity="center_horizontal"
android:textColor="@color/signal_text_secondary"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/group_join_group_details"
tools:text="Coordinate the folks to do the thing"
tools:visibility="visible" />
<TextView
android:id="@+id/group_join_explain"
style="@style/TextAppearance.Signal.Body2"
@@ -63,9 +81,9 @@
android:layout_marginEnd="16dp"
android:textColor="@color/signal_text_primary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/group_join_group_details"
app:layout_constraintTop_toBottomOf="@+id/group_join_group_description"
tools:text="@string/GroupJoinBottomSheetDialogFragment_admin_approval_needed" />
<Button

14
app/src/main/res/layout/group_manage_fragment.xml
View File

@@ -54,6 +54,20 @@
android:textColor="@color/signal_text_secondary"
tools:text="12 members (4 invited)" />
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/manage_group_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:layout_marginStart="16dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="16dp"
android:textAppearance="@style/Signal.Text.Body"
android:textColor="@color/signal_text_secondary"
android:visibility="gone"
tools:text="Group to plot the capture of Doc Oct"
tools:visibility="visible" />
<org.thoughtcrime.securesms.util.views.LearnMoreTextView
android:id="@+id/manage_group_info_text"
android:layout_width="wrap_content"

4
app/src/main/res/layout/profile_create_fragment.xml
View File

@@ -16,7 +16,8 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
android:layout_weight="1"
android:scrollIndicators="top|bottom">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@@ -163,6 +164,7 @@
android:hint="@string/CreateProfileActivity_last_name_optional"
android:inputType="textPersonName"
android:singleLine="true" />
</LinearLayout>
<org.thoughtcrime.securesms.util.views.LearnMoreTextView

5
app/src/main/res/values/signal_styles.xml
View File

@@ -114,10 +114,11 @@
<item name="android:windowAnimationStyle">@style/TextSecure.Animation.FullScreenDialog</item>
</style>
<style name="Signal.ThemeOverlay.Dialog.Rounded" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
<style name="Signal.ThemeOverlay.Dialog.Rounded" parent="@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog">
<item name="alertDialogStyle">@style/Signal.MaterialAlertDialog</item>
<item name="android:background">@color/signal_background_dialog</item>
<item name="materialAlertDialogBodyTextStyle">@style/Signal.Text.Body</item>
<item name="materialAlertDialogTitleTextStyle">@style/TextAppearance.Signal.Title2.MaterialDialog</item>
<item name="materialAlertDialogBodyTextStyle">@style/TextAppearance.Signal.Body1</item>
<item name="buttonBarPositiveButtonStyle">@style/Signal.Widget.Button.Dialog</item>
<item name="buttonBarNeutralButtonStyle">@style/Signal.Widget.Button.Dialog</item>
<item name="buttonBarNegativeButtonStyle">@style/Signal.Widget.Button.Dialog</item>

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

@@ -744,6 +744,8 @@
<string name="ManageGroupActivity_upgrade_this_group">upgrade this group.</string>
<string name="ManageGroupActivity_this_is_an_insecure_mms_group">This is an insecure MMS Group. To chat privately, invite your contacts to Signal.</string>
<string name="ManageGroupActivity_invite_now">Invite now</string>
<string name="ManageGroupActivity_more">…more</string>
<string name="ManageGroupActivity_add_group_description">Add group description...</string>
<!-- GroupMentionSettingDialog -->
<string name="GroupMentionSettingDialog_notify_me_for_mentions">Notify me for Mentions</string>
@@ -1127,6 +1129,11 @@
<string name="MessageRecord_s_changed_the_group_name_to_s">%1$s changed the group name to \"%2$s\".</string>
<string name="MessageRecord_the_group_name_has_changed_to_s">The group name has changed to \"%1$s\".</string>
<!-- GV2 description change -->
<string name="MessageRecord_you_changed_the_group_description">You changed the group description.</string>
<string name="MessageRecord_s_changed_the_group_description">%1$s changed the group description.</string>
<string name="MessageRecord_the_group_description_has_changed">The group description has changed.</string>
<!-- GV2 avatar change -->
<string name="MessageRecord_you_changed_the_group_avatar">You changed the group avatar.</string>
<string name="MessageRecord_s_changed_the_group_avatar">%1$s changed the group avatar.</string>
@@ -1894,6 +1901,7 @@
<string name="ConversationUpdateItem_enable_call_notifications">Enable Call Notifications</string>
<string name="ConversationUpdateItem_no_groups_in_common_review_requests_carefully">No groups in common. Review requests carefully.</string>
<string name="ConversationUpdateItem_no_contacts_in_this_group_review_requests_carefully">No contacts in this group. Review requests carefully.</string>
<string name="ConversationUpdateItem_view">View</string>
<!-- audio_view -->
<string name="audio_view__play_pause_accessibility_description">Play … Pause</string>
@@ -2057,6 +2065,7 @@
<string name="CreateProfileActivity__username">Username</string>
<string name="CreateProfileActivity__create_a_username">Create a username</string>
<string name="CreateProfileActivity_custom_mms_group_names_and_photos_will_only_be_visible_to_you">Custom MMS group names and photos will only be visible to you.</string>
<string name="CreateProfileActivity_group_descriptions_will_be_visible_to_members_of_this_group_and_people_who_have_been_invited">Group descriptions will be visible to members of this group and people who have been invited.</string>
<!-- EditAboutFragment -->
<string name="EditAboutFragment_about">About</string>
@@ -2073,6 +2082,7 @@
<!-- EditProfileFragment -->
<string name="EditProfileFragment__edit_group_name_and_photo">Edit group name and photo</string>
<string name="EditProfileFragment__group_name">Group name</string>
<string name="EditProfileFragment__group_description">Group description</string>
<string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string>
<!-- EditProfileNameFragment -->
@@ -3362,6 +3372,9 @@
<string name="GroupsInCommonMessageRequest__okay">Okay</string>
<string name="GroupsInCommonMessageRequest__support_article" translatable="false">https://support.signal.org/hc/articles/360007459591</string>
<!-- GroupDescriptionDialog -->
<string name="GroupDescriptionDialog__group_description">Group description</string>
<!-- EOF -->
</resources>

5
app/src/main/res/values/text_styles.xml
View File

@@ -69,6 +69,11 @@
<item name="android:textStyle">bold</item>
</style>
<style name="TextAppearance.Signal.Title2.MaterialDialog">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
</style>
<style name="TextAppearance.Signal.Headline.Insights" parent="">
<item name="android:textStyle">bold</item>
<item name="android:textSize">28sp</item>