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

Make room for triple dot menu

Browse Source
This commit is contained in:
nielsandriesse 2021-06-02 13:28:02 +10:00
parent 9397f02272
commit 9a0e5e7b6c
3 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
View File

@ -4,7 +4,6 @@ import android.os.Bundle
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import kotlinx.android.synthetic.main.activity_conversation_v2.* import kotlinx.android.synthetic.main.activity_conversation_v2.*
import network.loki.messenger.R import network.loki.messenger.R
import org.session.libsession.utilities.TextSecurePreferences
import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.database.DatabaseFactory
import org.thoughtcrime.securesms.mms.GlideApp import org.thoughtcrime.securesms.mms.GlideApp
@ -46,9 +45,8 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity() {
private fun setUpToolbar() { private fun setUpToolbar() {
backButton.setOnClickListener { onBackPressed() } backButton.setOnClickListener { onBackPressed() }
conversationTitleView.text = thread.toShortString() conversationTitleView.text = thread.toShortString()
conversationSettingsButton.glide = glide profilePictureView.glide = glide
conversationSettingsButton.update(thread, threadID) profilePictureView.update(thread, threadID)
conversationSettingsButton.setOnClickListener { showConversationSettings() }
} }
// endregion // endregion

15
app/src/main/res/drawable/conversation_back_button_background.xml Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorControlHighlight">
<item
android:id="@android:id/mask"
android:right="24dp">
<shape>
<corners
android:bottomLeftRadius="46dp"
android:topLeftRadius="46dp" />
<solid android:color="@android:color/white" />
</shape>
</item>
</ripple>

30
app/src/main/res/layout/activity_conversation_v2.xml
View File

@ -20,14 +20,29 @@
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"> android:layout_marginRight="20dp">
<ImageButton <LinearLayout
android:id="@+id/backButton" android:id="@+id/backButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:src="?attr/homeAsUpIndicator" android:orientation="horizontal"
android:background="?attr/selectableItemBackgroundBorderless" /> android:background="@drawable/conversation_back_button_background">
<ImageView
android:layout_width="18dp"
android:layout_height="18dp"
android:src="@drawable/ic_baseline_arrow_back_compact_24"
android:layout_marginRight="-2dp"
android:layout_marginLeft="8dp" />
<org.thoughtcrime.securesms.loki.views.ProfilePictureView
android:id="@+id/profilePictureView"
android:layout_width="@dimen/small_profile_picture_size"
android:layout_height="@dimen/small_profile_picture_size" />
</LinearLayout>
<TextView <TextView
android:id="@+id/conversationTitleView" android:id="@+id/conversationTitleView"
@ -35,19 +50,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="64dp" android:layout_marginLeft="66dp"
android:text="Elon" android:text="Elon"
android:textColor="@color/text" android:textColor="@color/text"
android:textStyle="bold" android:textStyle="bold"
android:textSize="@dimen/very_large_font_size" /> android:textSize="@dimen/very_large_font_size" />
<org.thoughtcrime.securesms.loki.views.ProfilePictureView
android:id="@+id/conversationSettingsButton"
android:layout_width="@dimen/small_profile_picture_size"
android:layout_height="@dimen/small_profile_picture_size"
android:layout_alignParentRight="true"
android:layout_centerVertical="true" />
</RelativeLayout> </RelativeLayout>
</androidx.appcompat.widget.Toolbar> </androidx.appcompat.widget.Toolbar>