Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Flag Images for 25+ countries and added the code for these flags #52

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,23 @@
branches:
only:
- master

- master
language: android
jdk: oraclejdk7
env:
global:
- secure: HFrTJGqM13CLydBxYKVDVzxyxML8ivAdb0Q7WZsqF0Ou+mrin9+uj4tIc6fGo5SJaXRV5pLEXE5aXfzMqhdv80WBafe0n7aQLizlOJG2Z6PhYu8ojY7hjtVnYUtYj62uoP+Vh/YgWiAjPGZ3No3NSNmJ0noJkaFkDP0xyUAs6TE=
- secure: QbNqQu3xj6erKQIy/r76vIjubmzqdZ8CpILRsb0S1bVuE6ntAFkyQlFUzkGgqiUXpxuXeM/U8yGQJND+S4X+zFvEnLftdkK5x/TpYLruVo+C0pSetn6AHmAeg6yRnoEOsEDbjTAMnlygwPd8T9R2TNt62HtEH/5H1w2FkGkWmrE=

- secure: PpcvmeijzW8Hm9GbLveIRyPXAYRoZIMIFYe+mQk3CCzO1CJU1TJPf/MLLmHsKavVFdBbgiiqijNwfxaE1kpvITryZm9+dpJ7B5xA8IQYV1vJw74bguNWNtGU4KXHBW4ALy54rKkuki6DCAZl2ZmSlDLQGFxw5BmFZJlQIhgDg1k=
- secure: TJfoJvz3AhR20Zi4GqZAXAR9HHFKGV/Y+8wpI8+rkE+f2946OcxLXgFoEw6XBWaf3JZ6+/XJ+SdSFoNsERp4+mPd8TCAYBCIhSC1Ma9MVg82F7+482UuPM8ShGRzOwf/dEZx4EMCiosbnfYYgNSUdlnYnBl6zlIUSaqFYG2nUno=
android:
components:
- tools
- platform-tools
- extra-android-support
- extra-android-m2repository
- android-22
- build-tools-22.0.1
- android-21
- build-tools-21.1.2
install:
- ./gradlew dependencies

- "./gradlew dependencies"
script:
- ./gradlew build

- "./gradlew build"
after_success:
- ./gradlew uploadArchives
- "./gradlew uploadArchives"
2 changes: 1 addition & 1 deletion example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,6 @@ if (project.hasProperty('keystorepassword')) {
}

dependencies {
compile 'com.android.support:appcompat-v7:22.2.1'
compile 'com.android.support:appcompat-v7:21.0.2'
compile project(':library')
}
6 changes: 3 additions & 3 deletions example/example.iml
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@
</content>
<orderEntry type="jdk" jdkName="Android API 21 Platform (1)" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.2" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.2" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-21.0.2" level="project" />
<orderEntry type="module" module-name="library" exported="" />
</component>
</module>
</module>
15 changes: 13 additions & 2 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,30 @@
buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.0.+'
}
}
apply plugin: 'com.android.library'
apply from: 'gradle-mvn-push.gradle'

ext.emojiconVersionName = "1.2-SNAPSHOT"
android {
compileSdkVersion 22
buildToolsVersion "22.0.1"

defaultConfig {
minSdkVersion 7
targetSdkVersion 22
targetSdkVersion 21
versionCode 3
versionName emojiconVersionName
}
lintOptions {
abortOnError false
}
}

dependencies {
compile 'com.android.support:support-v4:22.2.1'
compile 'com.android.support:support-v4:21.0.2'
}
8 changes: 4 additions & 4 deletions library/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
# limitations under the License.
#

VERSION_NAME=1.3.2-SNAPSHOT
VERSION_NAME=1.2-SNAPSHOT
VERSION_CODE=3
GROUP=com.rockerhieu.emojicon

POM_DESCRIPTION=A library to show emoji in TextView, EditText (like WhatsApp) for Android
Expand All @@ -32,6 +33,5 @@ POM_NAME=Emojicon Library for Android
POM_ARTIFACT_ID=library
POM_PACKAGING=aar


NEXUS_USERNAME=7gFAp0ww
NEXUS_PASSWORD=ZDWlqe836x/cdO3FZQRyjMQHpnP6Oy5eu0P3VObTbxij
NEXUS_USERNAME=rockerhieu
NEXUS_PASSWORD=hieminHIEMINSonatype
6 changes: 3 additions & 3 deletions library/library.iml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
</content>
<orderEntry type="jdk" jdkName="Android API 22 Platform (1)" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.2" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.2" level="project" />
</component>
</module>
</module>
1 change: 0 additions & 1 deletion library/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.rockerhieu.emojicon">

<application android:label="@string/app_name"/>
</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
*/
public class EmojiconEditText extends EditText {
private int mEmojiconSize;
private int mEmojiconAlignment;
private int mEmojiconTextSize;
private boolean mUseSystemDefault = false;

Expand Down Expand Up @@ -72,7 +71,7 @@ public void setEmojiconSize(int pixels) {
}

private void updateText() {
EmojiconHandler.addEmojis(getContext(), getText(), mEmojiconSize, mEmojiconAlignment, mEmojiconTextSize, mUseSystemDefault);
EmojiconHandler.addEmojis(getContext(), getText(), mEmojiconSize, mEmojiconTextSize, mUseSystemDefault);
}

/**
Expand Down
Loading