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

Allow the selection of fitzpatrick emoji.

Browse Source
This commit is contained in:
Greyson Parrelli
2018-10-23 23:37:09 -07:00
parent 1999d09901
commit 48ff9673b9
20 changed files with 486 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/drawable/emoji_variation_selector_background_light.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="5dp" />
<solid android:color="@color/core_white" />
</shape>

13
res/drawable/triangle_bottom_right_corner.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:pathData="M24,0 L0,24 L24,24 Z"
android:strokeColor="#00000000"
android:fillColor="#ffffff"/>
</vector>

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

@@ -0,0 +1,38 @@
<?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"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="2dp"
android:background="?selectableItemBackground">
<ImageView
android:id="@+id/emoji_image"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingTop="6dp"
android:paddingRight="6dp"
android:paddingLeft="6dp"
android:adjustViewBounds="true"
android:scaleType="fitCenter" />
<org.thoughtcrime.securesms.components.emoji.AsciiEmojiView
android:id="@+id/emoji_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="6dp"
android:paddingRight="6dp"
android:paddingLeft="6dp"
android:visibility="gone"/>
<ImageView
android:id="@+id/emoji_variation_hint"
android:layout_width="7dp"
android:layout_height="7dp"
android:layout_gravity="bottom|right|end"
app:srcCompat="@drawable/triangle_bottom_right_corner"
android:tint="@color/core_grey_25"/>
</FrameLayout>

2
res/layout/emoji_drawer.xml
View File

@@ -36,7 +36,7 @@
</LinearLayout>
<android.support.v4.view.ViewPager
<org.thoughtcrime.securesms.components.ControllableViewPager
android:id="@+id/emoji_pager"
android:visibility="visible"
android:layout_width="match_parent"

16
res/layout/emoji_grid_layout.xml
View File

@@ -4,15 +4,11 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<GridView android:id="@+id/emoji"
android:visibility="visible"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:stretchMode="columnWidth"
android:columnWidth="@dimen/emoji_drawer_size"
android:horizontalSpacing="0dp"
android:verticalSpacing="0dp"
android:numColumns="auto_fit"
android:gravity="center"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/emoji"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:paddingBottom="8dp"/>
</FrameLayout>

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

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/emoji_variation_selector_background_light">
</LinearLayout>

8
res/layout/emoji_variation_selector_item.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<ImageView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="50dp"
android:layout_height="50dp"
android:padding="6dp">
</ImageView>

1
res/values/dimens.xml
View File

@@ -8,6 +8,7 @@
<dimen name="emoji_drawer_item_padding">5dp</dimen>
<dimen name="emoji_drawer_indicator_height">1.5dp</dimen>
<dimen name="emoji_drawer_left_right_padding">5dp</dimen>
<dimen name="emoji_drawer_item_width">48dp</dimen>
<dimen name="conversation_item_body_text_size">16sp</dimen>
<dimen name="conversation_item_date_text_size">12sp</dimen>
<dimen name="transport_selection_popup_width">200sp</dimen>