From a7ba31c4ae375429cdd722fd1d8bf56052958a63 Mon Sep 17 00:00:00 2001
From: Dmitry Tretyakov <76806170+tretdm@users.noreply.github.com>
Date: Sat, 11 Feb 2023 22:19:36 +0700
Subject: [PATCH] build 15

---
 app/build.gradle                              |   4 +-
 app/src/main/AndroidManifest.xml              |   9 +
 .../ui/core/activities/AppActivity.java       |   2 +-
 .../ui/core/activities/AuthActivity.java      |  94 ++++++++-
 .../core/activities/MainSettingsActivity.java | 190 ++++++++++++++++++
 .../app/AboutApplicationFragment.java         |   2 +-
 .../fragments/app/MainSettingsFragment.java   |  30 ++-
 .../app/PersonalizationFragment.java          |  14 ++
 .../core/fragments/app/ProfileFragment.java   |  18 +-
 .../ui/core/fragments/auth/AuthFragment.java  |  25 +++
 .../fragments/auth/AuthProgressFragment.java  |  21 +-
 .../adapters/DialogSingleChoiceAdapter.java   |  17 ++
 .../ui/list/adapters/FriendsAdapter.java      |   2 +-
 .../ui/list/adapters/NewsfeedAdapter.java     |   6 +-
 .../ui/util/OvkAlertDialogBuilder.java        |  50 ++++-
 .../ui/view/layouts/ProfileHeader.java        |   2 +-
 .../ui/view/layouts/ProgressLayout.java       |   2 +-
 .../main/res/drawable/photo_placeholder.xml   |  12 ++
 app/src/main/res/layout-night/auth_screen.xml |  79 ++++++++
 ...rogress_fragment.xml => auth_progress.xml} |   0
 app/src/main/res/layout/auth_screen.xml       |  95 ++++++---
 app/src/main/res/menu/app_auth.xml            |  10 +
 app/src/main/res/values/colors.xml            |   4 +-
 app/src/main/res/xml/main_pref.xml            |  17 +-
 app/src/main/res/xml/person_perf.xml          |   4 +
 25 files changed, 650 insertions(+), 59 deletions(-)
 create mode 100644 app/src/main/java/uk/openvk/android/refresh/ui/core/activities/MainSettingsActivity.java
 create mode 100644 app/src/main/res/drawable/photo_placeholder.xml
 create mode 100644 app/src/main/res/layout-night/auth_screen.xml
 rename app/src/main/res/layout/{auth_progress_fragment.xml => auth_progress.xml} (100%)
 create mode 100644 app/src/main/res/menu/app_auth.xml

diff --git a/app/build.gradle b/app/build.gradle
index 18af95a..66408dc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "uk.openvk.android.refresh"
         minSdk 21
         targetSdk 33
-        versionCode 14
-        versionName "0.0.14.alpha"
+        versionCode 15
+        versionName "0.0.15.alpha"
     }
 
     buildTypes {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b9ed44f..f2ac5a1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -37,6 +37,15 @@
             android:windowSoftInputMode="adjustResize"
             android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|mcc|mnc|uiMode"
             android:label="@string/title_activity_auth" />
+
+        <activity
+            android:name=".ui.core.activities.MainSettingsActivity"
+            android:exported="false"
+            android:windowSoftInputMode="adjustResize"
+            android:label="@string/nav_settings"
+            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|mcc|mnc|uiMode"
+            android:theme="@style/ApplicationTheme.NoActionBar"
+            tools:ignore="RedundantLabel" />
         <activity
             android:name=".ui.core.activities.AppActivity"
             android:exported="false"
diff --git a/app/src/main/java/uk/openvk/android/refresh/ui/core/activities/AppActivity.java b/app/src/main/java/uk/openvk/android/refresh/ui/core/activities/AppActivity.java
index 45bf451..cbb3a47 100644
--- a/app/src/main/java/uk/openvk/android/refresh/ui/core/activities/AppActivity.java
+++ b/app/src/main/java/uk/openvk/android/refresh/ui/core/activities/AppActivity.java
@@ -387,7 +387,7 @@ private void setMonetTheme() {
                 BottomNavigationView b_navView = findViewById(R.id.bottom_nav_view);
                 if (isDarkTheme) {
                     colors = new int[]{
-                            Objects.requireNonNull(getMonet().getMonetColors().getAccent1().get(100)).toLinearSrgb().toSrgb().quantize8(),
+                            Objects.requireNonNull(getMonet().getMonetColors().getAccent1().get(200)).toLinearSrgb().toSrgb().quantize8(),
                             Global.adjustAlpha(colorOnSurface, 0.6f)
                     };
                 } else {
diff --git a/app/src/main/java/uk/openvk/android/refresh/ui/core/activities/AuthActivity.java b/app/src/main/java/uk/openvk/android/refresh/ui/core/activities/AuthActivity.java
index 8376b05..c122f8e 100644
--- a/app/src/main/java/uk/openvk/android/refresh/ui/core/activities/AuthActivity.java
+++ b/app/src/main/java/uk/openvk/android/refresh/ui/core/activities/AuthActivity.java
@@ -11,6 +11,7 @@
 import android.os.Looper;
 import android.os.Message;
 import android.preference.PreferenceManager;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
@@ -18,15 +19,18 @@
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatDelegate;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.WindowCompat;
 import androidx.core.view.WindowInsetsControllerCompat;
 import androidx.fragment.app.FragmentTransaction;
 
+import com.google.android.material.color.MaterialColors;
 import com.google.android.material.snackbar.Snackbar;
 import com.kieronquinn.monetcompat.app.MonetCompatActivity;
 import com.kieronquinn.monetcompat.core.MonetCompat;
 
 import java.util.Locale;
+import java.util.Objects;
 
 import dev.kdrag0n.monet.theme.ColorScheme;
 import uk.openvk.android.refresh.Global;
@@ -98,6 +102,20 @@ public void onKeyboardStateChanged(boolean state) {
                 e.printStackTrace();
             }
         }
+        setAppBar();
+    }
+
+    private void setAppBar() {
+        ((Toolbar) findViewById(R.id.toolbar)).setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() {
+            @Override
+            public boolean onMenuItemClick(MenuItem item) {
+                if(item.getItemId() == R.id.settings) {
+                    Intent intent = new Intent(getApplicationContext(), MainSettingsActivity.class);
+                    startActivity(intent);
+                }
+                return false;
+            }
+        });
     }
 
     @Override
