Pixelfed
/
Pixelcat-App-Android
mirror of https://github.com/pixelcatapp/Pixelcat
1
0
Fork 0
Code Issues Releases Wiki Activity

improve custom font display

This commit is contained in:
Konrad Pozniak 2020-10-02 19:32:23 +02:00
parent bc1a88a68d
commit 75eea7d614
9 changed files with 54 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle.kts
View File

@ -61,6 +61,7 @@ tasks {
dependencies { dependencies {
val lifecycleVersion = "2.3.0-alpha07" val lifecycleVersion = "2.3.0-alpha07"
val emojiCompatVersion = "1.2.0-alpha01"
val roomVersion = "2.3.0-alpha02" val roomVersion = "2.3.0-alpha02"
val okHttpVersion = "4.8.1" val okHttpVersion = "4.8.1"
val retrofitVersion = "2.9.0" val retrofitVersion = "2.9.0"
@ -84,7 +85,8 @@ dependencies {
implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
implementation("androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion")
implementation("androidx.preference:preference:1.1.1") implementation("androidx.preference:preference:1.1.1")
implementation("androidx.emoji:emoji-bundled:1.2.0-alpha01") implementation("androidx.emoji:emoji-bundled:$emojiCompatVersion")
implementation("androidx.emoji:emoji-appcompat:$emojiCompatVersion")
implementation("androidx.paging:paging-runtime-ktx:3.0.0-alpha06") implementation("androidx.paging:paging-runtime-ktx:3.0.0-alpha06")
implementation("androidx.viewpager2:viewpager2:1.0.0") implementation("androidx.viewpager2:viewpager2:1.0.0")

BIN
app/src/main/res/font/nunito_bold.ttf
View File

Binary file not shown.

BIN
app/src/main/res/font/nunito_regular.ttf
View File

Binary file not shown.

89
app/src/main/res/layout/item_account_selection.xml
View File

@ -1,54 +1,51 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent"
android:layout_marginTop="4dp" android:layout_height="wrap_content"
android:layout_marginBottom="4dp" android:layout_marginLeft="8dp"
android:layout_marginLeft="8dp" android:layout_marginTop="4dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:paddingTop="4dp" android:layout_marginBottom="4dp"
android:paddingBottom="4dp" android:background="@drawable/background_selectable"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:paddingRight="8dp" android:paddingTop="4dp"
android:background="@drawable/background_selectable" android:paddingRight="8dp"
xmlns:tools="http://schemas.android.com/tools"> android:paddingBottom="4dp">
<ImageView <ImageView
android:id="@+id/accountAvatar" android:id="@+id/accountAvatar"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
tools:background="#f00" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintTop_toTopOf="parent"/> tools:background="#f00" />
<androidx.emoji.widget.EmojiAppCompatTextView
<androidx.emoji.widget.EmojiTextView android:id="@+id/accountDisplayName"
android:id="@+id/accountDisplayName" android:layout_width="0dp"
android:layout_width="0dp" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginStart="16dp"
app:layout_constraintStart_toEndOf="@id/accountAvatar" android:ellipsize="end"
app:layout_constraintEnd_toEndOf="parent" android:lines="1"
android:layout_marginStart="16dp" android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/accountName"
app:layout_constraintBottom_toTopOf="@id/accountName" app:layout_constraintEnd_toEndOf="parent"
android:ellipsize="end" app:layout_constraintStart_toEndOf="@id/accountAvatar"
tools:text="Conny Duck" app:layout_constraintTop_toTopOf="parent"
android:textStyle="bold" tools:text="Conny Duck" />
app:layout_constraintTop_toTopOf="parent"
android:lines="1"/>
<TextView <TextView
android:id="@+id/accountName" android:id="@+id/accountName"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end" android:layout_marginStart="16dp"
android:layout_marginStart="16dp" android:ellipsize="end"
app:layout_constraintStart_toEndOf="@id/accountAvatar" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/accountAvatar"
app:layout_constraintTop_toBottomOf="@id/accountDisplayName" app:layout_constraintTop_toBottomOf="@id/accountDisplayName"
tools:text="\@connyduck@pixelfed.social" /> tools:text="\@connyduck@pixelfed.social" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/item_notification.xml
View File

@ -18,7 +18,7 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:background="#f00" /> tools:background="#f00" />
<androidx.emoji.widget.EmojiTextView <androidx.emoji.widget.EmojiAppCompatTextView
android:id="@+id/notificationText" android:id="@+id/notificationText"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"

4
app/src/main/res/layout/item_notification_follow.xml
View File

@ -5,7 +5,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<androidx.emoji.widget.EmojiTextView <androidx.emoji.widget.EmojiAppCompatTextView
android:id="@+id/notificationText" android:id="@+id/notificationText"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -27,7 +27,7 @@
app:layout_constraintTop_toBottomOf="@id/notificationText" app:layout_constraintTop_toBottomOf="@id/notificationText"
tools:background="#f00" /> tools:background="#f00" />
<androidx.emoji.widget.EmojiTextView <androidx.emoji.widget.EmojiAppCompatTextView
android:id="@+id/notificationDisplayName" android:id="@+id/notificationDisplayName"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"

2
app/src/main/res/layout/item_profile_header.xml
View File

@ -108,7 +108,7 @@
app:layout_constraintTop_toBottomOf="@id/profileImage" app:layout_constraintTop_toBottomOf="@id/profileImage"
tools:text="Hi I am a placeholder text" /> tools:text="Hi I am a placeholder text" />
<androidx.emoji.widget.EmojiTextView <androidx.emoji.widget.EmojiAppCompatTextView
android:id="@+id/profileNote" android:id="@+id/profileNote"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

4
app/src/main/res/layout/item_reply.xml
View File

@ -19,7 +19,7 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:background="#f00" /> tools:background="#f00" />
<androidx.emoji.widget.EmojiTextView <androidx.emoji.widget.EmojiAppCompatTextView
android:id="@+id/postDisplayName" android:id="@+id/postDisplayName"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -47,7 +47,7 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:text="\@connyduck\@chaos.social" /> tools:text="\@connyduck\@chaos.social" />
<androidx.emoji.widget.EmojiTextView <androidx.emoji.widget.EmojiAppCompatTextView
android:id="@+id/postDescription" android:id="@+id/postDescription"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"

4
app/src/main/res/layout/item_status.xml
View File

@ -19,7 +19,7 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:background="#f00" /> tools:background="#f00" />
<androidx.emoji.widget.EmojiTextView <androidx.emoji.widget.EmojiAppCompatTextView
android:id="@+id/postDisplayName" android:id="@+id/postDisplayName"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -123,7 +123,7 @@
app:layout_constraintStart_toEndOf="@id/postReplyButton" app:layout_constraintStart_toEndOf="@id/postReplyButton"
app:layout_constraintTop_toTopOf="@id/postReplyButton" /> app:layout_constraintTop_toTopOf="@id/postReplyButton" />
<androidx.emoji.widget.EmojiTextView <androidx.emoji.widget.EmojiAppCompatTextView
android:id="@+id/postDescription" android:id="@+id/postDescription"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"