From 2747c9efc840a19d76f99a692e4c5077a4b035b2 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Tue, 12 Apr 2022 17:34:09 +0300
Subject: [PATCH] Improved dark theme

---
 smali/res/layout/article_author_empty_view.xml     |  4 ++--
 smali/res/layout/article_author_page_fragment.xml  | 14 +++++++-------
 smali/res/layout/article_author_page_item_big.xml  |  6 +++---
 .../res/layout/article_author_page_item_small.xml  |  6 +++---
 smali/res/layout/article_author_subscribe_view.xml |  4 ++--
 smali/res/layout/article_list_sort_picker_item.xml |  2 +-
 smali/res/layout/board_topic_row.xml               |  8 ++++----
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/smali/res/layout/article_author_empty_view.xml b/smali/res/layout/article_author_empty_view.xml
index 7bcd01fbf..7518acbfe 100644
--- a/smali/res/layout/article_author_empty_view.xml
+++ b/smali/res/layout/article_author_empty_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <ImageView android:id="@id/icon" android:layout_width="64.0dip" android:layout_height="64.0dip" android:src="@drawable/ic_article_64" android:tint="@color/gray_300" android:layout_marginStart="8.0dip" android:layout_marginEnd="8.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:srcCompat="@drawable/ic_article_64" />
-    <TextView android:textSize="16.0sp" android:textColor="@color/subhead_gray" android:ellipsize="end" android:gravity="center" android:id="@id/text" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:text="@string/article_author_group_empty" android:singleLine="true" android:includeFontPadding="false" android:fontFamily="@font/roboto_regular" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/icon" app:layout_constraintWidth_default="wrap" />
+    <ImageView android:id="@id/icon" android:layout_width="64.0dip" android:layout_height="64.0dip" android:src="@drawable/ic_article_64" android:tint="?accent" android:layout_marginStart="8.0dip" android:layout_marginEnd="8.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:srcCompat="@drawable/ic_article_64" />
+    <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:ellipsize="end" android:gravity="center" android:id="@id/text" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:text="@string/article_author_group_empty" android:singleLine="true" android:includeFontPadding="false" android:fontFamily="@font/roboto_regular" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/icon" app:layout_constraintWidth_default="wrap" />
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/smali/res/layout/article_author_page_fragment.xml b/smali/res/layout/article_author_page_fragment.xml
index 8b730ef40..89203884d 100644
--- a/smali/res/layout/article_author_page_fragment.xml
+++ b/smali/res/layout/article_author_page_fragment.xml
@@ -2,20 +2,20 @@
 <android.support.design.widget.CoordinatorLayout android:fitsSystemWindows="true" android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <View android:background="?tabbar_background" android:fitsSystemWindows="true" android:layout_width="fill_parent" android:layout_height="fill_parent" />
-    <android.support.design.widget.AppBarLayout android:id="@id/app_bar_layout" android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="238.0dip">
-        <android.support.design.widget.CollapsingToolbarLayout android:theme="@style/WhiteThemeActionBar" android:id="@id/collapsing_toolbar_layout" android:layout_width="fill_parent" android:layout_height="238.0dip" app:contentScrim="@color/white" app:layout_scrollFlags="exitUntilCollapsed|scroll" app:statusBarScrim="@color/white_with_FixAndroidBug" app:titleEnabled="false">
+    <android.support.design.widget.AppBarLayout android:id="@id/app_bar_layout" android:background="?background_content" android:layout_width="fill_parent" android:layout_height="238.0dip">
+        <android.support.design.widget.CollapsingToolbarLayout android:theme="@style/WhiteThemeActionBar" android:id="@id/collapsing_toolbar_layout" android:layout_width="fill_parent" android:layout_height="238.0dip" app:contentScrim="?text_primary" app:layout_scrollFlags="exitUntilCollapsed|scroll" app:statusBarScrim="?tabbar_background" app:titleEnabled="false">
             <LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:id="@id/header_container" android:background="@drawable/scrim_bottom_4percent" android:layout_width="fill_parent" android:layout_height="238.0dip" app:layout_collapseMode="parallax" app:layout_collapseParallaxMultiplier="0.4">
                 <com.vk.imageloader.view.VKCircleImageView android:id="@id/owner_image" android:layout_width="80.0dip" android:layout_height="80.0dip" android:layout_marginTop="32.0dip" />