@@ -172,8 +190,23 @@ private void receiveState(int message, Bundle data) {
             TextView snackTextView = (TextView) snackbarView.findViewById(com.google.android.material.R.id.snackbar_text);
             snackTextView.setMaxLines(3);
             snackTextView.setTextColor(getResources().getColor(R.color.primaryTextColor));
-            snackbar.setBackgroundTint(Color.WHITE);
-            snackbar.setActionTextColor(getResources().getColor(R.color.accentColor));
+            if(global_prefs.getBoolean("dark_theme", false)) {
+                snackbar.setBackgroundTint(getResources().getColor(R.color.navbarColor));
+            } else {
+                snackbar.setBackgroundTint(Color.WHITE);
+            }
+            if(Global.checkMonet(this)) {
+                if(global_prefs.getBoolean("dark_theme", false)) {
+                    snackbar.setActionTextColor(Objects.requireNonNull(
+                            getMonet().getMonetColors().getAccent1().get(100)).toLinearSrgb().toSrgb().quantize8());
+                } else {
+                    snackbar.setActionTextColor(Objects.requireNonNull(
+                            getMonet().getMonetColors().getAccent1().get(500)).toLinearSrgb().toSrgb().quantize8());
+                }
+            } else {
+                snackbar.setActionTextColor(MaterialColors.getColor(this, androidx.appcompat.R.attr.colorAccent,
+                        getResources().getColor(R.color.accentColor)));
+            }
             Button snackActionBtn = (Button) snackbarView.findViewById(com.google.android.material.R.id.snackbar_action);
             snackActionBtn.setLetterSpacing(0);
             snackbar.show();
@@ -192,8 +225,23 @@ public void onClick(View view) {
             TextView snackTextView = (TextView) snackbarView.findViewById(com.google.android.material.R.id.snackbar_text);
             snackTextView.setMaxLines(3);
             snackTextView.setTextColor(getResources().getColor(R.color.primaryTextColor));
-            snackbar.setBackgroundTint(Color.WHITE);
-            snackbar.setActionTextColor(getResources().getColor(R.color.accentColor));
+            if(global_prefs.getBoolean("dark_theme", false)) {
+                snackbar.setBackgroundTint(getResources().getColor(R.color.navbarColor));
+            } else {
+                snackbar.setBackgroundTint(Color.WHITE);
+            }
+            if(Global.checkMonet(this)) {
+                if(global_prefs.getBoolean("dark_theme", false)) {
+                    snackbar.setActionTextColor(Objects.requireNonNull(
+                            getMonet().getMonetColors().getAccent1().get(100)).toLinearSrgb().toSrgb().quantize8());
+                } else {
+                    snackbar.setActionTextColor(Objects.requireNonNull(
+                            getMonet().getMonetColors().getAccent1().get(500)).toLinearSrgb().toSrgb().quantize8());
+                }
+            } else {
+                snackbar.setActionTextColor(MaterialColors.getColor(this, androidx.appcompat.R.attr.colorAccent,
+                        getResources().getColor(R.color.accentColor)));
+            }
             Button snackActionBtn = (Button) snackbarView.findViewById(com.google.android.material.R.id.snackbar_action);
             snackActionBtn.setLetterSpacing(0);
             snackbar.show();
@@ -205,10 +253,25 @@ public void onClick(View view) {
             snackbar = Snackbar.make(auth_layout, R.string.auth_instance_unavailable, Snackbar.LENGTH_LONG);
             View snackbarView = snackbar.getView();
             TextView snackTextView = (TextView) snackbarView.findViewById(com.google.android.material.R.id.snackbar_text);
-            snackbar.setBackgroundTint(Color.WHITE);
+            if(global_prefs.getBoolean("dark_theme", false)) {
+                snackbar.setBackgroundTint(getResources().getColor(R.color.navbarColor));
+            } else {
+                snackbar.setBackgroundTint(Color.WHITE);
+            }
             snackTextView.setMaxLines(3);
             snackTextView.setTextColor(getResources().getColor(R.color.primaryTextColor));
-            snackbar.setActionTextColor(getResources().getColor(R.color.accentColor));
+            if(Global.checkMonet(this)) {
+                if(global_prefs.getBoolean("dark_theme", false)) {
+                    snackbar.setActionTextColor(Objects.requireNonNull(
+                            getMonet().getMonetColors().getAccent1().get(100)).toLinearSrgb().toSrgb().quantize8());
+                } else {
+                    snackbar.setActionTextColor(Objects.requireNonNull(
+                            getMonet().getMonetColors().getAccent1().get(500)).toLinearSrgb().toSrgb().quantize8());
+                }
+            } else {
+                snackbar.setActionTextColor(MaterialColors.getColor(this, androidx.appcompat.R.attr.colorAccent,
+                        getResources().getColor(R.color.accentColor)));
+            }
             Button snackActionBtn = (Button) snackbarView.findViewById(com.google.android.material.R.id.snackbar_action);
             snackActionBtn.setLetterSpacing(0);
             snackbar.show();
@@ -221,9 +284,24 @@ public void onClick(View view) {
             View snackbarView = snackbar.getView();
             TextView snackTextView = (TextView) snackbarView.findViewById(com.google.android.material.R.id.snackbar_text);
             snackTextView.setMaxLines(3);
-            snackbar.setBackgroundTint(Color.WHITE);
+            if(global_prefs.getBoolean("dark_theme", false)) {
+                snackbar.setBackgroundTint(getResources().getColor(R.color.navbarColor));
+            } else {
+                snackbar.setBackgroundTint(Color.WHITE);
+            }
             snackTextView.setTextColor(getResources().getColor(R.color.primaryTextColor));
-            snackbar.setActionTextColor(getResources().getColor(R.color.accentColor));
+            if(Global.checkMonet(this)) {
+                if(global_prefs.getBoolean("dark_theme", false)) {
+                    snackbar.setActionTextColor(Objects.requireNonNull(
+                            getMonet().getMonetColors().getAccent1().get(100)).toLinearSrgb().toSrgb().quantize8());
+                } else {
+                    snackbar.setActionTextColor(Objects.requireNonNull(
+                            getMonet().getMonetColors().getAccent1().get(500)).toLinearSrgb().toSrgb().quantize8());
+                }
+            } else {
+                snackbar.setActionTextColor(MaterialColors.getColor(this, androidx.appcompat.R.attr.colorAccent,
+                        getResources().getColor(R.color.accentColor)));
+            }
             Button snackActionBtn = (Button) snackbarView.findViewById(com.google.android.material.R.id.snackbar_action);
             snackActionBtn.setLetterSpacing(0);
             snackbar.show();
diff --git a/app/src/main/java/uk/openvk/android/refresh/ui/core/activities/MainSettingsActivity.java b/app/src/main/java/uk/openvk/android/refresh/ui/core/activities/MainSettingsActivity.java
new file mode 100644
index 0000000..3bffe09
--- /dev/null
+++ b/app/src/main/java/uk/openvk/android/refresh/ui/core/activities/MainSettingsActivity.java
@@ -0,0 +1,190 @@
+package uk.openvk.android.refresh.ui.core.activities;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.preference.PreferenceManager;
+
+import com.google.android.material.appbar.MaterialToolbar;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
+import com.google.android.material.navigation.NavigationView;
+import com.kieronquinn.monetcompat.app.MonetCompatActivity;
+import com.kieronquinn.monetcompat.core.MonetCompat;
+
+import java.util.Locale;
+import java.util.Objects;
+
+import dev.kdrag0n.monet.theme.ColorScheme;
+import uk.openvk.android.refresh.Global;
+import uk.openvk.android.refresh.OvkApplication;
+import uk.openvk.android.refresh.R;
+import uk.openvk.android.refresh.api.Account;
+import uk.openvk.android.refresh.api.Likes;
+import uk.openvk.android.refresh.api.Users;
+import uk.openvk.android.refresh.api.Wall;
+import uk.openvk.android.refresh.api.enumerations.HandlerMessages;
+import uk.openvk.android.refresh.api.models.User;
+import uk.openvk.android.refresh.api.models.WallPost;
+import uk.openvk.android.refresh.api.wrappers.DownloadManager;
+import uk.openvk.android.refresh.api.wrappers.OvkAPIWrapper;
+import uk.openvk.android.refresh.ui.core.fragments.app.AboutApplicationFragment;
+import uk.openvk.android.refresh.ui.core.fragments.app.MainSettingsFragment;
+import uk.openvk.android.refresh.ui.core.fragments.app.PersonalizationFragment;
+import uk.openvk.android.refresh.ui.core.fragments.app.ProfileFragment;
+import uk.openvk.android.refresh.ui.wrappers.LocaleContextWrapper;
+
+public class MainSettingsActivity extends MonetCompatActivity {
+    private SharedPreferences global_prefs;
+    private SharedPreferences instance_prefs;
+    public Handler handler;
+    private OvkAPIWrapper ovk_api;
+    private DownloadManager downloadManager;
+    private Wall wall;
+    private Account account;
+    private Likes likes;
+    private FragmentTransaction ft;
+    private String args;
+    private MaterialToolbar toolbar;
+    private Users users;
+    private User user;
+    private boolean isDarkTheme;
+    private MainSettingsFragment mainSettingsFragment;
+    private PersonalizationFragment personalizationFragment;
+    private AboutApplicationFragment aboutAppFragment;
+    private Fragment selectedFragment;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        global_prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        isDarkTheme = global_prefs.getBoolean("dark_theme", false);
+        Global.setColorTheme(this, global_prefs.getString("theme_color", "blue"));
+        Global.setInterfaceFont(this);
+        instance_prefs = getSharedPreferences("instance", 0);
+        setContentView(R.layout.intent_view);
+        setMonetTheme();
+        setAppBar();
+        createFragments();
+    }
+
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        Locale languageType = OvkApplication.getLocale(newBase);
+        super.attachBaseContext(LocaleContextWrapper.wrap(newBase, languageType));
+    }
+
+    private void setMonetTheme() {
+        if(Global.checkMonet(this)) {
+            MaterialToolbar toolbar = findViewById(R.id.app_toolbar);
+            if (!isDarkTheme) {
+                toolbar.setBackgroundColor(Objects.requireNonNull(getMonet().getMonetColors().getAccent1().get(600)).toLinearSrgb().toSrgb().quantize8());
+                getWindow().setStatusBarColor(Objects.requireNonNull(getMonet().getMonetColors().getAccent1().get(700)).toLinearSrgb().toSrgb().quantize8());
+            }
+        }
+    }
+
+    private void createFragments() {
+        mainSettingsFragment = new MainSettingsFragment();
+        personalizationFragment = new PersonalizationFragment();
+        aboutAppFragment = new AboutApplicationFragment();
+        setAppBar();
+        FragmentManager fm = getSupportFragmentManager();
+        ft = getSupportFragmentManager().beginTransaction();
+        ft.add(R.id.fragment_screen, mainSettingsFragment, "settings");
+        ft.add(R.id.fragment_screen, personalizationFragment, "personalization");
+        ft.add(R.id.fragment_screen, aboutAppFragment, "about_app");
+        ft.commit();
+        ft = getSupportFragmentManager().beginTransaction();
+        ft.hide(personalizationFragment);
+        ft.hide(aboutAppFragment);
+        ft.commit();
+        ft = getSupportFragmentManager().beginTransaction();
+        selectedFragment = getSupportFragmentManager().findFragmentByTag("settings");
+    }
+
+    private void setAppBar() {
+        toolbar = findViewById(R.id.app_toolbar);
+        toolbar.setNavigationIcon(R.drawable.ic_arrow_back);
+        toolbar.setTitle(getResources().getString(R.string.nav_settings));
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                onBackPressed();
+            }
+        });
+        if(!Global.checkMonet(this)) {
+            TypedValue typedValue = new TypedValue();
+            boolean isDarkThemeEnabled = (getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;
+            if (isDarkThemeEnabled) {
+                getTheme().resolveAttribute(androidx.appcompat.R.attr.background, typedValue, true);
+            } else {
+                getTheme().resolveAttribute(androidx.appcompat.R.attr.colorPrimaryDark, typedValue, true);
+            }
+            getWindow().setStatusBarColor(typedValue.data);
+        }
+    }
+
+    @Override
+    public void onMonetColorsChanged(@NonNull MonetCompat monet, @NonNull ColorScheme monetColors, boolean isInitialChange) {
+        super.onMonetColorsChanged(monet, monetColors, isInitialChange);
+        getMonet().updateMonetColors();
+        setMonetTheme();
+    }
+
+    public void switchFragment(String tag) {
+        FragmentManager fm = getSupportFragmentManager();
+        ft = getSupportFragmentManager().beginTransaction();
+        ft.hide(Objects.requireNonNull(fm.findFragmentByTag("settings")));
+        ft.hide(Objects.requireNonNull(fm.findFragmentByTag("personalization")));
+        ft.hide(Objects.requireNonNull(fm.findFragmentByTag("about_app")));
+        if(selectedFragment == null) selectedFragment = getSupportFragmentManager().findFragmentByTag("settings");
+        switch (tag) {
+            case "settings":
+                ft.hide(selectedFragment);
+                selectedFragment = Objects.requireNonNull(fm.findFragmentByTag("settings"));
+                ft.show(selectedFragment);
+                ((MaterialToolbar) findViewById(R.id.app_toolbar)).setTitle(R.string.nav_settings);
+                ((MaterialToolbar) findViewById(R.id.app_toolbar)).setNavigationIcon(R.drawable.ic_arrow_back);
+                break;
+            case "personalization":
+                ft.hide(selectedFragment);
+                selectedFragment = Objects.requireNonNull(fm.findFragmentByTag("personalization"));
+                ft.show(selectedFragment);
+                ((MaterialToolbar) findViewById(R.id.app_toolbar)).setTitle(R.string.pref_personalization);
+                ((MaterialToolbar) findViewById(R.id.app_toolbar)).setNavigationIcon(R.drawable.ic_arrow_back);
+                break;
+            case "about_app":
+                ft.hide(selectedFragment);
+                selectedFragment = Objects.requireNonNull(fm.findFragmentByTag("about_app"));
+                ft.show(selectedFragment);
+                ((MaterialToolbar) findViewById(R.id.app_toolbar)).setTitle(R.string.pref_about_app);
+                ((MaterialToolbar) findViewById(R.id.app_toolbar)).setNavigationIcon(R.drawable.ic_arrow_back);
+                break;
+        }
+        ft.commit();
+    }
+
+    @Override
+    public void onBackPressed() {
+        if(selectedFragment != null && selectedFragment != mainSettingsFragment) {
+            switchFragment("settings");
+        } else {
+            super.onBackPressed();
+        }
+    }
+}
diff --git a/app/src/main/java/uk/openvk/android/refresh/ui/core/fragments/app/AboutApplicationFragment.java b/app/src/main/java/uk/openvk/android/refresh/ui/core/fragments/app/AboutApplicationFragment.java
index 4fcf8c0..6206ab3 100644
--- a/app/src/main/java/uk/openvk/android/refresh/ui/core/fragments/app/AboutApplicationFragment.java
+++ b/app/src/main/java/uk/openvk/android/refresh/ui/core/fragments/app/AboutApplicationFragment.java
@@ -43,7 +43,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
             MonetCompat monet = MonetCompat.getInstance();
             boolean isDarkTheme = PreferenceManager.getDefaultSharedPreferences(requireContext()).getBoolean("dark_theme", false);
             if(isDarkTheme) {
-                ((Button) view.findViewById(R.id.source_code_btn)).setTextColor(ColorStateList.valueOf(Objects.requireNonNull(monet.getMonetColors().getAccent1().get(100)).toLinearSrgb().toSrgb().quantize8()));
+                ((Button) view.findViewById(R.id.source_code_btn)).setTextColor(ColorStateList.valueOf(Objects.requireNonNull(monet.getMonetColors().getAccent1().get(200)).toLinearSrgb().toSrgb().quantize8()));
             } else {
                 ((Button) view.findViewById(R.id.source_code_btn)).setTextColor(ColorStateList.valueOf(Objects.requireNonNull(monet.getMonetColors().getAccent1().get(500)).toLinearSrgb().toSrgb().quantize8()));
             }
