diff options
author | lookshe <github@lookshe.org> | 2015-08-12 21:43:04 +0200 |
---|---|---|
committer | lookshe <github@lookshe.org> | 2015-08-12 21:43:04 +0200 |
commit | 4bb806585f6ccb02a1f25a69dafd57f17f1c7411 (patch) | |
tree | 29dcf543b7a7c1869411b838816cc6a2f4b85b84 /libs/emojicon/src/main/res/layout | |
parent | 0ee1992da2014d51e42c008b2ae39a6e1e033d0b (diff) |
merged latest version from https://github.com/firexel/emojicon/trz/emojicon-merge
but only seems to work with lollipop, so switch back to the old pictures
Diffstat (limited to '')
5 files changed, 53 insertions, 146 deletions
diff --git a/libs/emojicon/src/main/res/layout/emojicon_grid.xml b/libs/emojicon/src/main/res/layout/emojicon_grid.xml index 457f8756..d82f07a3 100644 --- a/libs/emojicon/src/main/res/layout/emojicon_grid.xml +++ b/libs/emojicon/src/main/res/layout/emojicon_grid.xml @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="utf-8"?><!-- ~ Copyright (C) 2013 Klamr. All rights reserved. ~ ~ This software is the confidential and proprietary information of Klamr or one of its @@ -16,12 +15,6 @@ <GridView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/Emoji_GridView" + style="?emojicon_grid_style" android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@android:color/transparent" - android:cacheColorHint="@android:color/transparent" - android:columnWidth="40dip" - android:horizontalSpacing="0dip" - android:numColumns="auto_fit" - android:scrollbars="vertical" - android:verticalSpacing="0dip" /> + android:layout_height="match_parent" /> diff --git a/libs/emojicon/src/main/res/layout/emojicon_item.xml b/libs/emojicon/src/main/res/layout/emojicon_item.xml index ed11041a..c5e765cb 100644 --- a/libs/emojicon/src/main/res/layout/emojicon_item.xml +++ b/libs/emojicon/src/main/res/layout/emojicon_item.xml @@ -1,32 +1,25 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright 2014 Ankush Sachdeva - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:emojicon="http://schemas.android.com/apk/res-auto" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + style="?emojicon_grid_item_style" + android:layout_width="64dp" + android:layout_height="64dp"> + + <TextView + android:id="@+id/emojiId" + style="?emojicon_id_style" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + tools:text="A68" /> + + <TextView + android:id="@+id/emojiContainer" + style="?emojicon_item_style" android:layout_width="wrap_content" - android:layout_height="wrap_content"> - <github.ankushsachdeva.emojicon.EmojiconTextView - android:layout_gravity="center" - android:id="@+id/emojicon_icon" - android:layout_width="36dip" - android:layout_height="36dip" - emojicon:emojiconSize="30dip" - android:focusable="false" - android:focusableInTouchMode="false" - android:gravity="center"/> -</FrameLayout>
\ No newline at end of file + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:layout_gravity="center" + tools:text=";)" /> + +</RelativeLayout>
\ No newline at end of file diff --git a/libs/emojicon/src/main/res/layout/emojicon_tab.xml b/libs/emojicon/src/main/res/layout/emojicon_tab.xml new file mode 100644 index 00000000..51492c38 --- /dev/null +++ b/libs/emojicon/src/main/res/layout/emojicon_tab.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<ImageButton xmlns:android="http://schemas.android.com/apk/res/android" + style="?emojicon_tab_item_style" + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_weight="1" />
\ No newline at end of file diff --git a/libs/emojicon/src/main/res/layout/emojicon_tab_divider.xml b/libs/emojicon/src/main/res/layout/emojicon_tab_divider.xml new file mode 100644 index 00000000..0228cc9e --- /dev/null +++ b/libs/emojicon/src/main/res/layout/emojicon_tab_divider.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<View xmlns:android="http://schemas.android.com/apk/res/android" + style="?emojicon_divider_style" + android:layout_width="1px" + android:layout_height="match_parent" />
\ No newline at end of file diff --git a/libs/emojicon/src/main/res/layout/emojicons.xml b/libs/emojicon/src/main/res/layout/emojicons.xml index 287923d1..f1e71624 100644 --- a/libs/emojicon/src/main/res/layout/emojicons.xml +++ b/libs/emojicon/src/main/res/layout/emojicons.xml @@ -1,119 +1,29 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright 2014 Ankush Sachdeva - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:background="@drawable/keyboard_background_holo" - android:layout_width="match_parent" - android:layout_height="match_parent"> + style="?emojicon_kbd_style" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <LinearLayout - android:id="@+id/emojis_tab" - android:layout_width="match_parent" - android:layout_height="50dip" - android:layout_alignParentTop="true" - android:orientation="horizontal"> - <ImageButton - android:background="@null" - android:layout_width="0dip" - android:layout_height="match_parent" - android:layout_weight="1" - android:scaleType="center" - android:id="@+id/emojis_tab_0_recents" - android:src="@drawable/ic_emoji_recent_light"/> - <View - android:layout_width="1px" - android:layout_height="match_parent" - android:background="#888888"/> - <ImageButton - android:background="@null" - android:layout_width="0dip" - android:layout_height="match_parent" - android:layout_weight="1" - android:scaleType="center" - android:id="@+id/emojis_tab_1_people" - android:src="@drawable/ic_emoji_people_light"/> - <View - android:layout_width="1px" - android:layout_height="match_parent" - android:background="#888888"/> - <ImageButton - android:background="@null" - android:layout_width="0dip" - android:layout_height="match_parent" - android:layout_weight="1" - android:scaleType="center" - android:id="@+id/emojis_tab_2_nature" - android:src="@drawable/ic_emoji_nature_light"/> - <View - android:layout_width="1px" - android:layout_height="match_parent" - android:background="#888888"/> - <ImageButton - android:background="@null" - android:layout_width="0dip" - android:layout_height="match_parent" - android:layout_weight="1" - android:scaleType="center" - android:id="@+id/emojis_tab_3_objects" - android:src="@drawable/ic_emoji_objects_light"/> - <View - android:layout_width="1px" - android:layout_height="match_parent" - android:background="#888888"/> - <ImageButton - android:background="@null" - android:layout_width="0dip" - android:layout_height="match_parent" - android:layout_weight="1" - android:scaleType="center" - android:id="@+id/emojis_tab_4_cars" - android:src="@drawable/ic_emoji_places_light"/> - <View - android:layout_width="1px" - android:layout_height="match_parent" - android:background="#888888"/> - <ImageButton - android:background="@null" - android:layout_width="0dip" - android:layout_height="match_parent" - android:layout_weight="1" - android:scaleType="center" - android:id="@+id/emojis_tab_5_punctuation" - android:src="@drawable/ic_emoji_symbols_light"/> - <View - android:layout_width="1px" - android:layout_height="match_parent" - android:background="#888888"/> - <ImageButton - android:background="@null" - android:layout_width="0dip" - android:layout_height="match_parent" - android:layout_weight="1" - android:id="@+id/emojis_backspace" - android:src="@drawable/sym_keyboard_delete_holo_dark"/> - </LinearLayout> + android:id="@+id/emojis_tab" + style="?emojicon_tab_bar_style" + android:layout_width="match_parent" + android:layout_height="?emojicon_tab_bar_height" + android:layout_alignParentTop="true" + android:orientation="horizontal" /> + <android.support.v4.view.ViewPager - android:layout_below="@id/emojis_tab" android:id="@+id/emojis_pager" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentBottom="true"/> + android:layout_alignParentBottom="true" + android:layout_below="@id/emojis_tab" /> + <View + style="?emojicon_divider_style" android:layout_width="match_parent" android:layout_height="1px" - android:layout_below="@id/emojis_tab" - android:background="#8f8f8f"/> + android:layout_below="@id/emojis_tab" /> + </RelativeLayout> |