-                <TextView android:textSize="20.0dip" android:textColor="@color/dark_grey" android:ellipsize="end" android:id="@id/owner_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="12.0dip" android:singleLine="true" android:includeFontPadding="false" android:drawablePadding="4.0dip" android:layout_marginStart="32.0dip" android:layout_marginEnd="32.0dip" app:fontFamily="@font/roboto_medium" />
-                <TextView android:textSize="13.0dip" android:textColor="@color/caption_gray" android:ellipsize="end" android:id="@id/subscribers_count" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:singleLine="true" android:includeFontPadding="false" android:layout_marginStart="32.0dip" android:layout_marginEnd="32.0dip" app:fontFamily="@font/roboto_regular" />
-                <TextView android:textSize="14.0dip" android:textColor="@color/white" android:ellipsize="end" android:gravity="center_vertical" android:id="@id/subscribe_button" android:layout_width="wrap_content" android:layout_height="30.0dip" android:layout_marginTop="8.0dip" android:singleLine="true" android:includeFontPadding="false" android:drawablePadding="5.0dip" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" android:layout_marginStart="32.0dip" android:layout_marginEnd="32.0dip" app:fontFamily="@font/roboto_medium" />
+                <TextView android:textSize="20.0dip" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/owner_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="12.0dip" android:singleLine="true" android:includeFontPadding="false" android:drawablePadding="4.0dip" android:layout_marginStart="32.0dip" android:layout_marginEnd="32.0dip" app:fontFamily="@font/roboto_medium" />
+                <TextView android:textSize="13.0dip" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/subscribers_count" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:singleLine="true" android:includeFontPadding="false" android:layout_marginStart="32.0dip" android:layout_marginEnd="32.0dip" app:fontFamily="@font/roboto_regular" />
+                <TextView android:textSize="14.0dip" android:textColor="?accent" android:ellipsize="end" android:gravity="center_vertical" android:id="@id/subscribe_button" android:layout_width="wrap_content" android:layout_height="30.0dip" android:layout_marginTop="8.0dip" android:singleLine="true" android:includeFontPadding="false" android:drawablePadding="5.0dip" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" android:layout_marginStart="32.0dip" android:layout_marginEnd="32.0dip" app:fontFamily="@font/roboto_medium" />
             </LinearLayout>
             <android.support.v7.widget.Toolbar android:theme="@style/WhiteThemeActionBar" android:id="@id/toolbar" android:fitsSystemWindows="true" android:layout_width="fill_parent" android:layout_height="?actionBarSize" app:layout_collapseMode="pin">
-                <TextView android:textSize="20.0dip" android:textColor="@color/attach_title" android:ellipsize="end" android:id="@id/custom_toolbar_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:fontFamily="@font/roboto_medium" style="@style/ActionBarTitleStyle" />
+                <TextView android:textSize="20.0dip" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/custom_toolbar_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:fontFamily="@font/roboto_medium" style="@style/ActionBarTitleStyle" />
             </android.support.v7.widget.Toolbar>
         </android.support.design.widget.CollapsingToolbarLayout>
     </android.support.design.widget.AppBarLayout>
     <com.vk.articles.author_page.ui.ArticleAuthorPageRecyclerPaginatedView android:id="@id/list" android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" />
     <View android:id="@id/shadow" android:background="@drawable/bg_toolbar_shadow_dark" android:layout_width="fill_parent" android:layout_height="12.0dip" android:alpha="0.0" app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-    <TextView android:textSize="16.0sp" android:textColor="@color/subhead_gray" android:ellipsize="end" android:gravity="center" android:layout_gravity="center" android:id="@id/privacy_error" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/article_private_error" android:singleLine="true" android:includeFontPadding="false" android:drawablePadding="8.0dip" android:layout_marginStart="24.0dip" android:layout_marginEnd="24.0dip" />
