chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases Activity

remove todos from status layouts (#1112)

Browse source 
* remove todos from status layouts

* remove todo from account autocomplete layout
This commit is contained in:
Konrad Pozniak 2019-03-08 20:27:30 +01:00 committed by GitHub
parent 830b3802a5
commit 0506bfa7d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/res/layout/item_autocomplete_account.xml
View file

@ -22,8 +22,6 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="vertical"> android:orientation="vertical">
<!--TODO: Check if this needs emoji support-->
<!--FIXME: The placeholder texts seem to be swapped-->
<androidx.emoji.widget.EmojiTextView <androidx.emoji.widget.EmojiTextView
android:id="@+id/display_name" android:id="@+id/display_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -33,7 +31,7 @@
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textSize="?attr/status_text_large" android:textSize="?attr/status_text_large"
android:textStyle="normal|bold" android:textStyle="normal|bold"
tools:text="\@ConnyDuck" /> tools:text="Conny Duck" />
<TextView <TextView
android:id="@+id/username" android:id="@+id/username"
@ -43,7 +41,7 @@
android:maxLines="1" android:maxLines="1"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="?attr/status_text_medium" android:textSize="?attr/status_text_medium"
tools:text="Conny Duck" /> tools:text="\@ConnyDuck" />
</LinearLayout> </LinearLayout>

5
app/src/main/res/layout/item_conversation.xml
View file

@ -309,7 +309,7 @@
app:layout_constraintTop_toTopOf="@+id/status_media_preview_container" app:layout_constraintTop_toTopOf="@+id/status_media_preview_container"
app:srcCompat="@drawable/ic_eye_24dp" /> app:srcCompat="@drawable/ic_eye_24dp" />
<androidx.emoji.widget.EmojiTextView <TextView
android:id="@+id/status_sensitive_media_warning" android:id="@+id/status_sensitive_media_warning"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
@ -327,8 +327,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<!--TODO: Check if this needs emoji support--> <TextView
<androidx.emoji.widget.EmojiTextView
android:id="@+id/status_media_label" android:id="@+id/status_media_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

5
app/src/main/res/layout/item_status.xml
View file

@ -293,7 +293,7 @@
app:layout_constraintTop_toTopOf="@+id/status_media_preview_container" app:layout_constraintTop_toTopOf="@+id/status_media_preview_container"
app:srcCompat="@drawable/ic_eye_24dp" /> app:srcCompat="@drawable/ic_eye_24dp" />
<androidx.emoji.widget.EmojiTextView <TextView
android:id="@+id/status_sensitive_media_warning" android:id="@+id/status_sensitive_media_warning"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
@ -312,8 +312,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<!--TODO: Check if this needs emoji support--> <TextView
<androidx.emoji.widget.EmojiTextView
android:id="@+id/status_media_label" android:id="@+id/status_media_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

8
app/src/main/res/layout/item_status_detailed.xml
View file

@ -144,7 +144,6 @@
android:paddingRight="6dp" android:paddingRight="6dp"
android:paddingBottom="6dp"> android:paddingBottom="6dp">
<!--TODO: check if this needs emoji support-->
<androidx.emoji.widget.EmojiTextView <androidx.emoji.widget.EmojiTextView
android:id="@+id/card_title" android:id="@+id/card_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -156,7 +155,6 @@
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textSize="?attr/status_text_medium" /> android:textSize="?attr/status_text_medium" />
<!--TODO: Check if this needs emoji support-->
<androidx.emoji.widget.EmojiTextView <androidx.emoji.widget.EmojiTextView
android:id="@+id/card_description" android:id="@+id/card_description"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -293,8 +291,7 @@
app:layout_constraintTop_toTopOf="@+id/status_media_preview_container" app:layout_constraintTop_toTopOf="@+id/status_media_preview_container"
app:srcCompat="@drawable/ic_eye_24dp" /> app:srcCompat="@drawable/ic_eye_24dp" />
<!--TODO: Check if this needs emoji support--> <TextView
<androidx.emoji.widget.EmojiTextView
android:id="@+id/status_sensitive_media_warning" android:id="@+id/status_sensitive_media_warning"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
@ -312,8 +309,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<!--TODO: Check if this needs emoji support--> <TextView
<androidx.emoji.widget.EmojiTextView
android:id="@+id/status_media_label" android:id="@+id/status_media_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"