diff options
| author | Alex Ning <chineseperson5@gmail.com> | 2019-06-14 10:14:49 +0000 |
|---|---|---|
| committer | Alex Ning <chineseperson5@gmail.com> | 2019-06-14 10:14:49 +0000 |
| commit | 502cbe02ba9ad397d616961bd7cb85ae66aced8e (patch) | |
| tree | a35426388cc2e86d2841c3c9bcc37eee1d790bfb /app/src/main/res | |
| parent | 72d811186f09aea6a6be93b5e4cf1d35083d2462 (diff) | |
| download | infinity-for-reddit-502cbe02ba9ad397d616961bd7cb85ae66aced8e.tar infinity-for-reddit-502cbe02ba9ad397d616961bd7cb85ae66aced8e.tar.gz infinity-for-reddit-502cbe02ba9ad397d616961bd7cb85ae66aced8e.tar.bz2 infinity-for-reddit-502cbe02ba9ad397d616961bd7cb85ae66aced8e.tar.lz infinity-for-reddit-502cbe02ba9ad397d616961bd7cb85ae66aced8e.tar.xz infinity-for-reddit-502cbe02ba9ad397d616961bd7cb85ae66aced8e.tar.zst infinity-for-reddit-502cbe02ba9ad397d616961bd7cb85ae66aced8e.zip | |
Reply to comments. Preparing for comment deletion.
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/drawable/ic_outline_share_20px.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_comment.xml | 9 | ||||
| -rw-r--r-- | app/src/main/res/layout/item_comment.xml | 15 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 1 |
4 files changed, 27 insertions, 2 deletions
diff --git a/app/src/main/res/drawable/ic_outline_share_20px.xml b/app/src/main/res/drawable/ic_outline_share_20px.xml new file mode 100644 index 00000000..4c1a8bbb --- /dev/null +++ b/app/src/main/res/drawable/ic_outline_share_20px.xml @@ -0,0 +1,4 @@ +<vector android:height="20dp" android:viewportHeight="24" + android:viewportWidth="24" android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="#FF000000" android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92s2.92,-1.31 2.92,-2.92c0,-1.61 -1.31,-2.92 -2.92,-2.92zM18,4c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM6,13c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM18,20.02c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1z"/> +</vector> diff --git a/app/src/main/res/layout/activity_comment.xml b/app/src/main/res/layout/activity_comment.xml index c494cf3f..4a7be7b0 100644 --- a/app/src/main/res/layout/activity_comment.xml +++ b/app/src/main/res/layout/activity_comment.xml @@ -28,11 +28,18 @@ android:padding="16dp" app:layout_behavior="@string/appbar_scrolling_view_behavior"> - <TextView + <!--<TextView android:id="@+id/comment_parent_text_view_comment_activity" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" + android:textSize="16sp" />--> + + <ru.noties.markwon.view.MarkwonView + android:id="@+id/comment_parent_markwon_view_comment_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="16dp" android:textSize="16sp" /> <EditText diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml index c5bb40bc..d04f78b6 100644 --- a/app/src/main/res/layout/item_comment.xml +++ b/app/src/main/res/layout/item_comment.xml @@ -104,7 +104,7 @@ android:id="@+id/expand_button_item_post_comment" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_toStartOf="@id/reply_button_item_post_comment" + android:layout_toStartOf="@id/share_button_item_post_comment" android:layout_centerVertical="true" android:layout_marginEnd="16dp" android:tint="@android:color/tab_indicator_text" @@ -114,6 +114,19 @@ android:visibility="gone"/> <ImageView + android:id="@+id/share_button_item_post_comment" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toStartOf="@id/reply_button_item_post_comment" + android:layout_centerVertical="true" + android:layout_marginEnd="16dp" + android:src="@drawable/ic_outline_share_20px" + android:tint="@android:color/tab_indicator_text" + android:background="?actionBarItemBackground" + android:clickable="true" + android:focusable="true"/> + + <ImageView android:id="@+id/reply_button_item_post_comment" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c9f5b44d..475ceb6c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,6 +3,7 @@ <string name="login_activity_label">Login</string> <string name="search_activity_label">Search</string> <string name="comment_activity_label">Add Comment</string> + <string name="comment_activity_label_is_replying">Reply</string> <string name="navigation_drawer_open">Open navigation drawer</string> <string name="navigation_drawer_close">Close navigation drawer</string> |