Skip to content
Snippets Groups Projects
Commit 1f48029e authored by Jawnnypoo's avatar Jawnnypoo
Browse files

Parse emoji from their colon aliases :100: :100: :100:

parent 75f82b70
No related branches found
No related tags found
No related merge requests found
Pipeline #
Loading
Loading
@@ -125,6 +125,9 @@ dependencies {
compile 'com.afollestad.material-dialogs:core:0.9.0.1'
compile 'com.afollestad.material-dialogs:commons:0.9.0.1'
compile 'de.hdodenhof:circleimageview:2.1.0'
compile ('com.vdurmont:emoji-java:3.1.3') {
exclude group: 'org.json', module: 'json'
}
 
normalCompile('com.crashlytics.sdk.android:crashlytics:2.6.2@aar') {
transitive = true;
Loading
Loading
Loading
Loading
@@ -71,6 +71,9 @@ public class ProjectActivity extends BaseActivity {
private final Callback<Project> mProjectCallback = new EasyCallback<Project>() {
@Override
public void success(@NonNull Project response) {
mProgress.animate()
.alpha(0.0f)
.withEndAction(new HideRunnable(mProgress));
bindProject(response);
}
 
Loading
Loading
Loading
Loading
@@ -28,6 +28,7 @@ import com.commit451.gitlab.navigation.Navigator;
import com.commit451.gitlab.observable.DecodeObservableFactory;
import com.commit451.gitlab.util.BypassImageGetterFactory;
import com.squareup.otto.Subscribe;
import com.vdurmont.emoji.EmojiParser;
 
import java.util.List;
 
Loading
Loading
@@ -159,6 +160,7 @@ public class ProjectFragment extends ButterKnifeFragment {
String text = new String(bytes);
switch (getReadmeType(response.getFileName())) {
case README_TYPE_MARKDOWN:
text = EmojiParser.parseToUnicode(text);
mOverviewVew.setText(mBypass.markdownToSpannable(text,
BypassImageGetterFactory.create(mOverviewVew,
App.instance().getPicasso(),
Loading
Loading
Loading
Loading
@@ -18,6 +18,7 @@ import com.commit451.gitlab.transformation.CircleTransformation;
import com.commit451.gitlab.util.BypassImageGetterFactory;
import com.commit451.gitlab.util.DateUtil;
import com.commit451.gitlab.util.ImageUtil;
import com.vdurmont.emoji.EmojiParser;
 
import butterknife.BindView;
import butterknife.ButterKnife;
Loading
Loading
@@ -58,7 +59,9 @@ public class IssueHeaderViewHolder extends RecyclerView.ViewHolder {
App.instance().getPicasso(),
App.instance().getAccount().getServerUrl().toString(),
project);
mDescriptionView.setText(mBypass.markdownToSpannable(issue.getDescription(), getter));
String description = issue.getDescription();
description = EmojiParser.parseToUnicode(description);
mDescriptionView.setText(mBypass.markdownToSpannable(description, getter));
mDescriptionView.setMovementMethod(LinkMovementMethod.getInstance());
}
 
Loading
Loading
Loading
Loading
@@ -17,6 +17,7 @@ import com.commit451.gitlab.transformation.CircleTransformation;
import com.commit451.gitlab.util.BypassImageGetterFactory;
import com.commit451.gitlab.util.DateUtil;
import com.commit451.gitlab.util.ImageUtil;
import com.vdurmont.emoji.EmojiParser;
 
import butterknife.BindView;
import butterknife.ButterKnife;
Loading
Loading
@@ -50,7 +51,9 @@ public class MergeRequestHeaderViewHolder extends RecyclerView.ViewHolder {
mDescriptionView.setVisibility(View.GONE);
} else {
mDescriptionView.setVisibility(View.VISIBLE);
mDescriptionView.setText(bypass.markdownToSpannable(mergeRequest.getDescription(),
String description = mergeRequest.getDescription();
description = EmojiParser.parseToUnicode(description);
mDescriptionView.setText(bypass.markdownToSpannable(description,
BypassImageGetterFactory.create(mDescriptionView,
App.instance().getPicasso(),
App.instance().getAccount().getServerUrl().toString(),
Loading
Loading
Loading
Loading
@@ -17,6 +17,7 @@ import com.commit451.gitlab.transformation.CircleTransformation;
import com.commit451.gitlab.util.BypassImageGetterFactory;
import com.commit451.gitlab.util.DateUtil;
import com.commit451.gitlab.util.ImageUtil;
import com.vdurmont.emoji.EmojiParser;
 
import butterknife.BindView;
import butterknife.ButterKnife;
Loading
Loading
@@ -55,6 +56,7 @@ public class NoteViewHolder extends RecyclerView.ViewHolder {
String summary = "";
if (note.getBody() != null) {
summary = note.getBody();
summary = EmojiParser.parseToUnicode(summary);
}
 
BypassPicassoImageGetter getter = BypassImageGetterFactory.create(mSummaryView,
Loading
Loading
Loading
Loading
@@ -68,13 +68,6 @@
 
</LinearLayout>
 
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:gravity="center"
android:text="pssst... try tilting"
android:textSize="12dp"/>
</LinearLayout>
 
<include layout="@layout/progress"/>
Loading
Loading
Loading
Loading
@@ -289,7 +289,7 @@
<!-- About -->
<string name="about">About</string>
<string name="contributors">Contributors</string>
<string name="sauce">See the Sauce</string>
<string name="sauce">See the source</string>
<string name="source_url">https://gitlab.com/Commit451/LabCoat</string>
<string name="failed_to_load_contributors">Failed to load contributors :(</string>
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment