Improved Amoled Theme

This reverts commit 07e1f1a1d3.

smali/res/drawable-v21/vkui_bg_button_white.xml

@@ -5,7 +5,7 @@
         <ripple android:color="@color/overlay">
             <item>
                 <shape>
-                    <solid android:color="?background_content" />
+                    <solid android:color="?accent" />
                     <corners android:radius="@dimen/vkui_button_corner_big_radius" />
                 </shape>
             </item>
@@ -13,7 +13,7 @@
     </item>
     <item>
         <shape>
-            <solid android:color="?background_content" />
+            <solid android:color="?accent" />
             <corners android:radius="@dimen/vkui_button_corner_big_radius" />
         </shape>
     </item>

smali/res/drawable/vkui_bg_button_white.xml

@@ -15,7 +15,7 @@
     </item>
     <item>
         <shape>
-            <solid android:color="?background_content" />
+            <solid android:color="?accent" />
             <corners android:radius="@dimen/vkui_button_corner_big_radius" />
         </shape>
     </item>

smali/res/layout/community_head_avatar.xml

@@ -2,8 +2,8 @@
 <FrameLayout android:paddingTop="16.0dip" android:paddingBottom="8.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginStart="16.0dip" android:layout_marginEnd="112.0dip">
-        <com.vk.common.view.TextViewEllipsizeEnd android:textColor="?text_muted" android:ellipsize="end" android:id="@id/profile_name" android:layout_width="fill_parent" android:layout_height="wrap_content" android:maxLines="2" style="@style/VKUIText.Title1" />
-        <TextView android:textColor="?text_secondary" android:ellipsize="end" android:id="@id/label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:maxLines="2" style="@style/VKUIText.New.Text" />
+        <com.vk.common.view.TextViewEllipsizeEnd android:textColor="?text_primary" android:ellipsize="end" android:id="@id/profile_name" android:layout_width="fill_parent" android:layout_height="wrap_content" android:maxLines="2" style="@style/VKUIText.Title1" />
+        <TextView android:textColor="?text_primary" android:ellipsize="end" android:id="@id/label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:maxLines="2" style="@style/VKUIText.New.Text" />
         <TextView android:textColor="?text_secondary" android:ellipsize="end" android:id="@id/secondary_label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" android:maxLines="2" style="@style/VKUIText.New.Text" />
     </LinearLayout>
     <com.vk.profile.ui.community.CommunityBorderedImageView android:layout_gravity="end|center" android:id="@id/profile_photo" android:layout_width="80.0dip" android:layout_height="80.0dip" android:layout_marginEnd="16.0dip" />

smali/res/values-v21/styles.xml

@@ -206,7 +206,7 @@
         <item name="android:seekBarStyle">@style/SolidSeekBar</item>
         <item name="android:alertDialogTheme">@style/MaterialDialogTheme.Dark</item>
         <item name="android:colorControlHighlight">#33999999</item>
-        <item name="android:navigationBarColor">?tabbar_background</item>
+        <item name="android:navigationBarColor">@android:color/black</item>
     </style>
 
     <style name="BaseAmoledStyle" parent="@style/BaseAmoledTheme">
@@ -266,7 +266,7 @@
         <item name="android:seekBarStyle">@style/SolidSeekBar</item>
         <item name="android:alertDialogTheme">@style/MaterialDialogTheme.Dark</item>
         <item name="android:colorControlHighlight">#33999999</item>
-        <item name="android:navigationBarColor">?tabbar_background</item>
+        <item name="android:navigationBarColor">@android:color/black</item>
     </style>
 
     <style name="BaseStyle" parent="@style/BaseTheme">
@@ -326,7 +326,7 @@
         <item name="android:colorPrimary">@color/white</item>
         <item name="android:colorPrimaryDark">@color/white</item>
         <item name="android:colorAccent">@color/white</item>
-        <item name="android:navigationBarColor">?tabbar_background</item>
+        <item name="android:navigationBarColor">@android:color/black</item>
     </style>
     <style name="BaseStyle.Dialog" parent="@style/Theme.AppCompat.Light.Dialog">
         <item name="android:backgroundDimAmount">0.4</item>
@@ -463,7 +463,7 @@
         <item name="android:alertDialogTheme">@style/MaterialDialogTheme</item>
         <item name="android:colorControlHighlight">#33999999</item>
         <item name="android:statusBarColor">@color/clear</item>
-        <item name="android:navigationBarColor">?tabbar_background</item>
+        <item name="android:navigationBarColor">@android:color/black</item>
     </style>
     <style name="BottomSheetTheme" parent="@style/Theme.Design.Light.BottomSheetDialog">
         <item name="android:windowAnimationStyle">@style/BottomSheet.AnimationStyle</item>
@@ -480,7 +480,7 @@
         <item name="android:layout_gravity">center</item>
         <item name="android:layout_margin">0.0dip</item>
         <item name="android:backgroundDimEnabled">false</item>
-        <item name="android:navigationBarColor">?tabbar_background</item>
+        <item name="android:navigationBarColor">@android:color/black</item>
         <item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
     </style>
     <style name="GradientActionBarSubtitleStyle" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Subtitle.Inverse">
