sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-14 10:11:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update emoji library

Browse source
This commit is contained in:
Phillip Thelen 2016-06-21 11:28:51 +02:00
parent 8f7f447230
commit 94f826119a
23 changed files with 42 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/AndroidManifest.xml
View file

@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.habitrpg.android.habitica"
android:versionCode="89"
android:versionCode="90"
android:versionName="0.0.31.0"
android:screenOrientation="portrait"
android:installLocation="auto" >

16
Habitica/build.gradle
View file

@ -71,18 +71,18 @@ dependencies {
compile('com.mikepenz:materialdrawer:5.2.6@aar') {
transitive = true
}
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:design:23.4.0'
compile 'com.android.support:gridlayout-v7:23.4.0'
compile 'com.android.support:recyclerview-v7:23.4.0'
compile 'com.android.support:preference-v14:23.4.0'
compile 'com.android.support:appcompat-v7:24.0.0'
compile 'com.android.support:design:24.0.0'
compile 'com.android.support:gridlayout-v7:24.0.0'
compile 'com.android.support:recyclerview-v7:24.0.0'
compile 'com.android.support:preference-v14:24.0.0'
compile 'com.android.support:multidex:1.0.1'
// Image Loading/Caching
compile 'com.squareup.picasso:picasso:2.5.2'
// Emojis
compile 'com.github.data5tream:emoji-lib:0.0.2.1'
compile 'com.github.viirus:emoji-lib:0.0.3.2'
// Markdown
compile 'com.commonsware.cwac:anddown:0.2.4'
@ -133,7 +133,7 @@ dependencies {
testCompile 'org.robolectric:robolectric:3.0'
testCompile 'org.robolectric:shadows-multidex:3.0'
testCompile "org.robolectric:shadows-support-v4:3.0"
testCompile "org.mockito:mockito-core:1.+"
testCompile "org.mockito:mockito-core:1.10.19"
//Leak Detection
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1'
@ -141,7 +141,7 @@ dependencies {
}
android {
compileSdkVersion 23
compileSdkVersion 24
buildToolsVersion "23.0.3"
lintOptions {

2
Habitica/res/layout/activity_group_form.xml
View file

@ -42,7 +42,7 @@
android:layout_height="match_parent"
app:hintTextAppearance="@style/TextAppearance.AppCompat">
<com.github.data5tream.emojilib.EmojiEditText
<net.pherth.android.emoji_library.EmojiEditText
android:id="@+id/group_description_edittext"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
Habitica/res/layout/activity_maintenance.xml
View file

@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="180dp"
android:scaleType="centerInside"/>
<com.github.data5tream.emojilib.EmojiTextView
<net.pherth.android.emoji_library.EmojiTextView
android:id="@+id/descriptionTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>

6
Habitica/res/layout/activity_task_form.xml
View file

@ -38,7 +38,7 @@
android:layout_height="match_parent"
app:hintTextAppearance="@style/TextAppearance.AppCompat">
<com.github.data5tream.emojilib.EmojiEditText
<net.pherth.android.emoji_library.EmojiEditText
android:id="@+id/task_text_edittext"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -66,7 +66,7 @@
android:layout_height="72dp"
app:hintTextAppearance="@style/TextAppearance.AppCompat">
<com.github.data5tream.emojilib.EmojiEditText
<net.pherth.android.emoji_library.EmojiEditText
android:id="@+id/task_notes_edittext"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -232,7 +232,7 @@
android:background="@drawable/md_transparent"
android:contentDescription="Toogle Emoji" />
<com.github.data5tream.emojilib.EmojiEditText
<net.pherth.android.emoji_library.EmojiEditText
android:id="@+id/new_checklist"
android:layout_width="0dp"
android:layout_height="wrap_content"

2
Habitica/res/layout/checklist_item.xml
View file

@ -17,7 +17,7 @@
android:id="@+id/delete_item_button"
android:text="x" />
<com.github.data5tream.emojilib.EmojiEditText
<net.pherth.android.emoji_library.EmojiEditText
android:layout_width="0dp"
android:layout_height="wrap_content"
android:id="@+id/item_edittext"

2
Habitica/res/layout/checklist_item_row.xml
View file

@ -19,7 +19,7 @@
android:button="@drawable/daily_checkbox"
android:layout_gravity="center_horizontal" />
</RelativeLayout>
<com.github.data5tream.emojilib.EmojiTextView
<net.pherth.android.emoji_library.EmojiTextView
android:id="@+id/checkedTextView"
style="@style/CardTitle"
android:layout_width="match_parent"

4
Habitica/res/layout/daily_item_card.xml
View file

@ -32,12 +32,12 @@
android:paddingTop="@dimen/task_top_bottom_padding"
android:id="@+id/linearLayout"
android:layout_weight="1">
<com.github.data5tream.emojilib.EmojiTextView
<net.pherth.android.emoji_library.EmojiTextView
android:id="@+id/checkedTextView"
style="@style/CardTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<com.github.data5tream.emojilib.EmojiTextView
<net.pherth.android.emoji_library.EmojiTextView
android:id="@+id/notesTextView"
style="@style/CardText"
android:layout_width="match_parent"

4
Habitica/res/layout/fragment_group_info.xml
View file

@ -61,7 +61,7 @@
android:divider="?android:listDivider"
android:showDividers="middle"
android:orientation="vertical">
<com.github.data5tream.emojilib.EmojiTextView
<net.pherth.android.emoji_library.EmojiTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
bind:parsemarkdown="@{group.description}" />
@ -74,7 +74,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@{@string/leaderMessage(group.leaderName)}" />
<com.github.data5tream.emojilib.EmojiTextView
<net.pherth.android.emoji_library.EmojiTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
bind:parsemarkdown="@{group.leaderMessage}"/>

4
Habitica/res/layout/habit_item_card.xml
View file

@ -56,13 +56,13 @@
android:paddingEnd="16dp"
android:paddingBottom="@dimen/task_top_bottom_padding"
android:paddingTop="@dimen/task_top_bottom_padding">
<com.github.data5tream.emojilib.EmojiTextView
<net.pherth.android.emoji_library.EmojiTextView
android:id="@+id/checkedTextView"
style="@style/CardTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<com.github.data5tream.emojilib.EmojiTextView
<net.pherth.android.emoji_library.EmojiTextView
android:id="@+id/notesTextView"
style="@style/CardText"
android:layout_width="match_parent"

4
Habitica/res/layout/reward_item_card.xml
View file

@ -24,13 +24,13 @@
android:paddingRight="@dimen/reward_spacing"
android:layout_gravity="center_vertical">
<com.github.data5tream.emojilib.EmojiTextView
<net.pherth.android.emoji_library.EmojiTextView
android:id="@+id/checkedTextView"
style="@style/CardTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<com.github.data5tream.emojilib.EmojiTextView
<net.pherth.android.emoji_library.EmojiTextView
android:id="@+id/notesTextView"
style="@style/CardText"
android:layout_width="match_parent"

2
Habitica/res/layout/tavern_chat_item.xml
View file

@ -96,7 +96,7 @@
</LinearLayout>
</LinearLayout>
<com.github.data5tream.emojilib.EmojiTextView
<net.pherth.android.emoji_library.EmojiTextView
android:id="@+id/message_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
Habitica/res/layout/tavern_chat_new_entry_item.xml
View file

@ -34,7 +34,7 @@
android:layout_weight="1"
app:hintTextAppearance="@style/TextAppearance.AppCompat">
<com.github.data5tream.emojilib.EmojiEditText
<net.pherth.android.emoji_library.EmojiEditText
android:id="@+id/edit.new.message.text"
android:layout_width="match_parent"
android:layout_height="wrap_content"

4
Habitica/res/layout/todo_item_card.xml
View file

@ -32,13 +32,13 @@
android:paddingBottom="@dimen/task_top_bottom_padding"
android:paddingTop="@dimen/task_top_bottom_padding"
android:layout_weight="1">
<com.github.data5tream.emojilib.EmojiTextView
<net.pherth.android.emoji_library.EmojiTextView
android:id="@+id/checkedTextView"
style="@style/CardTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<com.github.data5tream.emojilib.EmojiTextView
<net.pherth.android.emoji_library.EmojiTextView
android:id="@+id/notesTextView"
style="@style/CardText"
android:layout_width="match_parent"

5
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.java
View file

@ -1,12 +1,13 @@
package com.habitrpg.android.habitica.ui.activities;
import com.github.data5tream.emojilib.EmojiEditText;
import com.github.data5tream.emojilib.EmojiPopup;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.components.AppComponent;
import com.habitrpg.android.habitica.ui.helpers.UiUtils;
import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
import net.pherth.android.emoji_library.EmojiEditText;
import net.pherth.android.emoji_library.EmojiPopup;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.java
View file

@ -1,6 +1,6 @@
package com.habitrpg.android.habitica.ui.activities;
import com.github.data5tream.emojilib.EmojiTextView;
import net.pherth.android.emoji_library.EmojiTextView;
import com.habitrpg.android.habitica.APIHelper;
import com.habitrpg.android.habitica.HabiticaApplication;
import com.habitrpg.android.habitica.HostConfig;

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
View file

@ -1,7 +1,7 @@
package com.habitrpg.android.habitica.ui.activities;
import com.github.data5tream.emojilib.EmojiEditText;
import com.github.data5tream.emojilib.EmojiPopup;
import net.pherth.android.emoji_library.EmojiEditText;
import net.pherth.android.emoji_library.EmojiPopup;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.components.AppComponent;
import com.habitrpg.android.habitica.events.TaskSaveEvent;

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
View file

@ -1,7 +1,7 @@
package com.habitrpg.android.habitica.ui.adapter.social;
import com.github.data5tream.emojilib.EmojiEditText;
import com.github.data5tream.emojilib.EmojiTextView;
import net.pherth.android.emoji_library.EmojiEditText;
import net.pherth.android.emoji_library.EmojiTextView;
import com.habitrpg.android.habitica.HabiticaApplication;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.events.commands.CopyChatAsTodoCommand;

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java
View file

@ -1,6 +1,6 @@
package com.habitrpg.android.habitica.ui.adapter.tasks;
import com.github.data5tream.emojilib.EmojiEditText;
import net.pherth.android.emoji_library.EmojiEditText;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperAdapter;
import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperViewHolder;

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.java
View file

@ -1,6 +1,6 @@
package com.habitrpg.android.habitica.ui.helpers;
import com.github.data5tream.emojilib.EmojiTextView;
import net.pherth.android.emoji_library.EmojiTextView;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.databinding.ValueBarBinding;
import com.squareup.picasso.Picasso;

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/EmojiKeyboard.java
View file

@ -1,7 +1,7 @@
package com.habitrpg.android.habitica.ui.helpers;
import com.github.data5tream.emojilib.EmojiEditText;
import com.github.data5tream.emojilib.EmojiPopup;
import net.pherth.android.emoji_library.EmojiEditText;
import net.pherth.android.emoji_library.EmojiPopup;
import com.habitrpg.android.habitica.R;
import android.content.Context;

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.java
View file

@ -1,7 +1,7 @@
package com.habitrpg.android.habitica.ui.helpers;
import com.commonsware.cwac.anddown.AndDown;
import com.github.data5tream.emojilib.EmojiParser;
import net.pherth.android.emoji_library.EmojiParser;
import android.text.Html;

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java
View file

@ -1,6 +1,6 @@
package com.habitrpg.android.habitica.ui.viewHolders.tasks;
import com.github.data5tream.emojilib.EmojiTextView;
import net.pherth.android.emoji_library.EmojiTextView;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.events.commands.ChecklistCheckedCommand;
import com.habitrpg.android.habitica.events.TaskSaveEvent;