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

Fix conversation list toolbar styling.

Browse Source
This commit is contained in:
Greyson Parrelli 2019-10-18 17:32:39 -04:00
parent 2cfb6ede7f
commit 097d95428a
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
res/layout/conversation_list_activity.xml
View File

@ -20,19 +20,20 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<ImageView android:id="@+id/toolbar_icon" <org.thoughtcrime.securesms.components.AvatarImageView
android:contentDescription="@string/conversation_list_settings_shortcut" android:id="@+id/toolbar_icon"
android:layout_width="58dp" android:contentDescription="@string/conversation_list_settings_shortcut"
android:layout_height="48dp" android:layout_width="58dp"
android:layout_alignParentStart="true" android:layout_height="48dp"
android:paddingTop="10dp" android:layout_alignParentStart="true"
android:paddingBottom="10dp" android:paddingTop="10dp"
android:paddingStart="12dp" android:paddingBottom="10dp"
android:paddingEnd="18dp" android:paddingStart="12dp"
app:layout_constraintStart_toStartOf="parent" android:paddingEnd="18dp"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/ic_contact_picture" /> app:layout_constraintBottom_toBottomOf="parent"
tools:src="@drawable/ic_contact_picture" />
<TextView android:layout_width="0dp" <TextView android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -63,15 +64,6 @@
</androidx.appcompat.widget.Toolbar> </androidx.appcompat.widget.Toolbar>
<View
android:id="@+id/conversation_list_toolbar_shadow"
android:layout_width="match_parent"
android:layout_height="4dp"
android:layout_below="@id/toolbar"
android:background="@drawable/toolbar_shadow"
android:visibility="gone"
tools:visibility="visible" />
<FrameLayout android:id="@+id/fragment_container" <FrameLayout android:id="@+id/fragment_container"
android:layout_below="@id/toolbar" android:layout_below="@id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -85,5 +77,14 @@
android:background="?attr/conversation_list_toolbar_background" android:background="?attr/conversation_list_toolbar_background"
android:elevation="4dp" android:elevation="4dp"
android:visibility="invisible" /> android:visibility="invisible" />
<View
android:id="@+id/conversation_list_toolbar_shadow"
android:layout_width="match_parent"
android:layout_height="4dp"
android:layout_below="@id/toolbar"
android:background="@drawable/toolbar_shadow"
android:visibility="gone"
tools:visibility="visible" />
</RelativeLayout> </RelativeLayout>

3
src/org/thoughtcrime/securesms/mediasend/camerax/CameraXModule.java
View File

@ -240,6 +240,9 @@ final class CameraXModule {
mImageCaptureConfigBuilder.setTargetRotation(getDisplaySurfaceRotation()); mImageCaptureConfigBuilder.setTargetRotation(getDisplaySurfaceRotation());
mImageCaptureConfigBuilder.setLensFacing(mCameraLensFacing); mImageCaptureConfigBuilder.setLensFacing(mCameraLensFacing);
// Begin Signal Custom Code Block
mImageCaptureConfigBuilder.setCaptureMode(CameraXUtil.getOptimalCaptureMode());
// End Signal Custom Code Block
mImageCapture = new ImageCapture(mImageCaptureConfigBuilder.build()); mImageCapture = new ImageCapture(mImageCaptureConfigBuilder.build());
// Begin Signal Custom Code Block // Begin Signal Custom Code Block