TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-01-11 21:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweak edit closed group screen layout

Browse Source
This commit is contained in:
nielsandriesse 2020-08-18 10:05:24 +10:00
parent 74dac84796
commit f0aa843825
3 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
res/layout/activity_edit_closed_group.xml
View File

@ -17,36 +17,35 @@
android:id="@+id/ctnGroupNameSection" android:id="@+id/ctnGroupNameSection"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/large_spacing" android:padding="@dimen/large_spacing"
android:layout_marginTop="@dimen/small_spacing" android:gravity="center">
android:layout_marginRight="@dimen/large_spacing">
<LinearLayout <LinearLayout
android:id="@+id/cntGroupNameEdit" android:id="@+id/cntGroupNameEdit"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:gravity="center"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="invisible" android:visibility="invisible"
tools:visibility="visible"> tools:visibility="visible">
<ImageView <ImageView
android:id="@+id/btnCancelGroupNameEdit" android:id="@+id/btnCancelGroupNameEdit"
android:layout_width="36dp" android:layout_width="24dp"
android:layout_height="36dp" android:layout_height="24dp"
android:layout_gravity="center"
android:src="@drawable/ic_close_white_24dp"/> android:src="@drawable/ic_close_white_24dp"/>
<EditText <EditText
style="@style/SessionEditText" style="@style/SessionEditText"
android:id="@+id/edtGroupName" android:id="@+id/edtGroupName"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginStart="4dp" android:layout_marginStart="@dimen/small_spacing"
android:layout_marginEnd="4dp" android:layout_marginEnd="@dimen/small_spacing"
android:textAlignment="center" android:textAlignment="center"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:inputType="text" android:inputType="text"
android:singleLine="true" android:singleLine="true"
android:imeOptions="actionDone" android:imeOptions="actionDone"
@ -54,8 +53,8 @@
<ImageView <ImageView
android:id="@+id/btnSaveGroupNameEdit" android:id="@+id/btnSaveGroupNameEdit"
android:layout_width="36dp" android:layout_width="24dp"
android:layout_height="36dp" android:layout_height="24dp"
android:layout_gravity="center" android:layout_gravity="center"
android:src="@drawable/ic_check_white_24dp"/> android:src="@drawable/ic_check_white_24dp"/>
@ -65,8 +64,6 @@
android:id="@+id/cntGroupNameDisplay" android:id="@+id/cntGroupNameDisplay"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingVertical="@dimen/medium_spacing"
android:gravity="center" android:gravity="center"
android:visibility="visible" android:visibility="visible"
tools:visibility="invisible"> tools:visibility="invisible">
@ -85,6 +82,7 @@
android:drawableEnd="@drawable/ic_edit_white_24dp" android:drawableEnd="@drawable/ic_edit_white_24dp"
android:drawablePadding="@dimen/small_spacing" android:drawablePadding="@dimen/small_spacing"
tools:text="SomeGroupName"/> tools:text="SomeGroupName"/>
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
@ -96,17 +94,17 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/large_spacing" android:layout_marginStart="@dimen/medium_spacing"
android:layout_marginTop="@dimen/small_spacing" android:layout_marginTop="@dimen/small_spacing"
android:layout_marginEnd="@dimen/massive_spacing" android:layout_marginEnd="@dimen/small_spacing"
android:layout_marginBottom="@dimen/small_spacing" android:layout_marginBottom="@dimen/small_spacing"
android:layout_weight="1" android:layout_weight="1"
android:alpha="0.8"
android:text="@string/activity_edit_closed_group_edit_members" android:text="@string/activity_edit_closed_group_edit_members"
android:textColor="@color/text" android:textColor="@color/text"
android:textSize="@dimen/medium_font_size" /> android:textSize="@dimen/medium_font_size" />
@ -114,17 +112,23 @@
<Button <Button
android:id="@+id/addMembersClosedGroupButton" android:id="@+id/addMembersClosedGroupButton"
style="@style/MediumProminentOutlineButton" style="@style/MediumProminentOutlineButton"
android:layout_width="135dp" android:layout_width="wrap_content"
android:layout_height="@dimen/small_button_height" android:layout_height="@dimen/small_button_height"
android:layout_marginTop="@dimen/small_spacing" android:layout_marginTop="@dimen/small_spacing"
android:layout_marginRight="@dimen/large_spacing" android:layout_marginEnd="@dimen/medium_spacing"
android:layout_marginLeft="@dimen/very_large_spacing" android:layout_marginStart="@dimen/small_spacing"
android:layout_marginBottom="@dimen/small_spacing" android:layout_marginBottom="@dimen/small_spacing"
android:layout_weight="1" android:paddingStart="@dimen/medium_spacing"
android:paddingEnd="@dimen/medium_spacing"
android:text="@string/activity_edit_closed_group_add_members" /> android:text="@string/activity_edit_closed_group_add_members" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/separator" />
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView" android:id="@+id/recyclerView"
android:layout_width="match_parent" android:layout_width="match_parent"

4
res/values/strings.xml
View File

@ -1835,9 +1835,9 @@
<!-- Next round of translation --> <!-- Next round of translation -->
<string name="activity_edit_closed_group_title">Edit Closed Group</string> <string name="activity_edit_closed_group_title">Edit Group</string>
<string name="activity_edit_closed_group_edit_text_hint">Enter a new group name</string> <string name="activity_edit_closed_group_edit_text_hint">Enter a new group name</string>
<string name="activity_edit_closed_group_edit_members">Edit members</string> <string name="activity_edit_closed_group_edit_members">Members</string>
<string name="activity_edit_closed_group_add_members">Add members</string> <string name="activity_edit_closed_group_add_members">Add members</string>
<string name="activity_edit_closed_group_group_name_missing_error">Group name can\'t be empty</string> <string name="activity_edit_closed_group_group_name_missing_error">Group name can\'t be empty</string>
<string name="activity_edit_closed_group_group_name_too_long_error">Please enter a shorter group name</string> <string name="activity_edit_closed_group_group_name_too_long_error">Please enter a shorter group name</string>

1
src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@ -153,7 +153,6 @@ import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil;
import org.thoughtcrime.securesms.linkpreview.LinkPreviewViewModel; import org.thoughtcrime.securesms.linkpreview.LinkPreviewViewModel;
import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.loki.activities.EditClosedGroupActivity; import org.thoughtcrime.securesms.loki.activities.EditClosedGroupActivity;
import org.thoughtcrime.securesms.loki.activities.EditClosedGroupActivityKt;
import org.thoughtcrime.securesms.loki.activities.HomeActivity; import org.thoughtcrime.securesms.loki.activities.HomeActivity;
import org.thoughtcrime.securesms.loki.database.LokiThreadDatabase; import org.thoughtcrime.securesms.loki.database.LokiThreadDatabase;
import org.thoughtcrime.securesms.loki.database.LokiThreadDatabaseDelegate; import org.thoughtcrime.securesms.loki.database.LokiThreadDatabaseDelegate;