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

Clean up threaded discussion screen

Browse Source 
Adds RTL support
Fixing cropping bug

Closes #964
This commit is contained in:
Torsten Grote
2018-09-11 17:16:54 -03:00
parent 81292967e0
commit f83b9244d4
6 changed files with 83 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemAdapter.java
View File

@@ -1,5 +1,6 @@
package org.briarproject.briar.android.threaded; package org.briarproject.briar.android.threaded;
import android.support.annotation.NonNull;
import android.support.annotation.UiThread; import android.support.annotation.UiThread;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
@@ -36,8 +37,9 @@ public class ThreadItemAdapter<I extends ThreadItem>
this.layoutManager = layoutManager; this.layoutManager = layoutManager;
} }
@NonNull
@Override @Override
public BaseThreadItemViewHolder<I> onCreateViewHolder( public BaseThreadItemViewHolder<I> onCreateViewHolder(@NonNull
ViewGroup parent, int viewType) { ViewGroup parent, int viewType) {
View v = LayoutInflater.from(parent.getContext()) View v = LayoutInflater.from(parent.getContext())
.inflate(R.layout.list_item_thread, parent, false); .inflate(R.layout.list_item_thread, parent, false);
@@ -45,7 +47,8 @@ public class ThreadItemAdapter<I extends ThreadItem>
} }
@Override @Override
public void onBindViewHolder(BaseThreadItemViewHolder<I> ui, int position) { public void onBindViewHolder(@NonNull BaseThreadItemViewHolder<I> ui,
int position) {
I item = items.get(position); I item = items.get(position);
ui.bind(item, listener); ui.bind(item, listener);
} }

4
briar-android/src/main/res/drawable/level_indicator_circle.xml
View File

@@ -3,9 +3,9 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval"> android:shape="oval">
<solid android:color="@color/window_background"/> <solid android:color="@color/thread_item_background"/>
<stroke <stroke
android:width="2dp" android:width="@dimen/forum_nested_line_width"
android:color="@color/thread_indicator"/> android:color="@color/thread_indicator"/>
</shape> </shape>

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

@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <android.support.constraint.ConstraintLayout
android:id="@+id/layout" android:id="@+id/layout"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:baselineAligned="false"
android:orientation="vertical">
<com.vanniktech.emoji.EmojiTextView <com.vanniktech.emoji.EmojiTextView
android:id="@+id/text" android:id="@+id/text"
@@ -17,20 +15,24 @@
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/text_size_medium" android:textSize="@dimen/text_size_medium"
android:textStyle="italic" android:textStyle="italic"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/groups_member_joined"/> 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"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignLeft="@+id/text" android:layout_margin="@dimen/margin_medium"
android:layout_alignStart="@+id/text" app:layout_constraintStart_toStartOf="parent"
android:layout_below="@+id/text" app:layout_constraintTop_toBottomOf="@+id/text"
app:persona="commenter"/> app:persona="commenter"/>
<View <View
android:id="@+id/divider"
style="@style/Divider.ThreadItem" style="@style/Divider.ThreadItem"
android:layout_below="@+id/author" android:layout_marginTop="@dimen/margin_medium"
android:layout_marginTop="@dimen/margin_medium"/> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/author"/>
</RelativeLayout> </android.support.constraint.ConstraintLayout>

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

