More modern material UI

app/src/main/java/net/gsantner/markor/activity/ActionButtonSettingsActivity.java

@@ -9,7 +9,6 @@
 
 import static androidx.recyclerview.widget.ItemTouchHelper.ACTION_STATE_DRAG;
 
-import android.graphics.Color;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -22,7 +21,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.SwitchCompat;
-import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -68,7 +67,6 @@ protected void onCreate(Bundle savedInstanceState) {
         // Set up recyclerview
         final RecyclerView recycler = findViewById(R.id.action_order_activity_recycler);
         recycler.setLayoutManager(new LinearLayoutManager(this));
-        recycler.addItemDecoration(new DividerItemDecoration(recycler.getContext(), DividerItemDecoration.VERTICAL));
 
         extractActionData();
         _adapter = new OrderAdapter(_actions, _keys, _disabled);
@@ -86,7 +84,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
         final MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.action_order__menu, menu);
 
-        _cu.tintMenuItems(menu, true, Color.WHITE);
+        _cu.tintMenuItems(menu, true, ContextCompat.getColor(this, R.color.action_bar_content));
         return true;
     }
 
@@ -99,11 +97,18 @@ public boolean onOptionsItemSelected(MenuItem item) {
             }
 
             case R.id.action_reorder_reset: {
-                final List<String> activeKeys = _textActions.getActiveActionKeys();
-                for (int i = 0; i < activeKeys.size(); i++) {
-                    String key = activeKeys.get(i);
-                    _adapter.order.set(i, _keys.indexOf(key));
+                final List<String> savedOrder = _textActions.getActionOrder();
+                final List<String> savedDisabled = _textActions.getDisabledActions();
+
+                _adapter.order.clear();
+                for (final String key : savedOrder) {
+                    final int index = _keys.indexOf(key);
+                    if (index >= 0) {
+                        _adapter.order.add(index);
+                    }
                 }
+                _adapter._disabled.clear();
+                _adapter._disabled.addAll(savedDisabled);
                 _adapter.notifyDataSetChanged();
                 return true;
             }

app/src/main/java/net/gsantner/markor/activity/DocumentEditAndViewFragment.java

@@ -43,6 +43,7 @@
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.SearchView;
+import androidx.core.content.ContextCompat;
 
 import net.gsantner.markor.ApplicationObject;
 import net.gsantner.markor.BuildConfig;
@@ -300,7 +301,7 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
         inflater.inflate(R.menu.document__edit__menu, menu);
-        _cu.tintMenuItems(menu, true, Color.WHITE);
+        _cu.tintMenuItems(menu, true, ContextCompat.getColor(requireContext(), R.color.action_bar_content));
         _cu.setSubMenuIconsVisibility(menu, true);
 
         final boolean isExperimentalFeaturesEnabled = _appSettings.isExperimentalFeaturesEnabled();

app/src/main/java/net/gsantner/markor/activity/DocumentShareIntoFragment.java

@@ -189,7 +189,7 @@ public static class ShareIntoImportOptionsFragment extends GsPreferenceFragmentB
 
         @Override
         public boolean isDividerVisible() {
-            return true;
+            return false;
         }
 
         public ShareIntoImportOptionsFragment setAttachment(File file) {

app/src/main/java/net/gsantner/markor/activity/MainActivity.java

@@ -12,7 +12,6 @@
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.content.Intent;
-import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -24,6 +23,7 @@
 import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -265,7 +265,7 @@ public boolean onCreateOptionsMenu(final Menu menu) {
         getMenuInflater().inflate(R.menu.main__menu, menu);
         menu.findItem(R.id.action_settings).setVisible(_appSettings.isShowSettingsOptionInMainToolbar());
 
-        _cu.tintMenuItems(menu, true, Color.WHITE);
+        _cu.tintMenuItems(menu, true, ContextCompat.getColor(this, R.color.action_bar_content));
         _cu.setSubMenuIconsVisibility(menu, true);
         return true;
     }

app/src/main/java/net/gsantner/markor/activity/MarkorBaseActivity.java

@@ -1,25 +1,34 @@
 package net.gsantner.markor.activity;
 
 import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
 import android.os.Bundle;
+import android.util.TypedValue;
 import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.View;
 import android.view.WindowManager;
 
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 
+import com.google.android.material.bottomnavigation.BottomNavigationView;
+
+import net.gsantner.markor.R;
 import net.gsantner.markor.model.AppSettings;
 import net.gsantner.markor.util.MarkorContextUtils;
 import net.gsantner.opoc.frontend.base.GsActivityBase;
 import net.gsantner.opoc.frontend.base.GsFragmentBase;
 
 public abstract class MarkorBaseActivity extends GsActivityBase<AppSettings, MarkorContextUtils> {
-
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         _appSettings.applyAppTheme();
+        applyThemedBars();
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             getWindow().setEnterTransition(null);
             getWindow().setExitTransition(null);
@@ -30,18 +39,24 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         }
     }
 
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        _cu.tintMenuItems(menu, true, getActionBarContentColor());
+        return super.onPrepareOptionsMenu(menu);
+    }
+
     protected boolean onReceiveKeyPress(GsFragmentBase fragment, int keyCode, KeyEvent event) {
         return fragment.onReceiveKeyPress(keyCode, event);
     }
 
     @Override
     public Integer getNewNavigationBarColor() {
-        return _appSettings.getAppThemeName().contains("black") ? Color.BLACK : null;
+        return getThemedBarBackgroundColor();
     }
 
     @Override
     public Integer getNewActivityBackgroundColor() {
-        return _appSettings.getAppThemeName().contains("black") ? Color.BLACK : null;
+        return getThemedBarBackgroundColor();
     }
 
     @Override
