sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-22 21:57:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bump up emoji size. Fixes #1065

Browse source
This commit is contained in:
Phillip Thelen 2019-02-28 16:47:24 +01:00
parent d0da491922
commit 2974409c93
17 changed files with 41 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -67,7 +67,7 @@
android:layout_marginStart="26dp"
android:orientation="vertical">
<net.pherth.android.emoji_library.EmojiTextView
<com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
android:id="@+id/challenge_name"
style="@style/Headline"
android:layout_width="match_parent"
@ -75,7 +75,7 @@
android:maxLines="2"
android:textColor="@color/textColorDark" />
<net.pherth.android.emoji_library.EmojiTextView
<com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
android:id="@+id/challenge_description"
style="@style/Body2"
android:layout_width="match_parent"

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"/>
<net.pherth.android.emoji_library.EmojiTextView
<com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
android:id="@+id/descriptionTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>

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

@ -6,7 +6,7 @@
android:paddingBottom="@dimen/spacing_medium"
android:paddingStart="@dimen/spacing_large"
android:paddingEnd="@dimen/spacing_large">
<net.pherth.android.emoji_library.EmojiTextView
<com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
android:id="@+id/emoji_textview"
android:layout_width="wrap_content"
android:layout_height="30dp"

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

@ -50,7 +50,7 @@
android:orientation="vertical">
<net.pherth.android.emoji_library.EmojiTextView
<com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
android:id="@+id/challenge_name"
style="@style/ChallengeName"
android:layout_width="match_parent"
@ -58,7 +58,7 @@
android:maxLines="3"
tools:text="Name" />
<net.pherth.android.emoji_library.EmojiTextView
<com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
android:id="@+id/challenge_shorttext"
android:layout_width="match_parent"
android:layout_height="wrap_content"

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

@ -18,7 +18,7 @@
android:button="@drawable/checklist_checkbox"
android:layout_gravity="center" />
</FrameLayout>
<net.pherth.android.emoji_library.EmojiTextView
<com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
android:id="@+id/checkedTextView"
style="@style/Body2"
android:layout_width="match_parent"

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

@ -76,7 +76,7 @@
android:scrollbars="vertical">
<net.pherth.android.emoji_library.EmojiTextView
<com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
android:id="@+id/challenge_name"
style="@style/Title2"
android:layout_width="wrap_content"
@ -84,7 +84,7 @@
android:layout_marginTop="9dp"
tools:text="Read a book by or about a person in your field of study" />
<net.pherth.android.emoji_library.EmojiTextView
<com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
android:id="@+id/challenge_description"
style="@style/Body2"
android:layout_width="wrap_content"

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

@ -31,7 +31,7 @@
android:layout_gravity="center"
android:layout_weight="3">
<net.pherth.android.emoji_library.EmojiTextView
<com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
android:id="@+id/daily_title"
style="@style/Body1"
android:layout_width="wrap_content"

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

@ -32,7 +32,7 @@
android:layout_gravity="center"
android:layout_weight="3">
<net.pherth.android.emoji_library.EmojiTextView
<com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
android:id="@+id/habit_title"
style="@style/Body1"
android:layout_width="wrap_content"

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

@ -18,7 +18,7 @@
android:layout_marginRight="15.5dp"
android:layout_marginStart="14.5dp"
android:layout_marginTop="18dp" />
<net.pherth.android.emoji_library.EmojiTextView
<com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
android:id="@+id/reward_title"
style="@style/Body1"
android:layout_width="wrap_content"

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

@ -31,7 +31,7 @@
android:layout_gravity="center"
android:layout_weight="3">
<net.pherth.android.emoji_library.EmojiTextView
<com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
android:id="@+id/todo_title"
style="@style/Body1"
android:layout_width="wrap_content"

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

@ -34,7 +34,7 @@
android:button="@drawable/daily_checkbox"
android:gravity="center" />
</FrameLayout>
<net.pherth.android.emoji_library.EmojiTextView
<com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
android:id="@+id/text_view"
style="@style/Subheader3"
android:layout_width="match_parent"

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

@ -20,7 +20,7 @@
android:orientation="vertical"
android:paddingLeft="16dp"
android:paddingRight="16dp">
<net.pherth.android.emoji_library.EmojiTextView
<com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
android:id="@+id/challenge_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -174,7 +174,7 @@
android:layout_height="wrap_content"
app:title="@string/challenge_categories"
android:background="@color/white">
<net.pherth.android.emoji_library.EmojiTextView
<com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
android:id="@+id/challenge_description"
style="@style/Body2"
android:layout_width="wrap_content"

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

@ -177,13 +177,13 @@
android:showDividers="middle"
android:orientation="vertical">
<net.pherth.android.emoji_library.EmojiTextView
<com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
android:id="@+id/groupSummaryView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/spacing_medium" />
<net.pherth.android.emoji_library.EmojiTextView
<com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
android:id="@+id/groupDescriptionView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

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

@ -21,13 +21,13 @@
android:paddingEnd="16dp"
android:paddingBottom="20dp"
android:paddingTop="20dp">
<net.pherth.android.emoji_library.EmojiTextView
<com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
android:id="@+id/titleTextView"
style="@style/CardTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<net.pherth.android.emoji_library.EmojiTextView
<com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
android:id="@+id/notesTextView"
style="@style/CardText"
android:layout_width="match_parent"

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

@ -93,7 +93,7 @@
tools:text="2d ago"
android:textSize="12sp"
android:textColor="@color/gray_300"/>
<net.pherth.android.emoji_library.EmojiTextView
<com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
android:id="@+id/message_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EllipsisTextView.kt
View file

@ -16,9 +16,9 @@ package com.habitrpg.android.habitica.ui.views
import android.content.Context
import android.util.AttributeSet
import net.pherth.android.emoji_library.EmojiTextView
import com.habitrpg.android.habitica.R
class EllipsisTextView : EmojiTextView {
class EllipsisTextView : HabiticaEmojiTextView {
private val ellipsesListeners = ArrayList<EllipsisListener>()

18
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaEmojiTextView.kt Normal file
View file

@ -0,0 +1,18 @@
package com.habitrpg.android.habitica.ui.views
import android.content.Context
import android.util.AttributeSet
import net.pherth.android.emoji_library.EmojiTextView
open class HabiticaEmojiTextView : EmojiTextView {
constructor(context: Context) : super(context)
constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle)
init {
setEmojiconSize((textSize * 1.5).toInt())
}
}