diff options
Diffstat (limited to 'app/src/main/res')
34 files changed, 191 insertions, 136 deletions
diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_downward_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_arrow_downward_black_24dp.png Binary files differdeleted file mode 100644 index b848197a..00000000 --- a/app/src/main/res/drawable-hdpi/ic_arrow_downward_black_24dp.png +++ /dev/null diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_upward_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_arrow_upward_black_24dp.png Binary files differdeleted file mode 100644 index 705f7ae8..00000000 --- a/app/src/main/res/drawable-hdpi/ic_arrow_upward_black_24dp.png +++ /dev/null diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_downward_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_arrow_downward_black_24dp.png Binary files differdeleted file mode 100644 index 3cc4b130..00000000 --- a/app/src/main/res/drawable-mdpi/ic_arrow_downward_black_24dp.png +++ /dev/null diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_upward_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_arrow_upward_black_24dp.png Binary files differdeleted file mode 100644 index 368eb65f..00000000 --- a/app/src/main/res/drawable-mdpi/ic_arrow_upward_black_24dp.png +++ /dev/null diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_downward_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_arrow_downward_black_24dp.png Binary files differdeleted file mode 100644 index 3c147bc5..00000000 --- a/app/src/main/res/drawable-xhdpi/ic_arrow_downward_black_24dp.png +++ /dev/null diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_upward_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_arrow_upward_black_24dp.png Binary files differdeleted file mode 100644 index f2b35ac2..00000000 --- a/app/src/main/res/drawable-xhdpi/ic_arrow_upward_black_24dp.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_downward_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_downward_black_24dp.png Binary files differdeleted file mode 100644 index ace750c4..00000000 --- a/app/src/main/res/drawable-xxhdpi/ic_arrow_downward_black_24dp.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_upward_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_upward_black_24dp.png Binary files differdeleted file mode 100644 index 99622e7c..00000000 --- a/app/src/main/res/drawable-xxhdpi/ic_arrow_upward_black_24dp.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxxhdpi/ic_arrow_downward_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_arrow_downward_black_24dp.png Binary files differdeleted file mode 100644 index 2690b202..00000000 --- a/app/src/main/res/drawable-xxxhdpi/ic_arrow_downward_black_24dp.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxxhdpi/ic_arrow_upward_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_arrow_upward_black_24dp.png Binary files differdeleted file mode 100644 index fca5022c..00000000 --- a/app/src/main/res/drawable-xxxhdpi/ic_arrow_upward_black_24dp.png +++ /dev/null diff --git a/app/src/main/res/drawable/ic_arrow_downward_black_22dp.xml b/app/src/main/res/drawable/ic_arrow_downward_black_22dp.xml deleted file mode 100644 index c6c587c6..00000000 --- a/app/src/main/res/drawable/ic_arrow_downward_black_22dp.xml +++ /dev/null @@ -1,4 +0,0 @@ -<vector android:height="24dp" android:viewportHeight="24.0" - android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#010101" android:pathData="M20,12l-1.41,-1.41L13,16.17V4h-2v12.17l-5.58,-5.59L4,12l8,8 8,-8z"/> -</vector> diff --git a/app/src/main/res/drawable/ic_arrow_downward_black_24dp.xml b/app/src/main/res/drawable/ic_arrow_downward_black_24dp.xml new file mode 100644 index 00000000..dd7522fd --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_downward_black_24dp.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:pathData="M20,12l-1.41,-1.41L13,16.17V4h-2v12.17l-5.58,-5.59L4,12l8,8 8,-8z" + android:fillColor="#010101"/> +</vector> diff --git a/app/src/main/res/drawable/ic_arrow_downward_grey_24dp.xml b/app/src/main/res/drawable/ic_arrow_downward_grey_24dp.xml new file mode 100644 index 00000000..bc5c4cf5 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_downward_grey_24dp.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:pathData="M20,12l-1.41,-1.41L13,16.17V4h-2v12.17l-5.58,-5.59L4,12l8,8 8,-8z" + android:fillColor="#FF808080"/> +</vector> diff --git a/app/src/main/res/drawable/ic_arrow_upward_black_22dp.xml b/app/src/main/res/drawable/ic_arrow_upward_black_22dp.xml deleted file mode 100644 index 150d5218..00000000 --- a/app/src/main/res/drawable/ic_arrow_upward_black_22dp.xml +++ /dev/null @@ -1,4 +0,0 @@ -<vector android:height="24dp" android:viewportHeight="24.0" - android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FF000000" android:pathData="M4,12l1.41,1.41L11,7.83V20h2V7.83l5.58,5.59L20,12l-8,-8 -8,8z"/> -</vector> diff --git a/app/src/main/res/drawable/ic_arrow_upward_black_24dp.xml b/app/src/main/res/drawable/ic_arrow_upward_black_24dp.xml new file mode 100644 index 00000000..fb30b2cb --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_upward_black_24dp.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="#FF000000" + android:pathData="M4,12l1.41,1.41L11,7.83V20h2V7.83l5.58,5.59L20,12l-8,-8 -8,8z"/> +</vector> diff --git a/app/src/main/res/drawable/ic_arrow_upward_grey_24dp.xml b/app/src/main/res/drawable/ic_arrow_upward_grey_24dp.xml new file mode 100644 index 00000000..e370580a --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_upward_grey_24dp.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="#FF808080" + android:pathData="M4,12l1.41,1.41L11,7.83V20h2V7.83l5.58,5.59L20,12l-8,-8 -8,8z"/> +</vector> diff --git a/app/src/main/res/drawable/ic_bookmark_20dp.xml b/app/src/main/res/drawable/ic_bookmark_20dp.xml deleted file mode 100644 index 6908d298..00000000 --- a/app/src/main/res/drawable/ic_bookmark_20dp.xml +++ /dev/null @@ -1,4 +0,0 @@ -<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="M17,3H7c-1.1,0 -2,0.9 -2,2v16l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/> -</vector> diff --git a/app/src/main/res/drawable/ic_baseline_bookmark_24px.xml b/app/src/main/res/drawable/ic_bookmark_black_24dp.xml index a7ff3655..a7ff3655 100644 --- a/app/src/main/res/drawable/ic_baseline_bookmark_24px.xml +++ b/app/src/main/res/drawable/ic_bookmark_black_24dp.xml diff --git a/app/src/main/res/drawable/ic_bookmark_border_20dp.xml b/app/src/main/res/drawable/ic_bookmark_border_20dp.xml deleted file mode 100644 index d77b4ce5..00000000 --- a/app/src/main/res/drawable/ic_bookmark_border_20dp.xml +++ /dev/null @@ -1,4 +0,0 @@ -<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="M17,3L7,3c-1.1,0 -2,0.9 -2,2v16l7,-3 7,3L19,5c0,-1.1 -0.9,-2 -2,-2zM17,18l-5,-2.18L7,18L7,5h10v13z"/> -</vector> diff --git a/app/src/main/res/drawable/ic_baseline_bookmark_border_24px.xml b/app/src/main/res/drawable/ic_bookmark_border_black_24dp.xml index 71382d27..71382d27 100644 --- a/app/src/main/res/drawable/ic_baseline_bookmark_border_24px.xml +++ b/app/src/main/res/drawable/ic_bookmark_border_black_24dp.xml diff --git a/app/src/main/res/drawable/ic_bookmark_border_grey_24dp.xml b/app/src/main/res/drawable/ic_bookmark_border_grey_24dp.xml new file mode 100644 index 00000000..377a705f --- /dev/null +++ b/app/src/main/res/drawable/ic_bookmark_border_grey_24dp.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="#FF808080" + android:pathData="M17,3L7,3c-1.1,0 -2,0.9 -2,2v16l7,-3 7,3L19,5c0,-1.1 -0.9,-2 -2,-2zM17,18l-5,-2.18L7,18L7,5h10v13z"/> +</vector> diff --git a/app/src/main/res/drawable/ic_bookmark_grey_24dp.xml b/app/src/main/res/drawable/ic_bookmark_grey_24dp.xml new file mode 100644 index 00000000..3f4a6dd4 --- /dev/null +++ b/app/src/main/res/drawable/ic_bookmark_grey_24dp.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="#FF808080" + android:pathData="M17,3H7c-1.1,0 -2,0.9 -2,2v16l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/> +</vector> diff --git a/app/src/main/res/drawable/ic_comment_grey_24dp.xml b/app/src/main/res/drawable/ic_comment_grey_24dp.xml new file mode 100644 index 00000000..93d143c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_comment_grey_24dp.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="#FF808080" + android:pathData="M21.99,4c0,-1.1 -0.89,-2 -1.99,-2L4,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4 -0.01,-18zM20,4v13.17L18.83,16L4,16L4,4h16zM6,12h12v2L6,14zM6,9h12v2L6,11zM6,6h12v2L6,8z"/> +</vector> diff --git a/app/src/main/res/drawable/ic_expand_less_black_22dp.xml b/app/src/main/res/drawable/ic_expand_less_grey_24dp.xml index f7a3985f..6e5840db 100644 --- a/app/src/main/res/drawable/ic_expand_less_black_22dp.xml +++ b/app/src/main/res/drawable/ic_expand_less_grey_24dp.xml @@ -1,4 +1,4 @@ <vector android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FF000000" android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z"/> + <path android:fillColor="#FF808080" android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z"/> </vector> diff --git a/app/src/main/res/drawable/ic_expand_more_black_20dp.xml b/app/src/main/res/drawable/ic_expand_more_grey_24dp.xml index 2e1e234a..71b8f17a 100644 --- a/app/src/main/res/drawable/ic_expand_more_black_20dp.xml +++ b/app/src/main/res/drawable/ic_expand_more_grey_24dp.xml @@ -1,4 +1,4 @@ <vector android:height="20dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FF000000" android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/> + <path android:fillColor="#FF808080" android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/> </vector> diff --git a/app/src/main/res/drawable/ic_outline_more_vert_24px.xml b/app/src/main/res/drawable/ic_more_vert_grey_24dp.xml index 568cbb4d..69c1029e 100644 --- a/app/src/main/res/drawable/ic_outline_more_vert_24px.xml +++ b/app/src/main/res/drawable/ic_more_vert_grey_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> <path - android:fillColor="#FF000000" + android:fillColor="#FF808080" android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/> </vector> diff --git a/app/src/main/res/drawable/ic_outline_share_20px.xml b/app/src/main/res/drawable/ic_outline_share_20px.xml deleted file mode 100644 index 52eda61c..00000000 --- a/app/src/main/res/drawable/ic_outline_share_20px.xml +++ /dev/null @@ -1,4 +0,0 @@ -<vector android:height="24dp" android:viewportHeight="24" - android:viewportWidth="24" android:width="24dp" 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/drawable/ic_reply_black_20dp.xml b/app/src/main/res/drawable/ic_reply_grey_24dp.xml index 1dd3dfed..979f0eb2 100644 --- a/app/src/main/res/drawable/ic_reply_black_20dp.xml +++ b/app/src/main/res/drawable/ic_reply_grey_24dp.xml @@ -1,4 +1,4 @@ <vector android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FF000000" android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z"/> + <path android:fillColor="#FF808080" android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z"/> </vector> diff --git a/app/src/main/res/drawable/ic_outline_share_24px.xml b/app/src/main/res/drawable/ic_share_grey_24dp.xml index 82ddcec3..86f0e234 100644 --- a/app/src/main/res/drawable/ic_outline_share_24px.xml +++ b/app/src/main/res/drawable/ic_share_grey_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> <path - android:fillColor="#FF000000" + android:fillColor="#FF808080" 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/item_comment.xml b/app/src/main/res/layout/item_comment.xml index 3c1a3330..1e594578 100644 --- a/app/src/main/res/layout/item_comment.xml +++ b/app/src/main/res/layout/item_comment.xml @@ -83,7 +83,7 @@ android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" - android:src="@drawable/ic_arrow_upward_black_22dp" + android:src="@drawable/ic_arrow_upward_grey_24dp" android:tint="@android:color/tab_indicator_text" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -110,7 +110,7 @@ android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" - android:src="@drawable/ic_arrow_downward_black_22dp" + android:src="@drawable/ic_arrow_downward_grey_24dp" android:tint="@android:color/tab_indicator_text" app:layout_constraintStart_toEndOf="@+id/score_text_view_item_post_comment" app:layout_constraintEnd_toStartOf="@id/more_button_item_post_comment" @@ -126,8 +126,7 @@ android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" - android:src="@drawable/ic_outline_more_vert_24px" - android:tint="@android:color/tab_indicator_text" + android:src="@drawable/ic_more_vert_grey_24dp" android:visibility="gone" app:layout_constraintEnd_toStartOf="@+id/expand_button_item_post_comment" app:layout_constraintTop_toTopOf="parent" @@ -141,7 +140,7 @@ android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" - android:src="@drawable/ic_expand_less_black_22dp" + android:src="@drawable/ic_expand_less_grey_24dp" android:tint="@android:color/tab_indicator_text" android:visibility="gone" app:layout_constraintEnd_toStartOf="@+id/save_button_item_post_comment" @@ -156,7 +155,6 @@ android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" - android:tint="@android:color/tab_indicator_text" app:layout_constraintEnd_toStartOf="@+id/share_button_item_post_comment" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent"/> @@ -169,8 +167,7 @@ android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" - android:src="@drawable/ic_outline_share_20px" - android:tint="@android:color/tab_indicator_text" + android:src="@drawable/ic_share_grey_24dp" app:layout_constraintEnd_toStartOf="@+id/reply_button_item_post_comment" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent"/> @@ -183,8 +180,7 @@ android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" - android:src="@drawable/ic_reply_black_20dp" - android:tint="@android:color/tab_indicator_text" + android:src="@drawable/ic_reply_grey_24dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent"/> diff --git a/app/src/main/res/layout/item_post.xml b/app/src/main/res/layout/item_post.xml index c702e529..5733f9c5 100644 --- a/app/src/main/res/layout/item_post.xml +++ b/app/src/main/res/layout/item_post.xml @@ -256,7 +256,7 @@ android:background="@color/grey" android:visibility="gone"/> - <androidx.constraintlayout.widget.ConstraintLayout + <!--<androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content"> @@ -265,69 +265,147 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="12dp" - android:src="@drawable/ic_arrow_upward_black_24dp" + android:src="@drawable/ic_arrow_upward_grey_24dp" android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintEnd_toStartOf="@id/score_text_view_item_post" /> <TextView android:id="@+id/score_text_view_item_post" android:layout_width="64dp" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:gravity="center" android:textSize="?attr/font_12" android:textStyle="bold" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@id/plus_button_item_post" /> + app:layout_constraintEnd_toStartOf="@id/minus_button_item_post" /> <ImageView android:id="@+id/minus_button_item_post" android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="12dp" - android:src="@drawable/ic_arrow_downward_black_24dp" + android:src="@drawable/ic_arrow_downward_grey_24dp" android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@id/score_text_view_item_post" /> + app:layout_constraintEnd_toEndOf="parent" /> + + <TextView + android:id="@+id/comments_count_item_post" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="12dp" + android:gravity="center_vertical" + android:textSize="?attr/font_12" + android:textStyle="bold" + android:drawableStart="@drawable/ic_comment_grey_24dp" + android:drawablePadding="12dp" + app:layout_constraintHorizontal_bias="0" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@id/save_button_item_post" + app:layout_constraintEnd_toStartOf="@id/plus_button_item_post" /> <ImageView - android:id="@+id/comment_button_item_post" + android:id="@+id/save_button_item_post" android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="12dp" - android:src="@drawable/ic_comment_white_24dp" android:tint="@android:color/tab_indicator_text" + android:background="?actionBarItemBackground" + android:clickable="true" + android:focusable="true" app:layout_constraintHorizontal_bias="0" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@id/minus_button_item_post" /> + app:layout_constraintStart_toEndOf="@id/share_button_item_post" /> + + <ImageView + android:id="@+id/share_button_item_post" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="12dp" + android:src="@drawable/ic_share_grey_24dp" + android:background="?actionBarItemBackground" + android:clickable="true" + android:focusable="true" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintHorizontal_bias="1" /> + + </androidx.constraintlayout.widget.ConstraintLayout>--> + + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/bottom_constraint_layout_item_post" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <ImageView + android:id="@+id/plus_button_item_post" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="12dp" + android:src="@drawable/ic_arrow_upward_grey_24dp" + android:background="?actionBarItemBackground" + android:clickable="true" + android:focusable="true" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" /> + + <TextView + android:id="@+id/score_text_view_item_post" + android:layout_width="64dp" + android:layout_height="wrap_content" + android:gravity="center" + android:textSize="?attr/font_12" + android:textStyle="bold" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@id/plus_button_item_post" /> + + <ImageView + android:id="@+id/minus_button_item_post" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="12dp" + android:src="@drawable/ic_arrow_downward_grey_24dp" + android:background="?actionBarItemBackground" + android:clickable="true" + android:focusable="true" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@id/score_text_view_item_post" /> <TextView android:id="@+id/comments_count_item_post" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:padding="12dp" + android:gravity="center_vertical" android:textSize="?attr/font_12" android:textStyle="bold" - app:layout_constraintHorizontal_bias="0" + android:drawableStart="@drawable/ic_comment_grey_24dp" + android:drawablePadding="12dp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@id/comment_button_item_post" /> + app:layout_constraintStart_toEndOf="@id/minus_button_item_post" /> <ImageView android:id="@+id/save_button_item_post" android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="12dp" - android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" @@ -342,15 +420,13 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="12dp" - android:src="@drawable/ic_outline_share_24px" - android:tint="@android:color/tab_indicator_text" + android:src="@drawable/ic_share_grey_24dp" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="1" /> + app:layout_constraintEnd_toEndOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/item_post_detail.xml b/app/src/main/res/layout/item_post_detail.xml index 9d7b574b..338975e4 100644 --- a/app/src/main/res/layout/item_post_detail.xml +++ b/app/src/main/res/layout/item_post_detail.xml @@ -248,70 +248,17 @@ android:tint="@android:color/tab_indicator_text" android:visibility="gone" /> - <!--<RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <ImageView - android:id="@+id/plus_button_item_post_detail" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentStart="true" - android:layout_centerVertical="true" - android:background="?actionBarItemBackground" - android:clickable="true" - android:focusable="true" - android:padding="16dp" - android:src="@drawable/ic_arrow_upward_black_24dp" - android:tint="@android:color/tab_indicator_text" /> - - <TextView - android:id="@+id/score_text_view_item_post_detail" - android:layout_width="64dp" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_toEndOf="@id/plus_button_item_post_detail" - android:gravity="center" - android:textSize="?attr/font_default" /> - - <ImageView - android:id="@+id/minus_button_item_post_detail" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_toEndOf="@id/score_text_view_item_post_detail" - android:background="?actionBarItemBackground" - android:clickable="true" - android:focusable="true" - android:padding="16dp" - android:src="@drawable/ic_arrow_downward_black_24dp" - android:tint="@android:color/tab_indicator_text" /> - - <ImageView - android:id="@+id/share_button_item_post_detail" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:layout_centerVertical="true" - android:background="?actionBarItemBackground" - android:clickable="true" - android:focusable="true" - android:padding="16dp" - android:src="@drawable/ic_outline_share_24px" - android:tint="@android:color/tab_indicator_text" /> - - </RelativeLayout>--> - <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:id="@+id/bottom_constraint_layout_item_post_detail"> <ImageView android:id="@+id/plus_button_item_post_detail" android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="12dp" - android:src="@drawable/ic_arrow_upward_black_24dp" + android:src="@drawable/ic_arrow_upward_grey_24dp" android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" @@ -323,7 +270,7 @@ <TextView android:id="@+id/score_text_view_item_post_detail" android:layout_width="64dp" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:gravity="center" android:textSize="?attr/font_12" android:textStyle="bold" @@ -336,7 +283,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="12dp" - android:src="@drawable/ic_arrow_downward_black_24dp" + android:src="@drawable/ic_arrow_downward_grey_24dp" android:tint="@android:color/tab_indicator_text" android:background="?actionBarItemBackground" android:clickable="true" @@ -345,31 +292,19 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_detail" /> - <ImageView - android:id="@+id/comment_button_item_post_detail" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="12dp" - android:src="@drawable/ic_comment_white_24dp" - android:tint="@android:color/tab_indicator_text" - android:background="?actionBarItemBackground" - android:clickable="true" - android:focusable="true" - app:layout_constraintHorizontal_bias="0" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@id/minus_button_item_post_detail" /> - <TextView android:id="@+id/comments_count_item_post_detail" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:padding="12dp" + android:gravity="center_vertical" android:textSize="?attr/font_12" android:textStyle="bold" - app:layout_constraintHorizontal_bias="0" + android:drawableStart="@drawable/ic_comment_grey_24dp" + android:drawablePadding="12dp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@id/comment_button_item_post_detail" /> + app:layout_constraintStart_toEndOf="@id/minus_button_item_post_detail" /> <ImageView android:id="@+id/save_button_item_post_detail" @@ -391,15 +326,13 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="12dp" - android:src="@drawable/ic_outline_share_24px" - android:tint="@android:color/tab_indicator_text" + android:src="@drawable/ic_share_grey_24dp" android:background="?actionBarItemBackground" android:clickable="true" android:focusable="true" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="1" /> + app:layout_constraintEnd_toEndOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c0071a81..d8dc8b01 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -287,6 +287,7 @@ <string name="settings_theme_system_default_summary">Device default</string> <string name="settings_amoled_dark_title">Amoled Dark</string> <string name="settings_immersive_interface_title">Immersive Interface</string> + <string name="settings_vote_buttons_on_the_right_title">Vote Buttons on the Right</string> <string name="settings_lazy_mode_interval_title">Lazy Mode Interval</string> <string name="settings_font_size_title">Font Size</string> <string name="settings_title_font_size_title">Title Font Size</string> diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml index 5f3925f4..575dfd38 100644 --- a/app/src/main/res/xml/main_preferences.xml +++ b/app/src/main/res/xml/main_preferences.xml @@ -26,6 +26,17 @@ app:title="@string/settings_immersive_interface_title" app:isPreferenceVisible="false" /> + <SwitchPreference + app:defaultValue="false" + app:key="vote_buttons_on_the_right" + app:title="@string/settings_vote_buttons_on_the_right_title" + app:isPreferenceVisible="true" /> + + <Preference + app:title="@string/settings_font_size_title" + app:icon="@drawable/ic_font_size_24dp" + app:fragment="ml.docilealligator.infinityforreddit.Settings.FontSizePreferenceFragment" /> + <ListPreference app:defaultValue="2.5" android:entries="@array/settings_lazy_mode_interval" @@ -35,11 +46,6 @@ app:title="@string/settings_lazy_mode_interval_title" app:useSimpleSummaryProvider="true" /> - <Preference - app:title="@string/settings_font_size_title" - app:icon="@drawable/ic_font_size_24dp" - app:fragment="ml.docilealligator.infinityforreddit.Settings.FontSizePreferenceFragment" /> - <SwitchPreference app:defaultValue="false" app:key="nsfw" |
