TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-25 15:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add 'add members' functionality and cleanup, refactor

Browse Source
This commit is contained in:
Haafingar
2020-06-12 14:37:21 +10:00
parent 50799d9d90
commit 91af472d3b
13 changed files with 202 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
res/layout/activity_select_contacts.xml Normal file
View File

@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/default_session_background" >
<LinearLayout
android:id="@+id/mainContentContainer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
<LinearLayout
android:id="@+id/emptyStateContainer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical"
android:layout_centerInParent="true">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/medium_font_size"
android:textColor="@color/text"
android:text="@string/activity_create_closed_group_empty_state_message" />
<Button
style="@style/MediumProminentOutlineButton"
android:id="@+id/createNewPrivateChatButton"
android:layout_width="196dp"
android:layout_height="@dimen/medium_button_height"
android:layout_marginTop="@dimen/medium_spacing"
android:text="@string/activity_create_closed_group_empty_state_button_title" />
</LinearLayout>
</RelativeLayout>

10
res/menu/group_create.xml
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:title="@string/GroupCreateActivity_menu_apply_button"
android:id="@+id/menu_create_group"
android:icon="?menu_accept_icon"
app:showAsAction="always|withText"/>
</menu>

5
res/menu/menu_edit_closed_group.xml → res/menu/menu_apply.xml
View File

@@ -3,8 +3,9 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:title="@string/activity_edit_closed_group_apply_changes"
android:id="@+id/editClosedGroupButton"
android:title="@string/menu_apply_button"
android:id="@+id/applyButton"
android:icon="?menu_accept_icon"
app:showAsAction="always" />
</menu>

5
res/menu/menu_create_closed_group.xml → res/menu/menu_done.xml
View File

@@ -3,8 +3,9 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:title="Done"
android:id="@+id/createClosedGroupButton"
android:title="@string/menu_done_button"
android:id="@+id/doneButton"
android:icon="?menu_accept_icon"
app:showAsAction="always" />
</menu>

7
res/values/strings.xml
View File

@@ -1781,11 +1781,13 @@
<string name="activity_edit_closed_group_invalid_session_id_error">One of the members of your group has an invalid Session ID</string>
<string name="activity_edit_closed_group_confirm_removal">Are you sure you want to remove this user?</string>
<string name="activity_edit_closed_group_member_removed">User removed from group</string>
<string name="activity_edit_closed_group_apply_changes">Apply</string>
<string name="fragment_edit_group_bottom_sheet_remove">Remove user from group</string>
<string name="fragment_edit_group_bottom_sheet_admin">Make this user a group admin</string>
<string name="activity_select_contacts_title">Select Contacts</string>
<string name="activity_join_public_chat_title">Join Open Group</string>
<string name="activity_join_public_chat_error">Couldn\'t join group</string>
<string name="activity_join_public_chat_enter_group_url_tab_title">Open Group URL</string>
@@ -1878,4 +1880,7 @@
<string name="fragment_contact_selection_closed_groups_title">Closed Groups</string>
<string name="fragment_contact_selection_open_groups_title">Open Groups</string>
<string name="menu_apply_button">Apply</string>
<string name="menu_done_button">Done</string>
</resources>