test coloring bottomsheet

app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarManager.java

@@ -3,7 +3,7 @@ package ru.vtosters.lite.ui.fragments.dockbar;
 import static ru.vtosters.lite.utils.Globals.getContext;
 import static ru.vtosters.lite.utils.Globals.getString;
 import static ru.vtosters.lite.utils.Preferences.newfeed;
-import static ru.vtosters.lite.utils.Preferences.olddock;
+import static ru.vtosters.lite.utils.Preferences.oldicons;
 
 import com.vk.apps.AppsFragment;
 import com.vk.discover.DiscoverFragment;
@@ -79,11 +79,11 @@ public class DockBarManager {
         File dockbar = new File(getContext().getFilesDir(), "dockbar.json");
 
         if (!dockbar.exists()) {
-            mSelectedTabs.add(new DockBarTab("tab_news", olddock() ? R.drawable.ic_newsfeed_28 : R.drawable.ic_menu_newsfeed_outline_28, R.string.newsfeed, R.id.tab_news, newfeed() ? HomeFragment.class : NewsfeedFragment.class));
-            mSelectedTabs.add(new DockBarTab("tab_discover", olddock() ? R.drawable.ic_search_28 : R.drawable.ic_menu_search_outline_28, R.string.search, R.id.tab_discover, DiscoverFragment.class ));
-            mSelectedTabs.add(new DockBarTab("tab_messages", olddock() ? R.drawable.ic_menu_messages_28 : R.drawable.ic_message_28_outline, R.string.messages, R.id.tab_messages, DialogsFragment.class));
-            mSelectedTabs.add(new DockBarTab("tab_feedback", olddock() ? R.drawable.ic_menu_notifications_28 : R.drawable.ic_menu_notification_outline_28, R.string.feedback, R.id.tab_feedback, NotificationsContainerFragment.class));
-            mSelectedTabs.add(new DockBarTab("tab_menu", olddock() ? R.drawable.ic_menu_more_28 : R.drawable.ic_menu_more_outline_28, R.string.menu, R.id.tab_menu, MenuFragment.class));
+            mSelectedTabs.add(new DockBarTab("tab_news", oldicons() ? R.drawable.ic_newsfeed_28 : R.drawable.ic_menu_newsfeed_outline_28, R.string.newsfeed, R.id.tab_news, newfeed() ? HomeFragment.class : NewsfeedFragment.class));
+            mSelectedTabs.add(new DockBarTab("tab_discover", oldicons() ? R.drawable.ic_search_28 : R.drawable.ic_menu_search_outline_28, R.string.search, R.id.tab_discover, DiscoverFragment.class ));
+            mSelectedTabs.add(new DockBarTab("tab_messages", oldicons() ? R.drawable.ic_menu_messages_28 : R.drawable.ic_message_28_outline, R.string.messages, R.id.tab_messages, DialogsFragment.class));
+            mSelectedTabs.add(new DockBarTab("tab_feedback", oldicons() ? R.drawable.ic_menu_notifications_28 : R.drawable.ic_menu_notification_outline_28, R.string.feedback, R.id.tab_feedback, NotificationsContainerFragment.class));
+            mSelectedTabs.add(new DockBarTab("tab_menu", oldicons() ? R.drawable.ic_menu_more_28 : R.drawable.ic_menu_more_outline_28, R.string.menu, R.id.tab_menu, MenuFragment.class));
 
             mDisabledTabs.add(new DockBarTab("tab_friends", R.drawable.ic_user_24, R.string.friends, R.id.menu_friends, FriendsFragment.class));
             mDisabledTabs.add(new DockBarTab("tab_groups", R.drawable.ic_users_24, R.string.groups, R.id.menu_groups, GroupsFragment.class));

app/src/main/java/ru/vtosters/lite/utils/FragAnimationKit.java

@@ -0,0 +1,71 @@
+package ru.vtosters.lite.utils;
+
+import static ru.vtosters.lite.utils.Globals.getIdentifier;
+import static ru.vtosters.lite.utils.Globals.getPrefsValue;
+
+import android.content.res.Resources;
+import android.support.v4.app.FragmentTransaction;
+
+public class FragAnimationKit {
+    // Q
+    private static final int actOpenEnter = getIdentifier("q_enter", "anim");
+    private static final int actCloseExit = getIdentifier("q_pop_exit", "anim");
+    // Slide
+    private static final int SactOpenEnter = getIdentifier("legacy_enter", "anim");
+    private static final int SactCloseExit = getIdentifier("legacy_pop_exit", "anim");
+    // Fade
+    private static final int FadeOpenEnter = getIdentifier("vkme_enter_slide_up", "anim");
+    private static final int FadeCloseExit = getIdentifier("vkme_enter_slide_down", "anim");
+    // System
+    private static final Resources resources = Resources.getSystem();
+    private static final int SSactOpenEnter = resources.getIdentifier("activity_open_enter", "anim","android");
+    private static final int SSactCloseExit = resources.getIdentifier("activity_close_exit", "anim", "android");
+    // System [task]
+    private static final int SSTactOpenEnter = resources.getIdentifier("task_open_enter", "anim","android");
+    private static final int SSTactCloseExit = resources.getIdentifier("task_close_exit", "anim", "android");
+
+    public static void animateOpen(FragmentTransaction transaction) {
+        setAnimations(transaction);
+    }
+
+    public static void animateClose(FragmentTransaction transaction) {
+        setAnimations(transaction);
+    }
+
+    public static void setAnimations(FragmentTransaction transaction) {
+        if (transaction != null && !getPrefsValue("anim_rtrn_type").equals("noanim")) {
+            switch (getPrefsValue("anim_rtrn_type")) {
+                case "q":
+                    transaction.a(
+                            actOpenEnter,
+                            actCloseExit
+                    );
+                    break;
+                case "fade":
+                    transaction.a(
+                            FadeOpenEnter,
+                            FadeCloseExit
+                    );
+                    break;
+                case "slide":
+                    transaction.a(
+                            SactOpenEnter,
+                            SactCloseExit
+                    );
+                    break;
+                case "system":
+                    transaction.a(
+                            SSactOpenEnter,
+                            SSactCloseExit
+                    );
+                    break;
+                case "system_task":
+                    transaction.a(
+                            SSTactOpenEnter,
+                            SSTactCloseExit
+                    );
+                    break;
+            }
+        }
+    }
+}

app/src/main/java/ru/vtosters/lite/utils/Preferences.java

@@ -1,5 +1,6 @@
 package ru.vtosters.lite.utils;
 
+import static android.os.Build.VERSION;
 import static ru.vtosters.lite.f0x1d.VTVerifications.isVerified;
 import static ru.vtosters.lite.ui.fragments.multiaccount.MultiAccountManager.migrate;
 import static ru.vtosters.lite.utils.DeletedMessagesHandler.reloadMessagesList;
@@ -16,11 +17,12 @@ import static ru.vtosters.lite.utils.OpusLoader.LoadLibrary;
 import static ru.vtosters.lite.utils.Proxy.setProxy;
 import static ru.vtosters.lite.utils.Themes.systemThemeChanger;
 
+import android.annotation.SuppressLint;
 import android.app.Application;
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.os.Build;
 import android.preference.PreferenceManager;
+import android.util.Log;
 
 import com.vk.core.util.Screen;
 import com.vk.im.engine.models.users.UserSex;
@@ -49,6 +51,13 @@ public class Preferences {
         systemThemeChanger();
     } // VK Init
 
+    public static void forceOffline() {
+        if (setoffline() && !offline()) {
+            Users.b();
+        }
+        setupFilters();
+    }
+
     public static boolean getBoolValue(String key, Boolean value) {
         if (preferences == null) {
             preferences = PreferenceManager.getDefaultSharedPreferences(getContext());
@@ -56,6 +65,10 @@ public class Preferences {
         return preferences.getBoolean(key, value);
     } // Set bool by default and get value
 
+    public static SharedPreferences getPrefsFromFile(String filename) {
+        return getContext().getSharedPreferences(filename, Context.MODE_PRIVATE);
+    }
+
     public static boolean opusmodule() {
         return getBoolValue("opusmodule", true);
     }
@@ -100,8 +113,8 @@ public class Preferences {
         return getBoolValue("adsgroup", false);
     }
 
-    public static boolean olddock() {
-        return getBoolValue("olddock", false);
+    public static boolean oldicons() {
+        return getBoolValue("oldicons", false);
     }
 
     public static boolean adsslider() {
@@ -180,13 +193,6 @@ public class Preferences {
         return getBoolValue("commentssorting", false);
     }
 
-    public static void forceOffline() {
-        if (setoffline() && !offline()) {
-            Users.b();
-        }
-        setupFilters();
-    }
-
     public static boolean gcmfix() {
         return getBoolValue("gcmfix", true);
     }
@@ -313,15 +319,15 @@ public class Preferences {
     }
 
     public static String MediacontentFix() {
-        return Build.VERSION.SDK_INT >= 29 ? "date_modified DESC" : "datetaken DESC";
+        return VERSION.SDK_INT >= 29 ? "date_modified DESC" : "datetaken DESC";
     } // Fix photo picker for sdk 29+
 
     public static String MediacontentFix2() {
-        return Build.VERSION.SDK_INT >= 29 ? "date_modified" : "datetaken";
+        return VERSION.SDK_INT >= 29 ? "date_modified" : "datetaken";
     } // Fix photo picker for sdk 29+
 
     public static String MediacontentFix3() {
-        return Build.VERSION.SDK_INT >= 29 ? ", date_modified=" : ", dateTaken=";
+        return VERSION.SDK_INT >= 29 ? ", date_modified=" : ", dateTaken=";
     } // Fix photo picker for sdk 29+
 
     public static boolean color_grishka() {
@@ -370,21 +376,24 @@ public class Preferences {
         return string.isEmpty() ? Locale.getDefault().getLanguage() : string;
     }
 
-
     public static boolean fulltime() {
         return getPrefsValue("dateformat").equals("noyear") || getPrefsValue("dateformat").equals("full") || getPrefsValue("dateformat").equals("noseconds");
     }
 
     public static String getDateFormat() {
-        if (getPrefsValue("dateformat").equals("noyear")) {
-            return getString("fulltime2");
+        switch (getPrefsValue("dateformat")) {
+            case "noyear":
+                return getString("fulltime2");
+            case "full":
+                return getString("fulltime");
+            default:
+                return getString("fulltime3");
         }
+    }
 
-        if (getPrefsValue("dateformat").equals("full")) {
-            return getString("fulltime");
-        }
-
-        return getString("fulltime3");
+    @SuppressLint("SimpleDateFormat")
+    public static SimpleDateFormat setDateFormat() {
+        return new SimpleDateFormat(getDateFormat());
     }
 
     public static String getFormattedDate(UserSex type, long time){
@@ -393,9 +402,9 @@ public class Preferences {
         if(!fulltime()) return null;
 
         try {
-            return getStringDate(type == UserSex.FEMALE ? getIdentifier("last_seen_profile_f", "string") : getIdentifier("last_seen_profile_m", "string"), new Object[]{date.format(new Date(time))});
-
+            return getStringDate(type == UserSex.FEMALE ? getIdentifier("last_seen_profile_f", "string") : getIdentifier("last_seen_profile_m", "string"), date.format(new Date(time)));
         } catch (Throwable th) {
+            Log.d("VTLite", "Format data error, type " + type + " , time " + time);
             th.printStackTrace();
             return null;
         }

app/src/main/java/ru/vtosters/lite/utils/Themes.java

@@ -1,15 +1,14 @@
 package ru.vtosters.lite.utils;
 
 import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
-import static java.util.Arrays.asList;
 import static ru.vtosters.lite.utils.Globals.getIdentifier;
 import static ru.vtosters.lite.utils.Globals.getPrefsValue;
 import static ru.vtosters.lite.utils.Globals.getResources;
 import static ru.vtosters.lite.utils.Preferences.color_grishka;
 import static ru.vtosters.lite.utils.Preferences.isBGStickersEnabled;
 import static ru.vtosters.lite.utils.Preferences.navbar;
-import static ru.vtosters.lite.utils.Preferences.systemtheme;
 import static ru.vtosters.lite.utils.Preferences.roundedmsgs;
+import static ru.vtosters.lite.utils.Preferences.systemtheme;
 import static ru.vtosters.lite.utils.Preferences.vksans;
 
 import android.content.Context;
@@ -32,11 +31,12 @@ import com.vk.im.ui.themes.ImTheme;
 import com.vk.im.ui.themes.ImThemeHelper;
 import com.vtosters.lite.R;
 
+import java.util.Arrays;
 import java.util.List;
 
 public class Themes {
-    public static List<String> accentColors = asList(
-            "71AAEB", "3F8AE0", "528BCC", "4986CC", "5181B8", "74A2D6", "518BCC"
+    public static List<String> accentColors = Arrays.asList(
+            "5692d7", "528bcc", "7aa0cc", "518bcc", "6296d0", "2f68aa", "638ebf", "5181b8", "71aaeb", "4774a8", "5baaf4", "4186c8", "add3ff", "4774a8", "718198", "5a9eff", "99a2ad", "74a2d6", "e9eef3", "dfe3e7", "eff1f3", "5c9ce6", "4986cc", "4680c2"
     );
 
     public static void applyTheme(VKTheme theme, ImTheme imtheme) {
@@ -186,8 +186,12 @@ public class Themes {
         return ColorStateList.valueOf(getAccentColor());
     } // Recolor ColorStateList to accent color
 
-    public static ColorStateList themeCSL(ColorStateList csl) {
-        int color = csl.getDefaultColor();
+    public static ColorStateList themeCSL(Context context, int color) {
+        if (isColorRefAccented(color) && isAndroidMonet()) {
+            return ColorStateList.valueOf(getAccentColor());
+        }
+
+        ColorStateList csl = context.getColorStateList(color);
         try {
             int unsel = csl.getColorForState(new int[]{-android.R.attr.state_selected}, Color.BLACK);
             int sel = csl.getColorForState(new int[]{android.R.attr.state_selected}, Color.BLACK);
@@ -225,6 +229,13 @@ public class Themes {
         return Color.argb(Color.alpha(color), red, green, blue);
     }
 
+    public static int fixTextColor(int resid) {
+        if (resid == R.color.music_action_button_gray || resid == R.color.cool_grey || resid == R.color.accent_blue){
+            return isDarkTheme()? R.color.white : R.color.cool_grey;
+        }
+        return resid;
+    }
+
     public static int halfAlpha(int src) {
         return ColorUtils.setAlphaComponent(src, 169);
     }
@@ -234,7 +245,7 @@ public class Themes {
     }
 
     public static boolean isAccentedColor(int target) {
-        return accentColors.contains(hex(target).toUpperCase());
+        return accentColors.contains(hex(target).toLowerCase());
     }
 
     public static int getColor(Context context, int i) {

smali/res/anim/abc_grow_fade_in_from_bottom.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:shareInterpolator="false"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
     <scale
-        android:interpolator="@android:anim/decelerate_interpolator"
         android:duration="@integer/abc_config_activityDefaultDur"
+        android:fromXScale="0.9"
+        android:fromYScale="0.9"
+        android:interpolator="@android:anim/decelerate_interpolator"
         android:pivotX="50.0%"
         android:pivotY="100.0%"
-        android:fromXScale="0.9"
         android:toXScale="1.0"
-        android:fromYScale="0.9"
         android:toYScale="1.0" />
     <alpha
-        android:interpolator="@android:anim/decelerate_interpolator"
         android:duration="@integer/abc_config_activityShortDur"
         android:fromAlpha="0.0"
+        android:interpolator="@android:anim/decelerate_interpolator"
         android:toAlpha="1.0" />
 </set>

smali/res/anim/abc_popup_enter.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:shareInterpolator="false"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
     <alpha
-        android:interpolator="@android:anim/decelerate_interpolator"
         android:duration="@integer/abc_config_activityShortDur"
         android:fromAlpha="0.0"
+        android:interpolator="@android:anim/decelerate_interpolator"
         android:toAlpha="1.0" />
 </set>

smali/res/anim/abc_popup_exit.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:shareInterpolator="false"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
     <alpha
-        android:interpolator="@android:anim/decelerate_interpolator"
         android:duration="@integer/abc_config_activityShortDur"
         android:fromAlpha="1.0"
+        android:interpolator="@android:anim/decelerate_interpolator"
         android:toAlpha="0.0" />
 </set>

smali/res/anim/abc_shrink_fade_out_from_bottom.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:shareInterpolator="false"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
     <scale
-        android:interpolator="@android:anim/decelerate_interpolator"
         android:duration="@integer/abc_config_activityDefaultDur"
+        android:fromXScale="1.0"
+        android:fromYScale="1.0"
+        android:interpolator="@android:anim/decelerate_interpolator"
         android:pivotX="50.0%"
         android:pivotY="100.0%"
-        android:fromXScale="1.0"
         android:toXScale="0.9"
-        android:fromYScale="1.0"
         android:toYScale="0.9" />
     <alpha
-        android:interpolator="@android:anim/decelerate_interpolator"
         android:duration="@integer/abc_config_activityShortDur"
         android:fromAlpha="1.0"
+        android:interpolator="@android:anim/decelerate_interpolator"
         android:toAlpha="0.0" />
 </set>

smali/res/anim/abc_tooltip_enter.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<alpha android:interpolator="@android:interpolator/decelerate_quad"
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
     android:duration="@integer/config_tooltipAnimTime"
     android:fromAlpha="0.0"
-    android:toAlpha="1.0"
-    xmlns:android="http://schemas.android.com/apk/res/android" />
+    android:interpolator="@android:interpolator/decelerate_quad"
+    android:toAlpha="1.0" />

smali/res/anim/abc_tooltip_exit.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<alpha android:interpolator="@android:interpolator/accelerate_quad"
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
     android:duration="@integer/config_tooltipAnimTime"
     android:fromAlpha="1.0"
-    android:toAlpha="0.0"
-    xmlns:android="http://schemas.android.com/apk/res/android" />
+    android:interpolator="@android:interpolator/accelerate_quad"
+    android:toAlpha="0.0" />

smali/res/anim/activity_close_enter.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:zAdjustment="normal"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:zAdjustment="normal">
     <alpha
         android:duration="300"
-        android:fillBefore="true"
         android:fillAfter="true"
+        android:fillBefore="true"
+        android:fillEnabled="true"
         android:fromAlpha="1.0"
-        android:toAlpha="1.0"
-        android:fillEnabled="true" />
+        android:toAlpha="1.0" />
 </set>

smali/res/anim/activity_close_exit.xml

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:shareInterpolator="false"
-    android:zAdjustment="top"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false"
+    android:zAdjustment="top">
     <alpha
-        android:interpolator="@android:interpolator/decelerate_cubic"
         android:duration="300"
-        android:fillBefore="true"
         android:fillAfter="true"
+        android:fillBefore="true"
+        android:fillEnabled="true"
         android:fromAlpha="1.0"
-        android:toAlpha="0.0"
-        android:fillEnabled="true" />
-    <scale
         android:interpolator="@android:interpolator/decelerate_cubic"
+        android:toAlpha="0.0" />
+    <scale
         android:duration="300"
+        android:fillAfter="true"
+        android:fillBefore="true"
+        android:fillEnabled="true"
+        android:fromXScale="1.0"
+        android:fromYScale="1.0"
+        android:interpolator="@android:interpolator/decelerate_cubic"
         android:pivotX="50.0%p"
         android:pivotY="50.0%p"
-        android:fillBefore="true"
-        android:fillAfter="true"
-        android:fromXScale="1.0"
         android:toXScale="0.8"
-        android:fromYScale="1.0"
-        android:toYScale="0.8"
-        android:fillEnabled="true" />
+        android:toYScale="0.8" />
 </set>

smali/res/anim/activity_posting_slide_in.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:interpolator="@android:anim/decelerate_interpolator"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/decelerate_interpolator">
     <translate
         android:duration="300"
         android:fromYDelta="100.0%p"

smali/res/anim/activity_posting_slide_out.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:interpolator="@android:anim/accelerate_interpolator"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/accelerate_interpolator">
     <translate
         android:duration="300"
         android:fromYDelta="0.0%p"

smali/res/anim/bottom_sheet_slide_in.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="225"
+    android:interpolator="@android:interpolator/linear_out_slow_in">
+    <translate
+        android:fromYDelta="100.0%p"
+        android:toYDelta="0.0" />
+</set>

smali/res/anim/bottom_sheet_slide_out.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="195"
+    android:interpolator="@android:interpolator/fast_out_linear_in">
+    <translate
+        android:fromYDelta="0.0%p"
+        android:toYDelta="100.0%p" />
+</set>

smali/res/anim/button_raise.xml

@@ -5,15 +5,15 @@
         android:state_pressed="true">
         <objectAnimator
             android:duration="200"
+            android:propertyName="translationZ"
             android:valueTo="2.0dip"
-            android:valueType="floatType"
-            android:propertyName="translationZ" />
+            android:valueType="floatType" />
     </item>
     <item>
         <objectAnimator
             android:duration="200"
+            android:propertyName="translationZ"
             android:valueTo="1.0dip"
-            android:valueType="floatType"
-            android:propertyName="translationZ" />
+            android:valueType="floatType" />
     </item>
 </selector>

smali/res/anim/button_raise_big.xml

@@ -5,15 +5,15 @@
         android:state_pressed="true">
         <objectAnimator
             android:duration="200"
+            android:propertyName="translationZ"
             android:valueTo="4.0dip"
-            android:valueType="floatType"
-            android:propertyName="translationZ" />
+            android:valueType="floatType" />
     </item>
     <item>
         <objectAnimator
             android:duration="200"
+            android:propertyName="translationZ"
             android:valueTo="2.0dip"
-            android:valueType="floatType"
-            android:propertyName="translationZ" />
+            android:valueType="floatType" />
     </item>
 </selector>

smali/res/anim/design_bottom_sheet_slide_in.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+<set xmlns:android="http://schemas.android.com/apk/res/android"
     android:duration="@integer/bottom_sheet_slide_duration"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:interpolator="@android:interpolator/fast_out_linear_in">
     <translate
         android:fromYDelta="20.000004%p"
         android:toYDelta="0.0" />

smali/res/anim/design_bottom_sheet_slide_out.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:interpolator="@android:anim/accelerate_interpolator"
+<set xmlns:android="http://schemas.android.com/apk/res/android"
     android:duration="@integer/bottom_sheet_slide_duration"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:interpolator="@android:interpolator/fast_out_slow_in">
     <translate
         android:fromYDelta="0.0"
         android:toYDelta="20.000004%p" />

smali/res/anim/design_snackbar_in.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<translate android:fromYDelta="100.0%"
-    android:toYDelta="0.0"
-    xmlns:android="http://schemas.android.com/apk/res/android" />
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromYDelta="100.0%"
+    android:toYDelta="0.0" />

smali/res/anim/design_snackbar_out.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<translate android:fromYDelta="0.0"
-    android:toYDelta="100.0%"
-    xmlns:android="http://schemas.android.com/apk/res/android" />
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromYDelta="0.0"
+    android:toYDelta="100.0%" />

smali/res/anim/fade_out_fast.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<alpha android:interpolator="@android:anim/accelerate_interpolator"
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
     android:duration="200"
     android:fromAlpha="1.0"
-    android:toAlpha="0.0"
-    xmlns:android="http://schemas.android.com/apk/res/android" />
+    android:interpolator="@android:anim/accelerate_interpolator"
+    android:toAlpha="0.0" />

smali/res/anim/fast_out_extra_slow_in.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:pathData="M 0,0 C 0.05, 0, 0.133333, 0.06, 0.166666, 0.4 C 0.208333, 0.82, 0.25, 1, 1, 1" />

smali/res/anim/fast_out_linear_in.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:controlX1="0.4"
+    android:controlX2="1.0"
+    android:controlY1="0.0"
+    android:controlY2="1.0" />

smali/res/anim/grow_fade_in.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <scale
+        android:duration="@android:integer/config_shortAnimTime"
+        android:fromXScale="0.9"
+        android:fromYScale="0.9"
+        android:pivotX="50.0%"
+        android:pivotY="0.0%"
+        android:toXScale="1.0"
+        android:toYScale="1.0" />
+    <alpha
+        android:duration="@android:integer/config_shortAnimTime"
+        android:fromAlpha="0.0"
+        android:toAlpha="1.0" />
+</set>

smali/res/anim/item_animation_fall_down.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="100">
+    <translate
+        android:fromYDelta="-20.000004%"
+        android:interpolator="@android:anim/decelerate_interpolator"
+        android:toYDelta="0.0" />
+    <alpha
+        android:fromAlpha="0.0"
+        android:interpolator="@android:anim/decelerate_interpolator"
+        android:toAlpha="1.0" />
+</set>

smali/res/anim/item_animation_fall_up.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="100">
+    <translate
+        android:fromYDelta="20.000004%"
+        android:interpolator="@android:anim/decelerate_interpolator"
+        android:toYDelta="0.0" />
+    <alpha
+        android:fromAlpha="0.0"
+        android:interpolator="@android:anim/decelerate_interpolator"
+        android:toAlpha="1.0" />
+</set>

smali/res/anim/layout_animation_fall_down.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layoutAnimation xmlns:android="http://schemas.android.com/apk/res/android"
+    android:animation="@anim/item_animation_fall_down"
+    android:animationOrder="normal"
+    android:delay="14.999998%" />

smali/res/anim/layout_animation_fall_up.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layoutAnimation xmlns:android="http://schemas.android.com/apk/res/android"
+    android:animation="@anim/item_animation_fall_up"
+    android:animationOrder="reverse"
+    android:delay="14.999998%" />

smali/res/anim/legacy_enter.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <translate
+        android:duration="250"
+        android:fromXDelta="100.0%"
+        android:fromYDelta="0.0%"
+        android:toXDelta="0.0%"
+        android:toYDelta="0.0%" />
+</set>

smali/res/anim/legacy_exit.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <translate
+        android:duration="250"
+        android:fromXDelta="0.0%"
+        android:fromYDelta="0.0%"
+        android:toXDelta="-100.0%"
+        android:toYDelta="0.0%" />
+</set>

smali/res/anim/legacy_pop_enter.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <translate
+        android:duration="250"
+        android:fromXDelta="-100.0%"
+        android:fromYDelta="0.0%"
+        android:toXDelta="0.0%"
+        android:toYDelta="0.0%" />
+</set>

smali/res/anim/legacy_pop_exit.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <translate
+        android:duration="250"
+        android:fromXDelta="0.0%"
+        android:fromYDelta="0.0%"
+        android:toXDelta="100.0%"
+        android:toYDelta="0.0%" />
+</set>

smali/res/anim/linear.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<linearInterpolator />

smali/res/anim/linear_out_slow_in.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:controlX1="0.0"
+    android:controlX2="0.2"
+    android:controlY1="0.0"
+    android:controlY2="1.0" />

smali/res/anim/live_combo_bounce.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:interpolator="@android:anim/decelerate_interpolator"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/decelerate_interpolator">
     <scale
-        android:interpolator="@android:anim/bounce_interpolator"
         android:duration="200"
+        android:fillAfter="false"
+        android:fromXScale="1.0"
+        android:fromYScale="1.0"
+        android:interpolator="@android:anim/bounce_interpolator"
         android:pivotX="50.0%"
         android:pivotY="50.0%"
-        android:fillAfter="false"
         android:repeatCount="1"
         android:repeatMode="reverse"
-        android:fromXScale="1.0"
         android:toXScale="1.2"
-        android:fromYScale="1.0"
         android:toYScale="1.2" />
 </set>

smali/res/anim/live_like_butt_bounce.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:interpolator="@android:anim/decelerate_interpolator"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/decelerate_interpolator">
     <scale
-        android:interpolator="@android:anim/decelerate_interpolator"
         android:duration="100"
+        android:fillAfter="false"
+        android:fromXScale="1.0"
+        android:fromYScale="1.0"
+        android:interpolator="@android:anim/decelerate_interpolator"
         android:pivotX="50.0%"
         android:pivotY="50.0%"
-        android:fillAfter="false"
         android:repeatCount="1"
         android:repeatMode="reverse"
-        android:fromXScale="1.0"
         android:toXScale="0.7"
-        android:fromYScale="1.0"
         android:toYScale="0.7" />
 </set>

smali/res/anim/noop.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:interpolator="@android:anim/decelerate_interpolator"
+<set xmlns:android="http://schemas.android.com/apk/res/android"
     android:duration="300"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:interpolator="@android:anim/decelerate_interpolator">
     <translate
         android:fromYDelta="0.0"
         android:toYDelta="0.0" />

smali/res/anim/picker_dialog_enter.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<alpha android:interpolator="@android:anim/accelerate_interpolator"
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
     android:duration="200"
     android:fromAlpha="0.0"
-    android:toAlpha="1.0"
-    xmlns:android="http://schemas.android.com/apk/res/android" />
+    android:interpolator="@android:anim/accelerate_interpolator"
+    android:toAlpha="1.0" />

smali/res/anim/picker_dialog_exit.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<alpha android:interpolator="@android:anim/accelerate_interpolator"
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
     android:duration="200"
     android:fillAfter="true"
     android:fromAlpha="1.0"
-    android:toAlpha="0.0"
-    xmlns:android="http://schemas.android.com/apk/res/android" />
+    android:interpolator="@android:anim/accelerate_interpolator"
+    android:toAlpha="0.0" />

smali/res/anim/picker_dialog_no_animation.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<translate android:duration="50"
-    xmlns:android="http://schemas.android.com/apk/res/android" />
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="50" />

smali/res/anim/player_exit.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="@android:integer/config_longAnimTime"
+        android:fromYDelta="0.0"
+        android:toYDelta="100.0%p" />
+    <alpha
+        android:duration="300"
+        android:fromAlpha="1.0"
+        android:toAlpha="0.0" />
+</set>

smali/res/anim/popup_menu_open.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:shareInterpolator="false"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
     <scale
-        android:interpolator="@android:anim/overshoot_interpolator"
+        fromXScale="0.1"
         android:duration="400"
+        android:fromYScale="0.1"
+        android:interpolator="@android:anim/overshoot_interpolator"
         android:pivotX="20.000004%"
         android:pivotY="0.0"
         android:toXScale="1.0"
-        android:fromYScale="0.1"
-        android:toYScale="1.0"
-        fromXScale="0.1" />
+        android:toYScale="1.0" />
     <alpha
-        android:interpolator="@android:anim/decelerate_interpolator"
         android:duration="400"
         android:fromAlpha="0.0"
+        android:interpolator="@android:anim/decelerate_interpolator"
         android:toAlpha="1.0" />
 </set>

smali/res/anim/push_down_in.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@anim/linear_out_slow_in"
+    android:shareInterpolator="true">
     <translate
         android:duration="300"
         android:fromYDelta="-100.0%p"

smali/res/anim/push_down_out.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:ordering="together"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@anim/fast_out_linear_in"
+    android:ordering="together"
+    android:shareInterpolator="true">
     <translate
         android:duration="300"
         android:fromYDelta="0.0"

smali/res/anim/q_enter.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <alpha
+        android:duration="50"
+        android:fillAfter="true"
+        android:fillBefore="true"
+        android:fillEnabled="true"
+        android:fromAlpha="0.0"
+        android:interpolator="@anim/linear"
+        android:startOffset="50"
+        android:toAlpha="1.0" />
+    <scale
+        android:duration="400"
+        android:fillAfter="true"
+        android:fillBefore="true"
+        android:fillEnabled="true"
+        android:fromXScale="0.85"
+        android:fromYScale="0.85"
+        android:interpolator="@anim/fast_out_extra_slow_in"
+        android:pivotX="50.0%"
+        android:pivotY="50.0%"
+        android:toXScale="1.0"
+        android:toYScale="1.0" />
+</set>

smali/res/anim/q_exit.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <alpha
+        android:duration="87"
+        android:fillAfter="true"
+        android:fillBefore="true"
+        android:fillEnabled="true"
+        android:fromAlpha="1.0"
+        android:interpolator="@anim/linear"
+        android:startOffset="83"
+        android:toAlpha="0.4" />
+    <scale
+        android:duration="400"
+        android:fillAfter="true"
+        android:fillBefore="true"
+        android:fillEnabled="true"
+        android:fromXScale="1.0"
+        android:fromYScale="1.0"
+        android:interpolator="@anim/fast_out_extra_slow_in"
+        android:pivotX="50.0%"
+        android:pivotY="50.0%"
+        android:toXScale="1.05"
+        android:toYScale="1.05" />
+</set>

smali/res/anim/q_pop_enter.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <scale
+        android:duration="400"
+        android:fillAfter="true"
+        android:fillBefore="true"
+        android:fillEnabled="true"
+        android:fromXScale="1.1"
+        android:fromYScale="1.1"
+        android:interpolator="@anim/fast_out_extra_slow_in"
+        android:pivotX="50.0%"
+        android:pivotY="50.0%"
+        android:toXScale="1.0"
+        android:toYScale="1.0" />
+</set>

smali/res/anim/q_pop_exit.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false"
+    android:zAdjustment="top">
+    <alpha
+        android:duration="167"
+        android:fillAfter="true"
+        android:fillBefore="true"
+        android:fillEnabled="true"
+        android:fromAlpha="1.0"
+        android:interpolator="@anim/linear"
+        android:startOffset="33"
+        android:toAlpha="0.0" />
+    <scale
+        android:duration="400"
+        android:fillAfter="true"
+        android:fillBefore="true"
+        android:fillEnabled="true"
+        android:fromXScale="1.0"
+        android:fromYScale="1.0"
+        android:interpolator="@anim/fast_out_extra_slow_in"
+        android:pivotX="50.0%"
+        android:pivotY="50.0%"
+        android:toXScale="0.9"
+        android:toYScale="0.9" />
+</set>

smali/res/anim/shrink_fade_out.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <scale
+        android:duration="@android:integer/config_shortAnimTime"
+        android:fromXScale="1.0"
+        android:fromYScale="1.0"
+        android:pivotX="50.0%"
+        android:pivotY="0.0%"
+        android:toXScale="0.9"
+        android:toYScale="0.9" />
+    <alpha
+        android:duration="@android:integer/config_shortAnimTime"
+        android:fromAlpha="1.0"
+        android:toAlpha="0.0" />
+</set>

smali/res/anim/slide_bottom_in_fast.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:interpolator="@android:anim/decelerate_interpolator"
+<set xmlns:android="http://schemas.android.com/apk/res/android"
     android:duration="200"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:interpolator="@android:anim/decelerate_interpolator">
     <translate
         android:fromYDelta="-4.999995%"
         android:toYDelta="0.0" />

smali/res/anim/slide_in.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:interpolator="@android:anim/decelerate_interpolator"
+<set xmlns:android="http://schemas.android.com/apk/res/android"
     android:duration="200"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:interpolator="@android:anim/decelerate_interpolator">
     <translate
         android:fromYDelta="50.0%"
         android:toYDelta="0.0" />

smali/res/anim/slide_top_in.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:interpolator="@android:anim/decelerate_interpolator"
+<set xmlns:android="http://schemas.android.com/apk/res/android"
     android:duration="200"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:interpolator="@android:anim/decelerate_interpolator">
     <translate
         android:fromYDelta="-50.0%"
         android:toYDelta="0.0" />

smali/res/anim/slide_top_out.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:interpolator="@android:anim/decelerate_interpolator"
+<set xmlns:android="http://schemas.android.com/apk/res/android"
     android:duration="200"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:interpolator="@android:anim/decelerate_interpolator">
     <translate
         android:fromYDelta="0.0"
         android:toYDelta="50.0%" />

smali/res/anim/sticker_dialog_in.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:interpolator="@android:anim/decelerate_interpolator"
+<set xmlns:android="http://schemas.android.com/apk/res/android"
     android:duration="300"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:interpolator="@android:anim/decelerate_interpolator">
     <rotate
         android:fromDegrees="-15.0"
-        android:toDegrees="0.0"
         android:pivotX="50.0%"
-        android:pivotY="50.0%" />
+        android:pivotY="50.0%"
+        android:toDegrees="0.0" />
     <translate
         android:fromYDelta="-100.0%p"
         android:toYDelta="0.0" />

smali/res/anim/sticker_dialog_out.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:interpolator="@android:anim/accelerate_interpolator"
+<set xmlns:android="http://schemas.android.com/apk/res/android"
     android:duration="300"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:interpolator="@android:anim/accelerate_interpolator">
     <rotate
         android:fromDegrees="0.0"
-        android:toDegrees="15.0"
         android:pivotX="50.0%"
-        android:pivotY="50.0%" />
+        android:pivotY="50.0%"
+        android:toDegrees="15.0" />
     <translate
         android:fromYDelta="0.0"
         android:toYDelta="100.0%p" />

smali/res/anim/stories_ask_question_author_in.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <scale
+        android:fromXScale="0.0%"
+        android:fromYScale="0.0%"
+        android:pivotX="50.0%"
+        android:pivotY="50.0%"
+        android:toXScale="100.0%"
+        android:toYScale="100.0%" />
+    <alpha
+        android:fromAlpha="0.0"
+        android:toAlpha="1.0" />
+</set>

smali/res/anim/stories_ask_question_author_out.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <scale
+        android:fromXScale="100.0%"
+        android:fromYScale="100.0%"
+        android:pivotX="50.0%"
+        android:pivotY="50.0%"
+        android:toXScale="0.0%"
+        android:toYScale="0.0%" />
+    <alpha
+        android:fromAlpha="1.0"
+        android:toAlpha="0.0" />
+</set>

smali/res/anim/stories_slide_in_from_bottom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:interpolator="@android:anim/decelerate_interpolator"
+<set xmlns:android="http://schemas.android.com/apk/res/android"
     android:duration="400"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:interpolator="@android:anim/decelerate_interpolator">
     <translate
         android:fromYDelta="100.0%"
         android:toYDelta="0.0" />

smali/res/anim/stories_slide_out.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:interpolator="@android:interpolator/accelerate_decelerate"
+<set xmlns:android="http://schemas.android.com/apk/res/android"
     android:duration="300"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:interpolator="@android:interpolator/fast_out_slow_in">
     <translate
         android:fromYDelta="0.0"
         android:toYDelta="14.999998%" />

smali/res/anim/vkim_activity_slide_in.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:zAdjustment="normal"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:zAdjustment="normal">
     <translate
         android:duration="200"
-        android:fillBefore="true"
         android:fillAfter="true"
+        android:fillBefore="true"
+        android:fillEnabled="true"
         android:fromXDelta="100.0%"
-        android:toXDelta="0.0"
-        android:fillEnabled="true" />
+        android:toXDelta="0.0" />
 </set>

smali/res/anim/vkim_change_theme_enter.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:duration="300"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="300">
     <alpha
         android:fromAlpha="0.0"
         android:toAlpha="1.0" />

smali/res/anim/vkim_change_theme_exit.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:duration="300"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="300">
     <alpha
         android:fromAlpha="1.0"
         android:toAlpha="0.0" />

smali/res/anim/vkme_enter_interpolator.xml

@@ -1,3 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<accelerateInterpolator android:factor="2.0"
-    xmlns:android="http://schemas.android.com/apk/res/android" />
+<pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:controlX1="0.4"
+    android:controlX2="0.2"
+    android:controlY1="0.0"
+    android:controlY2="1.0" />

smali/res/anim/vkme_enter_slide_down.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:interpolator="@anim/vkme_enter_interpolator"
+<set xmlns:android="http://schemas.android.com/apk/res/android"
     android:duration="180"
-    android:shareInterpolator="true"
-    android:fillBefore="true"
     android:fillAfter="true"
+    android:fillBefore="true"
     android:fillEnabled="true"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:interpolator="@anim/vkme_enter_interpolator"
+    android:shareInterpolator="true">
     <translate
         android:fromYDelta="0.0%"
         android:toYDelta="3.9999962%" />
     <scale
-        android:pivotX="50.0%"
         android:fromXScale="100.0%"
-        android:toXScale="96.0%"
         android:fromYScale="100.0%"
+        android:pivotX="50.0%"
+        android:toXScale="96.0%"
         android:toYScale="96.0%" />
     <alpha
         android:fromAlpha="1.0"

smali/res/anim/vkme_enter_slide_up.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:interpolator="@anim/vkme_enter_interpolator"
+<set xmlns:android="http://schemas.android.com/apk/res/android"
     android:duration="200"
-    android:shareInterpolator="true"
-    android:fillBefore="true"
     android:fillAfter="true"
+    android:fillBefore="true"
     android:fillEnabled="true"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:interpolator="@anim/vkme_enter_interpolator"
+    android:shareInterpolator="true">
     <translate
         android:fromYDelta="3.9999962%"
         android:toYDelta="0.0%" />
     <scale
-        android:pivotX="50.0%"
         android:fromXScale="96.0%"
-        android:toXScale="100.0%"
         android:fromYScale="96.0%"
+        android:pivotX="50.0%"
+        android:toXScale="100.0%"
         android:toYScale="100.0%" />
     <alpha
         android:fromAlpha="0.0"

smali/res/anim/vkme_exit_noop.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:duration="200"
-    android:fillBefore="true"
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="200"
     android:fillAfter="false"
-    android:fillEnabled="false"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:fillBefore="true"
+    android:fillEnabled="false">
     <alpha
         android:fromAlpha="1.0"
         android:toAlpha="1.0" />

smali/res/drawable/bg_modern_search_im_new.xml

@@ -2,5 +2,5 @@
 <shape android:shape="rectangle"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="8.0dip" />
-    <solid android:color="#10000c1a" />
+    <solid android:color="?background_content" />
 </shape>

smali/res/layout/music_playlist_item2.xml

@@ -21,7 +21,7 @@
     <TextView
         android:textSize="14.0dip"
         android:textStyle="normal"
-        android:textColor="?header_text"
+        android:textColor="?text_primary"
         android:ellipsize="end"
         android:gravity="center_vertical"
         android:id="@id/playlist_title"

smali/res/layout/music_search_input_stub.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView android:textColorHint="@color/music_text_hint"
+<TextView android:textColorHint="?text_primary"
     android:gravity="center_vertical"
     android:paddingLeft="60.0dip"
     android:paddingRight="56.0dip"

smali/res/layout/music_search_recent_item.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView android:textSize="16.0dip"
     android:textStyle="normal"
-    android:textColor="@color/muted_black"
+    android:textColor="?text_primary"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:drawablePadding="12.0dip"

smali/res/layout/music_user_music1.xml

@@ -32,7 +32,7 @@
                 android:layout_height="fill_parent"
                 android:src="@drawable/ic_back_24"
                 android:scaleType="centerInside"
-                android:tint="#ff909499"
+                android:tint="?text_primary"
                 android:contentDescription="@string/music_talkback_go_back"
                 android:layout_marginStart="8.0dip"
                 style="@style/ActionButton.Gray" />

smali/res/layout/toolbar_search_expanded.xml

@@ -9,7 +9,7 @@
 
     <EditText
         android:textSize="16.0dip"
-        android:textColorHint="?header_text"
+        android:textColorHint="?text_primary"
         android:id="@id/search_input"
         android:background="@null"
         android:paddingRight="16.0dip"

smali/res/layout/view_modern_search.xml

@@ -6,7 +6,8 @@
         android:gravity="center_vertical"
         android:orientation="horizontal"
         android:id="@id/search_box"
-        android:background="@drawable/bg_modern_search"
+        android:background="@drawable/bg_modern_search_im_new"
+        android:backgroundTint="?background_content"
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:layout_width="fill_parent"
@@ -24,8 +25,8 @@
 
         <com.vk.core.view.NoMenuEditText
             android:textSize="16.0dip"
-            android:textColor="?header_text"
-            android:textColorHint="#ffaaaeb3"
+            android:textColor="?text_primary"
+            android:textColorHint="?text_secondary"
             android:gravity="center_vertical"
             android:id="@id/query"
             android:background="@null"
@@ -41,8 +42,8 @@
 
         <TextView
             android:textSize="16.0dip"
-            android:textColor="?header_text"
-            android:textColorHint="#ffaaaeb3"
+            android:textColor="?text_primary"
+            android:textColorHint="?text_secondary"
             android:ellipsize="end"
             android:gravity="center_vertical"
             android:id="@id/query_static"
@@ -64,7 +65,7 @@
             android:layout_height="40.0dip"
             android:src="@drawable/ic_search_params_24"
             android:scaleType="centerInside"
-            android:tint="?header_text" />
+            android:tint="?text_primary" />
 
         <ImageView
             android:layout_gravity="center_vertical"
@@ -74,6 +75,6 @@
             android:layout_height="40.0dip"
             android:src="@drawable/ic_cancel_24"
             android:scaleType="centerInside"
-            android:tint="?header_text" />
+            android:tint="?text_primary" />
     </LinearLayout>
 </merge>

smali/res/values-ru/arrays.xml

@@ -438,6 +438,19 @@
         <item>Видеозапись</item>
         <item>Документ</item>
     </string-array>
+    <string-array name="animations2">
+        <item>Без анимации</item>
+        <item>Системный</item>
+        <item>Системный (task)</item>
+    </string-array>
+    <string-array name="animations">
+        <item>Без анимации</item>
+        <item>Android Q</item>
+        <item>Fade</item>
+        <item>Слайд</item>
+        <item>Системный</item>
+        <item>Системный (task)</item>
+    </string-array>
     <string-array name="language">
         <item>Системный</item>
         <item>Английский</item>

smali/res/values-ru/strings.xml

@@ -4286,11 +4286,11 @@
     <string name="appearance_theme_use_system">Использовать системную тему</string>
     <string name="appearance_theme_use_system_summary">Применение системной темы при запуске приложения</string>
 
-    <string name="appearance_other_color_navbar_summary">Если семтемно имеется</string>
+    <string name="appearance_other_color_navbar_summary">Если системно имеется</string>
     <string name="appearance_other_color_webview_summary">Покраска страниц, таких как VKID, под тему приложения</string>
 
     <string name="interface_global_old_icons">Старые иконки</string>
-    <string name="interface_global_old_icons_summary">Использовать старые иконки в докбаре. Необходимо сбросить настройки докбара для применения изменений</string>
+    <string name="interface_global_old_icons_summary">Необходимо сбросить настройки докбара для применения изменений</string>
 
     <string name="activity_what_is_it">Что это за функция?</string>
     <string name="activity_dnr_summary">Функция позволяет вам не отправлять статус прочтения вами сообщения собеседника</string>
@@ -4443,5 +4443,8 @@
 
     <string name="dateformat">Выберите тип показа дат</string>
 
+    <string name="franimation">Анимация фрагментов (бета)</string>
+    <string name="selectfranimation">Выберите анимацию фрагментов</string>
+
     <string name="empty_text" />
 </resources>

smali/res/values-v21/styles.xml

@@ -2,13 +2,13 @@
 <resources>
 
     <style name="ActionBarGrayTheme">
-        <item name="android:textColorPrimary">@color/attach_title</item>
-        <item name="android:textColorSecondary">@color/attach_title</item>
+        <item name="android:textColorPrimary">?header_text</item>
+        <item name="android:textColorSecondary">?header_text</item>
         <item name="android:selectableItemBackground">@drawable/highlight_toolbar</item>
         <item name="android:actionBarItemBackground">@drawable/highlight_icon_white_unbounded</item>
-        <item name="android:colorAccent">@color/attach_title</item>
-        <item name="colorAccent">@color/attach_title</item>
-        <item name="colorPrimary">#fffafafa</item>
+        <item name="android:colorAccent">?accent</item>
+        <item name="colorAccent">?accent</item>
+        <item name="colorPrimary">?header_background</item>
     </style>
 
     <style name="ActionBarSpinner" parent="@android:style/Widget.Material.Spinner" />
@@ -19,13 +19,13 @@
 
     <style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
         <item name="android:textColorPrimary">?header_text</item>
-        <item name="android:textColorSecondary">?header_tint</item>
+        <item name="android:textColorSecondary">?header_text</item>
         <item name="android:selectableItemBackground">@drawable/highlight_toolbar</item>
         <item name="android:actionBarItemBackground">@drawable/highlight_icon_white_unbounded</item>
         <item name="android:titleTextAppearance">@style/ToolbarTitle</item>
-        <item name="android:colorAccent">#ffffffff</item>
-        <item name="colorAccent">#ffffffff</item>
-        <item name="colorPrimary">@color/toolbar_blue_background</item>
+        <item name="android:colorAccent">?accent</item>
+        <item name="colorAccent">?accent</item>
+        <item name="colorPrimary">?header_background</item>
         <item name="layout_scrollFlags">enterAlways|scroll|snap</item>
         <item name="titleTextAppearance">@style/ToolbarTitle</item>
         <item name="toolbarIconsColor">?header_text</item>
@@ -41,7 +41,7 @@
         <item name="android:titleTextAppearance">@style/ToolbarTitle</item>
         <item name="android:colorAccent">?accent</item>
         <item name="colorAccent">?accent</item>
-        <item name="colorPrimary">@color/toolbar_milk_background</item>
+        <item name="colorPrimary">?header_background</item>
         <item name="layout_scrollFlags">enterAlways|scroll|snap</item>
         <item name="titleTextAppearance">@style/ToolbarTitle</item>
         <item name="toolbarIconsColor">@color/toolbar_milk_textColorSecondary</item>
@@ -53,7 +53,7 @@
         <item name="android:titleTextAppearance">@style/ToolbarTitle</item>
         <item name="android:colorAccent">?accent</item>
         <item name="colorAccent">?accent</item>
-        <item name="colorPrimary">@color/toolbar_white_background</item>
+        <item name="colorPrimary">?header_background</item>
         <item name="layout_scrollFlags">enterAlways|scroll|snap</item>
         <item name="titleTextAppearance">@style/ToolbarTitle</item>
         <item name="toolbarIconsColor">?header_text</item>
@@ -207,7 +207,13 @@
 
     <style name="Base.Widget.AppCompat.ListView" parent="@android:style/Widget.Material.ListView" />
 
-    <style name="Base.Widget.AppCompat.ListView.DropDown" parent="@android:style/Widget.Material.ListView.DropDown" />
+    <style name="Base.Widget.AppCompat.ListView.DropDown" parent="@android:style/Widget.Material.ListView.DropDown">
+        <item name="android:background">?background_content</item>
+        <item name="android:textColorPrimary">?text_primary</item>
+        <item name="android:textColorSecondary">?text_secondary</item>
+        <item name="android:titleTextAppearance">@style/ToolbarTitle</item>
+        <item name="android:colorAccent">?accent</item>
+    </style>
 
     <style name="Base.Widget.AppCompat.ListView.Menu" parent="@style/Base.Widget.AppCompat.ListView" />
 

smali/res/values-v31/styles.xml

@@ -13,6 +13,7 @@
         <item name="accent">@android:color/system_accent1_100</item>
         <item name="text_primary">@android:color/system_accent1_50</item>
         <item name="text_secondary">@android:color/system_neutral2_200</item>
+        <item name="android:textColorSecondary">?text_secondary</item>
         <item name="background_content">@android:color/system_neutral1_900</item>
         <item name="background_page">@android:color/system_neutral1_800</item>
         <item name="action_sheet_action_foreground">@color/white</item>
@@ -209,6 +210,7 @@
         <item name="accent">@android:color/system_accent1_500</item>
         <item name="text_primary">@android:color/system_accent1_900</item>
         <item name="text_secondary">@android:color/system_accent2_700</item>
+        <item name="android:textColorSecondary">?text_secondary</item>
         <item name="background_content">@android:color/system_neutral1_10</item>
         <item name="background_page">@android:color/system_neutral1_50</item>
         <item name="android:windowLightStatusBar">true</item>
@@ -593,6 +595,7 @@
         <item name="toolbar_attach_background_to">@color/gray_600</item>
         <item name="writebar_icon">@color/gray_400</item>
         <item name="tabbar_fix">?tabbar_background</item>
+        <item name="android:textColorSecondary">?text_secondary</item>
     </style>
 
     <style name="VkIm.Theme.VkApp.Light" parent="@style/VkIm.Theme.VkApp">

smali/res/values/arrays.xml

@@ -559,18 +559,30 @@
         <item>Document</item>
     </string-array>
     <string-array name="animations">
+        <item>No Animation</item>
+        <item>Android Q</item>
+        <item>Fade</item>
         <item>Slide</item>
         <item>System</item>
         <item>System task</item>
-        <item>AndroidX</item>
-        <item>Fade</item>
     </string-array>
     <string-array name="animations_values">
+        <item>noanim</item>
+        <item>q</item>
+        <item>fade</item>
         <item>slide</item>
         <item>system</item>
         <item>system_task</item>
-        <item>frag_enter</item>
-        <item>frag_fade</item>
+    </string-array>
+    <string-array name="animations2">
+        <item>No Animation</item>
+        <item>System</item>
+        <item>System task</item>
+    </string-array>
+    <string-array name="animations_values2">
+        <item>noanim</item>
+        <item>system</item>
+        <item>system_task</item>
     </string-array>
     <string-array name="language">
         <item>System</item>

smali/res/values/strings.xml

@@ -4414,7 +4414,7 @@ May look like a fake leaving the online"</string>
     <string name="appearance_other_color_webview_summary">Color pages such as VKID in app theme</string>
 
     <string name="interface_global_old_icons">Old icons</string>
-    <string name="interface_global_old_icons_summary">Use old icons in dockbar. You should reset its setting to apply changes</string>
+    <string name="interface_global_old_icons_summary">You should reset its setting to apply changes</string>
 
     <string name="activity_what_is_it">What is it?</string>
     <string name="activity_dnr_summary">Function lets you don\'t send read message status</string>
@@ -4577,6 +4577,9 @@ May look like a fake leaving the online"</string>
 
     <string name="dateformat">Select the date display type</string>
 
+    <string name="franimation">Fragment animation (beta)</string>
+    <string name="selectfranimation">Select fragment animation</string>
+
     <item type="string" name="APKTOOL_DUMMY_10be" />
     <item type="string" name="APKTOOL_DUMMY_10bf" />
     <item type="string" name="APKTOOL_DUMMY_10c0" />

smali/res/values/styles.xml

@@ -30,7 +30,7 @@
         <item name="android:selectableItemBackground">@drawable/highlight_toolbar</item>
         <item name="android:actionBarItemBackground">@drawable/highlight_icon_white_unbounded</item>
         <item name="colorAccent">?header_text</item>
-        <item name="colorPrimary">@color/toolbar_blue_background</item>
+        <item name="colorPrimary">?header_background</item>
         <item name="layout_scrollFlags">enterAlways|scroll|snap</item>
         <item name="titleTextAppearance">@style/ToolbarTitle</item>
         <item name="toolbarIconsColor">?header_text</item>
@@ -38,14 +38,14 @@
 
     <style name="ActionBarThemeFix" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
         <item name="android:textColorPrimary">@color/white</item>
-        <item name="android:textColorSecondary">?header_tint</item>
+        <item name="android:textColorSecondary">@color/white</item>
         <item name="android:selectableItemBackground">@drawable/highlight_toolbar</item>
         <item name="android:actionBarItemBackground">@drawable/highlight_icon_white_unbounded</item>
         <item name="colorAccent">@color/white</item>
         <item name="colorPrimary">@color/toolbar_blue_background</item>
         <item name="layout_scrollFlags">enterAlways|scroll|snap</item>
         <item name="titleTextAppearance">@style/ToolbarTitle</item>
-        <item name="toolbarIconsColor">?header_text</item>
+        <item name="toolbarIconsColor">@color/white</item>
     </style>
 
     <style name="ActionBarTheme.ItemsFull" parent="@style/ActionBarTheme" />
@@ -54,17 +54,17 @@
         <item name="android:textColorPrimary">@color/toolbar_milk_textColorPrimary</item>
         <item name="android:textColorSecondary">@color/toolbar_milk_textColorSecondary</item>
         <item name="colorAccent">?accent</item>
-        <item name="colorPrimary">@color/toolbar_milk_background</item>
+        <item name="colorPrimary">?header_background</item>
         <item name="layout_scrollFlags">enterAlways|scroll|snap</item>
         <item name="titleTextAppearance">@style/ToolbarTitle</item>
         <item name="toolbarIconsColor">@color/toolbar_milk_textColorSecondary</item>
     </style>
 
     <style name="ActionBarTheme.White" parent="@style/ThemeOverlay.AppCompat.ActionBar">
-        <item name="android:textColorPrimary">@color/toolbar_white_textColorPrimary</item>
-        <item name="android:textColorSecondary">?header_text</item>
+        <item name="android:textColorPrimary">?header_text</item>
+        <item name="android:textColorSecondary">?header_text_secondary</item>
         <item name="colorAccent">?accent</item>
-        <item name="colorPrimary">@color/toolbar_white_background</item>
+        <item name="colorPrimary">?background_content</item>
         <item name="layout_scrollFlags">enterAlways|scroll|snap</item>
         <item name="titleTextAppearance">@style/ToolbarTitle</item>
         <item name="toolbarIconsColor">?header_text</item>
@@ -78,15 +78,15 @@
     <style name="ActionButton" parent="@style/Widget.AppCompat.Light.ActionButton" />
 
     <style name="ActionButton.Blue" parent="@style/ActionButton">
-        <item name="android:tint">@color/music_action_button_blue</item>
+        <item name="android:tint">?header_text</item>
     </style>
 
     <style name="ActionButton.Gray" parent="@style/ActionButton">
-        <item name="android:tint">@color/music_action_button_gray</item>
+        <item name="android:tint">?header_text</item>
     </style>
 
     <style name="ActionButton.White" parent="@style/ActionButton">
-        <item name="android:tint">@color/music_action_button_white</item>
+        <item name="android:tint">?header_text</item>
     </style>
 
     <style name="ActionOverflowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow">
@@ -2667,8 +2667,9 @@
     <style name="MusicSearch">
         <item name="android:textSize">16.0dip</item>
         <item name="android:textStyle">normal</item>
-        <item name="android:textColorHint">@color/music_text_hint</item>
-        <item name="android:background">@drawable/bg_modern_search</item>
+        <item name="android:textColorHint">?header_text</item>
+        <item name="android:background">@drawable/bg_modern_search_im_new</item>
+        <item name="android:backgroundTint">?background_content</item>
         <item name="android:maxLines">1</item>
     </style>
 
@@ -3418,6 +3419,9 @@
     </style>
 
     <style name="RtlOverlay.Widget.AppCompat.PopupMenuItem.Text" parent="@android:style/Widget">
+        <item name="android:textColor">?text_primary</item>
+        <item name="android:textColorPrimary">?text_primary</item>
+        <item name="android:textColorSecondary">?text_secondary</item>
         <item name="android:textAlignment">viewStart</item>
         <item name="android:layout_alignParentStart">true</item>
     </style>
@@ -4346,7 +4350,7 @@
     </style>
 
     <style name="VKUIButton.White.BigRadius" parent="@style/VKUIButton.White">
-        <item name="android:background">@drawable/vkui_bg_button_white_big_radius</item>
+        <item name="android:background">@drawable/vkui_bg_button_white</item>
     </style>
 
     <style name="VKUIButton.WhiteTransparent15" parent="@style/VKUIButton">
@@ -4719,6 +4723,7 @@
         <item name="toolbar_attach_background_to">@color/steel_gray_250</item>
         <item name="writebar_icon">@color/azure_300</item>
         <item name="tabbar_fix">?accent</item>
+        <item name="android:textColorSecondary">?text_secondary</item>
     </style>
 
     <style name="Vk.Theme.client_amoled_generated" parent="@style/Vk.Theme.Dark">
@@ -4913,6 +4918,7 @@
         <item name="toolbar_attach_background_to">@color/gray_600</item>
         <item name="writebar_icon">@color/gray_400</item>
         <item name="tabbar_fix">?tabbar_background</item>
+        <item name="android:textColorSecondary">?text_secondary</item>
     </style>
 
     <style name="Vk.Theme.client_dark_generated" parent="@style/Vk.Theme.Dark">
@@ -5107,6 +5113,7 @@
         <item name="toolbar_attach_background_to">@color/gray_600</item>
         <item name="writebar_icon">@color/gray_400</item>
         <item name="tabbar_fix">?tabbar_background</item>
+        <item name="android:textColorSecondary">?text_secondary</item>
     </style>
 
     <style name="Vk.Theme.client_light_generated" parent="@style/Vk.Theme">
@@ -5301,6 +5308,7 @@
         <item name="toolbar_attach_background_to">@color/steel_gray_250</item>
         <item name="writebar_icon">@color/steel_gray_300</item>
         <item name="tabbar_fix">?accent</item>
+        <item name="android:textColorSecondary">?text_secondary</item>
     </style>
 
     <style name="Vk.Theme.space_gray_generated" parent="@style/Vk.Theme">
@@ -5494,6 +5502,7 @@
         <item name="toolbar_attach_background_from">@color/gray_500</item>
         <item name="toolbar_attach_background_to">@color/gray_600</item>
         <item name="writebar_icon">@color/gray_100</item>
+        <item name="android:textColorSecondary">?text_secondary</item>
     </style>
 
     <style name="VkAlertDialogTheme" parent="@style/Theme.AppCompat.Light.Dialog.Alert">
@@ -6339,7 +6348,7 @@
     <style name="VkIm.Theme.Search.Bg.VkApp" parent="@style/VkIm.Theme.Search.Bg">
         <item name="android:background">?background_content</item>
         <item name="android:text">@string/vkim_msg_search_hint</item>
-        <item name="android:textColor">?text_secondary</item>
+        <item name="android:textColor">?header_text</item>
     </style>
 
     <style name="VkIm.Theme.Search.Bg.VkMe" parent="@style/VkIm.Theme.Search.Bg">
@@ -6348,7 +6357,7 @@
     </style>
 
     <style name="VkIm.Theme.Search.VkApp" parent="@style/VkIm.Theme.Search">
-        <item name="search_bg">@drawable/bg_modern_search</item>
+        <item name="search_bg">@drawable/bg_modern_search_im_new</item>
     </style>
 
     <style name="VkIm.Theme.Search.VkMe" parent="@style/VkIm.Theme.Search">

smali/res/xml/preferences_activity.xml

@@ -2,7 +2,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory android:title="@string/activity_undel">
         <com.vtosters.lite.ui.SummaryListPreference
-            android:defaultValue="default"
+            android:defaultValue="🗑"
             android:dialogTitle="@string/activity_undel_dial"
             android:entries="@array/undel_value"
             android:entryValues="@array/undel_value"

smali/res/xml/preferences_debug.xml

@@ -10,6 +10,13 @@
         android:key="devmenu"
         android:title="@string/debug_show_settings_item" />
     <PreferenceCategory android:title="@string/debug_experimental">
+        <com.vtosters.lite.ui.SummaryListPreference
+            android:defaultValue="noanim"
+            android:dialogTitle="@string/selectfranimation"
+            android:entries="@array/animations"
+            android:entryValues="@array/animations_values"
+            android:key="anim_rtrn_type"
+            android:title="@string/franimation" />
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="true"
             android:key="msgtails"

smali/res/xml/preferences_interface.xml

@@ -25,6 +25,13 @@
             android:entryValues="@array/start_values"
             android:key="start_values"
             android:title="@string/interfacestartfr" />
+        <com.vtosters.lite.ui.SummaryListPreference
+            android:defaultValue="noanim"
+            android:dialogTitle="@string/selectfranimation"
+            android:entries="@array/animations2"
+            android:entryValues="@array/animations_values2"
+            android:key="anim_rtrn_type"
+            android:title="@string/franimation" />
         <com.vtosters.lite.ui.SummaryListPreference
             android:defaultValue="default"
             android:dialogTitle="@string/dateformat"
@@ -32,11 +39,6 @@
             android:entryValues="@array/dateformat"
             android:key="dateformat"
             android:title="@string/interfaceglobaldates" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="olddock"
-            android:summary="@string/interface_global_old_icons_summary"
-            android:title="@string/interface_global_old_icons" />
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="true"
             android:key="shortinfo"

smali/res/xml/preferences_themes.xml

@@ -24,6 +24,11 @@
             android:key="systemtheme"
             android:summary="@string/appearance_theme_use_system_summary"
             android:title="@string/appearance_theme_use_system" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+            android:defaultValue="false"
+            android:key="oldicons"
+            android:summary="@string/interface_global_old_icons_summary"
+            android:title="@string/interface_global_old_icons" />
         <com.vtosters.lite.ui.MaterialSectionDividerPreference />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vticon">

smali/smali_classes2/android/support/v4/content/ContextCompat.smali

@@ -358,11 +358,7 @@
 .method public static b(Landroid/content/Context;I)Landroid/content/res/ColorStateList;
     .locals 2
 
-    invoke-virtual {p0, p1}, Landroid/content/Context;->getColorStateList(I)Landroid/content/res/ColorStateList;
-
-    move-result-object p0
-
-    invoke-static {p0}, Lru/vtosters/lite/utils/Themes;->themeCSL(Landroid/content/res/ColorStateList;)Landroid/content/res/ColorStateList;
+    invoke-static {p0, p1}, Lru/vtosters/lite/utils/Themes;->themeCSL(Landroid/content/Context;I)Landroid/content/res/ColorStateList;
 
     move-result-object p0
 

smali/smali_classes2/com/vk/music/fragment/menu/Action.smali

@@ -66,7 +66,23 @@
 .end method
 
 .method public constructor <init>(IIII)V
-    .locals 1
+    .locals 5
+
+    invoke-static {p4}, Lru/vtosters/lite/utils/Themes;->fixTextColor(I)I
+
+    move-result p4
+
+    invoke-static {p3}, Lru/vtosters/lite/utils/Themes;->fixTextColor(I)I
+
+    move-result p3
+
+    invoke-static {p2}, Lru/vtosters/lite/utils/Themes;->fixTextColor(I)I
+
+    move-result p2
+
+    invoke-static {p1}, Lru/vtosters/lite/utils/Themes;->fixTextColor(I)I
+
+    move-result p1
 
     .line 29
     invoke-direct {p0}, Lcom/vk/core/serialize/Serializer$StreamParcelableAdapter;-><init>()V
@@ -99,6 +115,18 @@
 .method public constructor <init>(IILjava/lang/String;IZ)V
     .locals 1
 
+    invoke-static {p4}, Lru/vtosters/lite/utils/Themes;->fixTextColor(I)I
+
+    move-result p4
+
+    invoke-static {p2}, Lru/vtosters/lite/utils/Themes;->fixTextColor(I)I
+
+    move-result p2
+
+    invoke-static {p1}, Lru/vtosters/lite/utils/Themes;->fixTextColor(I)I
+
+    move-result p1
+
     .line 41
     invoke-direct {p0}, Lcom/vk/core/serialize/Serializer$StreamParcelableAdapter;-><init>()V
 

smali/smali_classes3/com/vk/core/view/ModernSearchView.smali

@@ -349,7 +349,7 @@
 
     if-eqz p2, :cond_1
 
-    invoke-virtual {p2, p1}, Landroid/view/ViewGroup;->setBackground(Landroid/graphics/drawable/Drawable;)V
+    ## invoke-virtual {p2, p1}, Landroid/view/ViewGroup;->setBackground(Landroid/graphics/drawable/Drawable;)V
 
     .line 107
     :cond_1

smali/smali_classes3/com/vk/music/playlist/PlaylistsFiltersAdapter$b.smali

@@ -72,6 +72,14 @@
 
     iput-object p2, p0, Lcom/vk/music/playlist/PlaylistsFiltersAdapter$b;->a:Landroid/widget/TextView;
 
+    iget-object p2, p0, Lcom/vk/music/playlist/PlaylistsFiltersAdapter$b;->a:Landroid/widget/TextView;
+
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getBackgroundContent()I
+
+    move-result v0
+
+    invoke-virtual {p2, v0}, Landroid/widget/TextView;->setBackgroundColor(I)V
+
     const-string p2, "LayoutInflater.from(cont\u2026as TextView\n            }"
 
     .line 69

smali/smali_classes4/com/vk/core/view/ToolbarDefaultSpinnerAdapter.smali

@@ -99,6 +99,10 @@
 
     move-result v0
 
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getSTextAttr()I
+
+    move-result v0
+
     .line 26
     invoke-virtual {p2}, Landroid/content/res/TypedArray;->recycle()V
 

smali/smali_classes4/com/vtosters/lite/ui/ListDialog.smali

@@ -140,10 +140,12 @@
     .line 236
     invoke-virtual {p2, p0}, Landroid/widget/ListView;->setSelector(I)V
 
-    const p0, 0x7f080693
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getBackgroundContent()I
+
+    move-result v0
 
     .line 237
-    invoke-virtual {p2, p0}, Landroid/widget/ListView;->setBackgroundResource(I)V
+    invoke-virtual {p2, v0}, Landroid/widget/ListView;->setBackgroundColor(I)V
 
     .line 238
     invoke-virtual {p2, p6}, Landroid/widget/ListView;->setDividerHeight(I)V

smali/smali_classes5/android/support/v7/c/a/AppCompatResources.smali

@@ -70,11 +70,7 @@
 .method public static a(Landroid/content/Context;I)Landroid/content/res/ColorStateList;
     .locals 2
 
-    invoke-virtual {p0, p1}, Landroid/content/Context;->getColorStateList(I)Landroid/content/res/ColorStateList;
-
-    move-result-object p0
-
-    invoke-static {p0}, Lru/vtosters/lite/utils/Themes;->themeCSL(Landroid/content/res/ColorStateList;)Landroid/content/res/ColorStateList;
+    invoke-static {p0, p1}, Lru/vtosters/lite/utils/Themes;->themeCSL(Landroid/content/Context;I)Landroid/content/res/ColorStateList;
 
     move-result-object p0
 

smali/smali_classes5/com/vk/core/fragments/b/a/ParentSupportFragmentManager.smali

@@ -201,6 +201,8 @@
     invoke-virtual {v0, p1, p2}, Landroid/support/v4/app/FragmentTransaction;->a(II)Landroid/support/v4/app/FragmentTransaction;
 
     :cond_0
+    invoke-static {v0}, Lru/vtosters/lite/utils/FragAnimationKit;->animateOpen(Landroid/support/v4/app/FragmentTransaction;)V
+
     return-void
 .end method
 
@@ -542,6 +544,8 @@
 
     move-result-object v0
 
+    invoke-static {v0}, Lru/vtosters/lite/utils/FragAnimationKit;->animateClose(Landroid/support/v4/app/FragmentTransaction;)V
+
     iput-object v0, p0, Lcom/vk/core/fragments/b/a/ParentSupportFragmentManager;->c:Landroid/support/v4/app/FragmentTransaction;
 
     return-void

smali/smali_classes5/com/vk/im/ui/components/dialogs_header/impl/vk/VkDialogsHeaderVc$1.smali

@@ -114,7 +114,6 @@
 
     goto :goto_0
 
-
     :cond_2
     const v0, 0x7f0a0ce9
 

smali/smali_classes5/com/vk/video/a/VideoMenuActionsBuilder.smali

@@ -170,7 +170,6 @@
     .line 31
     invoke-virtual {p0, p1, v0, v1, v2}, Lcom/vk/video/a/VideoMenuActionsBuilder;->a(IIII)V
 
-
     :cond_8
     const p1, 0x7f0a0bcf
 

smali/smali_classes5/com/vtosters/lite/b/VKBottomSheetDialog.smali

@@ -296,13 +296,7 @@
     .line 256
     iget-object p1, p0, Lcom/vtosters/lite/b/VKBottomSheetDialog;->t:Landroid/widget/FrameLayout;
 
-    invoke-virtual {p2}, Landroid/view/View;->getContext()Landroid/content/Context;
-
-    move-result-object v1
-
-    const v2, 0x7f060278
-
-    invoke-static {v1, v2}, Landroid/support/v4/content/ContextCompat;->c(Landroid/content/Context;I)I
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getBackgroundContent()I
 
     move-result v1