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

Add new twitter module and clean up gradle files #133

Merged
merged 1 commit into from
Jun 1, 2017
Merged
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ android {
dependencies {
compile project(':emoji-ios')
compile project(':emoji-google')
compile project(':emoji-twitter')
compile project(':emoji-one')

compile rootProject.ext.supportAppCompat
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import com.vanniktech.emoji.listeners.OnSoftKeyboardCloseListener;
import com.vanniktech.emoji.listeners.OnSoftKeyboardOpenListener;
import com.vanniktech.emoji.one.EmojiOneProvider;
import com.vanniktech.emoji.twitter.TwitterEmojiProvider;

public class MainActivity extends AppCompatActivity {
static final String TAG = "MainActivity";
Expand Down Expand Up @@ -93,6 +94,10 @@ public class MainActivity extends AppCompatActivity {
EmojiManager.install(new GoogleEmojiProvider());
recreate();
return true;
case R.id.variantTwitter:
EmojiManager.install(new TwitterEmojiProvider());
recreate();
return true;
case R.id.variantEmojiOne:
EmojiManager.install(new EmojiOneProvider());
recreate();
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/menu/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
<item
android:id="@+id/variantGoogle"
android:title="@string/variant_google_title"/>
<item
android:id="@+id/variantTwitter"
android:title="@string/variant_twitter_title"/>
<item
android:id="@+id/variantEmojiOne"
android:title="@string/variant_emojione_title"/>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<string name="variant_group_title">Emoji Variant</string>
<string name="variant_ios_title">Ios</string>
<string name="variant_google_title">Google</string>
<string name="variant_twitter_title">Twitter</string>
<string name="variant_emojione_title">EmojiOne</string>
<string name="show_dialog_title">Show Dialog</string>
</resources>
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ codeQualityTools {
}

junitJacoco {
ignoreProjects = ['app', 'emoji-ios', 'emoji-google', 'emoji-one'] // Don't care about sample and generated modules
ignoreProjects = ['app', 'emoji-ios', 'emoji-google', 'emoji-twitter', 'emoji-one'] // Don't care about sample and generated modules
}

subprojects {
Expand Down
8 changes: 0 additions & 8 deletions emoji-google/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@ android {

dependencies {
compile project(':emoji')

compile rootProject.ext.supportV4Compat

testCompile rootProject.ext.testing.junit
testCompile rootProject.ext.testing.mockito
testCompile rootProject.ext.testing.assertJ
testCompile rootProject.ext.testing.robolectric
testCompile rootProject.ext.testing.privateConstructor
}

apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
8 changes: 0 additions & 8 deletions emoji-ios/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@ android {

dependencies {
compile project(':emoji')

compile rootProject.ext.supportV4Compat

testCompile rootProject.ext.testing.junit
testCompile rootProject.ext.testing.mockito
testCompile rootProject.ext.testing.assertJ
testCompile rootProject.ext.testing.robolectric
testCompile rootProject.ext.testing.privateConstructor
}

apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
8 changes: 0 additions & 8 deletions emoji-one/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@ android {

dependencies {
compile project(':emoji')

compile rootProject.ext.supportV4Compat

testCompile rootProject.ext.testing.junit
testCompile rootProject.ext.testing.mockito
testCompile rootProject.ext.testing.assertJ
testCompile rootProject.ext.testing.robolectric
testCompile rootProject.ext.testing.privateConstructor
}

apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
1 change: 1 addition & 0 deletions emoji-twitter/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
23 changes: 23 additions & 0 deletions emoji-twitter/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion rootProject.ext.compileSdkVersion as int
buildToolsVersion rootProject.ext.buildToolsVersion as String

compileOptions {
sourceCompatibility rootProject.ext.javaVersion as JavaVersion
targetCompatibility rootProject.ext.javaVersion as JavaVersion
}

defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion as int
}

resourcePrefix 'emoji'
}

dependencies {
compile project(':emoji')
}

apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
3 changes: 3 additions & 0 deletions emoji-twitter/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
POM_NAME=Emoji
POM_ARTIFACT_ID=emoji-twitter
POM_PACKAGING=aar
4 changes: 4 additions & 0 deletions emoji-twitter/lint.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<lint>
<issue id="IconMissingDensityFolder" severity="ignore" />
</lint>
1 change: 1 addition & 0 deletions emoji-twitter/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<manifest package="com.vanniktech.emoji.twitter" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package com.vanniktech.emoji.twitter;

import android.support.annotation.NonNull;
import com.vanniktech.emoji.EmojiProvider;
import com.vanniktech.emoji.emoji.EmojiCategory;
import com.vanniktech.emoji.twitter.category.ActivityCategory;
import com.vanniktech.emoji.twitter.category.FlagsCategory;
import com.vanniktech.emoji.twitter.category.FoodCategory;
import com.vanniktech.emoji.twitter.category.NatureCategory;
import com.vanniktech.emoji.twitter.category.ObjectsCategory;
import com.vanniktech.emoji.twitter.category.PeopleCategory;
import com.vanniktech.emoji.twitter.category.SymbolsCategory;
import com.vanniktech.emoji.twitter.category.TravelCategory;

public final class TwitterEmojiProvider implements EmojiProvider {
@Override @NonNull public EmojiCategory[] getCategories() {
return new EmojiCategory[] {
new PeopleCategory(),
new NatureCategory(),
new FoodCategory(),
new ActivityCategory(),
new TravelCategory(),
new ObjectsCategory(),
new SymbolsCategory(),
new FlagsCategory()
};
}
}
Loading