diff --git a/app/src/main/java/uk/openvk/android/refresh/ui/core/fragments/app/MainSettingsFragment.java b/app/src/main/java/uk/openvk/android/refresh/ui/core/fragments/app/MainSettingsFragment.java
index 2a8b256..d03274f 100644
--- a/app/src/main/java/uk/openvk/android/refresh/ui/core/fragments/app/MainSettingsFragment.java
+++ b/app/src/main/java/uk/openvk/android/refresh/ui/core/fragments/app/MainSettingsFragment.java
@@ -16,16 +16,20 @@
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
 
 import java.util.Arrays;
+import java.util.Objects;
 
 import uk.openvk.android.refresh.Global;
 import uk.openvk.android.refresh.R;
 import uk.openvk.android.refresh.api.Ovk;
 import uk.openvk.android.refresh.api.models.InstanceLink;
 import uk.openvk.android.refresh.api.wrappers.OvkAPIWrapper;
+import uk.openvk.android.refresh.ui.core.activities.MainSettingsActivity;
 import uk.openvk.android.refresh.ui.list.adapters.DialogSingleChoiceAdapter;
 import uk.openvk.android.refresh.ui.util.OvkAlertDialogBuilder;
 import uk.openvk.android.refresh.ui.core.activities.AppActivity;