@@ -1,94 +1,106 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout
android:id="@+id/layout"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:baselineAligned="false" android:baselineAligned="false"
android:background="@drawable/list_item_thread_background"
android:orientation="horizontal"> android:orientation="horizontal">
<RelativeLayout <android.support.constraint.ConstraintLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:background="@drawable/list_item_thread_background">
<View <View
android:id="@+id/nested_line_1" android:id="@+id/nested_line_1"
style="@style/DiscussionLevelIndicator" style="@style/DiscussionLevelIndicator"
android:layout_width="@dimen/forum_nested_line_width" app:layout_constraintStart_toStartOf="parent"
android:layout_height="match_parent" app:layout_constraintTop_toTopOf="parent"
android:visibility="gone"
tools:visibility="visible"/> tools:visibility="visible"/>
<View <View
android:id="@+id/nested_line_2" android:id="@+id/nested_line_2"
style="@style/DiscussionLevelIndicator" style="@style/DiscussionLevelIndicator"
android:layout_width="@dimen/forum_nested_line_width" app:layout_constraintStart_toEndOf="@id/nested_line_1"
android:layout_height="match_parent" app:layout_constraintTop_toTopOf="parent"
android:layout_toRightOf="@id/nested_line_1" tools:visibility="visible"/>
android:visibility="gone"/>
<View <View
android:id="@+id/nested_line_3" android:id="@+id/nested_line_3"
style="@style/DiscussionLevelIndicator" style="@style/DiscussionLevelIndicator"
android:layout_width="@dimen/forum_nested_line_width" app:layout_constraintStart_toEndOf="@id/nested_line_2"
android:layout_height="match_parent" app:layout_constraintTop_toTopOf="parent"
android:layout_toRightOf="@id/nested_line_2" tools:visibility="visible"/>
android:visibility="gone"/>
<View <View
android:id="@+id/nested_line_4" android:id="@+id/nested_line_4"
style="@style/DiscussionLevelIndicator" style="@style/DiscussionLevelIndicator"
android:layout_width="@dimen/forum_nested_line_width" app:layout_constraintStart_toEndOf="@id/nested_line_3"
android:layout_height="match_parent" app:layout_constraintTop_toTopOf="parent"/>
android:layout_toRightOf="@id/nested_line_3"
android:visibility="gone"/>
<View <View
android:id="@+id/nested_line_5" android:id="@+id/nested_line_5"
style="@style/DiscussionLevelIndicator" style="@style/DiscussionLevelIndicator"
android:layout_width="@dimen/forum_nested_line_width" app:layout_constraintStart_toEndOf="@id/nested_line_4"
android:layout_height="match_parent" app:layout_constraintTop_toTopOf="parent"
android:layout_toRightOf="@id/nested_line_4" tools:visibility="visible"/>
android:visibility="gone"/>
<TextView <TextView
android:id="@+id/nested_line_text" android:id="@+id/nested_line_text"
android:layout_width="@dimen/forum_nested_indicator" android:layout_width="@dimen/forum_nested_indicator"
android:layout_height="@dimen/forum_nested_indicator" android:layout_height="@dimen/forum_nested_indicator"
android:layout_centerInParent="true"
android:background="@drawable/level_indicator_circle" android:background="@drawable/level_indicator_circle"
android:gravity="center" android:gravity="center"
android:textSize="@dimen/text_size_small" android:textSize="@dimen/text_size_small"
android:visibility="gone"/> android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="42"
tools:visibility="visible"/>
</RelativeLayout> </android.support.constraint.ConstraintLayout>
<RelativeLayout <android.support.constraint.ConstraintLayout
android:id="@+id/layout"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"> android:layout_weight="1"
android:background="@drawable/list_item_thread_background">
<View
android:id="@+id/divider"
style="@style/Divider.ThreadItem"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<com.vanniktech.emoji.EmojiTextView <com.vanniktech.emoji.EmojiTextView
android:id="@+id/text" android:id="@+id/text"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/margin_medium" android:padding="@dimen/margin_medium"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textIsSelectable="true" android:textIsSelectable="true"
android:textSize="@dimen/text_size_medium" android:textSize="@dimen/text_size_medium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/divider"
tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."/> tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."/>
<org.briarproject.briar.android.view.AuthorView <org.briarproject.briar.android.view.AuthorView
android:id="@+id/author" android:id="@+id/author"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignLeft="@id/text" android:layout_marginBottom="@dimen/margin_medium"
android:layout_below="@id/text" android:layout_marginEnd="@dimen/margin_medium"
android:layout_marginLeft="@dimen/margin_medium" android:layout_marginStart="@dimen/margin_medium"
android:layout_toLeftOf="@+id/btn_reply" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/btn_reply"
app:layout_constraintStart_toStartOf="@id/text"
app:layout_constraintTop_toBottomOf="@id/text"
app:persona="commenter"/> app:persona="commenter"/>
<TextView <TextView
@@ -96,19 +108,14 @@
style="@style/BriarButtonFlat.Positive.Tiny" style="@style/BriarButtonFlat.Positive.Tiny"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignBottom="@+id/author" android:layout_marginEnd="@dimen/margin_medium"
android:layout_alignParentRight="true" android:layout_marginStart="@dimen/margin_medium"
android:layout_below="@+id/text"
android:layout_marginRight="@dimen/margin_medium"
android:text="@string/btn_reply" android:text="@string/btn_reply"
android:textSize="@dimen/text_size_tiny"/> android:textSize="@dimen/text_size_tiny"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/text"/>
<View </android.support.constraint.ConstraintLayout>
style="@style/Divider.ThreadItem"
android:layout_alignLeft="@id/text"
android:layout_below="@+id/author"
android:layout_marginTop="@dimen/margin_medium"/>
</RelativeLayout>
</LinearLayout> </LinearLayout>

4
briar-android/src/main/res/values/dimens.xml
View File

@@ -52,8 +52,8 @@
<dimen name="message_bubble_margin_non_tail">30dp</dimen> <dimen name="message_bubble_margin_non_tail">30dp</dimen>
<dimen name="message_bubble_stroke">1px</dimen> <dimen name="message_bubble_stroke">1px</dimen>
<dimen name="forum_nested_line_width">2dp</dimen> <dimen name="forum_nested_line_width">1dp</dimen>
<dimen name="forum_nested_indicator">24dp</dimen> <dimen name="forum_nested_indicator">25dp</dimen>
<dimen name="blogs_avatar_normal_size">30dp</dimen> <dimen name="blogs_avatar_normal_size">30dp</dimen>
<dimen name="blogs_avatar_icon_size">15dp</dimen> <dimen name="blogs_avatar_icon_size">15dp</dimen>

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

@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"> <resources
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<style name="BriarToolbar" parent="Widget.AppCompat.Toolbar"> <style name="BriarToolbar" parent="Widget.AppCompat.Toolbar">
<item name="android:background">?colorPrimary</item> <item name="android:background">?colorPrimary</item>
@@ -79,7 +81,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">1dp</item> <item name="android:layout_height">@dimen/forum_nested_line_width</item>
</style> </style>
<style name="BriarAvatar"> <style name="BriarAvatar">
@@ -108,8 +110,12 @@
</style> </style>
<style name="DiscussionLevelIndicator"> <style name="DiscussionLevelIndicator">
<item name="android:layout_marginLeft">4dp</item> <item name="android:layout_height">match_parent</item>
<item name="android:layout_width">@dimen/forum_nested_line_width</item>
<item name="android:layout_marginLeft">5dp</item>
<item name="android:layout_marginStart" tools:targetApi="jelly_bean_mr1">5dp</item>
<item name="android:background">@color/thread_indicator</item> <item name="android:background">@color/thread_indicator</item>
<item name="android:visibility">gone</item>
</style> </style>
<style name="BriarCard" parent="CardView"> <style name="BriarCard" parent="CardView">