@@ -58,4 +73,87 @@ protected MarkorContextUtils createContextUtilsInstance() {
     public Boolean isFlagSecure() {
         return _appSettings.isDisallowScreenshots();
     }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        applyThemedBars();
+    }
+
+    private void applyThemedBars() {
+        final int barBackground = getThemedBarBackgroundColor();
+        final int actionBarBackground = getActionBarBackgroundColor();
+
+        final Toolbar toolbar = findViewById(R.id.toolbar);
+        if (toolbar != null) {
+            toolbar.setBackgroundColor(actionBarBackground);
+            toolbar.setPopupTheme(getPopupTheme());
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            getWindow().setStatusBarColor(actionBarBackground);
+            getWindow().setNavigationBarColor(barBackground);
+        }
+
+        final BottomNavigationView bottomNav = findViewById(R.id.bottom_navigation_bar);
+        if (bottomNav != null) {
+            bottomNav.setBackgroundColor(barBackground);
+            bottomNav.setItemBackground(new ColorDrawable(barBackground));
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            final View decorView = getWindow().getDecorView();
+            int flags = decorView.getSystemUiVisibility();
+            flags = applyLightBarFlag(flags, actionBarBackground, View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                flags = applyLightBarFlag(flags, barBackground, View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
+            }
+            decorView.setSystemUiVisibility(flags);
+        }
+    }
+
+    private int getThemedBarBackgroundColor() {
+        if (_appSettings.isBlackTheme()) {
+            return Color.BLACK;
+        }
+        return resolveThemeColor(android.R.attr.colorBackground, R.color.bar_background);
+    }
+
+    private int getActionBarBackgroundColor() {
+        if (_appSettings.isBlackTheme()) {
+            return Color.BLACK;
+        }
+        return resolveThemeColor(R.attr.colorPrimary, R.color.action_bar_background);
+    }
+
+    private int getActionBarContentColor() {
+        return ContextCompat.getColor(this, R.color.action_bar_content);
+    }
+
+    private int getPopupTheme() {
+        final boolean isBlack = _appSettings.isBlackTheme();
+        final boolean isDark = _cu.isDarkModeEnabled(this);
+        if (isBlack) {
+            return R.style.ToolbarPopupOverlayBlack;
+        }
+        return isDark ? R.style.ToolbarPopupOverlayDark : R.style.ToolbarPopupOverlay;
+    }
+
+    private int applyLightBarFlag(int flags, int backgroundColor, int lightFlag) {
+        final boolean needsDarkIcons = !_cu.shouldColorOnTopBeLight(backgroundColor);
+        if (needsDarkIcons) {
+            flags |= lightFlag;
+        } else {
+            flags &= ~lightFlag;
+        }
+        return flags;
+    }
+
+    private int resolveThemeColor(int attrResId, int fallbackColorResId) {
+        final TypedValue typedValue = new TypedValue();
+        if (getTheme().resolveAttribute(attrResId, typedValue, true)) {
+            return typedValue.data;
+        }
+        return ContextCompat.getColor(this, fallbackColorResId);
+    }
 }

app/src/main/java/net/gsantner/markor/activity/MoreInfoFragment.java