@@ -43,7 +47,13 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         global_prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
         instance_prefs = requireContext().getSharedPreferences("instance", 0);
         setListeners();
-        ovk = new Ovk();
+        if(requireActivity().getClass().getSimpleName().equals("MainSettingsActivity")) {
+            hideInstanceSettings();
+        } else {
+            ovk = new Ovk();
+        }
+        Preference restart_required = Objects.requireNonNull(findPreference("restart_required"));
+        restart_required.setVisible(false);
     }
 
     public void setListeners() {
@@ -54,6 +64,8 @@ public void setListeners() {
             public boolean onPreferenceClick(Preference preference) {
                 if(requireActivity().getClass().getSimpleName().equals("AppActivity")) {
                     ((AppActivity) requireActivity()).switchFragment("personalization");
+                } else if(requireActivity().getClass().getSimpleName().equals("MainSettingsActivity")) {
+                    ((MainSettingsActivity) requireActivity()).switchFragment("personalization");
                 }
                 return false;
             }
@@ -93,9 +105,11 @@ public boolean onPreferenceClick(@NonNull Preference preference) {
         assert about_app != null;
         about_app.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
             @Override
-            public boolean onPreferenceClick(Preference preference) {
+            public boolean onPreferenceClick(@NonNull Preference preference) {
                 if(requireActivity().getClass().getSimpleName().equals("AppActivity")) {
                     ((AppActivity) requireActivity()).switchFragment("about_app");
+                } else if(requireActivity().getClass().getSimpleName().equals("MainSettingsActivity")) {
+                    ((MainSettingsActivity) requireActivity()).switchFragment("about_app");
                 }
                 return false;
             }
@@ -144,6 +158,9 @@ public void onMenuItemClicked(String[] list, int which) {
         }
         if(requireActivity().getClass().getSimpleName().equals("AppActivity")) {
             ((AppActivity) requireActivity()).restart();
+        } else {
+            Preference restart_required = Objects.requireNonNull(findPreference("restart_required"));
+            restart_required.setVisible(true);
         }
     }
 
@@ -292,4 +309,13 @@ public void getInstanceInfo(String where, String response) {
             ((LinearLayout) about_instance_view.findViewById(R.id.instance_version_ll)).setVisibility(View.VISIBLE);
         }
     }
+
+    public void hideInstanceSettings() {
+        Preference about_instance = findPreference("about_instance");
+        assert about_instance != null;
+        about_instance.setVisible(false);
+        PreferenceCategory account_category = findPreference("account_category");
+        assert account_category != null;
+        account_category.setVisible(false);
+    }
 }
diff --git a/app/src/main/java/uk/openvk/android/refresh/ui/core/fragments/app/PersonalizationFragment.java b/app/src/main/java/uk/openvk/android/refresh/ui/core/fragments/app/PersonalizationFragment.java
index 93532f5..38f59cd 100644
--- a/app/src/main/java/uk/openvk/android/refresh/ui/core/fragments/app/PersonalizationFragment.java
+++ b/app/src/main/java/uk/openvk/android/refresh/ui/core/fragments/app/PersonalizationFragment.java
@@ -25,6 +25,8 @@ public class PersonalizationFragment extends PreferenceFragmentCompat {
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.person_perf);
+        Preference restart_required = Objects.requireNonNull(findPreference("restart_required"));
+        restart_required.setVisible(false);
         setListeners();
     }
 
@@ -85,6 +87,9 @@ public boolean onPreferenceClick(Preference preference) {
                 }
                 if(requireActivity().getClass().getSimpleName().equals("AppActivity")) {
                     ((AppActivity) requireActivity()).restart();
+                } else {
+                    Preference restart_required = Objects.requireNonNull(findPreference("restart_required"));
+                    restart_required.setVisible(true);
                 }
                 return true;
             }
