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

Groups V2 group manager copy updates.

master
Alan Evans 2020-07-20 16:18:22 -03:00
parent 662f0b8fb6
commit 3a38240fb2
3 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/dialogs/GroupRightsDialog.java
View File

@ -47,10 +47,10 @@ public final class GroupRightsDialog {
public enum Type {
MEMBERSHIP(R.string.GroupManagement_choose_who_can_add_or_invite_new_members,
MEMBERSHIP(R.string.ManageGroupActivity_choose_who_can_add_or_invite_new_members,
R.array.GroupManagement_edit_group_membership_choices),
ATTRIBUTES(R.string.GroupManagement_choose_who_can_change_the_group_name_and_photo,
ATTRIBUTES(R.string.ManageGroupActivity_choose_who_can_edit_the_group_name_avatar_and_disappearing_messages,
R.array.GroupManagement_edit_group_info_choices);
@StringRes private final int message;

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

@ -175,10 +175,10 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="end"
android:minWidth="48dp"
android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding"
android:gravity="end"
android:textAppearance="@style/Signal.Text.Body"
android:textColor="@color/ultramarine_text_button"
tools:text="Off" />
@ -387,7 +387,7 @@
android:gravity="center_vertical|start"
android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding"
android:text="@string/ManageGroupActivity_who_can_edit_group_membership"
android:text="@string/ManageGroupActivity_add_members"
android:textAlignment="viewStart"
android:textAppearance="@style/Signal.Text.Body" />
@ -395,8 +395,8 @@
android:id="@+id/edit_group_membership_value"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:minWidth="48dp"
android:gravity="center_vertical|end"
android:minWidth="136dp"
android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding"
android:textAppearance="@style/Signal.Text.Body"
@ -405,10 +405,10 @@
</LinearLayout>
<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/edit_group_access_row"
android:layout_width="match_parent"
android:layout_height="@dimen/group_manage_fragment_row_height"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true">
@ -416,28 +416,54 @@
<TextView
android:id="@+id/edit_group_access_title"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical|start"
android:gravity="start"
android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
android:paddingTop="16dp"
android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding"
android:text="@string/ManageGroupActivity_who_can_edit_group_info"
android:paddingBottom="8dp"
android:text="@string/ManageGroupActivity_edit_group_info"
android:textAlignment="viewStart"
android:textAppearance="@style/Signal.Text.Body" />
android:textAppearance="@style/Signal.Text.Body"
app:layout_constraintEnd_toStartOf="@+id/edit_group_access_value"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/edit_group_access_value"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:minWidth="48dp"
android:layout_height="0dp"
android:gravity="end"
android:minWidth="136dp"
android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
android:paddingTop="16dp"
android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding"
android:textAppearance="@style/Signal.Text.Body"
android:textColor="@color/ultramarine_text_button"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="All members" />
</LinearLayout>
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:paddingStart="@dimen/group_manage_fragment_row_horizontal_padding"
android:paddingEnd="@dimen/group_manage_fragment_row_horizontal_padding"
android:paddingBottom="16dp"
android:text="@string/ManageGroupActivity_choose_who_can_edit_the_group_name_avatar_and_disappearing_messages"
android:textAlignment="viewStart"
android:textAppearance="@style/Signal.Text.Caption"
android:textColor="?title_text_color_secondary"
app:layout_constraintEnd_toEndOf="@+id/edit_group_access_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/edit_group_access_title" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>

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

@ -525,8 +525,10 @@
<!-- ManageGroupActivity -->
<string name="ManageGroupActivity_disappearing_messages">Disappearing messages</string>
<string name="ManageGroupActivity_pending_group_invites">Pending group invites</string>
<string name="ManageGroupActivity_who_can_edit_group_membership">Who can edit group membership</string>
<string name="ManageGroupActivity_who_can_edit_group_info">Who can edit group info</string>
<string name="ManageGroupActivity_add_members">Add members</string>
<string name="ManageGroupActivity_edit_group_info">Edit group info</string>
<string name="ManageGroupActivity_choose_who_can_edit_the_group_name_avatar_and_disappearing_messages">Choose who can edit the group name, avatar, and disappearing messages.</string>
<string name="ManageGroupActivity_choose_who_can_add_or_invite_new_members">Choose who can add or invite new members.</string>
<string name="ManageGroupActivity_block_group">Block group</string>
<string name="ManageGroupActivity_unblock_group">Unblock group</string>
<string name="ManageGroupActivity_leave_group">Leave group</string>
@ -535,7 +537,6 @@
<string name="ManageGroupActivity_until_s">Until %1$s</string>
<string name="ManageGroupActivity_off">Off</string>
<string name="ManageGroupActivity_on">On</string>
<string name="ManageGroupActivity_add_members">Add members</string>
<string name="ManageGroupActivity_view_all_members">View all members</string>
<string name="ManageGroupActivity_see_all">See all</string>
@ -560,9 +561,6 @@
<string name="ManageGroupActivity_legacy_group">Legacy Group</string>
<string name="ManageGroupActivity_legacy_group_learn_more">This is a Legacy Group. To access features like group admins, create a New Group.</string>
<string name="GroupManagement_choose_who_can_add_or_invite_new_members">Choose who can add or invite new members</string>
<string name="GroupManagement_choose_who_can_change_the_group_name_and_photo">Choose who can change the group name and photo</string>
<!-- ManageRecipientActivity -->
<string name="ManageRecipientActivity_add_to_system_contacts">Add to system contacts</string>