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

Merge camera into send flow.

Browse Source
This commit is contained in:
Greyson Parrelli
2019-03-13 16:05:25 -07:00
parent eb1dd58a0b
commit 0a8bbf14a6
18 changed files with 267 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/camera_controls_landscape.xml
View File

@@ -20,8 +20,8 @@
android:id="@+id/camera_flip_button"
android:layout_width="48dp"
android:layout_height="wrap_content"
android:layout_below="@+id/camera_capture_button"
android:layout_marginTop="40dp"
android:layout_above="@+id/camera_capture_button"
android:layout_marginBottom="40dp"
android:layout_centerHorizontal="true"
android:src="@drawable/ic_camera_front"
android:scaleType="fitCenter"

4
res/layout/camera_fragment.xml
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@color/core_black">
<TextureView
android:id="@+id/camera_preview"