@@ -292,6 +297,9 @@ public void onMenuItemClicked(String[] list, int which) {
             setPreferenceSummary(findPreference("accentColor"), "theme_color");
             if(requireActivity().getClass().getSimpleName().equals("AppActivity")) {
                 ((AppActivity) requireActivity()).restart();
+            } else {
+                Preference restart_required = Objects.requireNonNull(findPreference("restart_required"));
+                restart_required.setVisible(true);
             }
         } else if(Arrays.equals(list, getResources().getStringArray(R.array.fonts))) {
             SharedPreferences.Editor editor = global_prefs.edit();
@@ -312,6 +320,9 @@ public void onMenuItemClicked(String[] list, int which) {
             setPreferenceSummary(findPreference("interfaceFont"), "interface_font");
             if(requireActivity().getClass().getSimpleName().equals("AppActivity")) {
                 ((AppActivity) requireActivity()).restart();
+            } else {
+                Preference restart_required = Objects.requireNonNull(findPreference("restart_required"));
+                restart_required.setVisible(true);
             }
         } else if(Arrays.equals(list, getResources().getStringArray(R.array.avatars_shape))) {
             SharedPreferences.Editor editor = global_prefs.edit();
@@ -328,6 +339,9 @@ public void onMenuItemClicked(String[] list, int which) {
             setPreferenceSummary(findPreference("avatarsShape"), "avatars_shape");
             if(requireActivity().getClass().getSimpleName().equals("AppActivity")) {
                 ((AppActivity) requireActivity()).setAvatarShape();
+            } else {
+                Preference restart_required = Objects.requireNonNull(findPreference("restart_required"));
+                restart_required.setVisible(true);
             }
         }
     }
diff --git a/app/src/main/java/uk/openvk/android/refresh/ui/core/fragments/app/ProfileFragment.java b/app/src/main/java/uk/openvk/android/refresh/ui/core/fragments/app/ProfileFragment.java
index 609035c..530bcea 100644
--- a/app/src/main/java/uk/openvk/android/refresh/ui/core/fragments/app/ProfileFragment.java
+++ b/app/src/main/java/uk/openvk/android/refresh/ui/core/fragments/app/ProfileFragment.java
@@ -3,6 +3,7 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.TypedValue;
@@ -21,7 +22,9 @@
 import androidx.viewpager2.widget.ViewPager2;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.color.MaterialColors;
 import com.google.android.material.tabs.TabLayout;
 import com.google.android.material.tabs.TabLayoutMediator;
 import com.kieronquinn.monetcompat.core.MonetCompat;
@@ -121,17 +124,22 @@ public void onPageSelected(int position) {
     private void setTheme() {
         TypedValue typedValue = new TypedValue();
         requireContext().getTheme().resolveAttribute(androidx.appcompat.R.attr.colorAccent, typedValue, true);
+        int unselectedColor = MaterialColors.getColor(requireContext(), com.google.android.material.R.attr.colorOnSurface, Color.BLACK);
+        int accentColor = MaterialColors.getColor(requireContext(), com.google.android.material.R.attr.colorAccent, Color.BLACK);
         if(Global.checkMonet(requireContext())) {
             MonetCompat monet = MonetCompat.getInstance();
             boolean isDarkTheme = global_prefs.getBoolean("dark_theme", false);
             if(isDarkTheme) {
-                ((SwipeRefreshLayout) view.findViewById(R.id.profile_swipe_layout)).setColorSchemeColors(
-                        Objects.requireNonNull(monet.getMonetColors().getAccent1().get(100)).toLinearSrgb().toSrgb().quantize8());
+                accentColor = Objects.requireNonNull(monet.getMonetColors().getAccent1().get(100)).toLinearSrgb().toSrgb().quantize8();
             } else {
-                ((SwipeRefreshLayout) view.findViewById(R.id.profile_swipe_layout)).setColorSchemeColors(
-                        Objects.requireNonNull(monet.getMonetColors().getAccent1().get(500)).toLinearSrgb().toSrgb().quantize8());
+                accentColor = Objects.requireNonNull(monet.getMonetColors().getAccent1().get(500)).toLinearSrgb().toSrgb().quantize8();
             }
+            ((SwipeRefreshLayout) view.findViewById(R.id.profile_swipe_layout)).setColorSchemeColors(accentColor);
+            ((TabLayout) view.findViewById(R.id.tab_layout)).setSelectedTabIndicatorColor(accentColor);
+            ((TabLayout) view.findViewById(R.id.tab_layout)).setTabTextColors(Global.adjustAlpha(unselectedColor, 0.6f), accentColor);
         } else {
+            ((TabLayout) view.findViewById(R.id.tab_layout)).setSelectedTabIndicatorColor(accentColor);
+            ((TabLayout) view.findViewById(R.id.tab_layout)).setTabTextColors(Global.adjustAlpha(unselectedColor, 0.6f), accentColor);
             ((SwipeRefreshLayout) view.findViewById(R.id.profile_swipe_layout)).setColorSchemeColors(typedValue.data);
         }
 
@@ -157,12 +165,14 @@ public void setData(User user) {
                 Glide.with(ctx).load(
                                 String.format("%s/photos_cache/account_avatar/avatar_%s",
                                         ctx.getCacheDir().getAbsolutePath(), user.id))
+                        .diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true)
                         .placeholder(R.drawable.circular_avatar).error(R.drawable.circular_avatar)
                         .centerCrop().into((ImageView) view.findViewById(R.id.profile_avatar));
             } else {
                 Glide.with(ctx).load(
                                 String.format("%s/photos_cache/profile_avatars/avatar_%s",
                                         ctx.getCacheDir().getAbsolutePath(), user.id))
+                        .diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true)
                         .placeholder(R.drawable.circular_avatar).error(R.drawable.circular_avatar)
                         .centerCrop().into((ImageView) view.findViewById(R.id.profile_avatar));
             }
diff --git a/app/src/main/java/uk/openvk/android/refresh/ui/core/fragments/auth/AuthFragment.java b/app/src/main/java/uk/openvk/android/refresh/ui/core/fragments/auth/AuthFragment.java
index 4605d02..9aba35f 100644
--- a/app/src/main/java/uk/openvk/android/refresh/ui/core/fragments/auth/AuthFragment.java
+++ b/app/src/main/java/uk/openvk/android/refresh/ui/core/fragments/auth/AuthFragment.java
@@ -2,8 +2,10 @@
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
+import android.content.res.ColorStateList;
 import android.net.Uri;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -15,11 +17,14 @@
 import androidx.appcompat.widget.LinearLayoutCompat;
 import androidx.fragment.app.Fragment;
 
+import com.google.android.material.color.MaterialColors;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
+import com.kieronquinn.monetcompat.core.MonetCompat;
 
 import java.util.Objects;
 
+import uk.openvk.android.refresh.Global;
 import uk.openvk.android.refresh.R;
 import uk.openvk.android.refresh.ui.core.activities.AuthActivity;
 
@@ -60,9 +65,29 @@ public void onClick(View v) {
                 openWebAddress(String.format("http://%s/restore", instance_edit.getText().toString()));
             }
         });
+        setMonetTheme();
         return view;
     }
 