+    <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:ellipsize="end" android:gravity="center" android:layout_gravity="center" android:id="@id/privacy_error" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/article_private_error" android:singleLine="true" android:includeFontPadding="false" android:drawablePadding="8.0dip" android:layout_marginStart="24.0dip" android:layout_marginEnd="24.0dip" />
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/smali/res/layout/article_author_page_item_big.xml b/smali/res/layout/article_author_page_item_big.xml
index 1fd276b32..084b85110 100644
--- a/smali/res/layout/article_author_page_item_big.xml
+++ b/smali/res/layout/article_author_page_item_big.xml
@@ -2,8 +2,8 @@
 <android.support.constraint.ConstraintLayout android:background="@drawable/rounded_list_selector" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingStart="16.0dip" android:paddingEnd="16.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.vk.imageloader.view.VKImageView android:id="@id/image" android:layout_width="0.0dip" android:layout_height="0.0dip" app:actualImageScaleType="centerCrop" app:layout_constraintBottom_toTopOf="@id/title" app:layout_constraintDimensionRatio="h,5:3" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:roundedCornerRadius="3.0dip" />
-    <TextView android:textSize="15.0sp" android:textColor="@color/black" android:ellipsize="end" android:id="@id/title" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="10.0dip" android:maxLines="2" android:includeFontPadding="false" android:layout_marginEnd="8.0dip" app:fontFamily="@font/roboto_medium" app:layout_constraintBottom_toTopOf="@id/subtitle" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_weight="1.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/image" />
-    <TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:ellipsize="end" android:id="@id/subtitle" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:maxLines="2" android:includeFontPadding="false" app:fontFamily="@font/roboto_regular" app:layout_constraintBottom_toTopOf="@id/info" app:layout_constraintEnd_toEndOf="@id/title" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/title" />
-    <TextView android:textSize="13.0sp" android:textColor="@color/caption_gray" android:ellipsize="end" android:id="@id/info" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:maxLines="1" android:includeFontPadding="false" app:fontFamily="@font/roboto_regular" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/subtitle" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/subtitle" />
+    <TextView android:textSize="15.0sp" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/title" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="10.0dip" android:maxLines="2" android:includeFontPadding="false" android:layout_marginEnd="8.0dip" app:fontFamily="@font/roboto_medium" app:layout_constraintBottom_toTopOf="@id/subtitle" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_weight="1.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/image" />
+    <TextView android:textSize="14.0sp" android:textColor="?text_secondary" android:ellipsize="end" android:id="@id/subtitle" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:maxLines="2" android:includeFontPadding="false" app:fontFamily="@font/roboto_regular" app:layout_constraintBottom_toTopOf="@id/info" app:layout_constraintEnd_toEndOf="@id/title" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/title" />
+    <TextView android:textSize="13.0sp" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/info" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:maxLines="1" android:includeFontPadding="false" app:fontFamily="@font/roboto_regular" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/subtitle" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/subtitle" />
     <ImageView android:id="@id/fave" android:layout_width="44.0dip" android:layout_height="44.0dip" android:src="@drawable/fave_start_button" android:scaleType="center" app:layout_constraintEnd_toEndOf="@id/image" app:layout_constraintTop_toTopOf="@id/image" app:srcCompat="@drawable/fave_start_button" />
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/smali/res/layout/article_author_page_item_small.xml b/smali/res/layout/article_author_page_item_small.xml
index 542f3c06f..02f733d89 100644
--- a/smali/res/layout/article_author_page_item_small.xml
+++ b/smali/res/layout/article_author_page_item_small.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout android:background="@drawable/rounded_list_selector" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingStart="16.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:textSize="15.0sp" android:textColor="@color/black" android:ellipsize="end" android:id="@id/title" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:maxLines="2" android:includeFontPadding="false" app:fontFamily="@font/roboto_medium" app:layout_constraintBottom_toTopOf="@id/subtitle" app:layout_constraintEnd_toStartOf="@id/image_container" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_weight="1.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" />
-    <TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:ellipsize="end" android:id="@id/subtitle" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:maxLines="2" android:includeFontPadding="false" app:fontFamily="@font/roboto_regular" app:layout_constraintBottom_toTopOf="@id/info" app:layout_constraintEnd_toEndOf="@id/title" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/title" />
-    <TextView android:textSize="13.0sp" android:textColor="@color/caption_gray" android:ellipsize="end" android:id="@id/info" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:layout_marginBottom="16.0dip" android:maxLines="1" android:includeFontPadding="false" app:fontFamily="@font/roboto_regular" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/subtitle" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/subtitle" />
+    <TextView android:textSize="15.0sp" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/title" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:maxLines="2" android:includeFontPadding="false" app:fontFamily="@font/roboto_medium" app:layout_constraintBottom_toTopOf="@id/subtitle" app:layout_constraintEnd_toStartOf="@id/image_container" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_weight="1.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" />
+    <TextView android:textSize="14.0sp" android:textColor="?text_secondary" android:ellipsize="end" android:id="@id/subtitle" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:maxLines="2" android:includeFontPadding="false" app:fontFamily="@font/roboto_regular" app:layout_constraintBottom_toTopOf="@id/info" app:layout_constraintEnd_toEndOf="@id/title" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/title" />
+    <TextView android:textSize="13.0sp" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/info" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:layout_marginBottom="16.0dip" android:maxLines="1" android:includeFontPadding="false" app:fontFamily="@font/roboto_regular" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/subtitle" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/subtitle" />
     <FrameLayout android:id="@id/image_container" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_weight="0.0" app:layout_constraintStart_toEndOf="@id/title" app:layout_constraintTop_toTopOf="parent">
         <com.vk.imageloader.view.VKImageView android:layout_gravity="center" android:id="@id/image" android:layout_width="105.0dip" android:layout_height="76.0dip" android:layout_margin="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" app:actualImageScaleType="centerCrop" app:roundedCornerRadius="3.0dip" />
         <ImageView android:layout_gravity="end|center|top" android:id="@id/fave" android:layout_width="44.0dip" android:layout_height="44.0dip" android:layout_margin="2.0dip" android:src="@drawable/fave_start_button" android:scaleType="center" app:srcCompat="@drawable/fave_start_button" />
