Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 12:19:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'message-terminology' into 'master'

Browse Source 
Use "text" to refer to message text

See merge request briar/briar!948
This commit is contained in:
Torsten Grote
2018-10-15 13:22:31 +00:00
parent 09c6f09805 79d5612645
commit b464fe1653
145 changed files with 750 additions and 764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/res/layout/activity_write_blog_post.xml
View File

@@ -8,7 +8,7 @@
tools:context=".android.blog.WriteBlogPostActivity">
<org.briarproject.briar.android.view.LargeTextInputView
android:id="@+id/bodyInput"
android:id="@+id/textInput"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="bottom"

2
briar-android/src/main/res/layout/list_item_blog_comment.xml
View File

@@ -24,7 +24,7 @@
app:persona="commenter"/>
<com.vanniktech.emoji.EmojiTextView
android:id="@+id/bodyView"
android:id="@+id/textView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/listitem_vertical_margin"

4
briar-android/src/main/res/layout/list_item_blog_post.xml
View File

@@ -54,7 +54,7 @@
app:tint="?attr/colorControlNormal"/>
<com.vanniktech.emoji.EmojiTextView
android:id="@+id/bodyView"
android:id="@+id/textView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="@dimen/listitem_vertical_margin"
@@ -72,7 +72,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/listitem_vertical_margin"
android:orientation="vertical"
app:layout_constraintTop_toBottomOf="@+id/bodyView">
app:layout_constraintTop_toBottomOf="@+id/textView">
<include
layout="@layout/list_item_blog_comment"