+    private void setMonetTheme() {
+        Button sign_in_btn = view.findViewById(R.id.sign_in_btn);
+        Button register_btn = view.findViewById(R.id.register_btn);
+        if(Global.checkMonet(getContext())) {
+            MonetCompat monet = MonetCompat.getInstance();
+            if(PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean("dark_theme", false)) {
+                sign_in_btn.setBackgroundTintList(ColorStateList.valueOf(Objects.requireNonNull(
+                        monet.getMonetColors().getAccent1().get(200)).toLinearSrgb().toSrgb().quantize8()));
+                register_btn.setTextColor(ColorStateList.valueOf(Objects.requireNonNull(
+                        monet.getMonetColors().getAccent1().get(200)).toLinearSrgb().toSrgb().quantize8()));
+            } else {
+                sign_in_btn.setBackgroundTintList(ColorStateList.valueOf(Objects.requireNonNull(
+                        monet.getMonetColors().getAccent1().get(500)).toLinearSrgb().toSrgb().quantize8()));
+                register_btn.setTextColor(ColorStateList.valueOf(Objects.requireNonNull(
+                        monet.getMonetColors().getAccent1().get(500)).toLinearSrgb().toSrgb().quantize8()));
+            }
+        }
+    }
+
     public void setAuthorizationData(String instance, String username, String password) {
         AutoCompleteTextView instance_edit = view.findViewById(R.id.instance_edit);
         TextInputEditText username_edit = view.findViewById(R.id.username_edit);
diff --git a/app/src/main/java/uk/openvk/android/refresh/ui/core/fragments/auth/AuthProgressFragment.java b/app/src/main/java/uk/openvk/android/refresh/ui/core/fragments/auth/AuthProgressFragment.java
index 1c5acde..94fbf45 100644
--- a/app/src/main/java/uk/openvk/android/refresh/ui/core/fragments/auth/AuthProgressFragment.java
+++ b/app/src/main/java/uk/openvk/android/refresh/ui/core/fragments/auth/AuthProgressFragment.java
@@ -1,18 +1,37 @@
 package uk.openvk.android.refresh.ui.core.fragments.auth;
 
+import android.content.res.ColorStateList;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ProgressBar;
 
 import androidx.fragment.app.Fragment;
 
+import com.kieronquinn.monetcompat.core.MonetCompat;
+
+import java.util.Objects;
+
+import uk.openvk.android.refresh.Global;
 import uk.openvk.android.refresh.R;
 
 public class AuthProgressFragment extends Fragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.auth_progress_fragment, container, false);
+        View view = inflater.inflate(R.layout.auth_progress, container, false);
+        boolean isDarkTheme = PreferenceManager.getDefaultSharedPreferences(requireContext()).getBoolean("dark_theme", false);
+        if(Global.checkMonet(requireContext())) {
+            int accentColor;
+            MonetCompat monet = MonetCompat.getInstance();
+            if (isDarkTheme) {
+                accentColor = Objects.requireNonNull(monet.getMonetColors().getAccent1().get(200)).toLinearSrgb().toSrgb().quantize8();
+            } else {
+                accentColor = Objects.requireNonNull(monet.getMonetColors().getAccent1().get(500)).toLinearSrgb().toSrgb().quantize8();
+            }
+            ((ProgressBar) view.findViewById(R.id.auth_progress)).setProgressTintList(ColorStateList.valueOf(accentColor));
+        }
         return view;
     }
 }
diff --git a/app/src/main/java/uk/openvk/android/refresh/ui/list/adapters/DialogSingleChoiceAdapter.java b/app/src/main/java/uk/openvk/android/refresh/ui/list/adapters/DialogSingleChoiceAdapter.java
index bea8364..24963b6 100644
--- a/app/src/main/java/uk/openvk/android/refresh/ui/list/adapters/DialogSingleChoiceAdapter.java
+++ b/app/src/main/java/uk/openvk/android/refresh/ui/list/adapters/DialogSingleChoiceAdapter.java
@@ -2,6 +2,7 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.database.DataSetObserver;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -11,9 +12,14 @@
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
+import androidx.preference.PreferenceManager;
+
+import com.kieronquinn.monetcompat.core.MonetCompat;
 
 import java.util.ArrayList;
+import java.util.Objects;
 
+import uk.openvk.android.refresh.Global;
 import uk.openvk.android.refresh.R;
 import uk.openvk.android.refresh.ui.core.fragments.app.MainSettingsFragment;
 import uk.openvk.android.refresh.ui.util.OvkAlertDialogBuilder;
@@ -90,6 +96,17 @@ public View getView(int position, View convertView, ViewGroup parent) {
             viewHolder = (ViewHolder) convertView.getTag();
         }
         CheckedTextView checkedTv = ((CheckedTextView) convertView.findViewById(android.R.id.text1));
+        if(Global.checkMonet(ctx)) {
+            MonetCompat monet = MonetCompat.getInstance();
+            boolean isDarkTheme = PreferenceManager.getDefaultSharedPreferences(ctx).getBoolean("dark_theme", false);
+            int accentColor;
+            if (isDarkTheme) {
+                accentColor = Objects.requireNonNull(monet.getMonetColors().getAccent1().get(100)).toLinearSrgb().toSrgb().quantize8();
+            } else {
+                accentColor = Objects.requireNonNull(monet.getMonetColors().getAccent1().get(500)).toLinearSrgb().toSrgb().quantize8();
+            }
+            checkedTv.setBackgroundTintList(ColorStateList.valueOf(accentColor));
+        }
         checkedTv.setChecked(viewHolder.isSelected);
         checkedTv.setText((CharSequence) getItem(position));
         View finalConvertView = convertView;
