Skip to content

Commit

Permalink
bugfixes and new version of emojicon library.
Browse files Browse the repository at this point in the history
  • Loading branch information
pY4x3g committed Mar 30, 2015
1 parent 503fdff commit 3f06530
Show file tree
Hide file tree
Showing 77 changed files with 3,989 additions and 3,280 deletions.
4 changes: 2 additions & 2 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.redPanda"
android:versionCode="520"
android:versionName="0.1.520 beta">
android:versionCode="521"
android:versionName="0.1.521 beta">

<uses-sdk android:minSdkVersion="14"
android:targetSdkVersion="11" />
Expand Down
Binary file modified libs/bitchatj.jar
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/keyboard_background_holo.9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-mdpi/ic_emoji_places_light_normal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-mdpi/ic_emoji_symbols_light_normal.png
Binary file modified res/drawable-mdpi/ic_launcher.png
Binary file added res/drawable-mdpi/keyboard_background_holo.9.png
Binary file added res/drawable-mdpi/sym_keyboard_delete_holo_dark.png
Binary file added res/drawable-xhdpi/ic_launcher.png
Binary file added res/drawable-xhdpi/keyboard_background_holo.9.png
33 changes: 33 additions & 0 deletions res/drawable/ic_emoji_nature_light.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** 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.
*/
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_focused="true"
android:drawable="@drawable/ic_emoji_nature_light_activated" />
<item
android:state_pressed="true"
android:drawable="@drawable/ic_emoji_nature_light_activated" />
<item
android:state_selected="true"
android:drawable="@drawable/ic_emoji_nature_light_activated" />
<item
android:drawable="@drawable/ic_emoji_nature_light_normal" />
</selector>
32 changes: 32 additions & 0 deletions res/drawable/ic_emoji_objects_light.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** 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.
*/
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_focused="true"
android:drawable="@drawable/ic_emoji_objects_light_activated" />
<item
android:state_pressed="true"
android:drawable="@drawable/ic_emoji_objects_light_activated" />
<item
android:state_selected="true"
android:drawable="@drawable/ic_emoji_objects_light_activated" />
<item android:drawable="@drawable/ic_emoji_objects_light_normal" />
</selector>
32 changes: 32 additions & 0 deletions res/drawable/ic_emoji_people_light.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** 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.
*/
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_focused="true"
android:drawable="@drawable/ic_emoji_people_light_activated" />
<item
android:state_pressed="true"
android:drawable="@drawable/ic_emoji_people_light_activated" />
<item
android:state_selected="true"
android:drawable="@drawable/ic_emoji_people_light_activated" />
<item android:drawable="@drawable/ic_emoji_people_light_normal" />
</selector>
32 changes: 32 additions & 0 deletions res/drawable/ic_emoji_places_light.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** 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.
*/
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_focused="true"
android:drawable="@drawable/ic_emoji_places_light_activated" />
<item
android:state_pressed="true"
android:drawable="@drawable/ic_emoji_places_light_activated" />
<item
android:state_selected="true"
android:drawable="@drawable/ic_emoji_places_light_activated" />
<item android:drawable="@drawable/ic_emoji_places_light_normal" />
</selector>
32 changes: 32 additions & 0 deletions res/drawable/ic_emoji_recent_light.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** 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.
*/
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_focused="true"
android:drawable="@drawable/ic_emoji_recent_light_activated" />
<item
android:state_pressed="true"
android:drawable="@drawable/ic_emoji_recent_light_activated" />
<item
android:state_selected="true"
android:drawable="@drawable/ic_emoji_recent_light_activated" />
<item android:drawable="@drawable/ic_emoji_recent_light_normal" />
</selector>
32 changes: 32 additions & 0 deletions res/drawable/ic_emoji_symbols_light.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2013, The Android Open Source Project
**
** 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.
*/
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_focused="true"
android:drawable="@drawable/ic_emoji_symbols_light_activated" />
<item
android:state_pressed="true"
android:drawable="@drawable/ic_emoji_symbols_light_activated" />
<item
android:state_selected="true"
android:drawable="@drawable/ic_emoji_symbols_light_activated" />
<item android:drawable="@drawable/ic_emoji_symbols_light_normal" />
</selector>
55 changes: 27 additions & 28 deletions res/layout/emojicon_grid.xml
Original file line number Diff line number Diff line change
@@ -1,28 +1,27 @@
<?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
~ subsidiaries. You shall not disclose this confidential information and shall use it only in
~ accordance with the terms of the license agreement or other applicable agreement you entered into
~ with Klamr.
~
~ KLAMR MAKES NO REPRESENTATIONS OR WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE, EITHER
~ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
~ FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. KLAMR SHALL NOT BE LIABLE FOR ANY LOSSES
~ OR DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR
~ ITS DERIVATIVES.
-->

<GridView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/Emoji_GridView"
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="5dip"
android:paddingTop="5dip"
android:numColumns="auto_fit"
android:scrollbars="vertical"
android:verticalSpacing="5dip" />
<?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
~ subsidiaries. You shall not disclose this confidential information and shall use it only in
~ accordance with the terms of the license agreement or other applicable agreement you entered into
~ with Klamr.
~
~ KLAMR MAKES NO REPRESENTATIONS OR WARRANTIES ABOUT THE SUITABILITY OF THE SOFTWARE, EITHER
~ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY,
~ FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. KLAMR SHALL NOT BE LIABLE FOR ANY LOSSES
~ OR DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR
~ ITS DERIVATIVES.
-->

<GridView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/Emoji_GridView"
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" />
58 changes: 29 additions & 29 deletions res/layout/emojicon_item.xml
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2014 Hieu Rocker
~
~ 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"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<com.rockerhieu.emojicon.EmojiconTextView
android:layout_gravity="center"
android:id="@+id/emojicon_icon"
android:layout_width="32dip"
android:layout_height="32dip"
emojicon:emojiconSize="30dip"
android:gravity="center"/>
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2014 Hieu Rocker
~
~ 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"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<com.rockerhieu.emojicon.EmojiconTextView
android:layout_gravity="center"
android:id="@+id/emojicon_icon"
android:layout_width="36dip"
android:layout_height="36dip"
emojicon:emojiconSize="30dip"
android:gravity="center"/>
</FrameLayout>
Loading

0 comments on commit 3f06530

Please sign in to comment.