@@ -50,7 +50,7 @@ protected AppSettings getAppSettings(Context context) {
 
     @Override
     public boolean isDividerVisible() {
-        return true;
+        return false;
     }
 
     @Override

app/src/main/java/net/gsantner/markor/activity/SettingsActivity.java

@@ -18,13 +18,16 @@
 import android.text.TextUtils;
 import android.widget.Toast;
 
+import androidx.annotation.StringRes;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceScreen;
 
+import com.rarepebble.colorpicker.ColorPreference;
+
 import net.gsantner.markor.R;
 import net.gsantner.markor.frontend.MarkorDialogFactory;
 import net.gsantner.markor.frontend.filebrowser.MarkorFileBrowserFactory;
@@ -195,6 +198,8 @@ public void doUpdatePreferences() {
             for (final int keyId : experimentalKeys) {
                 setPreferenceVisible(keyId, _appSettings.isExperimentalFeaturesEnabled());
             }
+
+            refreshEditorColorPreferences();
         }
 
         @SuppressLint("ApplySharedPref")
@@ -211,7 +216,10 @@ protected void onPreferenceChanged(final SharedPreferences prefs, final String k
                 _appSettings.setRecreateMainRequired(true);
             } else if (eq(key, R.string.pref_key__app_theme)) {
                 _appSettings.applyAppTheme();
-                getActivity().finish();
+                _appSettings.setRecreateMainRequired(true);
+                if (getActivity() != null) {
+                    getActivity().recreate();
+                }
             } else if (eq(key, R.string.pref_key__theming_hide_system_statusbar)) {
                 activityRetVal = RESULT.RESTART_REQ;
                 _appSettings.setRecreateMainRequired(true);
@@ -313,38 +321,46 @@ public void onFsViewerConfig(GsFileBrowserOptions.Options dopt) {
                     return true;
                 }
                 case R.string.pref_key__basic_color_scheme_markor: {
-                    _appSettings.setEditorBasicColor(true, R.color.white, R.color.dark_grey);
-                    _appSettings.setEditorBasicColor(false, R.color.dark_grey, R.color.light__background);
+                    // Material-aligned: fixed light/dark values so app theme doesn't alter editor colors
+                    _appSettings.setEditorBasicColor(true, R.color.dark__primary_text, R.color.dark__background);
+                    _appSettings.setEditorBasicColor(false, R.color.light__primary_text, R.color.light__background);
+                    _appSettings.setRecreateMainRequired(true);
                     break;
                 }
                 case R.string.pref_key__basic_color_scheme_blackorwhite: {
                     _appSettings.setEditorBasicColor(true, R.color.white, R.color.black);
                     _appSettings.setEditorBasicColor(false, R.color.black, R.color.white);
+                    _appSettings.setRecreateMainRequired(true);
                     break;
                 }
                 case R.string.pref_key__basic_color_scheme_solarized: {
                     _appSettings.setEditorBasicColor(true, R.color.solarized_fg, R.color.solarized_bg_dark);
                     _appSettings.setEditorBasicColor(false, R.color.solarized_fg, R.color.solarized_bg_light);
+                    _appSettings.setRecreateMainRequired(true);
                     break;
                 }
                 case R.string.pref_key__basic_color_scheme_gruvbox: {
                     _appSettings.setEditorBasicColor(true, R.color.gruvbox_fg_dark, R.color.gruvbox_bg_dark);
                     _appSettings.setEditorBasicColor(false, R.color.gruvbox_fg_light, R.color.gruvbox_bg_light);
+                    _appSettings.setRecreateMainRequired(true);
                     break;
                 }
                 case R.string.pref_key__basic_color_scheme_nord: {
                     _appSettings.setEditorBasicColor(true, R.color.nord_fg_dark, R.color.nord_bg_dark);
                     _appSettings.setEditorBasicColor(false, R.color.nord_fg_light, R.color.nord_bg_light);
+                    _appSettings.setRecreateMainRequired(true);
                     break;
                 }
                 case R.string.pref_key__basic_color_scheme_greenscale: {
                     _appSettings.setEditorBasicColor(true, R.color.green_dark, R.color.black);
                     _appSettings.setEditorBasicColor(false, R.color.green_light, R.color.white);
+                    _appSettings.setRecreateMainRequired(true);
                     break;
                 }
                 case R.string.pref_key__basic_color_scheme_sepia: {
                     _appSettings.setEditorBasicColor(true, R.color.sepia_bg_light__fg_dark, R.color.sepia_fg_light__bg_dark);
                     _appSettings.setEditorBasicColor(false, R.color.sepia_fg_light__bg_dark, R.color.sepia_bg_light__fg_dark);
+                    _appSettings.setRecreateMainRequired(true);
                     break;
                 }
                 case R.string.pref_key__plaintext__reorder_actions:
@@ -372,14 +388,31 @@ public void onFsViewerConfig(GsFileBrowserOptions.Options dopt) {
 
             if (key.startsWith("pref_key__editor_basic_color_scheme") && !key.contains("_fg_") && !key.contains("_bg_")) {
                 _appSettings.setRecreateMainRequired(true);
-                restartActivity();
+                doUpdatePreferences();
             }
             return null;
         }
 
         @Override
         public boolean isDividerVisible() {
-            return true;
+            return false;
+        }
+
+        private void refreshEditorColorPreferences() {
+            updateColorPreference(R.string.pref_key__basic_color_scheme__bg_light, _appSettings.getInt(R.string.pref_key__basic_color_scheme__bg_light, _cu.rcolor(getContext(), R.color.background)));
+            updateColorPreference(R.string.pref_key__basic_color_scheme__fg_light, _appSettings.getInt(R.string.pref_key__basic_color_scheme__fg_light, _cu.rcolor(getContext(), R.color.primary_text)));
+            updateColorPreference(R.string.pref_key__basic_color_scheme__bg_dark, _appSettings.getInt(R.string.pref_key__basic_color_scheme__bg_dark, _cu.rcolor(getContext(), R.color.background)));
+            updateColorPreference(R.string.pref_key__basic_color_scheme__fg_dark, _appSettings.getInt(R.string.pref_key__basic_color_scheme__fg_dark, _cu.rcolor(getContext(), R.color.primary_text)));
+        }
+
+        private void updateColorPreference(@StringRes int key, int color) {
+            Preference pref = findPreference(key);
+            if (pref instanceof ColorPreference) {
+                try {
+                    ((ColorPreference) pref).setColor(color);
+                } catch (Exception ignored) {
+                }
+            }
         }
     }
 }