diff --git a/smali/res/layout/article_author_subscribe_view.xml b/smali/res/layout/article_author_subscribe_view.xml
index 509d8a3d5..778af9c62 100644
--- a/smali/res/layout/article_author_subscribe_view.xml
+++ b/smali/res/layout/article_author_subscribe_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:textSize="16.0sp" android:textColor="@color/subhead_gray" android:ellipsize="end" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="4" android:includeFontPadding="false" android:lineSpacingExtra="1.0sp" android:layout_marginStart="24.0dip" android:layout_marginEnd="24.0dip" app:fontFamily="@font/roboto_regular" />
-    <TextView android:textSize="15.0sp" android:textColor="@color/white" android:ellipsize="end" android:layout_gravity="center_horizontal" android:id="@id/button" android:paddingTop="9.0dip" android:paddingBottom="9.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:singleLine="true" android:includeFontPadding="false" android:drawablePadding="5.0dip" android:layout_marginStart="24.0dip" android:layout_marginEnd="24.0dip" app:fontFamily="@font/roboto_medium" style="@style/VKUIButton.Primary" />
+    <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:ellipsize="end" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="4" android:includeFontPadding="false" android:lineSpacingExtra="1.0sp" android:layout_marginStart="24.0dip" android:layout_marginEnd="24.0dip" app:fontFamily="@font/roboto_regular" />
+    <TextView android:textSize="15.0sp" android:textColor="?accent" android:ellipsize="end" android:layout_gravity="center_horizontal" android:id="@id/button" android:paddingTop="9.0dip" android:paddingBottom="9.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:singleLine="true" android:includeFontPadding="false" android:drawablePadding="5.0dip" android:layout_marginStart="24.0dip" android:layout_marginEnd="24.0dip" app:fontFamily="@font/roboto_medium" style="@style/VKUIButton.Primary" />
 </merge>