diff --git a/app/src/main/java/uk/openvk/android/refresh/ui/list/adapters/FriendsAdapter.java b/app/src/main/java/uk/openvk/android/refresh/ui/list/adapters/FriendsAdapter.java
index c2eae9b..e5e9cad 100644
--- a/app/src/main/java/uk/openvk/android/refresh/ui/list/adapters/FriendsAdapter.java
+++ b/app/src/main/java/uk/openvk/android/refresh/ui/list/adapters/FriendsAdapter.java
@@ -102,7 +102,7 @@ private void setTheme(View view) {
             boolean isDarkTheme = PreferenceManager.getDefaultSharedPreferences(ctx).getBoolean("dark_theme", false);
             if(isDarkTheme) {
                 ((ImageView) view.findViewById(R.id.verified_icon)).setImageTintList(ColorStateList.valueOf(
-                        Objects.requireNonNull(monet.getMonetColors().getAccent1().get(100)).toLinearSrgb().toSrgb().quantize8()));
+                        Objects.requireNonNull(monet.getMonetColors().getAccent1().get(200)).toLinearSrgb().toSrgb().quantize8()));
             } else {
                 ((ImageView) view.findViewById(R.id.verified_icon)).setImageTintList(ColorStateList.valueOf(
                         Objects.requireNonNull(monet.getMonetColors().getAccent1().get(500)).toLinearSrgb().toSrgb().quantize8()));
diff --git a/app/src/main/java/uk/openvk/android/refresh/ui/list/adapters/NewsfeedAdapter.java b/app/src/main/java/uk/openvk/android/refresh/ui/list/adapters/NewsfeedAdapter.java
index f004ad8..9a229de 100644
--- a/app/src/main/java/uk/openvk/android/refresh/ui/list/adapters/NewsfeedAdapter.java
+++ b/app/src/main/java/uk/openvk/android/refresh/ui/list/adapters/NewsfeedAdapter.java
@@ -5,6 +5,7 @@
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.text.method.LinkMovementMethod;
 import android.util.TypedValue;
@@ -239,7 +240,9 @@ public void onClick(View v) {
                         ((ImageView) ((PhotoAttachmentLayout) convertView.findViewById(R.id.photo_attachment)).getImageView()).setImageTintList(null);
                         Glide.with(ctx).load(String.format(local_photo_frm, ctx.getCacheDir().getAbsolutePath(), item.owner_id, item.post_id))
                                 .diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true)
-                                .dontAnimate().error(R.drawable.warning).into((ImageView) ((PhotoAttachmentLayout) convertView.findViewById(R.id.photo_attachment)).getImageView());
+                                .placeholder(ctx.getResources().getDrawable(R.drawable.photo_placeholder))
+                                .dontAnimate().error(R.drawable.warning)
+                                .into((ImageView) ((PhotoAttachmentLayout) convertView.findViewById(R.id.photo_attachment)).getImageView());
                         ((PhotoAttachmentLayout) convertView.findViewById(R.id.photo_attachment)).setVisibility(View.VISIBLE);
                         ((PhotoAttachmentLayout) convertView.findViewById(R.id.photo_attachment)).setOnClickListener(new View.OnClickListener() {
                             @Override
@@ -247,6 +250,7 @@ public void onClick(View view) {
 
                             }
                         });
+                        ((PhotoAttachmentLayout) convertView.findViewById(R.id.photo_attachment)).getImageView().setAdjustViewBounds(true);
                     }
                 } else {
                     ((PhotoAttachmentLayout) convertView.findViewById(R.id.photo_attachment)).setVisibility(View.GONE);
diff --git a/app/src/main/java/uk/openvk/android/refresh/ui/util/OvkAlertDialogBuilder.java b/app/src/main/java/uk/openvk/android/refresh/ui/util/OvkAlertDialogBuilder.java
index adf0b4e..f43ab51 100644
--- a/app/src/main/java/uk/openvk/android/refresh/ui/util/OvkAlertDialogBuilder.java
+++ b/app/src/main/java/uk/openvk/android/refresh/ui/util/OvkAlertDialogBuilder.java
@@ -5,13 +5,18 @@
 import static android.content.DialogInterface.BUTTON_POSITIVE;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.widget.CheckedTextView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
+import androidx.preference.PreferenceManager;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.kieronquinn.monetcompat.core.MonetCompat;
+
+import java.util.Objects;
 
 import uk.openvk.android.refresh.Global;
 
@@ -41,9 +46,48 @@ public void setFont() {
                     Global.getFlexibleTypeface(getContext(), 500));
         }
         // setting medium fonts for buttons
-        if(dialog.getButton(BUTTON_NEGATIVE) != null) dialog.getButton(BUTTON_NEGATIVE).setTypeface(Global.getFlexibleTypeface(getContext(), 500));
-        if(dialog.getButton(BUTTON_NEUTRAL) != null) dialog.getButton(BUTTON_NEUTRAL).setTypeface(Global.getFlexibleTypeface(getContext(), 500));
-        if(dialog.getButton(BUTTON_POSITIVE) != null) dialog.getButton(BUTTON_POSITIVE).setTypeface(Global.getFlexibleTypeface(getContext(), 500));
+        if(dialog.getButton(BUTTON_NEGATIVE) != null) {
+            dialog.getButton(BUTTON_NEGATIVE).setTypeface(Global.getFlexibleTypeface(getContext(), 500));
+            if(Global.checkMonet(getContext())) {
+                MonetCompat monet = MonetCompat.getInstance();
+                boolean isDarkTheme = PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean("dark_theme", false);
+                int accentColor;
+                if(isDarkTheme) {
+                    accentColor = Objects.requireNonNull(monet.getMonetColors().getAccent1().get(200)).toLinearSrgb().toSrgb().quantize8();
+                } else {
+                    accentColor = Objects.requireNonNull(monet.getMonetColors().getAccent1().get(500)).toLinearSrgb().toSrgb().quantize8();
+                }
+                dialog.getButton(BUTTON_NEGATIVE).setTextColor(accentColor);
+            }
+        }
+        if(dialog.getButton(BUTTON_NEUTRAL) != null) {
+            dialog.getButton(BUTTON_NEUTRAL).setTypeface(Global.getFlexibleTypeface(getContext(), 500));
+            if(Global.checkMonet(getContext())) {
+                MonetCompat monet = MonetCompat.getInstance();
+                boolean isDarkTheme = PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean("dark_theme", false);
+                int accentColor;
+                if(isDarkTheme) {
+                    accentColor = Objects.requireNonNull(monet.getMonetColors().getAccent1().get(200)).toLinearSrgb().toSrgb().quantize8();
+                } else {
+                    accentColor = Objects.requireNonNull(monet.getMonetColors().getAccent1().get(500)).toLinearSrgb().toSrgb().quantize8();
+                }
+                dialog.getButton(BUTTON_NEUTRAL).setTextColor(accentColor);
+            }
+        }
+        if(dialog.getButton(BUTTON_POSITIVE) != null) {
+            dialog.getButton(BUTTON_POSITIVE).setTypeface(Global.getFlexibleTypeface(getContext(), 500));
+            if(Global.checkMonet(getContext())) {
+                MonetCompat monet = MonetCompat.getInstance();
+                boolean isDarkTheme = PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean("dark_theme", false);
+                int accentColor;
+                if(isDarkTheme) {
+                    accentColor = Objects.requireNonNull(monet.getMonetColors().getAccent1().get(200)).toLinearSrgb().toSrgb().quantize8();
+                } else {
+                    accentColor = Objects.requireNonNull(monet.getMonetColors().getAccent1().get(500)).toLinearSrgb().toSrgb().quantize8();
+                }
+                dialog.getButton(BUTTON_POSITIVE).setTextColor(accentColor);
+            }
+        }
     }
 
     @Override
