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

Add back the highlight and sticker tools.

Browse Source
This commit is contained in:
Greyson Parrelli
2019-03-21 10:47:59 -07:00
parent 749d096931
commit aa5e32f0ee
24 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
res/layout/scribble_hud.xml
View File

@@ -57,6 +57,22 @@
android:padding="8dp"
android:src="@drawable/ic_undo_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_highlight_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="8dp"
android:src="@drawable/ic_highlighter_36" />
<ImageView
android:id="@+id/scribble_text_button"
android:layout_width="wrap_content"
@@ -66,12 +82,12 @@
android:src="@drawable/ic_text_36" />
<ImageView
android:id="@+id/scribble_draw_button"
android:id="@+id/scribble_sticker_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="8dp"
android:src="@drawable/ic_marker_36" />
android:src="@drawable/ic_camera_emoji_36" />
<ImageView
android:id="@+id/scribble_confirm_button"

5
res/layout/scribble_select_sticker_activity.xml
View File

@@ -9,15 +9,14 @@
android:id="@+id/tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:tabBackground="@color/signal_primary"
app:tabBackground="@color/core_grey_90"
app:tabMode="fixed"/>
<android.support.v4.view.ViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1"
android:background="@android:color/white" />
android:layout_weight="1" />
</LinearLayout>