@@ -521,7 +521,7 @@
         <item name="android:backgroundDimEnabled">false</item>
         <item name="android:windowSoftInputMode">adjustResize</item>
         <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:navigationBarColor">?tabbar_background</item>
+        <item name="android:navigationBarColor">@android:color/black</item>
         <item name="android:windowElevation">0.0px</item>
         <item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
     </style>
@@ -535,7 +535,7 @@
         <item name="android:windowFullscreen">true</item>
         <item name="android:backgroundDimEnabled">false</item>
         <item name="android:windowSoftInputMode">adjustResize</item>
-        <item name="android:navigationBarColor">?tabbar_background</item>
+        <item name="android:navigationBarColor">@android:color/black</item>
         <item name="android:windowElevation">0.0px</item>
     </style>
     <style name="PickerImageEditorActivity" parent="@style/Theme.AppCompat.Light.NoActionBar">
@@ -543,7 +543,7 @@
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:navigationBarColor">?tabbar_background</item>
+        <item name="android:navigationBarColor">@android:color/black</item>
         <item name="colorAccent">@color/picker_blue</item>
         <item name="colorPrimary">@color/picker_blue</item>
         <item name="colorPrimaryDark">@color/picker_blue</item>
@@ -573,7 +573,7 @@
         <item name="android:colorBackgroundCacheHint">@android:color/white</item>
         <item name="android:actionBarTheme">@style/ActionBarTheme.White</item>
         <item name="android:colorPrimaryDark">@color/not_placeholder_color</item>
-        <item name="android:navigationBarColor">?tabbar_background</item>
+        <item name="android:navigationBarColor">@android:color/black</item>
         <item name="android:actionBarPopupTheme">@style/Theme.AppCompat.Light</item>
         <item name="actionBarPopupTheme">@style/Theme.AppCompat.Light</item>
         <item name="actionBarTheme">@style/ActionBarTheme.White</item>
@@ -603,13 +603,13 @@
     <style name="Theme.App.Transparent" parent="@style/Base.Theme.App.Transparent">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">?tabbar_background</item>
+        <item name="android:navigationBarColor">@android:color/black</item>
     </style>
     <style name="TooltipFullScreenDialog" parent="@style/Theme.AppCompat.Light.Dialog">
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsFloating">false</item>
         <item name="android:windowFullscreen">true</item>
-        <item name="android:navigationBarColor">?tabbar_background</item>
+        <item name="android:navigationBarColor">@android:color/black</item>
     </style>
     <style name="TransparentTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowBackground">@android:color/transparent</item>
@@ -639,7 +639,7 @@
         <item name="android:windowFullscreen">false</item>
         <item name="android:colorBackgroundCacheHint">@android:color/transparent</item>
         <item name="android:actionBarTheme">@style/ActionBarTheme.White</item>
-        <item name="android:navigationBarColor">?tabbar_background</item>
+        <item name="android:navigationBarColor">@android:color/black</item>
         <item name="android:actionBarPopupTheme">@style/Theme.AppCompat.Light</item>
         <item name="actionBarPopupTheme">@style/Theme.AppCompat.Light</item>
         <item name="actionBarTheme">@style/ActionBarTheme.White</item>
@@ -668,7 +668,7 @@
         <item name="android:textColorSecondary">#ccffffff</item>
         <item name="android:windowBackground">@android:color/black</item>
         <item name="android:windowTranslucentNavigation">true</item>
-        <item name="android:navigationBarColor">?tabbar_background</item>
+        <item name="android:navigationBarColor">@android:color/black</item>
         <item name="colorAccent">#ffffffff</item>
     </style>
     <style name="VideoPlayerTranslucentStyle" parent="@style/TranslucentStyle">

smali/res/values/styles.xml

@@ -1157,6 +1157,7 @@
         <item name="appkitDefaultErrorText">@string/err_text</item>
         <item name="appkitRetryButtonText">@string/retry</item>
     </style>
+
     <style name="VkIm.Theme.VkApp.Amoled" parent="@style/VkIm.Theme.VkApp">
         <item name="accent">@color/sky_300</item>
         <item name="action_sheet_action_foreground">@color/white</item>
@@ -1301,8 +1302,8 @@
         <item name="im_bubble_incoming_alternate">@color/gray_800</item>
         <item name="im_bubble_incoming_alternate_highlighted">@color/gray_600</item>
         <item name="im_bubble_incoming_highlighted">@color/gray_600</item>
-        <item name="im_bubble_outgoing">@color/gray_700</item>
-        <item name="im_bubble_outgoing_alternate">@color/gray_700</item>
+        <item name="im_bubble_outgoing">@color/gray_750</item>
+        <item name="im_bubble_outgoing_alternate">@color/gray_750</item>
         <item name="im_bubble_outgoing_alternate_highlighted">@color/gray_500</item>
         <item name="im_bubble_outgoing_highlighted">@color/gray_600</item>
         <item name="im_conversation_error_icon">@color/red_error</item>