diff --git a/app/src/main/java/uk/openvk/android/refresh/ui/view/layouts/ProfileHeader.java b/app/src/main/java/uk/openvk/android/refresh/ui/view/layouts/ProfileHeader.java
index e71c508..1d65053 100644
--- a/app/src/main/java/uk/openvk/android/refresh/ui/view/layouts/ProfileHeader.java
+++ b/app/src/main/java/uk/openvk/android/refresh/ui/view/layouts/ProfileHeader.java
@@ -48,7 +48,7 @@ private void setTheme() {
             if(isDarkTheme) {
                 ((ImageView) findViewById(R.id.verified_icon)).setImageTintList(
                         ColorStateList.valueOf(Objects.requireNonNull(
-                                monet.getMonetColors().getAccent1().get(100)).toLinearSrgb().toSrgb().quantize8()));
+                                monet.getMonetColors().getAccent1().get(200)).toLinearSrgb().toSrgb().quantize8()));
             } else {
                 ((ImageView) findViewById(R.id.verified_icon)).setImageTintList(
                         ColorStateList.valueOf(Objects.requireNonNull(
diff --git a/app/src/main/java/uk/openvk/android/refresh/ui/view/layouts/ProgressLayout.java b/app/src/main/java/uk/openvk/android/refresh/ui/view/layouts/ProgressLayout.java
index dc99229..b79fa93 100644
--- a/app/src/main/java/uk/openvk/android/refresh/ui/view/layouts/ProgressLayout.java
+++ b/app/src/main/java/uk/openvk/android/refresh/ui/view/layouts/ProgressLayout.java
@@ -34,7 +34,7 @@ public ProgressLayout(Context context) {
             boolean isDarkTheme = PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean("dark_theme", false);
             if(isDarkTheme) {
                 ((CircularProgressIndicator) findViewById(R.id.progressBar)).setIndicatorColor(Objects.requireNonNull(
-                        monet.getMonetColors().getAccent1().get(100)).toLinearSrgb().toSrgb().quantize8());
+                        monet.getMonetColors().getAccent1().get(200)).toLinearSrgb().toSrgb().quantize8());
             } else {
                 ((CircularProgressIndicator) findViewById(R.id.progressBar)).setIndicatorColor(Objects.requireNonNull(
                         monet.getMonetColors().getAccent1().get(500)).toLinearSrgb().toSrgb().quantize8());
diff --git a/app/src/main/res/drawable/photo_placeholder.xml b/app/src/main/res/drawable/photo_placeholder.xml
new file mode 100644
index 0000000..be68d3b
--- /dev/null
+++ b/app/src/main/res/drawable/photo_placeholder.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <layer-list>
+            <item android:height="400px" android:width="400px">
+                <shape>
+                    <solid android:color="?attr/colorPrimary"/>
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout-night/auth_screen.xml b/app/src/main/res/layout-night/auth_screen.xml
new file mode 100644
index 0000000..2f55c56
--- /dev/null
+++ b/app/src/main/res/layout-night/auth_screen.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:minHeight="?attr/actionBarSize"
+                android:theme="?attr/actionBarTheme"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:menu="@menu/app_auth" />
+
+            <ImageView
+                android:id="@+id/ovk_logo"
+                android:layout_width="180dp"
+                android:layout_height="60dp"
+                android:layout_gravity="center"
+                android:contentDescription="TODO"
+                android:src="@drawable/ic_openvk_full_logo"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/nestedScrollView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/appbar">
+
+        <uk.openvk.android.refresh.ui.view.layouts.XConstraintLayout
+            android:id="@+id/auth_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+
+            <FrameLayout
+                android:id="@+id/dynamic_fragment_layout"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_gravity="center"
+                android:layout_marginTop="12dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/ovk_logo" />
+
+        </uk.openvk.android.refresh.ui.view.layouts.XConstraintLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/auth_progress_fragment.xml b/app/src/main/res/layout/auth_progress.xml
similarity index 100%
rename from app/src/main/res/layout/auth_progress_fragment.xml
rename to app/src/main/res/layout/auth_progress.xml
diff --git a/app/src/main/res/layout/auth_screen.xml b/app/src/main/res/layout/auth_screen.xml
index a40cb03..afb05cf 100644
--- a/app/src/main/res/layout/auth_screen.xml
+++ b/app/src/main/res/layout/auth_screen.xml
@@ -1,35 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
-<uk.openvk.android.refresh.ui.view.layouts.XConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/auth_layout">
-
-
-    <ImageView
-        android:id="@+id/ovk_logo"
-        android:layout_width="180dp"
-        android:layout_height="60dp"
-        android:layout_gravity="center_horizontal"
-        android:src="@drawable/ic_openvk_full_logo"
-        android:layout_marginTop="8dp"
-        app:layout_constraintBottom_toTopOf="@+id/scrollView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:contentDescription="TODO" />
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:background="@color/backgroundColor"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:minHeight="?attr/actionBarSize"
+                android:theme="?attr/actionBarTheme"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:menu="@menu/app_auth" />
 
-    <FrameLayout
-        android:id="@+id/dynamic_fragment_layout"
+            <ImageView
+                android:id="@+id/ovk_logo"
+                android:layout_width="180dp"
+                android:layout_height="60dp"
+                android:layout_gravity="center"
+                android:contentDescription="TODO"
+                android:src="@drawable/ic_openvk_full_logo"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/nestedScrollView"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginTop="12dp"
+        android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/ovk_logo"
-        android:layout_gravity="center"/>
+        app:layout_constraintTop_toBottomOf="@+id/appbar">
+
+        <uk.openvk.android.refresh.ui.view.layouts.XConstraintLayout
+            android:id="@+id/auth_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+
+            <FrameLayout
+                android:id="@+id/dynamic_fragment_layout"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_gravity="center"
+                android:layout_marginTop="12dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/ovk_logo" />
+
+        </uk.openvk.android.refresh.ui.view.layouts.XConstraintLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
 
-</uk.openvk.android.refresh.ui.view.layouts.XConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/app_auth.xml b/app/src/main/res/menu/app_auth.xml
new file mode 100644
index 0000000..82045a2
--- /dev/null
+++ b/app/src/main/res/menu/app_auth.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/settings"
+        android:icon="@drawable/ic_settings"
+        android:title="@string/nav_settings"
+        android:iconTint="@color/primaryTextColor"
+        app:showAsAction="always" />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9e2cde7..33371ad 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -54,9 +54,9 @@
 
     <!-- Theme attributes. Color #6 (teal) !-->
     <color name="primaryColorTeal">#263238</color>
-    <color name="primaryLightTeal">#009688</color>
+    <color name="primaryLightTeal">#80cbc4</color>
     <color name="primaryDarkColorTeal">#14171a</color>
-    <color name="primaryRippleColorTeal">#12009688</color>
+    <color name="primaryRippleColorTeal">#1280cbc4</color>
     <color name="statusBarColorTeal">#14171a</color>
     <color name="accentColorTeal">#009688</color>
     <color name="accentColorTeal_reserve">#009688</color>
diff --git a/app/src/main/res/xml/main_pref.xml b/app/src/main/res/xml/main_pref.xml
index efd073b..04cd530 100644
--- a/app/src/main/res/xml/main_pref.xml
+++ b/app/src/main/res/xml/main_pref.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--suppress ALL -->
 <PreferenceScreen
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:key="pref_screen">
+
+    <Preference
+        app:key="restart_required"
+        app:layout="@layout/pref_notif_layout" />
 
     <PreferenceCategory
         app:iconSpaceReserved="false"
@@ -35,15 +40,15 @@
     </PreferenceCategory>
 
     <PreferenceCategory
-        app:key="others_category"
-        app:title="@string/pref_account"
-        app:iconSpaceReserved="false">
+        app:iconSpaceReserved="false"
+        app:key="account_category"
+        app:title="@string/pref_account">
         <Preference
             app:icon="@drawable/ic_logout"
+            app:iconSpaceReserved="false"
             app:key="logout"
             app:singleLineTitle="true"
-            app:title="@string/pref_logout"
-            app:iconSpaceReserved="false"/>
+            app:title="@string/pref_logout" />
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/app/src/main/res/xml/person_perf.xml b/app/src/main/res/xml/person_perf.xml
index 7eacbfc..f57adc2 100644
--- a/app/src/main/res/xml/person_perf.xml
+++ b/app/src/main/res/xml/person_perf.xml
@@ -3,6 +3,10 @@
 <PreferenceScreen
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <Preference
+        app:key="restart_required"
+        app:layout="@layout/pref_notif_layout" />
+
     <PreferenceCategory
         app:key="interface_category"
         app:title="@string/pref_interface_category"