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

Updated media send UI.

Browse Source
This commit is contained in:
Greyson Parrelli
2019-03-14 17:01:23 -07:00
parent d8a56be5e8
commit 64cf032181
142 changed files with 651 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/camera_controls_landscape.xml
View File

@@ -23,7 +23,7 @@
android:layout_above="@+id/camera_capture_button"
android:layout_marginBottom="40dp"
android:layout_centerHorizontal="true"
android:src="@drawable/ic_camera_front"
android:src="@drawable/ic_switch_camera_36"
android:scaleType="fitCenter"
android:background="?selectableItemBackgroundBorderless"
android:visibility="gone"

2
res/layout/camera_controls_portrait.xml
View File

@@ -24,7 +24,7 @@
android:layout_marginRight="40dp"
android:layout_marginEnd="40dp"
android:layout_centerVertical="true"
android:src="@drawable/ic_camera_front"
android:src="@drawable/ic_switch_camera_36"
android:scaleType="fitCenter"
android:background="?selectableItemBackgroundBorderless"
android:visibility="gone"

36
res/layout/media_preview_album_rail_item.xml
View File

@@ -1,36 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:animateLayoutChanges="true">
<org.thoughtcrime.securesms.components.ThumbnailView
android:id="@+id/rail_item_image"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_margin="2dp"
android:padding="2dp"
android:background="@drawable/media_rail_item_background"
app:thumbnail_radius="0dp"/>
<ImageView
android:layout_width="52dp"
android:layout_height="52dp"
android:layout_gravity="center"
android:src="@drawable/mediapicker_item_border_dark"/>
<ImageView
android:id="@+id/rail_item_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|end|top"
android:src="@drawable/ic_x_circle"
android:elevation="8dp"
android:visibility="gone"
tools:visibility="visible"/>
</FrameLayout>

16
res/layout/mediarail_button_item.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_margin="2dp"
android:background="@drawable/mediarail_button_background">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/ic_plus_28"
android:elevation="4dp" />
</FrameLayout>

55
res/layout/mediarail_media_item.xml Normal file
View File

@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="57dp"
android:layout_height="57dp"
android:layout_margin="2dp"
android:animateLayoutChanges="true">
<org.thoughtcrime.securesms.components.ThumbnailView
android:id="@+id/rail_item_image"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_gravity="center"
android:background="@drawable/mediarail_media_outline"
app:thumbnail_radius="5dp"/>
<ImageView
android:id="@+id/rail_item_outline"
android:layout_width="57dp"
android:layout_height="57dp"
android:layout_gravity="center"
android:src="@drawable/mediarail_media_outline"
android:visibility="gone"
tools:visibility="visible"/>
<ImageView
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_gravity="center"
android:src="@drawable/mediapicker_item_border_dark"/>
<ImageView
android:id="@+id/rail_item_caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|start|top"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:src="@drawable/ic_caption_28"
android:visibility="gone"
tools:visibility="visible"/>
<ImageView
android:id="@+id/rail_item_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|end|top"
android:layout_margin="1dp"
android:src="@drawable/ic_x_28"
android:visibility="gone"
tools:visibility="visible"/>
</FrameLayout>

16
res/layout/mediasend_activity.xml
View File

@@ -51,4 +51,20 @@
</LinearLayout>
<ImageView
android:id="@+id/mediasend_camera_button"
android:layout_width="44dp"
android:layout_height="44dp"
android:layout_marginBottom="32dp"
android:layout_marginLeft="32dp"
android:layout_marginStart="32dp"
android:layout_gravity="bottom|left|start"
android:padding="12dp"
android:src="@drawable/ic_camera_filled_24"
android:tint="@color/core_grey_60"
android:background="@drawable/media_camera_button_background"
android:elevation="4dp"
android:visibility="gone"
tools:visibility="visible"/>
</FrameLayout>

51
res/layout/mediasend_fragment.xml
View File

@@ -37,56 +37,41 @@
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:paddingTop="6dp"
android:paddingBottom="6dp"
style="@style/Signal.Text.Body"
android:paddingTop="11dp"
android:paddingBottom="11dp"
android:drawableLeft="@drawable/ic_add_caption"
android:drawableStart="@drawable/ic_add_caption"
android:drawablePadding="6dp"
android:maxLines="3"
android:maxLength="240"
android:hint="@string/MediaSendActivity_add_a_caption"
android:autoText="true"
android:inputType="textAutoCorrect|textCapSentences|textMultiLine"
android:background="@null"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/mediasend_media_rail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="2dp"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
tools:layout_height="64dp"/>
<LinearLayout
android:id="@+id/mediasend_compose_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:layout_marginTop="12dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:orientation="horizontal"
android:paddingBottom="6dp">
<ImageView
android:id="@+id/mediasend_add_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:src="@drawable/ic_add_photo"
android:background="?selectableItemBackgroundBorderless"
android:visibility="gone"
tools:visibility="visible"/>
android:layout_marginBottom="12dp"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:paddingLeft="10dp"
android:paddingStart="10dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:orientation="horizontal"
android:background="@drawable/compose_background_camera">
@@ -152,10 +137,9 @@
android:id="@+id/mediasend_characters_left"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:paddingBottom="6dp"
android:paddingBottom="12dp"
android:visibility="gone"
tools:visibility="visible"
tools:text="160/160 (1)" />
@@ -171,13 +155,4 @@
</org.thoughtcrime.securesms.components.InputAwareLayout>
<!--<com.pnikosis.materialishprogress.ProgressWheel-->
<!--android:id="@+id/mediasend_progress_wheel"-->
<!--android:layout_width="70dp"-->
<!--android:layout_height="70dp"-->
<!--android:visibility="gone"-->
<!--android:layout_gravity="center"-->
<!--app:matProg_barColor="@color/white"-->
<!--app:matProg_progressIndeterminate="true" />-->
</FrameLayout>

