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

refactor direct capture

Browse Source 
Closes #3516
// FREEBIE
This commit is contained in:
Jake McGinty
2015-06-08 11:07:46 -07:00
committed by Moxie Marlinspike
parent c4a37e38ab
commit 54a37cc658
33 changed files with 1720 additions and 1540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
res/drawable/quick_camera_shutter_ring.xml
View File

@@ -1,27 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape
android:innerRadiusRatio="3"
android:shape="ring"
android:thickness="2dp"
android:useLevel="false" >
<shape android:innerRadiusRatio="3"
android:shape="ring"
android:thickness="2dp"
android:useLevel="false">
<solid android:color="@android:color/white" />
<size
android:height="52dp"
android:width="52dp" />
<size android:height="@dimen/quick_camera_shutter_ring_size" android:width="@dimen/quick_camera_shutter_ring_size" />
</shape>
</item>
<item>
<shape
android:innerRadiusRatio="3"
android:shape="ring"
android:thickness="2dp"
android:useLevel="false" >
<shape android:innerRadiusRatio="3"
android:shape="ring"
android:thickness="2dp"
android:useLevel="false" >
<solid android:color="#40ffffff" />
<size
android:height="52dp"
android:width="52dp" />
<size android:height="@dimen/quick_camera_shutter_ring_size" android:width="@dimen/quick_camera_shutter_ring_size" />
</shape>
</item>
</selector>

37
res/layout-land/quick_camera_controls.xml
View File

@@ -1,37 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="bottom"
tools:background="@android:color/darker_gray">
<ImageButton
android:id="@+id/shutter_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/quick_camera_shutter_ring"
android:src="@drawable/quick_shutter_button"
android:padding="20dp"/>
<ImageButton
android:id="@+id/fullscreen_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:background="#00000000"
android:src="@drawable/quick_camera_fullscreen"
android:padding="20dp"/>
<ImageButton
android:id="@+id/swap_camera_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:background="#00000000"
android:src="@drawable/quick_camera_front"
android:padding="20dp"
android:visibility="invisible"
tools:visibility="visible"/>
</RelativeLayout>

23
res/layout/conversation_activity.xml
View File

@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -10,7 +9,7 @@
android:background="?conversation_background"
android:orientation="vertical">
<org.thoughtcrime.securesms.components.QuickAttachmentDrawer
<org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/quick_attachment_drawer"
android:layout_width="match_parent"
@@ -99,15 +98,17 @@
android:nextFocusForward="@+id/send_button"
android:nextFocusRight="@+id/send_button"
tools:hint="Send TextSecure message" />
</LinearLayout>
<ImageButton android:id="@+id/quick_attachment_toggle"
android:layout_width="wrap_content"
android:layout_height="44dp"
android:src="?quick_camera_icon"
android:background="@drawable/touch_highlight_background"
android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_description"
android:padding="10dp"/>
<org.thoughtcrime.securesms.components.camera.HidingImageButton
android:id="@+id/quick_attachment_toggle"
android:layout_width="37dp"
android:layout_height="37dp"
android:layout_gravity="bottom"
android:src="?quick_camera_icon"
android:background="@drawable/touch_highlight_background"
android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_description"
android:padding="10dp"/>
</LinearLayout>
<org.thoughtcrime.securesms.components.AnimatingToggle
android:id="@+id/button_toggle"
@@ -156,5 +157,5 @@
</LinearLayout>
</RelativeLayout>
</org.thoughtcrime.securesms.components.QuickAttachmentDrawer>
</org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer>
</org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout>

9
res/layout/quick_attachment_drawer.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<org.thoughtcrime.securesms.components.camera.QuickCamera
android:id="@+id/quick_camera"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</merge>

70
res/layout/quick_camera_controls.xml
View File

@@ -1,37 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="bottom"
tools:background="@android:color/darker_gray">
<ImageButton
android:id="@+id/shutter_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:background="@drawable/quick_camera_shutter_ring"
android:src="@drawable/quick_shutter_button"
android:padding="20dp"/>
<ImageButton
android:id="@+id/fullscreen_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:background="#00000000"
android:src="@drawable/quick_camera_fullscreen"
android:padding="20dp"/>
<ImageButton
android:id="@+id/swap_camera_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:background="#00000000"
android:src="@drawable/quick_camera_front"
android:padding="20dp"
android:visibility="invisible"
tools:visibility="visible"/>
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/controls"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="bottom"
tools:background="@android:color/darker_gray">
<ImageButton android:id="@+id/shutter_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:background="@drawable/quick_camera_shutter_ring"
android:src="@drawable/quick_shutter_button"
android:padding="20dp"/>
<ImageButton android:id="@+id/fullscreen_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:background="#00000000"
android:src="@drawable/quick_camera_fullscreen"
android:padding="20dp" />
<ImageButton android:id="@+id/swap_camera_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:background="#00000000"
android:src="@drawable/quick_camera_front"
android:padding="20dp"
android:visibility="invisible"
tools:visibility="visible" />
</RelativeLayout>

38
res/layout/quick_camera_controls_land.xml Normal file
View File

@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/controls"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="bottom"
tools:background="@android:color/darker_gray">
<ImageButton android:id="@+id/shutter_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/quick_camera_shutter_ring"
android:src="@drawable/quick_shutter_button"
android:padding="20dp"/>
<ImageButton android:id="@+id/fullscreen_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:background="#00000000"
android:src="@drawable/quick_camera_fullscreen"
android:padding="20dp"/>
<ImageButton android:id="@+id/swap_camera_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:background="#00000000"
android:src="@drawable/quick_camera_front"
android:padding="20dp"
android:visibility="invisible"
tools:visibility="visible"/>
</RelativeLayout>

3
res/values/dimens.xml
View File

@@ -22,11 +22,12 @@
<dimen name="media_bubble_height">210dp</dimen>
<dimen name="media_bubble_border_width">3dp</dimen>
<integer name="media_overview_cols">3</integer>
<dimen name="message_details_table_row_pad">10dp</dimen>
<dimen name="color_grid_extra_padding">32dp</dimen>
<dimen name="color_grid_item_size">48dp</dimen>
<dimen name="quick_media_drawer_default_height">250dp</dimen>
<dimen name="quick_camera_shutter_ring_size">52dp</dimen>
</resources>

2
res/values/strings.xml
View File

@@ -512,7 +512,7 @@
<string name="conversation_title_view__conversation_muted">Conversation muted</string>
<!-- conversation_activity -->
<string name="conversation_activity__type_message_push">Send TextSecure message</string>
<string name="conversation_activity__type_message_push">Send via TextSecure</string>
<string name="conversation_activity__type_message_sms_insecure">Send unsecured SMS</string>
<string name="conversation_activity__type_message_mms_insecure">Send unsecured MMS</string>
<string name="conversation_activity__send">Send</string>

1
res/values/themes.xml
View File

@@ -40,7 +40,6 @@
<item name="ic_arrow_forward">@drawable/ic_arrow_forward_dark</item>
<item name="lockscreen_watermark">@drawable/lockscreen_watermark_dark</item>
<item name="android:windowBackground">@color/black</item>
<item name="conversation_background">@color/black</item>
</style>
<style name="PopupAnimation" parent="@android:style/Animation">