\ No newline at end of file
diff --git a/smali/res/layout/article_list_sort_picker_item.xml b/smali/res/layout/article_list_sort_picker_item.xml
index daa7495c4..e11350187 100644
--- a/smali/res/layout/article_list_sort_picker_item.xml
+++ b/smali/res/layout/article_list_sort_picker_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout android:layout_width="fill_parent" android:layout_height="44.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:textSize="13.0sp" android:textColor="@color/caption_gray" android:ellipsize="end" android:gravity="center" android:layout_width="wrap_content" android:layout_height="0.0dip" android:text="@string/article_all" android:singleLine="true" android:includeFontPadding="false" android:textAllCaps="true" android:layout_marginStart="16.0dip" app:fontFamily="@font/roboto_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
+    <TextView android:textSize="13.0sp" android:textColor="?text_primary" android:ellipsize="end" android:gravity="center" android:layout_width="wrap_content" android:layout_height="0.0dip" android:text="@string/article_all" android:singleLine="true" android:includeFontPadding="false" android:textAllCaps="true" android:layout_marginStart="16.0dip" app:fontFamily="@font/roboto_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
     <TextView android:textSize="14.0sp" android:textColor="?accent" android:ellipsize="end" android:gravity="center" android:id="@id/sort_type_text" android:background="@drawable/rounded_list_selector" android:layout_width="wrap_content" android:layout_height="0.0dip" android:text="@string/article_sort_time" android:singleLine="true" android:drawablePadding="4.0dip" android:paddingStart="6.0dip" android:paddingEnd="6.0dip" android:layout_marginEnd="6.0dip" app:fontFamily="@font/roboto_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" />
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/smali/res/layout/board_topic_row.xml b/smali/res/layout/board_topic_row.xml
index dd54e3f7c..3d43a962a 100644
--- a/smali/res/layout/board_topic_row.xml
+++ b/smali/res/layout/board_topic_row.xml
@@ -2,12 +2,12 @@
 <RelativeLayout android:paddingTop="17.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:id="@id/board_topic_title" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:layout_alignParentRight="true" />
-    <TextView android:textSize="14.0dip" android:textColor="#ff8c8d8f" android:id="@id/board_topic_info" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:layout_below="@id/board_topic_title" android:layout_alignLeft="@id/board_topic_title" android:layout_alignRight="@id/board_topic_title" />
+    <TextView android:textSize="14.0dip" android:textColor="?text_secondary" android:id="@id/board_topic_info" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:layout_below="@id/board_topic_title" android:layout_alignLeft="@id/board_topic_title" android:layout_alignRight="@id/board_topic_title" />
     <RelativeLayout android:id="@id/last_comment" android:background="@drawable/highlight" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="21.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_below="@id/board_topic_info" android:layout_alignLeft="@id/board_topic_info" android:layout_alignRight="@id/board_topic_info">
         <View android:id="@id/board_topic_divider" android:background="#26000000" android:layout_width="wrap_content" android:layout_height="0.5dip" android:layout_marginLeft="-16.0dip" android:layout_marginRight="-16.0dip" android:layout_marginBottom="12.0dip" />
         <com.vk.imageloader.view.VKCircleImageView android:id="@id/board_topic_photo" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginRight="12.0dip" android:layout_below="@id/board_topic_divider" app:placeholderImage="@drawable/photo_loading" />
-        <TextView android:textSize="15.0dip" android:textColor="?accent" android:id="@id/board_topic_l_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toRightOf="@id/board_topic_photo" android:layout_alignTop="@id/board_topic_photo" android:fontFamily="@string/font_family_medium" />
-        <com.vtosters.lite.ui.CorrectlyMeasuringTextView android:textSize="15.0dip" android:textColor="#dd000000" android:id="@id/board_topic_l_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:lines="1" android:layout_below="@id/board_topic_l_name" android:layout_alignLeft="@id/board_topic_l_name" />
-        <TextView android:textSize="13.0dip" android:textColor="#ff8c8d8f" android:id="@id/board_topic_l_updated" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="1.0dip" android:layout_below="@id/board_topic_l_text" android:layout_alignLeft="@id/board_topic_l_text" />
+        <TextView android:textSize="15.0dip" android:textColor="?text_primary" android:id="@id/board_topic_l_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toRightOf="@id/board_topic_photo" android:layout_alignTop="@id/board_topic_photo" android:fontFamily="@string/font_family_medium" />
+        <com.vtosters.lite.ui.CorrectlyMeasuringTextView android:textSize="15.0dip" android:textColor="?text_secondary" android:id="@id/board_topic_l_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:lines="1" android:layout_below="@id/board_topic_l_name" android:layout_alignLeft="@id/board_topic_l_name" />
+        <TextView android:textSize="13.0dip" android:textColor="?text_secondary" android:id="@id/board_topic_l_updated" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="1.0dip" android:layout_below="@id/board_topic_l_text" android:layout_alignLeft="@id/board_topic_l_text" />
     </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file