141
res/layout/scribble_hud.xml
View File

@@ -9,95 +9,110 @@
tools:parentTag="android.widget.LinearLayout"
tools:background="@color/core_grey_60">
<FrameLayout
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
android:layout_weight="1"
android:animateLayoutChanges="true">
<ImageView
android:id="@+id/scribble_save_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|left|start"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="12dp"
android:src="@drawable/ic_scribble_save"
android:background="?attr/selectableItemBackgroundBorderless"/>
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/scribble_toolbar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_gravity="top|right|end"
android:orientation="vertical"
android:animateLayoutChanges="true">
<ImageView
android:id="@+id/scribble_text_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_scribble_text"
android:padding="12dp"
android:background="?attr/selectableItemBackgroundBorderless"/>
<ImageView
android:id="@+id/scribble_draw_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_scribble_brush"
android:padding="12dp"
android:background="?attr/selectableItemBackgroundBorderless"/>
<ImageView
android:id="@+id/scribble_highlight_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_scribble_highlight"
android:padding="12dp"
android:background="?attr/selectableItemBackgroundBorderless"/>
<ImageView
android:id="@+id/scribble_sticker_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_scribble_sticker"
android:padding="12dp"
android:background="?attr/selectableItemBackgroundBorderless"/>
<ImageView
android:id="@+id/scribble_undo_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_scribble_undo"
android:padding="12dp"
android:background="?attr/selectableItemBackgroundBorderless"/>
android:layout_marginTop="8dp"
android:layout_marginEnd="10dp"
android:layout_marginRight="10dp"
android:animateLayoutChanges="true"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/scribble_delete_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_scribble_delete"
android:padding="12dp"
android:background="?attr/selectableItemBackgroundBorderless"/>
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="8dp"
android:src="@drawable/ic_trash_outline_36" />
<org.thoughtcrime.securesms.scribbles.widget.VerticalSlideColorPicker
android:id="@+id/scribble_color_picker"
android:layout_width="26dp"
android:layout_height="170dp"
android:layout_gravity="center"
android:layout_marginTop="12dp"
app:pickerBorderWidth="4dp"
app:pickerBorderColor="@color/white"
app:pickerColors="@array/scribble_colors"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/scribble_color_palette"
<ImageView
android:id="@+id/scribble_undo_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_gravity="center_horizontal"/>
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="8dp"
android:src="@drawable/ic_undo_36" />
<ImageView
android:id="@+id/scribble_text_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="8dp"
android:src="@drawable/ic_text_36" />
<ImageView
android:id="@+id/scribble_draw_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="8dp"
android:src="@drawable/ic_marker_36" />
<ImageView
android:id="@+id/scribble_confirm_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="8dp"
android:src="@drawable/ic_check_circle_filled_36" />
</LinearLayout>
</FrameLayout>
<org.thoughtcrime.securesms.scribbles.widget.VerticalSlideColorPicker
android:id="@+id/scribble_color_picker"
android:layout_width="32dp"
android:layout_height="250dp"
android:layout_below="@id/scribble_toolbar"
android:layout_gravity="center_horizontal"
android:layout_marginTop="32dp"
android:layout_marginEnd="10dp"
android:layout_marginRight="10dp"
app:layout_constraintEnd_toEndOf="@+id/scribble_toolbar"
app:layout_constraintTop_toBottomOf="@+id/scribble_toolbar"
app:pickerBorderColor="@color/white"
app:pickerBorderWidth="3dp"
app:pickerColors="@array/scribble_colors" />
<android.support.v7.widget.RecyclerView
android:id="@+id/scribble_color_palette"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_below="@id/scribble_color_picker"
android:layout_alignEnd="@id/scribble_color_picker"
android:layout_alignRight="@id/scribble_color_picker"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/scribble_color_picker"
app:layout_constraintTop_toBottomOf="@+id/scribble_color_picker"
app:layout_constraintVertical_bias="0.0" />
</android.support.constraint.ConstraintLayout>
<LinearLayout
android:id="@+id/scribble_compose_container"

2
res/layout/thumbnail_view.xml
View File

@@ -19,7 +19,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="6dp"
android:src="@drawable/ic_caption"
android:src="@drawable/ic_caption_28"
android:visibility="gone" />
<FrameLayout