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

Merge branch '1369-thread-layout' into 'master'

Browse Source 
Adapt private group join notices to new threaded layout

Closes #1369

See merge request briar/briar!1097
This commit is contained in:
akwizgran
2019-05-16 14:54:46 +00:00
parent ddc9b5b066 90437f4fa4
commit a61860af85
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
briar-android/src/main/res/layout/list_item_group_join_notice.xml
View File

@@ -8,17 +8,11 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/list_item_thread_background"> android:background="@drawable/list_item_thread_background">
<com.vanniktech.emoji.EmojiTextView <View
android:id="@+id/text" android:id="@+id/divider"
android:layout_width="match_parent" style="@style/Divider.ThreadItem"
android:layout_height="wrap_content" app:layout_constraintLeft_toLeftOf="parent"
android:layout_margin="@dimen/margin_medium" app:layout_constraintTop_toTopOf="parent"/>
android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/text_size_medium"
android:textStyle="italic"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/groups_member_joined"/>
<org.briarproject.briar.android.view.AuthorView <org.briarproject.briar.android.view.AuthorView
android:id="@+id/author" android:id="@+id/author"
@@ -27,14 +21,19 @@
android:layout_margin="@dimen/margin_medium" android:layout_margin="@dimen/margin_medium"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/text" app:layout_constraintTop_toBottomOf="@+id/divider"
app:persona="commenter"/> app:persona="commenter"/>
<View <com.vanniktech.emoji.EmojiTextView
android:id="@+id/divider" android:id="@+id/text"
style="@style/Divider.ThreadItem" android:layout_width="match_parent"
android:layout_marginTop="@dimen/margin_medium" android:layout_height="wrap_content"
android:padding="@dimen/margin_medium"
android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/text_size_medium"
android:textStyle="italic"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/author"/> app:layout_constraintTop_toBottomOf="@id/author"
tools:text="@string/groups_member_joined"/>
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>

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

@@ -89,7 +89,7 @@
app:layout_constraintBottom_toBottomOf="@+id/text" app:layout_constraintBottom_toBottomOf="@+id/text"
app:layout_constraintEnd_toStartOf="@+id/btn_reply" app:layout_constraintEnd_toStartOf="@+id/btn_reply"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toBottomOf="@+id/divider"
app:layout_constraintVertical_bias="0.0" app:layout_constraintVertical_bias="0.0"
app:persona="commenter"/> app:persona="commenter"/>
@@ -105,7 +105,7 @@
android:text="@string/btn_reply" android:text="@string/btn_reply"
android:textSize="@dimen/text_size_tiny" android:textSize="@dimen/text_size_tiny"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/divider"/> app:layout_constraintTop_toBottomOf="@+id/divider"/>
<com.vanniktech.emoji.EmojiTextView <com.vanniktech.emoji.EmojiTextView
android:id="@+id/text" android:id="@+id/text"

1
briar-android/src/main/res/values/styles.xml
View File

@@ -82,6 +82,7 @@
<style name="Divider.ThreadItem" parent="Divider"> <style name="Divider.ThreadItem" parent="Divider">
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">@dimen/forum_nested_line_width</item> <item name="android:layout_height">@dimen/forum_nested_line_width</item>
<item name="android:background">@color/thread_indicator</item>
</style> </style>
<style name="BriarAvatar"> <style name="BriarAvatar">