Improved dark theme

-Added styles list for dark and light themes
-Updated libs
-Auto refactored resources for easy editing
-Improved amoled theme

app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClient.java

@@ -3,8 +3,6 @@ package bruhcollective.itaysonlab.libvkx.client;
 import android.content.Context;
 import android.os.RemoteException;
 
-import bruhcollective.itaysonlab.libvkx.ILibVkxService;
-
 import com.vk.core.b.PackageManagerHelper;
 import com.vk.dto.music.MusicTrack;
 import com.vk.music.PlayerRefer;
@@ -13,12 +11,10 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import ru.vtosters.lite.utils.Helper;
+import bruhcollective.itaysonlab.libvkx.ILibVkxService;
-import ru.vtosters.lite.utils.Prefs;
 import ru.vtosters.lite.utils.Helper;
 import ru.vtosters.lite.utils.Prefs;
 
-/* loaded from: classes6.dex */
 public class LibVKXClient {
     private static LibVKXClientImpl impl;
 
@@ -52,8 +48,7 @@ public class LibVKXClient {
         return getInstance().runOnService(action);
     }
 
-    /* JADX INFO: Access modifiers changed from: package-private */
+    public static void lambdaplay(List list, MusicTrack musicTrack, PlayerRefer playerRefer, ILibVkxService iLibVkxService) {
-    public static /* synthetic */ void lambdaplay(List list, MusicTrack musicTrack, PlayerRefer playerRefer, ILibVkxService iLibVkxService) {
         int indexOf = list.indexOf(musicTrack);
         ArrayList arrayList = new ArrayList();
         Iterator it = list.iterator();

app/src/main/java/com/aefyr/tsg/g2/NotificationsHelper.java

@@ -1,8 +1,5 @@
 package com.aefyr.tsg.g2;
 
-import java.util.HashMap;
-import java.util.concurrent.atomic.AtomicLong;
-
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
@@ -10,11 +7,13 @@ import android.content.Context;
 import android.os.Build;
 
 import androidx.annotation.Nullable;
-import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
 
 import com.aefyr.tsg.g2.stickersgrabber.TelegramStickersGrabber;
 
+import java.util.HashMap;
+import java.util.concurrent.atomic.AtomicLong;
+
 
 /**
  * Created by Aefyr on 20.05.2018.

app/src/main/java/com/aefyr/tsg/g2/TelegramStickersPack.java

@@ -1,19 +1,19 @@
 package com.aefyr.tsg.g2;
 
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.util.Log;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.util.Log;
-
 /**
  * Created by Aefyr on 18.05.2018.
  */

app/src/main/java/com/aefyr/tsg/g2/TelegramStickersService.java

@@ -1,5 +1,15 @@
 package com.aefyr.tsg.g2;
 
+import android.content.Context;
+import android.content.Intent;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+
+import com.aefyr.tsg.g2.sql.TelegramStickersDbHelper;
+import com.aefyr.tsg.g2.stickersgrabber.TelegramStickersGrabber;
+import com.aefyr.tsg.g2.stickersgrabber.TelegramStickersPackInfo;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -7,18 +17,8 @@ import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadPoolExecutor;
 
-import com.aefyr.tsg.g2.sql.TelegramStickersDbHelper;
-import com.aefyr.tsg.g2.stickersgrabber.TelegramStickersGrabber;
-import com.aefyr.tsg.g2.stickersgrabber.TelegramStickersPackInfo;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Handler;
-import android.os.Looper;
-import android.util.Log;
-
-import ru.vtosters.lite.utils.Helper;
 import ru.vtosters.lite.ui.fragments.tgstickers.StickersFragment;
+import ru.vtosters.lite.utils.Helper;
 
 /**
  * Created by Aefyr on 19.05.2018.

app/src/main/java/com/aefyr/tsg/g2/sql/TelegramStickersDbHelper.java

@@ -11,12 +11,12 @@ import android.util.Log;
 
 import com.aefyr.tsg.g2.TelegramStickersPack;
 
-import java.io.File;
-import java.util.ArrayList;
-
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.File;
+import java.util.ArrayList;
+
 /**
  * Created by Aefyr on 19.05.2018.
  */

app/src/main/java/com/aefyr/tsg/g2/stickersgrabber/TelegramStickersGrabber.java

@@ -9,12 +9,6 @@ import android.util.Log;
 import com.aefyr.tsg.g2.stickersgrabber.util.Flag;
 import com.aefyr.tsg.g2.stickersgrabber.util.GoalCounter;
 
-import ru.f0x1d.net.NetCall;
-import ru.f0x1d.net.NetCallback;
-import ru.f0x1d.net.NetClient;
-import ru.f0x1d.net.NetRequest;
-import ru.f0x1d.net.NetResponse;
-
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -33,6 +27,12 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import ru.f0x1d.net.NetCall;
+import ru.f0x1d.net.NetCallback;
+import ru.f0x1d.net.NetClient;
+import ru.f0x1d.net.NetRequest;
+import ru.f0x1d.net.NetResponse;
+
 /**
  * Created by Aefyr on 11.05.2018.
  */

app/src/main/java/okhttp3/Request.java

@@ -7,13 +7,10 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import okhttp3.Headers;
 import okhttp3.internal.Util;
 import okhttp3.internal.b.HttpMethod;
-import okhttp3.Request;
 
 public final class Request {
-    /* renamed from: a  reason: collision with root package name */
     final HttpUrl a;
     final String b;
     final Headers c;
@@ -85,7 +82,6 @@ public final class Request {
 
     public static class Builder {
 
-        /* renamed from: a  reason: collision with root package name */
         HttpUrl a;
         String b;
         Headers.a c;

app/src/main/java/ru/f0x1d/net/F0x1dRequest.java

@@ -51,7 +51,6 @@ public class F0x1dRequest {
             this.mIsPut = z2;
         }
 
-        /* JADX INFO: Access modifiers changed from: protected */
         public String doInBackground(Void... voidArr) {
             try {
                 HttpURLConnection httpURLConnection = (HttpURLConnection) new URL(new String(this.url)).openConnection();

app/src/main/java/ru/f0x1d/net/NetCall.java

@@ -1,5 +1,7 @@
 package ru.f0x1d.net;
 
+import android.util.Base64;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -13,8 +15,6 @@ import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.TreeMap;
 
-import android.util.Base64;
-
 public final class NetCall {
     private NetRequest req;
     private NetClient cl;

app/src/main/java/ru/vtosters/lite/audio/gcm/GCMFix.java

@@ -31,7 +31,6 @@ public class GCMFix {
     private static KeyPair pair;
     private static int rid = 0;
 
-    /* access modifiers changed from: private */
     public interface Callback {
         void doCallback(String str);
     }
@@ -95,12 +94,12 @@ public class GCMFix {
         }
     }
 
-    static /* synthetic */ void lambdaRequestToken(StringBuilder sb, AtomicBoolean wait, String s) {
+    static void lambdaRequestToken(StringBuilder sb, AtomicBoolean wait, String s) {
         sb.append(s.substring(20));
         wait.set(true);
     }
 
-    static /* synthetic */ void lambda$requestToken$1(String str) {
+    static void lambda$requestToken$1(String str) {
     }
 
     private static void fillParams(List<String> params, String sig, String pub2, String xappid, long androidId, boolean del) {

app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java

@@ -71,7 +71,7 @@ public class FoafBase {
         F0x1dRequest.makeRequest(getLink(i), callback);
     }
 
-    static /* synthetic */ void lambdaLoadAndShow(ProgressDialog progressDialog, Context context, int i, String str) {
+    static void lambdaLoadAndShow(ProgressDialog progressDialog, Context context, int i, String str) {
         try {
             progressDialog.cancel();
             Matcher matcher = FOAF_REGEX.matcher(str);

app/src/main/java/ru/vtosters/lite/provider/VKFileProvider.java

@@ -2,6 +2,5 @@ package ru.vtosters.lite.provider;
 
 import android.support.v4.content.FileProvider;
 
-/* compiled from: VKFileProvider.kt */
 public final class VKFileProvider extends FileProvider {
 }

app/src/main/java/ru/vtosters/lite/ui/dialogs/Start.java

@@ -21,7 +21,6 @@ public class Start {
         builder.setMessage(getWelcome());
         builder.setCancelable(false);
         builder.setPositiveButton("Продолжить", new DialogInterface.OnClickListener() {
-            /* class ru.vtosters.lite.utils.lite.dialog.Start.AnonymousClass1 */
 
             @Override // android.content.DialogInterface.OnClickListener
             public void onClick(DialogInterface dialogInterface, int i) {
@@ -29,7 +28,6 @@ public class Start {
             }
         });
         builder.setNeutralButton("Новости", new DialogInterface.OnClickListener() {
-            /* class ru.vtosters.lite.utils.lite.dialog.Start.AnonymousClass2 */
 
             @Override // android.content.DialogInterface.OnClickListener
             public void onClick(DialogInterface dialogInterface, int i) {

app/src/main/java/ru/vtosters/lite/ui/fragments/ActivityFragment.java

@@ -7,7 +7,6 @@ import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
 
 public class ActivityFragment extends MaterialPreferenceToolbarFragment {
     @Override
-    // com.vtosters.lite.fragments.MaterialPreferenceFragment, android.support.v4.app.DialogFragment, android.support.v4.app.Fragment
     public void b(Bundle bundle) {
         super.b(bundle);
         a(R.xml.preferences_activity);

app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java

@@ -7,7 +7,6 @@ import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
 
 public class FeedFragment extends MaterialPreferenceToolbarFragment {
     @Override
-    // com.vtosters.lite.fragments.MaterialPreferenceFragment, android.support.v4.app.DialogFragment, android.support.v4.app.Fragment
     public void b(Bundle bundle) {
         super.b(bundle);
         a(R.xml.preferences_feed);

app/src/main/java/ru/vtosters/lite/ui/fragments/InstallGMSFragment.java

@@ -7,7 +7,6 @@ import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
 
 public class InstallGMSFragment extends MaterialPreferenceToolbarFragment {
     @Override
-    // com.vtosters.lite.fragments.MaterialPreferenceFragment, android.support.v4.app.DialogFragment, android.support.v4.app.Fragment
     public void b(Bundle bundle) {
         super.b(bundle);
         a(R.xml.preferences_gms);

app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java

@@ -9,18 +9,14 @@ import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
 
 import ru.vtosters.lite.utils.Helper;
 
-/* renamed from: ru.vtosters.lite.utils.lite.ui.activities.interface  reason: invalid class name */
 public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
     @Override
-    // com.vtosters.lite.fragments.MaterialPreferenceFragment, android.support.v4.app.DialogFragment, android.support.v4.app.Fragment
     public void b(Bundle bundle) {
         super.b(bundle);
         a(R.xml.preferences_interface);
         prefs();
     }
 
-    /* access modifiers changed from: package-private */
-    /* renamed from: ru.vtosters.lite.utils.lite.ui.activities.interface$a */
     public class a implements Preference.b {
         @Override // android.support.v7.preference.Preference.b
         public boolean a(Preference preference, Object obj) {
@@ -35,7 +31,7 @@ public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
         a("newfeed").a((Preference.b) new a());
     }
 
-    public /* synthetic */ boolean restart(Preference preference, Object obj) {
+    public boolean restart(Preference preference, Object obj) {
         ToastUtils.a(Helper.getString("restartapp"));
         return true;
     }

app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java

@@ -7,7 +7,6 @@ import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
 
 public class MessagesFragment extends MaterialPreferenceToolbarFragment {
     @Override
-    // com.vtosters.lite.fragments.MaterialPreferenceFragment, android.support.v4.app.DialogFragment, android.support.v4.app.Fragment
     public void b(Bundle bundle) {
         super.b(bundle);
         a(R.xml.preferences_messages);

app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java

@@ -23,7 +23,6 @@ import ru.vtosters.lite.utils.Helper;
 
 public class OtherFragment extends MaterialPreferenceToolbarFragment {
 
-    /* access modifiers changed from: package-private */
     static class c implements Preference.c {
         @Override // android.support.v7.preference.Preference.c
         public boolean a(Preference preference) {
@@ -42,14 +41,12 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
     }
 
     @Override
-    // com.vtosters.lite.fragments.MaterialPreferenceFragment, android.support.v4.app.DialogFragment, android.support.v4.app.Fragment
     public void b(Bundle bundle) {
         super.b(bundle);
         a(R.xml.preferences_other);
         prefs();
     }
 
-    /* access modifiers changed from: package-private */
     public class e implements Preference.c {
         @Override // android.support.v7.preference.Preference.c
         public boolean a(Preference preference) {
@@ -65,7 +62,6 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
         }
     }
 
-    /* access modifiers changed from: package-private */
     public class b implements Preference.c {
         b() {
         }
@@ -77,7 +73,6 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
         }
     }
 
-    /* access modifiers changed from: package-private */
     public class d implements Preference.c {
         @Override // android.support.v7.preference.Preference.c
         public boolean a(Preference preference) {
@@ -89,7 +84,6 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
         }
     }
 
-    /* access modifiers changed from: package-private */
     public class a implements Preference.c {
         a() {
         }

app/src/main/java/ru/vtosters/lite/ui/fragments/ProxySettingsFragment.java

@@ -7,7 +7,6 @@ import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment;
 
 public class ProxySettingsFragment extends MaterialPreferenceToolbarFragment {
     @Override
-    // com.vtosters.lite.fragments.MaterialPreferenceFragment, android.support.v4.app.DialogFragment, android.support.v4.app.Fragment
     public void b(Bundle bundle) {
         super.b(bundle);
         a(R.xml.preferences_proxy);

app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java

@@ -12,26 +12,29 @@ import ru.vtosters.lite.utils.IconHelper;
 
 public class ThemesFragment extends MaterialPreferenceToolbarFragment {
 
-    /* access modifiers changed from: package-private */
     public class a implements Preference.b {
-        public /* synthetic */ a() {
-        }
-
         @Override // android.support.v7.preference.Preference.b
         public boolean a(Preference preference, Object obj) {
             return ThemesFragment.this.apply(preference, obj);
         }
     }
 
+    public static class b implements Preference.b {
+        @Override // android.support.v7.preference.Preference.b
+        public boolean a(Preference preference, Object obj) {
+            ToastUtils.a(Helper.getString("restartapp"));
+            return true;
+        }
+    }
+
     @Override
-    // com.vtosters.lite.fragments.MaterialPreferenceFragment, android.support.v4.app.DialogFragment, android.support.v4.app.Fragment
     public void b(Bundle bundle) {
         super.b(bundle);
         a(R.xml.preferences_themes);
         prefs();
     }
 
-    public /* synthetic */ boolean apply(Preference preference, Object obj) {
+    public boolean apply(Preference preference, Object obj) {
         if (((Boolean) obj).booleanValue()) {
             IconHelper.switchToVK();
         } else {
@@ -43,5 +46,7 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment {
 
     private void prefs() {
         a("iconvk").a((Preference.b) new a());
+        a("darktheme").a((Preference.b) new b());
+        a("lighttheme").a((Preference.b) new b());
     }
 }

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

@@ -22,7 +22,7 @@ public class DockBarAdapter extends RecyclerView.a
     public static final int DISABLED_TAB_TYPE = 2;
     public static final int GROUP_TITLE_TYPE = 3;
 
-    
+
     private final DockBarManager mDockBarManager = DockBarManager.getInstance();
 
     @Override

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

@@ -36,7 +36,7 @@ public class DockBarFragment extends ToolbarFragment {
                 Helper.convertDpToPixel(10)
         );
         container.addView(buttonsContainer, new LinearLayout.LayoutParams(-1, -2));
-        
+
         Button save = new Button(n());
         save.setText("Сохранить");
         save.setOnClickListener(v -> {

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

@@ -224,7 +224,8 @@ public class DockBarManager {
         int target = adapter.getIndexByViewType(toPosition, adapter.getItemType(toPosition));
         if (fromPosition < toPosition) {
 
-            if (mSelectedTabs.size() <= MIN_SELECTED_TABS_LIMIT || mSelectedTabs.get(curr).tag.equals("tab_menu")) return;
+            if (mSelectedTabs.size() <= MIN_SELECTED_TABS_LIMIT || mSelectedTabs.get(curr).tag.equals("tab_menu"))
+                return;
 
             DockBarTab tab = mSelectedTabs.get(curr);
             mSelectedTabs.remove(tab);
@@ -237,7 +238,7 @@ public class DockBarManager {
             for (int i = 0; i < target; i++) {
                 Collections.swap(mDisabledTabs, i, i + 1);
             }
-        } else  {
+        } else {
 
             if (mSelectedTabs.size() >= MAX_SELECTED_TABS_LIMIT) return;
 

app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountAdapter.java

@@ -83,10 +83,10 @@ public class MultiAccountAdapter extends RecyclerView.a<MultiAccountAdapter.Mult
 
         return new MultiAccountViewHolder(layout);
     }
-    
+
     @Override
     public void a(MultiAccountViewHolder holder, int pos) {
-        holder.bind(pos == 0 ? null : mAccounts.get(pos-1), pos);
+        holder.bind(pos == 0 ? null : mAccounts.get(pos - 1), pos);
     }
 
     @Override

app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountManager.java

@@ -30,7 +30,7 @@ public class MultiAccountManager {
     }
 
     private static int getAccountPrefsCount() {
-       File[] prefs = new File(Helper.GetContext().getFilesDir().getParent(), "shared_prefs")
+        File[] prefs = new File(Helper.GetContext().getFilesDir().getParent(), "shared_prefs")
                 .listFiles((dir, name) -> {
                     return name.matches("pref_account_manager\\d+\\.xml");
                 });

app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java

@@ -166,10 +166,10 @@ public class StickersFragment extends ToolbarFragment {
                     TGPref.setTGBotKey(editText.getText().toString());
                     if (r != null) r.run();
                 }).setNegativeButton(android.R.string.cancel, null).setNeutralButton(Helper.getString("stickersapi7"), (dialog, which) -> new AlertDialog.Builder(super.n())
-                        .setTitle(Helper.getString("stickersapi8"))
+                .setTitle(Helper.getString("stickersapi8"))
-                        .setMessage(Helper.getString("stickersapi9") +
+                .setMessage(Helper.getString("stickersapi9") +
-                                Helper.getString("stickersapi10")).setPositiveButton(android.R.string.ok, null)
+                        Helper.getString("stickersapi10")).setPositiveButton(android.R.string.ok, null)
-                        .create().show()).create().show();
+                .create().show()).create().show();
     }
 
     private void checkApiKey(final Runnable r) {

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

@@ -65,7 +65,7 @@ public class Helper {
         return extendedUserProfile.a;
     }
 
-    public static void restarting(){
+    public static void restarting() {
         Context ctx = GetContext();
         PackageManager pm = ctx.getPackageManager();
         Intent intent = pm.getLaunchIntentForPackage(ctx.getPackageName());
@@ -141,6 +141,6 @@ public class Helper {
     public static boolean isNetworkConnected() {
         ConnectivityManager cm = (ConnectivityManager) GetContext().getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
-        return activeNetwork != null ? activeNetwork.isConnectedOrConnecting() :false;
+        return activeNetwork != null ? activeNetwork.isConnectedOrConnecting() : false;
     }
 }

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

@@ -1,7 +1,6 @@
 package ru.vtosters.lite.utils;
 
 import static ru.vtosters.lite.utils.Proxy.setProxy;
-import static ru.vtosters.lite.utils.Themes.amoled;
 
 import android.app.Activity;
 import android.app.Application;
@@ -274,7 +273,22 @@ public class Prefs {
     }
 
     public static String getAmoledVKUI() {
-        return amoled() ? "1" : "0";
+        String string = Helper.GetPreferences().getString("darktheme", "");
+        return string.equals("amoled") ? "1" : "0";
+    }
+
+    public static String getCommentsSort(String def) {
+        String string = Helper.GetPreferences().getString("commentssort", "");
+        if (string.isEmpty()) {
+            return def;
+        }
+        if (string.equals("new")) {
+            return "desc";
+        }
+        if (string.equals("old")) {
+            return "asc";
+        }
+        return def;
     }
 
     public static String getMeToken() {

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

@@ -3,8 +3,6 @@ package ru.vtosters.lite.utils;
 public class ProfileHide {
 //    private static final OkHttpClient client = new OkHttpClient();
 //
-//    /* JADX WARN: Type inference failed for: r1v1, types: [boolean] */
-//    /* JADX WARNING: Unknown variable types count: 1 */
 //    public static void injectMap(HashMap<Integer, AdministratorProfileFragment.a.a> hashMap) {
 //        for (int i = 0; VTVerifications.sServiceAccountsMap.valueOf(i) < 0; i++) {
 //            boolean valueOf = VTVerifications.sServiceAccountsMap.valueOf(Helper.getId());

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

@@ -10,6 +10,7 @@ import android.widget.ImageButton;
 import com.vk.core.d.RecoloredDrawable;
 import com.vk.core.ui.themes.VKTheme;
 import com.vk.core.ui.themes.VKThemeHelper;
+import com.vk.im.ui.themes.ImTheme;
 import com.vtosters.lite.R;
 
 public class Themes {
@@ -37,8 +38,42 @@ public class Themes {
         return Helper.GetContext().getResources().getIdentifier("VkIm.Theme.VkApp.Amoled", "style", Helper.GetContext().getPackageName());
     }
 
-    public static VKTheme getCurrentDarkTheme() {
+    public static VKTheme getDarkTheme() {
-        return amoled() ? VKTheme.AMOLED : VKTheme.DARK;
+        String string = Helper.GetPreferences().getString("darktheme", "");
+        if (string.isEmpty()) {
+            return VKTheme.DARK;
+        }
+        if (string.equals("amoled")) {
+            return VKTheme.AMOLED;
+        }
+        return VKTheme.DARK;
+    }
+
+    public static ImTheme getImDarkTheme() {
+        String string = Helper.GetPreferences().getString("darktheme", "");
+        if (string.isEmpty()) {
+            return ImTheme.VKAPP_DARK;
+        }
+        if (string.equals("amoled")) {
+            return ImTheme.VKAPP_AMOLED;
+        }
+        return ImTheme.VKAPP_DARK;
+    }
+
+    public static VKTheme getLightTheme() {
+        String string = Helper.GetPreferences().getString("lighttheme", "");
+        if (string.isEmpty()) {
+            return VKTheme.DEFAULT_LIGHT;
+        }
+        return VKTheme.DEFAULT_LIGHT;
+    }
+
+    public static ImTheme getImLightTheme() {
+        String string = Helper.GetPreferences().getString("lighttheme", "");
+        if (string.isEmpty()) {
+            return ImTheme.VKAPP_LIGHT;
+        }
+        return ImTheme.VKAPP_LIGHT;
     }
 
     public static int getColorFromAttr(int attr) {

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

@@ -1,9 +1,6 @@
 package ru.vtosters.lite.utils;
 
-import static ru.vtosters.lite.utils.Themes.amoled;
-
 import android.util.Base64;
-import android.util.Log;
 import android.webkit.WebView;
 
 import com.vtosters.lite.R;
@@ -61,6 +58,7 @@ public class VKUIInjector {
     }
 
     public static void inject(WebView webView) {
+        String string = Helper.GetPreferences().getString("darktheme", "");
         if (Prefs.BooleanTrue("VKUI_INJ")) {
             if (!isLoaded) {
                 load();
@@ -70,7 +68,7 @@ public class VKUIInjector {
                 sb.append("\n\n");
                 sb.append(loadedCSS);
             }
-            if (amoled() == true) {
+            if (string.equals("amoled")) {
                 sb.append("\n\n");
                 sb.append(loadedCSSAmoled);
             }

gradle.properties

@@ -1,3 +1,3 @@
 android.useAndroidX=true
 android.enableJetifier=true
-android.jetifier.ignorelist = classes-dex2jar.jar, classes2-dex2jar.jar, classes3-dex2jar.jar, classes4-dex2jar.jar, classes5-dex2jar.jar, classes6-dex2jar.jar, classes7-dex2jar.jar
+android.jetifier.ignorelist=classes-dex2jar.jar, classes2-dex2jar.jar, classes3-dex2jar.jar, classes4-dex2jar.jar, classes5-dex2jar.jar, classes6-dex2jar.jar, classes7-dex2jar.jar

smali/res/anim-v21/bottom_sheet_slide_in.xml

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

smali/res/anim-v21/bottom_sheet_slide_out.xml

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

smali/res/anim-v21/design_bottom_sheet_slide_in.xml

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

smali/res/anim-v21/design_bottom_sheet_slide_out.xml

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

smali/res/anim-v21/fast_out_linear_in.xml

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

smali/res/anim-v21/linear_out_slow_in.xml

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

smali/res/anim-v21/push_down_in.xml

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

smali/res/anim-v21/push_down_out.xml

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

smali/res/anim-v21/stories_slide_out.xml

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

smali/res/anim-v21/vkme_enter_interpolator.xml

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

smali/res/anim/abc_grow_fade_in_from_bottom.xml

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

smali/res/anim/abc_popup_enter.xml

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

smali/res/anim/abc_popup_exit.xml

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

smali/res/anim/abc_shrink_fade_out_from_bottom.xml

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

smali/res/anim/abc_tooltip_enter.xml

@@ -1,3 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<alpha android:interpolator="@android:interpolator/decelerate_quad" android:duration="@integer/config_tooltipAnimTime" android:fromAlpha="0.0" android:toAlpha="1.0"
+<alpha android:interpolator="@android:interpolator/decelerate_quad"
-  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" />

smali/res/anim/abc_tooltip_exit.xml

@@ -1,3 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<alpha android:interpolator="@android:interpolator/accelerate_quad" android:duration="@integer/config_tooltipAnimTime" android:fromAlpha="1.0" android:toAlpha="0.0"
+<alpha android:interpolator="@android:interpolator/accelerate_quad"
-  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" />

smali/res/anim/activity_close_enter.xml

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

smali/res/anim/activity_close_exit.xml

@@ -1,6 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set android:shareInterpolator="false" android:zAdjustment="top"
+<set android:shareInterpolator="false"
-  xmlns:android="http://schemas.android.com/apk/res/android">
+    android:zAdjustment="top"
-    <alpha android:interpolator="@android:interpolator/decelerate_cubic" android:duration="300" android:fillBefore="true" android:fillAfter="true" android:fromAlpha="1.0" android:toAlpha="0.0" android:fillEnabled="true" />
+    xmlns:android="http://schemas.android.com/apk/res/android">
-    <scale android:interpolator="@android:interpolator/decelerate_cubic" android:duration="300" 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" />
+    <alpha
+        android:interpolator="@android:interpolator/decelerate_cubic"
+        android:duration="300"
+        android:fillBefore="true"
+        android:fillAfter="true"
+        android:fromAlpha="1.0"
+        android:toAlpha="0.0"
+        android:fillEnabled="true" />
+    <scale
+        android:interpolator="@android:interpolator/decelerate_cubic"
+        android:duration="300"
+        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" />
 </set>

smali/res/anim/activity_posting_slide_in.xml

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

smali/res/anim/activity_posting_slide_out.xml

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

smali/res/anim/button_raise.xml

@@ -1,10 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
-    <item android:state_enabled="true" android:state_pressed="true">
+        android:state_enabled="true"
-        <objectAnimator android:duration="200" android:valueTo="2.0dip" android:valueType="floatType" android:propertyName="translationZ" />
+        android:state_pressed="true">
+        <objectAnimator
+            android:duration="200"
+            android:valueTo="2.0dip"
+            android:valueType="floatType"
+            android:propertyName="translationZ" />
     </item>
     <item>
-        <objectAnimator android:duration="200" android:valueTo="1.0dip" android:valueType="floatType" android:propertyName="translationZ" />
+        <objectAnimator
+            android:duration="200"
+            android:valueTo="1.0dip"
+            android:valueType="floatType"
+            android:propertyName="translationZ" />
     </item>
 </selector>

smali/res/anim/button_raise_big.xml

@@ -1,10 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
-    <item android:state_enabled="true" android:state_pressed="true">
+        android:state_enabled="true"
-        <objectAnimator android:duration="200" android:valueTo="4.0dip" android:valueType="floatType" android:propertyName="translationZ" />
+        android:state_pressed="true">
+        <objectAnimator
+            android:duration="200"
+            android:valueTo="4.0dip"
+            android:valueType="floatType"
+            android:propertyName="translationZ" />
     </item>
     <item>
-        <objectAnimator android:duration="200" android:valueTo="2.0dip" android:valueType="floatType" android:propertyName="translationZ" />
+        <objectAnimator
+            android:duration="200"
+            android:valueTo="2.0dip"
+            android:valueType="floatType"
+            android:propertyName="translationZ" />
     </item>
 </selector>

smali/res/anim/design_bottom_sheet_slide_in.xml

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

smali/res/anim/design_bottom_sheet_slide_out.xml

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

smali/res/anim/design_snackbar_in.xml

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

smali/res/anim/design_snackbar_out.xml

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

smali/res/anim/fade_out_fast.xml

@@ -1,3 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<alpha android:interpolator="@android:anim/accelerate_interpolator" android:duration="200" android:fromAlpha="1.0" android:toAlpha="0.0"
+<alpha android:interpolator="@android:anim/accelerate_interpolator"
-  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" />

smali/res/anim/fr_exit.xml

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

smali/res/anim/keyboard_pop_up_animation_enter.xml

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

smali/res/anim/keyboard_pop_up_animation_exit.xml

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

smali/res/anim/live_combo_bounce.xml

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

smali/res/anim/picker_dialog_enter.xml

@@ -1,3 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<alpha android:interpolator="@android:anim/accelerate_interpolator" android:duration="200" android:fromAlpha="0.0" android:toAlpha="1.0"
+<alpha android:interpolator="@android:anim/accelerate_interpolator"
-  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" />

smali/res/anim/picker_dialog_exit.xml

@@ -1,3 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<alpha android:interpolator="@android:anim/accelerate_interpolator" android:duration="200" android:fillAfter="true" android:fromAlpha="1.0" android:toAlpha="0.0"
+<alpha android:interpolator="@android:anim/accelerate_interpolator"
-  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" />

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" />
+    xmlns:android="http://schemas.android.com/apk/res/android" />

smali/res/anim/popup_menu_open.xml

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

smali/res/anim/push_down_in.xml

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

smali/res/anim/push_down_out.xml

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

smali/res/anim/push_up_in.xml

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

smali/res/anim/push_up_out.xml

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

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

smali/res/anim/slide_in.xml

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

smali/res/anim/slide_top_in.xml

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

smali/res/anim/slide_top_out.xml

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

smali/res/anim/sticker_dialog_in.xml

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

smali/res/anim/sticker_dialog_out.xml

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

smali/res/anim/stories_no_anim.xml

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

smali/res/anim/stories_slide_in_from_bottom.xml

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

smali/res/anim/stories_slide_out.xml

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

smali/res/anim/vkim_activity_slide_in.xml

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

smali/res/anim/vkim_change_theme_enter.xml

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

smali/res/anim/vkim_change_theme_exit.xml

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

smali/res/anim/vkme_enter_interpolator.xml

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

smali/res/anim/vkme_enter_slide_down.xml

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

smali/res/anim/vkme_enter_slide_up.xml

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

smali/res/anim/vkme_exit_noop.xml

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

smali/res/animator-v21/design_appbar_state_list_animator.xml

@@ -1,13 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:state_enabled="true" app:state_collapsed="false" app:state_collapsible="true">
+    <item
-        <objectAnimator android:duration="@integer/app_bar_elevation_anim_duration" android:valueTo="0.0dip" android:valueType="floatType" android:propertyName="elevation" />
+        android:state_enabled="true"
+        app:state_collapsed="false"
+        app:state_collapsible="true">
+        <objectAnimator
+            android:duration="@integer/app_bar_elevation_anim_duration"
+            android:valueTo="0.0dip"
+            android:valueType="floatType"
+            android:propertyName="elevation" />
     </item>
     <item android:state_enabled="true">
-        <objectAnimator android:duration="@integer/app_bar_elevation_anim_duration" android:valueTo="@dimen/design_appbar_elevation" android:valueType="floatType" android:propertyName="elevation" />
+        <objectAnimator
+            android:duration="@integer/app_bar_elevation_anim_duration"
+            android:valueTo="@dimen/design_appbar_elevation"
+            android:valueType="floatType"
+            android:propertyName="elevation" />
     </item>
     <item>
-        <objectAnimator android:duration="0" android:valueTo="0" android:valueType="floatType" android:propertyName="elevation" />
+        <objectAnimator
+            android:duration="0"
+            android:valueTo="0"
+            android:valueType="floatType"
+            android:propertyName="elevation" />
     </item>
 </selector>

smali/res/color-sw600dp/leftmenu_icon.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="true" android:color="#ff5d8cc2" />
     <item android:color="#ffa4aab1" />
 </selector>

smali/res/color-sw600dp/leftmenu_item.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="true" android:color="#ff7aa0cc" />
     <item android:color="#ffebf0f5" />
 </selector>

smali/res/color-v21/abc_btn_colored_borderless_text_material.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="?android:textColorSecondary" />
     <item android:color="?colorAccent" />
 </selector>

smali/res/color-v21/poll_setting_btn_text.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="@color/cool_grey" />
     <item android:color="?text_primary" />
 </selector>

smali/res/color-v23/abc_btn_colored_borderless_text_material.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="?android:textColorSecondary" android:alpha="?android:disabledAlpha" />
     <item android:color="?colorAccent" />
 </selector>

smali/res/color-v23/abc_btn_colored_text_material.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="?android:textColorPrimary" android:alpha="?android:disabledAlpha" />
     <item android:color="?android:textColorPrimaryInverse" />
 </selector>

smali/res/color-v23/abc_color_highlight_material.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="true" android:state_checked="true" android:color="?android:colorControlActivated" android:alpha="@dimen/highlight_alpha_material_colored" />
     <item android:color="?android:colorControlHighlight" />
 </selector>

smali/res/color-v23/abc_tint_btn_checkable.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="?colorControlNormal" android:alpha="?android:disabledAlpha" />
     <item android:state_checked="true" android:color="?colorControlActivated" />
     <item android:color="?colorControlNormal" />

smali/res/color-v23/abc_tint_default.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="?colorControlNormal" android:alpha="?android:disabledAlpha" />
     <item android:state_focused="true" android:color="?colorControlActivated" />
     <item android:state_pressed="true" android:color="?colorControlActivated" />