From c3d791e949e165a10452322903108d8b6749f402 Mon Sep 17 00:00:00 2001 From: Harshad Vedartham Date: Sat, 18 Apr 2026 22:49:03 -0700 Subject: [PATCH 1/8] Add appearance settings --- .../ActionButtonSettingsActivity.java | 2 +- .../activity/DocumentEditAndViewFragment.java | 2 +- .../activity/DocumentShareIntoFragment.java | 2 +- .../markor/activity/MainActivity.java | 77 ++++++++++++++++++- .../markor/activity/MarkorBaseActivity.java | 35 +++++++++ .../markor/activity/SettingsActivity.java | 8 +- .../filebrowser/MarkorFileBrowserFactory.java | 2 + .../gsantner/markor/model/AppSettings.java | 34 +++++++- .../filebrowser/GsFileBrowserFragment.java | 10 ++- .../res/drawable/bottomnav_color_selector.xml | 16 ---- app/src/main/res/layout/main__activity.xml | 2 - app/src/main/res/values-ar/strings.xml | 1 - app/src/main/res/values-bs/strings.xml | 1 - app/src/main/res/values-ca/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-da/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-el/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-et/strings.xml | 1 - app/src/main/res/values-fa/strings.xml | 1 - app/src/main/res/values-fi/strings.xml | 1 - app/src/main/res/values-fil/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-hi/strings.xml | 1 - app/src/main/res/values-hu/strings.xml | 1 - app/src/main/res/values-in/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-iw/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-nb-rNO/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-no/strings.xml | 1 - app/src/main/res/values-or/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 1 - app/src/main/res/values-pt/strings.xml | 1 - app/src/main/res/values-ro/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-sc/strings.xml | 1 - app/src/main/res/values-si/strings.xml | 1 - app/src/main/res/values-sl/strings.xml | 1 - app/src/main/res/values-sv/strings.xml | 1 - app/src/main/res/values-ta/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/opoc_res.xml | 13 ---- .../res/values/string-not_translatable.xml | 3 + app/src/main/res/values/strings.xml | 7 +- app/src/main/res/xml/preferences_master.xml | 66 +++++++++++----- 53 files changed, 213 insertions(+), 104 deletions(-) delete mode 100644 app/src/main/res/drawable/bottomnav_color_selector.xml diff --git a/app/src/main/java/net/gsantner/markor/activity/ActionButtonSettingsActivity.java b/app/src/main/java/net/gsantner/markor/activity/ActionButtonSettingsActivity.java index 01add9161b..6dc8698727 100644 --- a/app/src/main/java/net/gsantner/markor/activity/ActionButtonSettingsActivity.java +++ b/app/src/main/java/net/gsantner/markor/activity/ActionButtonSettingsActivity.java @@ -83,7 +83,7 @@ public boolean onCreateOptionsMenu(Menu menu) { final MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.action_order__menu, menu); - _cu.tintMenuItems(menu, true, _cu.rcolor(this, R.color.dark__primary_text)); + _cu.tintMenuItems(menu, true, getTopBottomBarForegroundColor()); return true; } diff --git a/app/src/main/java/net/gsantner/markor/activity/DocumentEditAndViewFragment.java b/app/src/main/java/net/gsantner/markor/activity/DocumentEditAndViewFragment.java index f48576e375..ff527a304a 100644 --- a/app/src/main/java/net/gsantner/markor/activity/DocumentEditAndViewFragment.java +++ b/app/src/main/java/net/gsantner/markor/activity/DocumentEditAndViewFragment.java @@ -299,7 +299,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, _cu.rcolor(getContext(), R.color.dark__primary_text)); + _cu.tintMenuItems(menu, true, _appSettings.getTopBottomBarForegroundColor()); _cu.setSubMenuIconsVisibility(menu, true); final boolean isExperimentalFeaturesEnabled = _appSettings.isExperimentalFeaturesEnabled(); diff --git a/app/src/main/java/net/gsantner/markor/activity/DocumentShareIntoFragment.java b/app/src/main/java/net/gsantner/markor/activity/DocumentShareIntoFragment.java index c96c8af273..d5bf395ea6 100644 --- a/app/src/main/java/net/gsantner/markor/activity/DocumentShareIntoFragment.java +++ b/app/src/main/java/net/gsantner/markor/activity/DocumentShareIntoFragment.java @@ -139,7 +139,7 @@ private CheckBox addCheckBoxToToolbar() { checkBox = new CheckBox(activity); checkBox.setText(R.string.format_link); checkBox.setTag(CHECKBOX_TAG); - final @ColorInt int color = _cu.rcolor(activity, R.color.dark__primary_text); + final @ColorInt int color = _appSettings.getTopBottomBarForegroundColor(); CompoundButtonCompat.setButtonTintList(checkBox, ColorStateList.valueOf(color)); checkBox.setTextColor(color); checkBox.setLayoutDirection(CheckBox.LAYOUT_DIRECTION_RTL); diff --git a/app/src/main/java/net/gsantner/markor/activity/MainActivity.java b/app/src/main/java/net/gsantner/markor/activity/MainActivity.java index 7b4c154015..6e0161cdb3 100644 --- a/app/src/main/java/net/gsantner/markor/activity/MainActivity.java +++ b/app/src/main/java/net/gsantner/markor/activity/MainActivity.java @@ -11,7 +11,9 @@ import android.annotation.SuppressLint; import android.app.Activity; import android.app.ActivityManager; +import android.content.res.ColorStateList; import android.content.Intent; +import android.graphics.drawable.ColorDrawable; import android.os.Build; import android.os.Bundle; import android.text.TextUtils; @@ -20,6 +22,7 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; +import android.view.ViewGroup; import android.view.WindowManager; import androidx.annotation.NonNull; @@ -32,6 +35,7 @@ import com.google.android.material.bottomnavigation.BottomNavigationView; import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.navigation.NavigationBarView; import net.gsantner.markor.BuildConfig; import net.gsantner.markor.R; @@ -66,6 +70,7 @@ public class MainActivity extends MarkorBaseActivity implements GsFileBrowserFra private DocumentEditAndViewFragment _quicknote, _todo; private MoreFragment _more; private FloatingActionButton _fab; + private int _bottomNavDefaultHeight = 0; private MarkorContextUtils _cu; private File _quickSwitchPrevFolder = null; @@ -99,6 +104,7 @@ public void onPageSelected(int position) { }); setSupportActionBar(findViewById(R.id.toolbar)); + applyMainAppearancePreferences(); optShowRate(); // Setup viewpager @@ -147,7 +153,7 @@ public void onActivityFirstTimeVisible() { @Override public Integer getNewNavigationBarColor() { - return ContextCompat.getColor(this, R.color.primary); + return _appSettings.getTopBottomBarColor(); } @Override @@ -270,7 +276,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, _cu.rcolor(this, R.color.dark__primary_text)); + _cu.tintMenuItems(menu, true, getTopBottomBarForegroundColor()); _cu.setSubMenuIconsVisibility(menu, true); return true; } @@ -293,6 +299,7 @@ protected void onResume() { } _cu.setKeepScreenOn(this, _appSettings.isKeepScreenOn()); + applyMainAppearancePreferences(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && _appSettings.isMultiWindowEnabled()) { setTaskDescription(new ActivityManager.TaskDescription(getString(R.string.app_name))); } @@ -318,6 +325,72 @@ public void onPostResume() { super.onPostResume(); } + private void applyMainAppearancePreferences() { + applyConfiguredToolbarColors(); + + if (_bottomNav == null || _viewPager == null || _fab == null) { + return; + } + + final boolean showTabTitles = _appSettings.isMainBottomBarTabTitlesShown(); + final int barColor = _appSettings.getTopBottomBarColor(); + final int itemColor = _appSettings.getTopBottomBarForegroundColor(); + final int selectedColor = ContextCompat.getColor(this, R.color.accent); + final int bottomNavDefaultHeight = getDefaultBottomNavHeight(); + final int bottomNavHeight = showTabTitles ? bottomNavDefaultHeight : _cu.convertDpToPx(this, 48); + + _bottomNav.setBackgroundColor(barColor); + _bottomNav.setItemBackground(new ColorDrawable(barColor)); + _bottomNav.setItemIconTintList(makeBottomNavColorStateList(selectedColor, itemColor)); + _bottomNav.setItemTextColor(makeBottomNavColorStateList(selectedColor, itemColor)); + _bottomNav.setLabelVisibilityMode(showTabTitles + ? NavigationBarView.LABEL_VISIBILITY_LABELED + : NavigationBarView.LABEL_VISIBILITY_UNLABELED); + + setViewHeight(_bottomNav, bottomNavHeight); + setViewBottomMargin(_viewPager, bottomNavHeight); + setViewBottomMargin(_fab, bottomNavHeight + _cu.convertDpToPx(this, 16)); + } + + private int getDefaultBottomNavHeight() { + if (_bottomNavDefaultHeight <= 0 && _bottomNav != null && _bottomNav.getLayoutParams() != null) { + _bottomNavDefaultHeight = _bottomNav.getLayoutParams().height; + } + return _bottomNavDefaultHeight > 0 ? _bottomNavDefaultHeight : _cu.convertDpToPx(this, 56); + } + + private ColorStateList makeBottomNavColorStateList(final int selectedColor, final int itemColor) { + return new ColorStateList( + new int[][]{ + new int[]{android.R.attr.state_checked}, + new int[]{} + }, + new int[]{ + selectedColor, + itemColor + } + ); + } + + private void setViewHeight(final View view, final int height) { + final ViewGroup.LayoutParams params = view.getLayoutParams(); + if (params != null && params.height != height) { + params.height = height; + view.setLayoutParams(params); + } + } + + private void setViewBottomMargin(final View view, final int marginBottom) { + final ViewGroup.LayoutParams params = view.getLayoutParams(); + if (params instanceof ViewGroup.MarginLayoutParams) { + final ViewGroup.MarginLayoutParams marginParams = (ViewGroup.MarginLayoutParams) params; + if (marginParams.bottomMargin != marginBottom) { + marginParams.bottomMargin = marginBottom; + view.setLayoutParams(marginParams); + } + } + } + // Cycle between recent, favourite, and current public boolean onLongClickFab(View view) { if (_notebook != null) { diff --git a/app/src/main/java/net/gsantner/markor/activity/MarkorBaseActivity.java b/app/src/main/java/net/gsantner/markor/activity/MarkorBaseActivity.java index 23f10744cb..b4e0a6c135 100644 --- a/app/src/main/java/net/gsantner/markor/activity/MarkorBaseActivity.java +++ b/app/src/main/java/net/gsantner/markor/activity/MarkorBaseActivity.java @@ -1,13 +1,16 @@ package net.gsantner.markor.activity; import android.graphics.Color; +import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Bundle; import android.view.KeyEvent; import android.view.WindowManager; import androidx.annotation.Nullable; +import androidx.appcompat.widget.Toolbar; import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; import net.gsantner.markor.R; import net.gsantner.markor.model.AppSettings; @@ -32,6 +35,12 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { } } + @Override + protected void onResume() { + super.onResume(); + applyConfiguredToolbarColors(); + } + protected boolean onReceiveKeyPress(GsFragmentBase fragment, int keyCode, KeyEvent event) { return fragment.onReceiveKeyPress(keyCode, event); } @@ -49,6 +58,32 @@ public Integer getNewActivityBackgroundColor() { return _appSettings.getAppThemeName().contains("black") ? Color.BLACK : null; } + public int getTopBottomBarForegroundColor() { + return _appSettings.getTopBottomBarForegroundColor(); + } + + public void applyConfiguredToolbarColors() { + final Toolbar toolbar = findViewById(R.id.toolbar); + if (toolbar == null) { + return; + } + + final int backgroundColor = _appSettings.getTopBottomBarColor(); + final int foregroundColor = _appSettings.getTopBottomBarForegroundColor(); + toolbar.setBackgroundColor(backgroundColor); + toolbar.setTitleTextColor(foregroundColor); + toolbar.setSubtitleTextColor(foregroundColor); + tintToolbarDrawable(toolbar.getNavigationIcon(), foregroundColor); + tintToolbarDrawable(toolbar.getOverflowIcon(), foregroundColor); + _cu.setStatusbarColor(this, backgroundColor); + } + + private void tintToolbarDrawable(final Drawable drawable, final int color) { + if (drawable != null) { + DrawableCompat.setTint(drawable.mutate(), color); + } + } + @Override protected AppSettings createAppSettingsInstance() { return new AppSettings(this); diff --git a/app/src/main/java/net/gsantner/markor/activity/SettingsActivity.java b/app/src/main/java/net/gsantner/markor/activity/SettingsActivity.java index f5f53a51b7..a74d11f4e2 100644 --- a/app/src/main/java/net/gsantner/markor/activity/SettingsActivity.java +++ b/app/src/main/java/net/gsantner/markor/activity/SettingsActivity.java @@ -191,7 +191,6 @@ public void doUpdatePreferences() { R.string.pref_key__swipe_to_change_mode, R.string.pref_key__todotxt__hl_delay, R.string.pref_key__markdown__hl_delay_v2, - R.string.pref_key__theming_hide_system_statusbar, R.string.pref_key__tab_width_v2, R.string.pref_key__editor_line_spacing, }; @@ -223,6 +222,13 @@ protected void onPreferenceChanged(final SharedPreferences prefs, final String k } else if (eq(key, R.string.pref_key__theming_hide_system_statusbar)) { activityRetVal = RESULT.RESTART_REQ; _appSettings.setRecreateMainRequired(true); + } else if (eq(key, R.string.pref_key__ui_flat_top_bottom_bars)) { + final Activity activity = getActivity(); + if (activity instanceof MarkorBaseActivity) { + ((MarkorBaseActivity) activity).applyConfiguredToolbarColors(); + } + } else if (eq(key, R.string.pref_key__file_browser_show_dividers)) { + _appSettings.setRecreateMainRequired(true); } else if (eq(key, R.string.pref_key__is_launcher_for_special_files_enabled)) { boolean extraLaunchersEnabled = prefs.getBoolean(key, false); new MarkorContextUtils(getActivity()).applySpecialLaunchersVisibility(getActivity(), extraLaunchersEnabled); diff --git a/app/src/main/java/net/gsantner/markor/frontend/filebrowser/MarkorFileBrowserFactory.java b/app/src/main/java/net/gsantner/markor/frontend/filebrowser/MarkorFileBrowserFactory.java index 1bfaf1b3b3..4487c36234 100644 --- a/app/src/main/java/net/gsantner/markor/frontend/filebrowser/MarkorFileBrowserFactory.java +++ b/app/src/main/java/net/gsantner/markor/frontend/filebrowser/MarkorFileBrowserFactory.java @@ -86,6 +86,8 @@ public static void updateFsViewerOpts(final GsFileBrowserOptions.Options opts, f opts.popularFiles = appSettings.getPopularFiles(); opts.descriptionFormat = appSettings.getString(R.string.pref_key__file_description_format, ""); + opts.primaryColor = appSettings.isFlatTopBottomBarColorEnabled() ? R.color.background : R.color.primary; + opts.titleTextColor = R.color.primary_text; final File downloads = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS); opts.addVirtualFile("Download", downloads, R.drawable.baseline_download_24); diff --git a/app/src/main/java/net/gsantner/markor/model/AppSettings.java b/app/src/main/java/net/gsantner/markor/model/AppSettings.java index 08c58131f7..0332a5bbdf 100644 --- a/app/src/main/java/net/gsantner/markor/model/AppSettings.java +++ b/app/src/main/java/net/gsantner/markor/model/AppSettings.java @@ -714,6 +714,36 @@ public String getAppThemeName() { return getString(R.string.pref_key__app_theme, _context.getString(R.string.app_theme_system)); } + public boolean isFlatTopBottomBarColorEnabled() { + return getBool(R.string.pref_key__ui_flat_top_bottom_bars, false); + } + + public boolean isMainBottomBarTabTitlesShown() { + return getBool(R.string.pref_key__main_bottom_bar_show_tab_titles, true); + } + + public boolean isFileBrowserDividerEnabled() { + return getBool(R.string.pref_key__file_browser_show_dividers, true); + } + + public @ColorInt int getUiBackgroundColor() { + if (getAppThemeName().contains("black")) { + return Color.BLACK; + } + return rcolor(R.color.background); + } + + public @ColorInt int getTopBottomBarColor() { + return isFlatTopBottomBarColorEnabled() ? getUiBackgroundColor() : rcolor(R.color.primary); + } + + public @ColorInt int getTopBottomBarForegroundColor() { + if (!isFlatTopBottomBarColorEnabled()) { + return rcolor(R.color.dark__primary_text); + } + return _cu.shouldColorOnTopBeLight(getTopBottomBarColor()) ? rcolor(R.color.dark__primary_text) : rcolor(R.color.primary_text); + } + public void setEditorBasicColor(boolean forDarkMode, @ColorRes int fgColor, @ColorRes int bgColor) { int resIdFg = forDarkMode ? R.string.pref_key__basic_color_scheme__fg_dark : R.string.pref_key__basic_color_scheme__fg_light; int resIdBg = forDarkMode ? R.string.pref_key__basic_color_scheme__bg_dark : R.string.pref_key__basic_color_scheme__bg_light; @@ -802,10 +832,6 @@ public boolean isFileBrowserSortFolderFirst() { return getBool(R.string.pref_key__filesystem_folder_first, true); } - public String getNavigationBarColor() { - return getString(R.string.pref_key__navigationbar_color, "#000000"); - } - public String getAppStartupFolderMenuId() { return getString(R.string.pref_key__app_start_folder, "notebook"); } diff --git a/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserFragment.java b/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserFragment.java index 668e4477ba..ad4f751084 100644 --- a/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserFragment.java +++ b/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserFragment.java @@ -287,8 +287,8 @@ private void updateMenuItems() { final MenuItem sortItem = _fragmentMenu.findItem(R.id.action_sort); if (sortItem != null) { - final @ColorInt int colorWhite = _cu.rcolor(getContext(), R.color.dark__primary_text); - _cu.tintDrawable(sortItem.getIcon(), _dopt.sortOrder.isFolderLocal ? GsFileBrowserListAdapter.FAVOURITE_COLOR : colorWhite); + final @ColorInt int itemColor = _appSettings.getTopBottomBarForegroundColor(); + _cu.tintDrawable(sortItem.getIcon(), _dopt.sortOrder.isFolderLocal ? GsFileBrowserListAdapter.FAVOURITE_COLOR : itemColor); } } @@ -357,7 +357,7 @@ public void onResume() { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { super.onCreateOptionsMenu(menu, inflater); inflater.inflate(R.menu.filesystem__menu, menu); - _cu.tintMenuItems(menu, true, _cu.rcolor(getContext(), R.color.dark__primary_text)); + _cu.tintMenuItems(menu, true, _appSettings.getTopBottomBarForegroundColor()); _cu.setSubMenuIconsVisibility(menu, true); List> sdcardFolders = _cu.getAppDataPublicDirs(getContext(), false, true, true); @@ -641,6 +641,10 @@ public static void addDivider(final Activity activity, final RecyclerView recycl return; } + if (!AppSettings.get(activity).isFileBrowserDividerEnabled()) { + return; + } + final LinearLayoutManager lam = (LinearLayoutManager) recyclerView.getLayoutManager(); if (lam == null) { diff --git a/app/src/main/res/drawable/bottomnav_color_selector.xml b/app/src/main/res/drawable/bottomnav_color_selector.xml deleted file mode 100644 index 2a75a2ecd2..0000000000 --- a/app/src/main/res/drawable/bottomnav_color_selector.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/main__activity.xml b/app/src/main/res/layout/main__activity.xml index c9e608f15b..d4a716ca15 100644 --- a/app/src/main/res/layout/main__activity.xml +++ b/app/src/main/res/layout/main__activity.xml @@ -64,8 +64,6 @@ android:layout_gravity="start|bottom" android:background="@color/primary" app:itemBackground="@color/primary" - app:itemIconTint="@drawable/bottomnav_color_selector" - app:itemTextColor="@drawable/bottomnav_color_selector" app:labelVisibilityMode="labeled" app:menu="@menu/main__bottom_nav" /> diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 6f3309da05..5bf52a8f78 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -297,7 +297,6 @@ work. If not, see . دفتر الملاحظات هو المجلد الذي تحمله العلامات في متصفح الملفات عند بدء التطبيق. إنه المجلد الرئيسي للملفات الخاصة بك. QuickNote هو أسرع خيار لكتابة الملاحظات. إنه ملف بتنسيق Markdown مع الموقع الافتراضي >ملاحظات/QuickNote. (د)<، يمكنك تعيين ملف مخصص في الإعدادات. إدارة المهام الخاصة بك مع ToDo. وهو ملف في تنسيق todo.txt مع الموقع الافتراضي >الملاحظات/todo. xt<، يمكنك تعيين ملف مخصص في الإعدادات. - لون شريط التنقل أسود أبيض عرض diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml index 6daabff55b..99007ecc70 100644 --- a/app/src/main/res/values-bs/strings.xml +++ b/app/src/main/res/values-bs/strings.xml @@ -277,7 +277,6 @@ work. If not, see . Bilježnica je direktorij koji Markor pri pokretanju učitava u preglednik datoteka. Ona je centralno mjesto za Vaše datoteke. QuickNote je najbrži način za pisanje bilješki. Datoteka slijedi Markdown notaciju i pohranjena je na >Notebook/QuickNote.md< lokaciji, koja se može promijeniti u podešavanjima. Zadacima upravljajte kroz ToDo datoteku, koja slijedi todo.txt metod bilježenja i pohranjena je na >Notebook/todo.txt< lokaciji, koja se može promijeniti u podešavanjima. - Boja trake za navigaciju Crna Bijela Prikaz diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 6ad4beac37..8d3e74cb3f 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -303,7 +303,6 @@ work. If not, see . El quadern és la carpeta que Markor carrega al navegador de fitxers quan s\'inicia l\'aplicació. És la carpeta inicial dels vostres fitxers. QuickNote és l’opció més ràpida per escriure notes. És un fitxer en format Markdown amb la ubicació per defecte >Quadern/QuickNote.md<, podeu establir una ruta de fitxers personalitzada a la configuració. Gestioneu les vostres tasques amb ToDo. És un fitxer en format todo.txt amb la ubicació per defecte >Quadern/todo.txt<, podeu establir una ruta de fitxers personalitzada a la configuració. - Color de la barra de navegació Negre Blanc Vista diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index aa9bd687f1..4e3b89afc9 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -286,7 +286,6 @@ work. If not, see . Notebook je složka, kterou Markor načítá v prohlížeči souborů, když je aplikace spuštěna. Je to domácí složka vašich souborů. QuickNote je nejrychlejší možnost pro psaní poznámek. Je to soubor ve formátu Markdown s výchozí pozicí >Notebook/QuickNote.md<, můžete nastavit vlastní cestu k souboru v nastaveních. Spravujte své úkoly pomocí ToDo. Je to soubor ve formátu todo.txt s výchozím umístění v >Notebook/todo. xt<, můžete nastavit vlastní cestu k souborům v nastavení. - Barva navigačního panelu Černá Bílá Zobrazení diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 3d793e5d60..126d968f9c 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -278,7 +278,6 @@ work. If not, see . Notebook er den mappe, som Markor indlæser i filbrowseren, når app\'en startes. Det er hjemmemappen for dine filer. QuickNote er den hurtigste mulighed for at skrive ned noter. Det er en fil i Markdown format med standard placering >Notebook / QuickNote. d<, kan du indstille en brugerdefineret filsti i indstillingerne. Administrer dine opgaver med ToDo. Det er en fil i todo.txt format med standard placering >Notebook / todo. xt<, du kan indstille en brugerdefineret filsti i indstillingerne. - Navigation bar farve Sort Hvid Vis diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index cde15b48df..7f38172ca2 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -300,7 +300,6 @@ work. If not, see . Notizbuch ist der Ordner, den Markor beim Starten der App im Dateibrowser lädt. Es ist der Home-Ordner Ihrer Dateien. QuickNote ist die schnellste Option, um Notizen zu erstellen. Es ist eine Datei im Markdown-Format mit dem Standardpfad >Notizbuch/QuickNote.md<, du kannst den Pfad in den Einstellungen anpassen. Manage deine Aufgaben mit ToDo. Es ist eine Datei im todo.txt-Format mit dem Standardpfad >Notizbuch/todo.txt<, du kannst den Pfad in den Einstellungen anpassen. - Farbe der Navigationsleiste Schwarz Weiß Betrachten diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 4df06833f5..4e009f04c2 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -286,7 +286,6 @@ work. If not, see . Σημειωματάριο είναι ο φάκελος που το Markor φορτώνει στο πρόγραμμα περιήγησης αρχείων όταν ξεκινά η εφαρμογή. Είναι ο αρχικός φάκελος των αρχείων σας. Το QuickNote είναι η ταχύτερη επιλογή για εγγραφή σημειώσεων. Είναι ένα αρχείο σε μορφή Markdown με την προεπιλεγμένη τοποθεσία >Notebook/QuickNote. d<, μπορείτε να ορίσετε ένα προσαρμοσμένο αρχείο στις ρυθμίσεις. Διαχειριστείτε τις εργασίες σας με ToDo. Είναι ένα αρχείο σε μορφή todo.txt με την προεπιλεγμένη τοποθεσία >Notebook/todo. xt<, μπορείτε να ορίσετε μία διαδρομή στις ρυθμίσεις. - Χρώμα μπάρας πλοήγησης Μαύρο Λευκό Προβολή diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index ab355ece62..6b2751f0a1 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -298,7 +298,6 @@ work. If not, see . Notebook es la carpeta que Markor carga en el navegador de archivos cuando se inicia la aplicación. Es la carpeta de inicio de sus archivos. QuickNote es la opción más rápida para escribir notas. Es un archivo en formato Markdown con la ubicación predeterminada >Notebook/QuickNote.md<, puede establecer una ruta de archivo personalizada en la configuración. Administre sus tareas con ToDo. Es un archivo en formato todo.txt con la ubicación predeterminada >Notebook/todo.txt<, puede establecer una ruta de archivo personalizada en la configuración. - Color de la barra de navegación Negro Blanco Ver diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 7d53268158..f5e059a0f3 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -290,7 +290,6 @@ work. If not, see . Märkmik/Notebook on kaust, mille Markor rakenduse käivitamisel failihaldurisse laadib. See on teie failide kodukaust. QuickNote on kiireim võimalus märkmete kirjutamiseks. See on Markdown-vormingus fail, mille vaikeasukoht >Notebook/QuickNote.md<, seadistustes saate kohandada failitee. Halda oma ülesandeid TodDo abil. See on faili todo.txt vormingus vaikimisi asukohas >Notebook/todo.txt<, mille failiteed saad seadetes muuta. - Liikumisriba värv Must Valge Vaade diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 47d08a3cd1..5a97045a9e 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -284,7 +284,6 @@ work. If not, see . Notebook is the folder that Markor loads in the file browser when the app is started. It is the home folder of your files. QuickNote is the fastest option to write down notes. It is a file in Markdown format with default location >Notebook/QuickNote.md<, you can set a custom filepath in the settings. Manage your tasks with ToDo. It is a file in todo.txt format with default location >Notebook/todo.txt<, you can set a custom filepath in the settings. - رنگ نوار پیمایش سیاه سفید نمایش diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index f5af2636a2..a0b1cf0d4a 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -278,7 +278,6 @@ work. If not, see . Muistiinpanot on kansio, jonka Markor lataa tiedostoselaimeen, kun sovellus käynnistetään. Se on tiedostojesi kotikansio. QuickNote on nopein vaihtoehto muistiinpanojen kirjoittamiseen. Se on tiedosto Markdown-muodossa, jonka oletussijainti on >Notebook/QuickNote.md<, voit määrittää mukautetun tiedostopolun asetuksissa. Hallitse tehtäviäsi ToDo:lla. Se on tiedosto todo.txt-muodossa, jonka oletussijainti on >Notebook/todo.txt<, voit määrittää mukautetun tiedostopolun asetuksissa. - Navigointipalkin väri Musta Valkoinen Näytä diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml index e379cc4978..7716e6d770 100644 --- a/app/src/main/res/values-fil/strings.xml +++ b/app/src/main/res/values-fil/strings.xml @@ -275,7 +275,6 @@ work. If not, see . Ang Notebook ay ang folder na nilo-load ng Markor sa file brower sa kada magbubukas ang app. Ito ang home folder ng iyong mga file. Ang Quicknote ay ang pinakamabilis na opsyon para magsulat ng mga tala. Ito ay isang file sa format na Markdown na default na nakalagay sa >Notebook/QuickNote.md<, maari kang magtakda ng custom na filepath sa mga pagsasaayos. Pamahalaan ang iyong mga gawain sa ToDo. Ito ay isang file sa format na todo.txt na default na nakalagay sa >Notebook/todo.txt<, maari kang magtakda ng custom ng filepath sa mga pagsasaayos. - Kulay ng navigation bar Itim Puti View diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 66db39d8b0..b93284a3eb 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -295,7 +295,6 @@ work. If not, see . Notebook est le dossier depuis lequel Markor charge les fichiers à son démarrage. C\'est le dossier principal de vos fichiers. QuickNote est l\'option la plus rapide pour prendre des notes. Il s\'agit d\'un fichier au format Markdown dont l\'emplacement par défaut est >Notebook/QuickNote.md<, vous pouvez définir un emplacement personnalisé dans les paramètres. Gérez vos tâches avec ToDo. Il s\'agit d\'un fichier au format todo.txt dont l\'emplacement par défaut est >NoteBook/todo.txt<, vous pouvez définir un emplacement personnalisé dans les paramètres. - Couleur de la barre de navigation Noir Blanc Vue diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 1b39276fea..d877a11be4 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -289,7 +289,6 @@ work. If not, see . फ़ोल्डर पहले इस पर चलें आंतरिक स्टोरेज - नेविगेशन पट्टी रंग काला सफ़ेद दृश्य diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 15b7e0a99d..7b76627e96 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -273,7 +273,6 @@ work. If not, see . A jegyzetfüzet az a mappa, amit Markor megnyit induláskor. A szövegfájlok helye. A QuickNote az ötletek gyors leírására szolgál Markdown formátumban. Alapértelmezetten a >Jegyzetfüzet/QuickNote.md< helyen található, de helye beállításokban testreszabható. A ToDo-val kezelheted a feladataidat \"todo.txt\" formátumban. Alapértelmezetten a >Jegyzetfüzet/todo.txt< helyen található, de helye beállításokban testreszabható. - Navigációs sáv színe Fekete Fehér Megtekintés diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 0dedfde62d..b34a667b85 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -284,7 +284,6 @@ work. If not, see . Notebook adalah folder yang dimuat Markor di browser file saat aplikasi dimulai. Ini adalah folder beranda dari file Anda. QuickNote adalah opsi tercepat untuk menuliskan catatan. Ini adalah file dalam format Markdown dengan lokasi default >Notebook/QuickNote.md<, Anda bisa mengatur jalur file kustom di pengaturan. Kelola tugas Anda dengan ToDo. Ini adalah file dalam format todo.txt dengan lokasi default >Notebook/todo.txt<, Anda dapat mengatur jalur file kustom di pengaturan. - Warna bilah navigasi Hitam Putih Lihat diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 15a934f5f1..706b126ad1 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -300,7 +300,6 @@ work. If not, see . Notebook è la cartella che Markor carica nel browser dei file quando l\'app è lanciata. È la cartella home per i tuoi file. QuickNote è l\'opzione più veloce per scrivere note. È un file in formato Markdown nella posizione predefinita >Notebook/QuickNote.md<, è possibile impostare un percorso file personalizzato nelle impostazioni. Gestisci le tue attività con ToDo. È un file in formato todo.txt nella posizione predefinita >Notebook/todo.txt<, è possibile impostare un file personalizzato nelle impostazioni. - Colore barra di navigazione Nero Bianco Vedi diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index e0df256672..ed42f5af03 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -294,7 +294,6 @@ work. If not, see . תיקיית המחברת הינו מה שMarkor טוען לתוך מעיין הקבצים בפתיחה האפלקיציה. זו תיקיית הבית עבור הקבצים שלכם. הפתק המהיר הינו הדרך המהירה ביותר לרשום דברים. זהו קובץ בפורמאט Markdown עם מיקום ברירת המחדל <Notebook/QuickNote.md>, הנכם יכולים להגדיר מיקום שונה בהגדרות. נהלו את משימותיכם באמצעות רשימת מטלות. זהו קובץ בפורמאט todo.txt עם מיקום ברירת המחדל <Notebook/todo.txt>, הנכם יכולים להגדיר מיקום שונה בהגדרות. - צבע שורת ניווט שחור לבן הצג diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index d7c2d1d049..c56ccdbc5d 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -279,7 +279,6 @@ work. If not, see . Notebook は、アプリが起動する時に、Markor がファイルブラウザーで読み込むフォルダーです。あなたのファイルのホームフォルダーになります。 QuickNote は、メモを書くための最速のオプションです。デフォルトの場所は >Notebook/QuickNote.md< で Markdown 形式のファイルです。設定でカスタムのパスを設定できます。 ToDo とタスクを管理します。デフォルトの場所は >Notebook/todo.txt< で Todo.txt 形式のファイルです。設定でカスタムパスを設定できます。 - ナビゲーションバーの色 黒 白 表示 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 90516e2b6f..5d806fff29 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -300,7 +300,6 @@ work. If not, see . \'노트북\'은 앱이 시작될 때 Markor가 파일 탐색기에서 불러오는 폴더입니다. 노트북은 파일과 문서의 보금자리(최상위) 폴더입니다. \'퀵노트\'는 노트를 작성할 수 있는 가장 빠른 옵션입니다. 퀵노트는 마크다운 형식의 파일이며 >Notebook/QuickNote.md<가 기본 위치입니다. 설정에서 이 기본 위치를 임의로 변경할 수 있습니다. \'할 일\'을 활용해 일정을 관리해보세요. 할 일은 todo.txt 형식의 파일이며 >Notebook/todo.txt<가 기본 위치입니다. 설정에서 이 기본 위치를 임의로 변경할 수 있습니다. - 탐색 버튼 색상 검정색 흰색 보기 diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 11eded7def..a69c106cd9 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -297,7 +297,6 @@ work. If not, see . Notebook er mappen som Markor laster i filbrowseren når appen starter. Det er startmappen for filene. QuickNote er det raskeste alternativet for å skrive ned notater. Det er en fil i Markdown-format med standardplasseringen >Notebook/QuickNote.md<, du kan angi en egendefinert filbane i innstillingene. Administrer oppgavene med To-Do. Det er en fil i «todo.txt»-format med standardplasseringen >Notebook/todo.txt<, du kan angi en egendefinert filbane i innstillingene. - Navigasjonsbar farge Svart Hvit Vis diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index aa3ea59488..e33cd26e05 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -298,7 +298,6 @@ work. If not, see . Notebook is de map die Markor in de bestandsbrowser laadt wanneer de app is gestart. Het is de home map van uw bestanden. QuickNote is de snelste optie om notities op te schrijven. Het is een bestand in Markdown formaat met standaard locatie >Notebook/QuickNote.md<, u kunt een aangepast bestandspad instellen in de instellingen. Beheer uw taken met ToDo. Het is een bestand in todo.txt formaat met standaard locatie >Notebook/todo.txt<, u kunt een aangepast bestandspad instellen in de instellingen. - Kleur navigatiebalk Zwart Wit Bekijk diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 2e9df3a965..06c14651b8 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -288,7 +288,6 @@ work. If not, see . Notebook er mappen som Markor laster i filbrowseren når appen starter. Det er startmappen for filene. QuickNote er det raskeste alternativet for å skrive ned notater. Det er en fil i Markdown format med standard plassering >Notebook/QuickNote. d<, du kan angi en egendefinert filstien i innstillingene. Administrere oppgavene med ToDo. Det er en fil i todo.txt format med standardplassering >Notebook/todo. xt<, du kan angi en egendefinert filbane i innstillingene. - Navigasjonsbar farge Svart Hvit Vis diff --git a/app/src/main/res/values-or/strings.xml b/app/src/main/res/values-or/strings.xml index 711bd59a83..bfe7503c92 100644 --- a/app/src/main/res/values-or/strings.xml +++ b/app/src/main/res/values-or/strings.xml @@ -190,7 +190,6 @@ work. If not, see . ପ୍ରଥମେ ଫୋଲ୍ଡର୍ ଅନ୍ତର୍ନିହିତ ଷ୍ଟୋରେଜ୍‌ ଆପଣ ତଳେଥିବା ମୁଖ୍ୟ ଦର୍ଶନ, ଫାଇଲ୍ ବ୍ରାଉଜର୍ କିମ୍ୱା ଉନ୍ମୋଚକ ରୁ ଡକ୍ୟୁମେଣ୍ଟ୍ ଖୋଲିପାରିବେ। Markorରେ ଅଂଶିଦାରୀ ପାଠ୍ୟ ଯୋଡ଼ିବାର ଏକ ବିକଳ୍ପ ମଧ୍ୟ ଅଛି। - ଦିଗଚଳନ ଦଣ୍ଡିକା ରଙ୍ଗ କଳା ଧଳା ଦର୍ଶନ diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index ef137bf0b5..ab99904e70 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -281,7 +281,6 @@ work. If not, see . Notatki to katalog, który Markor ładuje w przeglądarce plików po uruchomieniu aplikacji. To domyślny folder dla Twoich plików. QuickNote to najszybsza możliwość robienia notatek. Jest to plik w formacie Markdown z domyślną lokalizacją >Notatki/QuickNote.md<. Możesz wybrać własną lokalizację w ustawieniach. Zarządzaj zadaniami za pomocą ToDo. Jest to plik w formacie todo.txt z domyślną lokalizacją >Notebook/todo. xt<, możesz ustawić własną ścieżkę plików w ustawieniach. - Kolor paska nawigacji Czarny Biały Wyświetl diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index adcb783e90..d59ca1bb32 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -289,7 +289,6 @@ work. If not, see . Notebook é a pasta que o Markor abre através do gerenciador de arquivos quando o app é iniciado. É a pasta padrão dos seus arquivos. QuickNote é a opção mais rápida para suas anotações. Ele é um arquivo de formato Markdown e sua localização padrão é >Notebook/QuickNote.md<, e você pode customizar a localização nas configurações. Gerencie suas tarefas com ToDo. É um arquivo todo.txt com localização padrão >Notebook/todo.txt<, e que pode ter sua localização customizada nas configurações. - Cor da barra de navegação Preto Branco Ver diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 28dcd4e4b0..4c89a553ee 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -303,7 +303,6 @@ work. If not, see . Caderno é a pasta que a aplicação carrega no explorador de ficheiros ao iniciar. É a pasta que contém todos os seus ficheiros. QuickNote é a opção mais rápida para criar a sua nota. É um ficheiro com o formato Markdown, sendo colocado em >Caderno/QuickNote.md< mas pode ser definido um caminho personalizado nas definições. Pode gerir as suas tarefas em ToDo. É um ficheiro com o formato todo.txt, sendo colocado em >Caderno/todo.txt< mas pode ser definido um caminho personalizado nas definições. - Cor da barra de navegação Preto Branco Ver diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 302b43aab1..00cf5ad1a5 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -298,7 +298,6 @@ work. If not, see . Caietul este dosarul pe care Markor îl încarcă în browserul de fișiere la pornirea aplicației. Este dosarul principal al fișierelor tale. QuickNote este cea mai rapidă opțiune pentru a scrie notițe. Este un fișier în format Markdown cu locația implicită >Notebook/QuickNote.md<, puteți seta o cale personalizată în setări. Gestionați sarcinile cu ToDo. Este un fișier în format todo.txt cu locația implicită >Notebook/todo. xt<, puteţi seta o cale personalizată în setări. - Culoare bară de navigare Negru Alb Vizualizare diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 1a028cadfd..4638184abd 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -298,7 +298,6 @@ work. If not, see . Блокнот — это папка, которую Markor открывает в обозревателе файлов при запуске. Это папка по умолчанию для ваших файлов. QuickNote помогает быстро делать заметки. Это файл в формате Markdown, путь по умолчанию: >Notebook/QuickNote.md<. Вы можете изменить путь в настройках. Управляйте задачами с помощью ToDo. Это файл в формате todo.txt, путь по умолчанию: >Notebook/todo.txt<. Вы можете изменить путь в настройках. - Цвет панели навигации Чёрный Белый Просмотр diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml index b02239ff19..0f3f1b9bc4 100644 --- a/app/src/main/res/values-sc/strings.xml +++ b/app/src/main/res/values-sc/strings.xml @@ -298,7 +298,6 @@ work. If not, see . \"Notas\" est sa cartella chi Markor carrigat in s\'esploradore de documentos cando s\'aplicatzione benit alluta. Est sa cartella de sos documentos tuos. QuickNote est s\'optzione prus lestra pro iscrìere notas. Est unu documentu in formadu Markdown, chi s\'agatat in >Notebook/QuickNote.md<. Podes impostare un\'àndala personalizada pro su documentu in sas impostatziones. Amministra sas fainas tuas cun ToDo. Est unu documentu in formadu todo.txt chi s\'agatat in >Notebook/todo.txt<. Podes impostare un\'àndala personalizada pro su documentu in sas impostatziones. - Colore de sa barra de navigatzione Nieddu Biancu Abbàida diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml index 77d928ab75..e798c7b583 100644 --- a/app/src/main/res/values-si/strings.xml +++ b/app/src/main/res/values-si/strings.xml @@ -275,7 +275,6 @@ work. If not, see . Notebook යනු යෙදුම ආරම්භ කරන විට Markor ගොනු බ්‍රවුසරයේ පූරණය කරන ෆෝල්ඩරයයි. එය ඔබගේ ගොනු වල මුල් ෆෝල්ඩරය වේ. QuickNote යනු සටහන් ලිවීමට ඇති වේගවත්ම විකල්පයයි. එය පෙරනිමි ස්ථානය >Notebook/QuickNote.md<සමඟ Markdown ආකෘතියේ ගොනුවක් වේ, ඔබට සැකසීම් තුළ අභිරුචි ගොනු මාර්ගයක් සැකසිය හැක. ToDo සමඟින් ඔබගේ කාර්යයන් කළමනාකරණය කරන්න. එය todo.txt ආකෘතියේ ඇති ගොනුවකි, පෙරනිමි ස්ථානය >Notebook/todo.txt<, ඔබට සැකසීම් තුළ අභිරුචි ගොනු මාර්ගයක් සැකසිය හැක. - සංචාලන තීරුවේ වර්ණය කළු සුදු දැක්ම diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 85eb2aaea7..d61e1dae5b 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -300,7 +300,6 @@ work. If not, see . Beležka je mapa, ki jo Markor ob svojem zagonu naloži v brskalnik datotek. To je domača mapa vaših datotek. Hitra beležka je najhitrejša možnost zapisovanja zapiskov. To je datoteka v obliki Markdown s privzetim mestom >Notebook/QuickNote.md<, lahko pa tudi nastavite svoje mesto v nastavitvah. Upravljajte s svojimi opravili z Opravili. To je datoteka v obliki todo.txt s privzetim mestom >Notebook/todo.txt<, lahko pa tudi nastavite svoje mesto v nastavitvah. - Barva krmilne vrstice Črna Bela Pogled diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 5c26707f52..359d413652 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -296,7 +296,6 @@ work. If not, see . Anteckningsboken är katalogen Markor hämtar filhanteraren när programmet startas. Det är dina filers hemkatalaog. SnabbAnteckning är det snabbaste sättet att göra anteckningar. Det är en fil i Markdown-format som ligger i >Notebook/QuickNote.md<, du kan ändra vart filen sparas i inställningarna. Hantera dina uppgifter med ToDo. Det är en fil i todo.txt format med standardplats >Notebook/todo.txt< Du kan ställa in en anpassad sökväg i inställningarna. - Färg på navigeringsfältet Svart Vit Visa diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 6b025b8aec..a90f9fd2d3 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -272,7 +272,6 @@ work. If not, see . குறிப்புப்புத்தகம் என்பது ஒரு கோப்புறையாகும் Markor ஆவண உலாவியில் இருந்து செயலி தொடங்கும்போது இதை ஏற்றுகிறது. இதுவே உங்கள் ஆவணங்களின் முதன்மை கோப்புறையாகும். QuickNote என்பது விரைவாக குறிப்புகளை எழுதுவதற்கு ஒரு தேர்வாகும். இது Markdown முறையில் உள்ள ஒரு ஆவணமாகும் இதன் இயல்புநிலை இடமானது >Notebook/QuickNote.md<, நீங்கள் இந்த ஆவணத்திற்கு வேறு ஒரு கோப்பு பாதையை அமைப்புகளில் மாற்ற முடியும். உங்கள் செயல்களை நிர்வகிக்க ToDo வகை ஆவணத்தை பயன்படுத்தவும். அது todo.txt முறையில் உள்ள ஆவணமாகும் இதன் இயல்புநிலை இடமானது >Notebook/todo.txt<, நீங்கள் இந்த ஆவணத்திற்கு வேறு ஒரு கோப்பு பாதையை அமைப்புகளில் மாற்ற முடியும். - வழிநடத்தும் பட்டியின் நிறம் கருப்பு வெள்ளை பார்வை diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index c7fa416c82..54b2a67ca7 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -300,7 +300,6 @@ work. If not, see . Not Defteri, uygulama başlatıldığında Markor\'un dosya tarayıcısına yüklediği dizindir. Dosyalarınızın ana dizinidir. QuickNote not yazmak için en hızlı seçenektir. >NotDefteri/QuickNote.md < varsayılan konumunda bulunan Markdown biçiminde bir dosyadır, ayarlarda özel bir dosya yolu ayarlayabilirsiniz. Görevlerinizi ToDo ile yönetin. >NoteDefteri/todo.txt< varsayılan konumunda todo.txt biçiminde bir dosyadır, ayarlarda özel bir dosya yolu ayarlayabilirsiniz. - Gezinme çubuğu rengi Siyah Beyaz Görünüm diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index e1e5839c91..7998804ce3 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -296,7 +296,6 @@ work. If not, see . Notebook – директорія, яку Markor завантажує у переглядач файлів при запуску програми. Це домашня тека ваших файлів. QuickNote – найшвидший спосіб записувати нотатки. Це файл у форматі Markdown з типовим розташуванням >Notebook/QuickNote.md<, яке ви можете змінити у налаштуваннях. Керуйте своїми завданнями з ToDo. Це файл у форматі todo.txt, за умовчанням розташований у >Notebook/todo.txt<, ви можете встановити власний шлях у налаштуваннях. - Колір панелі навігації Чорний Білий Перегляд diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 3fd6d76e9b..65d9efdbd3 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -303,7 +303,6 @@ work. If not, see . 笔记本是程序启动时 Markor 在文件浏览器中加载的文件夹。它是你的文件的主文件夹。 QuickNote 是写下笔记最快选择。它是一个默认位置为 >Notebook/QuickNote.md< 的 Markdown 格式的文件，您可以在设置中设置一个自定义文件路径。 使用 ToDo 管理你的任务。它是 todo.txt 格式的文件，默认位置是 >Notebook/todo.txt<，你可以在设置中自定义文件路径。 - 导航栏颜色 黑色 白色 查看 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 31baa16cab..f2d921e537 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -297,7 +297,6 @@ work. If not, see . 「筆記本」是 Markor 啟動時在檔案管理器中的載入的資料夾，也是您檔案的主資料夾。 「QuickNote」是快速紀錄筆記的最佳選擇，以 Markdown 格式存放在預設位置 >Notebook/QuickNote.md<，您可以在設定裡自訂檔案路徑。 「ToDo」可以用來管理您的工作任務，以 todo.txt 格式存放在預設位置 >Notebook/todo.txt<，您可以在設定裡自訂檔案路徑。 - 導覽列顏色 黑色 白色 檢視 diff --git a/app/src/main/res/values/opoc_res.xml b/app/src/main/res/values/opoc_res.xml index dd9a3d9426..2aff400bf4 100644 --- a/app/src/main/res/values/opoc_res.xml +++ b/app/src/main/res/values/opoc_res.xml @@ -39,17 +39,4 @@ 4 - - pref_key__navigationbar_color - - System - @string/black - @string/white - - - - - #000000 - #ffffff - diff --git a/app/src/main/res/values/string-not_translatable.xml b/app/src/main/res/values/string-not_translatable.xml index 932f1fe99b..b6924d22d3 100644 --- a/app/src/main/res/values/string-not_translatable.xml +++ b/app/src/main/res/values/string-not_translatable.xml @@ -146,6 +146,9 @@ work. If not, see . pref_key__font_family pref_key__editor_font_size pref_key__app_theme + pref_key__ui_flat_top_bottom_bars + pref_key__main_bottom_bar_show_tab_titles + pref_key__file_browser_show_dividers pref_key__theming_hide_system_statusbar pref_key__language pref_key__is_main_recreate_required diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3a3d885196..2142031879 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -148,6 +148,12 @@ work. If not, see . App-wide Main View The overall theme used in the app + Flat top and bottom bars + Use the app background color for top and bottom bars + Show tab titles + Show text labels in the main bottom bar + File browser divider lines + Show divider lines between file browser entries Remember last directory Syntax Highlighting Highlighting delay @@ -319,7 +325,6 @@ work. If not, see . Notebook is the folder that Markor loads in the file browser when the app is started. It is the home folder of your files. QuickNote is the fastest option to write down notes. It is a file in Markdown format with default location >Notebook/QuickNote.md<, you can set a custom filepath in the settings. Manage your tasks with ToDo. It is a file in todo.txt format with default location >Notebook/todo.txt<, you can set a custom filepath in the settings. - Navigation bar color Black White View diff --git a/app/src/main/res/xml/preferences_master.xml b/app/src/main/res/xml/preferences_master.xml index d543f8f0d0..6af0e10d3e 100644 --- a/app/src/main/res/xml/preferences_master.xml +++ b/app/src/main/res/xml/preferences_master.xml @@ -116,22 +116,29 @@ - + + android:icon="@drawable/ic_palette_black_24dp" + android:summary="@string/theme" + android:title="@string/appearance"> - + + android:title="@string/theme" /> + + + + + + + + + + + + + + + + - - Date: Sun, 19 Apr 2026 00:02:44 -0700 Subject: [PATCH 2/8] Constrain main bottom bar layout --- .../markor/activity/MainActivity.java | 39 ++++++------------- app/src/main/res/layout/main__activity.xml | 34 +++++++++------- app/src/main/res/values/dimens.xml | 2 + 3 files changed, 34 insertions(+), 41 deletions(-) diff --git a/app/src/main/java/net/gsantner/markor/activity/MainActivity.java b/app/src/main/java/net/gsantner/markor/activity/MainActivity.java index 6e0161cdb3..ad6d480204 100644 --- a/app/src/main/java/net/gsantner/markor/activity/MainActivity.java +++ b/app/src/main/java/net/gsantner/markor/activity/MainActivity.java @@ -70,7 +70,6 @@ public class MainActivity extends MarkorBaseActivity implements GsFileBrowserFra private DocumentEditAndViewFragment _quicknote, _todo; private MoreFragment _more; private FloatingActionButton _fab; - private int _bottomNavDefaultHeight = 0; private MarkorContextUtils _cu; private File _quickSwitchPrevFolder = null; @@ -336,8 +335,6 @@ private void applyMainAppearancePreferences() { final int barColor = _appSettings.getTopBottomBarColor(); final int itemColor = _appSettings.getTopBottomBarForegroundColor(); final int selectedColor = ContextCompat.getColor(this, R.color.accent); - final int bottomNavDefaultHeight = getDefaultBottomNavHeight(); - final int bottomNavHeight = showTabTitles ? bottomNavDefaultHeight : _cu.convertDpToPx(this, 48); _bottomNav.setBackgroundColor(barColor); _bottomNav.setItemBackground(new ColorDrawable(barColor)); @@ -346,17 +343,7 @@ private void applyMainAppearancePreferences() { _bottomNav.setLabelVisibilityMode(showTabTitles ? NavigationBarView.LABEL_VISIBILITY_LABELED : NavigationBarView.LABEL_VISIBILITY_UNLABELED); - - setViewHeight(_bottomNav, bottomNavHeight); - setViewBottomMargin(_viewPager, bottomNavHeight); - setViewBottomMargin(_fab, bottomNavHeight + _cu.convertDpToPx(this, 16)); - } - - private int getDefaultBottomNavHeight() { - if (_bottomNavDefaultHeight <= 0 && _bottomNav != null && _bottomNav.getLayoutParams() != null) { - _bottomNavDefaultHeight = _bottomNav.getLayoutParams().height; - } - return _bottomNavDefaultHeight > 0 ? _bottomNavDefaultHeight : _cu.convertDpToPx(this, 56); + applyBottomNavHeight(showTabTitles); } private ColorStateList makeBottomNavColorStateList(final int selectedColor, final int itemColor) { @@ -372,22 +359,18 @@ private ColorStateList makeBottomNavColorStateList(final int selectedColor, fina ); } - private void setViewHeight(final View view, final int height) { - final ViewGroup.LayoutParams params = view.getLayoutParams(); - if (params != null && params.height != height) { - params.height = height; - view.setLayoutParams(params); + private void applyBottomNavHeight(final boolean showTabTitles) { + final ViewGroup.LayoutParams params = _bottomNav.getLayoutParams(); + if (params == null) { + return; } - } - private void setViewBottomMargin(final View view, final int marginBottom) { - final ViewGroup.LayoutParams params = view.getLayoutParams(); - if (params instanceof ViewGroup.MarginLayoutParams) { - final ViewGroup.MarginLayoutParams marginParams = (ViewGroup.MarginLayoutParams) params; - if (marginParams.bottomMargin != marginBottom) { - marginParams.bottomMargin = marginBottom; - view.setLayoutParams(marginParams); - } + final int height = getResources().getDimensionPixelSize(showTabTitles + ? R.dimen.main_bottom_bar_height + : R.dimen.main_bottom_bar_height_no_titles); + if (params.height != height) { + params.height = height; + _bottomNav.setLayoutParams(params); } } diff --git a/app/src/main/res/layout/main__activity.xml b/app/src/main/res/layout/main__activity.xml index d4a716ca15..8398b54072 100644 --- a/app/src/main/res/layout/main__activity.xml +++ b/app/src/main/res/layout/main__activity.xml @@ -8,7 +8,7 @@ * #########################################################*/ --> - + android:theme="@style/AppTheme.Light.AppBarOverlay" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + android:layout_width="0dp" + android:layout_height="0dp" + app:layout_constraintBottom_toTopOf="@id/bottom_navigation_bar" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/appbar" /> - + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 307809d0e1..17b3672fe0 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -5,5 +5,7 @@ 32dp 8dp 46dp + 56dp + 48dp 16dp From 698ee540b3e0bfb578c296f301123b6d52fd0a5e Mon Sep 17 00:00:00 2001 From: Harshad Vedartham Date: Sun, 19 Apr 2026 14:47:13 -0700 Subject: [PATCH 3/8] Keep appearance setting to background colors --- .../ActionButtonSettingsActivity.java | 2 +- .../activity/DocumentEditAndViewFragment.java | 2 +- .../activity/DocumentShareIntoFragment.java | 2 +- .../markor/activity/MainActivity.java | 24 +++---------------- .../markor/activity/MarkorBaseActivity.java | 21 ++-------------- .../markor/activity/SettingsActivity.java | 2 +- .../filebrowser/MarkorFileBrowserFactory.java | 1 - .../gsantner/markor/model/AppSettings.java | 7 ------ .../filebrowser/GsFileBrowserFragment.java | 6 ++--- .../res/drawable/bottomnav_color_selector.xml | 16 +++++++++++++ app/src/main/res/layout/main__activity.xml | 2 ++ 11 files changed, 30 insertions(+), 55 deletions(-) create mode 100644 app/src/main/res/drawable/bottomnav_color_selector.xml diff --git a/app/src/main/java/net/gsantner/markor/activity/ActionButtonSettingsActivity.java b/app/src/main/java/net/gsantner/markor/activity/ActionButtonSettingsActivity.java index 6dc8698727..01add9161b 100644 --- a/app/src/main/java/net/gsantner/markor/activity/ActionButtonSettingsActivity.java +++ b/app/src/main/java/net/gsantner/markor/activity/ActionButtonSettingsActivity.java @@ -83,7 +83,7 @@ public boolean onCreateOptionsMenu(Menu menu) { final MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.action_order__menu, menu); - _cu.tintMenuItems(menu, true, getTopBottomBarForegroundColor()); + _cu.tintMenuItems(menu, true, _cu.rcolor(this, R.color.dark__primary_text)); return true; } diff --git a/app/src/main/java/net/gsantner/markor/activity/DocumentEditAndViewFragment.java b/app/src/main/java/net/gsantner/markor/activity/DocumentEditAndViewFragment.java index ff527a304a..f48576e375 100644 --- a/app/src/main/java/net/gsantner/markor/activity/DocumentEditAndViewFragment.java +++ b/app/src/main/java/net/gsantner/markor/activity/DocumentEditAndViewFragment.java @@ -299,7 +299,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, _appSettings.getTopBottomBarForegroundColor()); + _cu.tintMenuItems(menu, true, _cu.rcolor(getContext(), R.color.dark__primary_text)); _cu.setSubMenuIconsVisibility(menu, true); final boolean isExperimentalFeaturesEnabled = _appSettings.isExperimentalFeaturesEnabled(); diff --git a/app/src/main/java/net/gsantner/markor/activity/DocumentShareIntoFragment.java b/app/src/main/java/net/gsantner/markor/activity/DocumentShareIntoFragment.java index d5bf395ea6..c96c8af273 100644 --- a/app/src/main/java/net/gsantner/markor/activity/DocumentShareIntoFragment.java +++ b/app/src/main/java/net/gsantner/markor/activity/DocumentShareIntoFragment.java @@ -139,7 +139,7 @@ private CheckBox addCheckBoxToToolbar() { checkBox = new CheckBox(activity); checkBox.setText(R.string.format_link); checkBox.setTag(CHECKBOX_TAG); - final @ColorInt int color = _appSettings.getTopBottomBarForegroundColor(); + final @ColorInt int color = _cu.rcolor(activity, R.color.dark__primary_text); CompoundButtonCompat.setButtonTintList(checkBox, ColorStateList.valueOf(color)); checkBox.setTextColor(color); checkBox.setLayoutDirection(CheckBox.LAYOUT_DIRECTION_RTL); diff --git a/app/src/main/java/net/gsantner/markor/activity/MainActivity.java b/app/src/main/java/net/gsantner/markor/activity/MainActivity.java index ad6d480204..498df6b4f5 100644 --- a/app/src/main/java/net/gsantner/markor/activity/MainActivity.java +++ b/app/src/main/java/net/gsantner/markor/activity/MainActivity.java @@ -11,7 +11,6 @@ import android.annotation.SuppressLint; import android.app.Activity; import android.app.ActivityManager; -import android.content.res.ColorStateList; import android.content.Intent; import android.graphics.drawable.ColorDrawable; import android.os.Build; @@ -152,7 +151,7 @@ public void onActivityFirstTimeVisible() { @Override public Integer getNewNavigationBarColor() { - return _appSettings.getTopBottomBarColor(); + return ContextCompat.getColor(this, R.color.primary); } @Override @@ -275,7 +274,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, getTopBottomBarForegroundColor()); + _cu.tintMenuItems(menu, true, _cu.rcolor(this, R.color.dark__primary_text)); _cu.setSubMenuIconsVisibility(menu, true); return true; } @@ -325,7 +324,7 @@ public void onPostResume() { } private void applyMainAppearancePreferences() { - applyConfiguredToolbarColors(); + applyConfiguredBarBackgroundColors(); if (_bottomNav == null || _viewPager == null || _fab == null) { return; @@ -333,32 +332,15 @@ private void applyMainAppearancePreferences() { final boolean showTabTitles = _appSettings.isMainBottomBarTabTitlesShown(); final int barColor = _appSettings.getTopBottomBarColor(); - final int itemColor = _appSettings.getTopBottomBarForegroundColor(); - final int selectedColor = ContextCompat.getColor(this, R.color.accent); _bottomNav.setBackgroundColor(barColor); _bottomNav.setItemBackground(new ColorDrawable(barColor)); - _bottomNav.setItemIconTintList(makeBottomNavColorStateList(selectedColor, itemColor)); - _bottomNav.setItemTextColor(makeBottomNavColorStateList(selectedColor, itemColor)); _bottomNav.setLabelVisibilityMode(showTabTitles ? NavigationBarView.LABEL_VISIBILITY_LABELED : NavigationBarView.LABEL_VISIBILITY_UNLABELED); applyBottomNavHeight(showTabTitles); } - private ColorStateList makeBottomNavColorStateList(final int selectedColor, final int itemColor) { - return new ColorStateList( - new int[][]{ - new int[]{android.R.attr.state_checked}, - new int[]{} - }, - new int[]{ - selectedColor, - itemColor - } - ); - } - private void applyBottomNavHeight(final boolean showTabTitles) { final ViewGroup.LayoutParams params = _bottomNav.getLayoutParams(); if (params == null) { diff --git a/app/src/main/java/net/gsantner/markor/activity/MarkorBaseActivity.java b/app/src/main/java/net/gsantner/markor/activity/MarkorBaseActivity.java index b4e0a6c135..9750e651a2 100644 --- a/app/src/main/java/net/gsantner/markor/activity/MarkorBaseActivity.java +++ b/app/src/main/java/net/gsantner/markor/activity/MarkorBaseActivity.java @@ -1,7 +1,6 @@ package net.gsantner.markor.activity; import android.graphics.Color; -import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Bundle; import android.view.KeyEvent; @@ -10,7 +9,6 @@ import androidx.annotation.Nullable; import androidx.appcompat.widget.Toolbar; import androidx.core.content.ContextCompat; -import androidx.core.graphics.drawable.DrawableCompat; import net.gsantner.markor.R; import net.gsantner.markor.model.AppSettings; @@ -38,7 +36,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { @Override protected void onResume() { super.onResume(); - applyConfiguredToolbarColors(); + applyConfiguredBarBackgroundColors(); } protected boolean onReceiveKeyPress(GsFragmentBase fragment, int keyCode, KeyEvent event) { @@ -58,32 +56,17 @@ public Integer getNewActivityBackgroundColor() { return _appSettings.getAppThemeName().contains("black") ? Color.BLACK : null; } - public int getTopBottomBarForegroundColor() { - return _appSettings.getTopBottomBarForegroundColor(); - } - - public void applyConfiguredToolbarColors() { + public void applyConfiguredBarBackgroundColors() { final Toolbar toolbar = findViewById(R.id.toolbar); if (toolbar == null) { return; } final int backgroundColor = _appSettings.getTopBottomBarColor(); - final int foregroundColor = _appSettings.getTopBottomBarForegroundColor(); toolbar.setBackgroundColor(backgroundColor); - toolbar.setTitleTextColor(foregroundColor); - toolbar.setSubtitleTextColor(foregroundColor); - tintToolbarDrawable(toolbar.getNavigationIcon(), foregroundColor); - tintToolbarDrawable(toolbar.getOverflowIcon(), foregroundColor); _cu.setStatusbarColor(this, backgroundColor); } - private void tintToolbarDrawable(final Drawable drawable, final int color) { - if (drawable != null) { - DrawableCompat.setTint(drawable.mutate(), color); - } - } - @Override protected AppSettings createAppSettingsInstance() { return new AppSettings(this); diff --git a/app/src/main/java/net/gsantner/markor/activity/SettingsActivity.java b/app/src/main/java/net/gsantner/markor/activity/SettingsActivity.java index a74d11f4e2..93bd09d5e0 100644 --- a/app/src/main/java/net/gsantner/markor/activity/SettingsActivity.java +++ b/app/src/main/java/net/gsantner/markor/activity/SettingsActivity.java @@ -225,7 +225,7 @@ protected void onPreferenceChanged(final SharedPreferences prefs, final String k } else if (eq(key, R.string.pref_key__ui_flat_top_bottom_bars)) { final Activity activity = getActivity(); if (activity instanceof MarkorBaseActivity) { - ((MarkorBaseActivity) activity).applyConfiguredToolbarColors(); + ((MarkorBaseActivity) activity).applyConfiguredBarBackgroundColors(); } } else if (eq(key, R.string.pref_key__file_browser_show_dividers)) { _appSettings.setRecreateMainRequired(true); diff --git a/app/src/main/java/net/gsantner/markor/frontend/filebrowser/MarkorFileBrowserFactory.java b/app/src/main/java/net/gsantner/markor/frontend/filebrowser/MarkorFileBrowserFactory.java index 4487c36234..2beb7bb064 100644 --- a/app/src/main/java/net/gsantner/markor/frontend/filebrowser/MarkorFileBrowserFactory.java +++ b/app/src/main/java/net/gsantner/markor/frontend/filebrowser/MarkorFileBrowserFactory.java @@ -87,7 +87,6 @@ public static void updateFsViewerOpts(final GsFileBrowserOptions.Options opts, f opts.descriptionFormat = appSettings.getString(R.string.pref_key__file_description_format, ""); opts.primaryColor = appSettings.isFlatTopBottomBarColorEnabled() ? R.color.background : R.color.primary; - opts.titleTextColor = R.color.primary_text; final File downloads = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS); opts.addVirtualFile("Download", downloads, R.drawable.baseline_download_24); diff --git a/app/src/main/java/net/gsantner/markor/model/AppSettings.java b/app/src/main/java/net/gsantner/markor/model/AppSettings.java index 0332a5bbdf..8a790a4972 100644 --- a/app/src/main/java/net/gsantner/markor/model/AppSettings.java +++ b/app/src/main/java/net/gsantner/markor/model/AppSettings.java @@ -737,13 +737,6 @@ public boolean isFileBrowserDividerEnabled() { return isFlatTopBottomBarColorEnabled() ? getUiBackgroundColor() : rcolor(R.color.primary); } - public @ColorInt int getTopBottomBarForegroundColor() { - if (!isFlatTopBottomBarColorEnabled()) { - return rcolor(R.color.dark__primary_text); - } - return _cu.shouldColorOnTopBeLight(getTopBottomBarColor()) ? rcolor(R.color.dark__primary_text) : rcolor(R.color.primary_text); - } - public void setEditorBasicColor(boolean forDarkMode, @ColorRes int fgColor, @ColorRes int bgColor) { int resIdFg = forDarkMode ? R.string.pref_key__basic_color_scheme__fg_dark : R.string.pref_key__basic_color_scheme__fg_light; int resIdBg = forDarkMode ? R.string.pref_key__basic_color_scheme__bg_dark : R.string.pref_key__basic_color_scheme__bg_light; diff --git a/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserFragment.java b/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserFragment.java index ad4f751084..2bd1ddc586 100644 --- a/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserFragment.java +++ b/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserFragment.java @@ -287,8 +287,8 @@ private void updateMenuItems() { final MenuItem sortItem = _fragmentMenu.findItem(R.id.action_sort); if (sortItem != null) { - final @ColorInt int itemColor = _appSettings.getTopBottomBarForegroundColor(); - _cu.tintDrawable(sortItem.getIcon(), _dopt.sortOrder.isFolderLocal ? GsFileBrowserListAdapter.FAVOURITE_COLOR : itemColor); + final @ColorInt int colorWhite = _cu.rcolor(getContext(), R.color.dark__primary_text); + _cu.tintDrawable(sortItem.getIcon(), _dopt.sortOrder.isFolderLocal ? GsFileBrowserListAdapter.FAVOURITE_COLOR : colorWhite); } } @@ -357,7 +357,7 @@ public void onResume() { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { super.onCreateOptionsMenu(menu, inflater); inflater.inflate(R.menu.filesystem__menu, menu); - _cu.tintMenuItems(menu, true, _appSettings.getTopBottomBarForegroundColor()); + _cu.tintMenuItems(menu, true, _cu.rcolor(getContext(), R.color.dark__primary_text)); _cu.setSubMenuIconsVisibility(menu, true); List> sdcardFolders = _cu.getAppDataPublicDirs(getContext(), false, true, true); diff --git a/app/src/main/res/drawable/bottomnav_color_selector.xml b/app/src/main/res/drawable/bottomnav_color_selector.xml new file mode 100644 index 0000000000..8cf065436c --- /dev/null +++ b/app/src/main/res/drawable/bottomnav_color_selector.xml @@ -0,0 +1,16 @@ + + + + + diff --git a/app/src/main/res/layout/main__activity.xml b/app/src/main/res/layout/main__activity.xml index 8398b54072..57c64cfbff 100644 --- a/app/src/main/res/layout/main__activity.xml +++ b/app/src/main/res/layout/main__activity.xml @@ -69,6 +69,8 @@ android:layout_height="@dimen/main_bottom_bar_height" android:background="@color/primary" app:itemBackground="@color/primary" + app:itemIconTint="@drawable/bottomnav_color_selector" + app:itemTextColor="@drawable/bottomnav_color_selector" app:labelVisibilityMode="labeled" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" From b89988ccd6f02943a084ee7a9b339d9df962ea13 Mon Sep 17 00:00:00 2001 From: Harshad Vedartham Date: Sun, 19 Apr 2026 15:05:01 -0700 Subject: [PATCH 4/8] Keep translated strings unchanged --- app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-bs/strings.xml | 1 + app/src/main/res/values-ca/strings.xml | 1 + app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-el/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-et/strings.xml | 1 + app/src/main/res/values-fa/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fil/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-hi/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-in/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-iw/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ko/strings.xml | 1 + app/src/main/res/values-nb-rNO/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-no/strings.xml | 1 + app/src/main/res/values-or/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rBR/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ro/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sc/strings.xml | 1 + app/src/main/res/values-si/strings.xml | 1 + app/src/main/res/values-sl/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-ta/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + 38 files changed, 38 insertions(+) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 5bf52a8f78..6f3309da05 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -297,6 +297,7 @@ work. If not, see . دفتر الملاحظات هو المجلد الذي تحمله العلامات في متصفح الملفات عند بدء التطبيق. إنه المجلد الرئيسي للملفات الخاصة بك. QuickNote هو أسرع خيار لكتابة الملاحظات. إنه ملف بتنسيق Markdown مع الموقع الافتراضي >ملاحظات/QuickNote. (د)<، يمكنك تعيين ملف مخصص في الإعدادات. إدارة المهام الخاصة بك مع ToDo. وهو ملف في تنسيق todo.txt مع الموقع الافتراضي >الملاحظات/todo. xt<، يمكنك تعيين ملف مخصص في الإعدادات. + لون شريط التنقل أسود أبيض عرض diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml index 99007ecc70..6daabff55b 100644 --- a/app/src/main/res/values-bs/strings.xml +++ b/app/src/main/res/values-bs/strings.xml @@ -277,6 +277,7 @@ work. If not, see . Bilježnica je direktorij koji Markor pri pokretanju učitava u preglednik datoteka. Ona je centralno mjesto za Vaše datoteke. QuickNote je najbrži način za pisanje bilješki. Datoteka slijedi Markdown notaciju i pohranjena je na >Notebook/QuickNote.md< lokaciji, koja se može promijeniti u podešavanjima. Zadacima upravljajte kroz ToDo datoteku, koja slijedi todo.txt metod bilježenja i pohranjena je na >Notebook/todo.txt< lokaciji, koja se može promijeniti u podešavanjima. + Boja trake za navigaciju Crna Bijela Prikaz diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 8d3e74cb3f..6ad4beac37 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -303,6 +303,7 @@ work. If not, see . El quadern és la carpeta que Markor carrega al navegador de fitxers quan s\'inicia l\'aplicació. És la carpeta inicial dels vostres fitxers. QuickNote és l’opció més ràpida per escriure notes. És un fitxer en format Markdown amb la ubicació per defecte >Quadern/QuickNote.md<, podeu establir una ruta de fitxers personalitzada a la configuració. Gestioneu les vostres tasques amb ToDo. És un fitxer en format todo.txt amb la ubicació per defecte >Quadern/todo.txt<, podeu establir una ruta de fitxers personalitzada a la configuració. + Color de la barra de navegació Negre Blanc Vista diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 4e3b89afc9..aa9bd687f1 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -286,6 +286,7 @@ work. If not, see . Notebook je složka, kterou Markor načítá v prohlížeči souborů, když je aplikace spuštěna. Je to domácí složka vašich souborů. QuickNote je nejrychlejší možnost pro psaní poznámek. Je to soubor ve formátu Markdown s výchozí pozicí >Notebook/QuickNote.md<, můžete nastavit vlastní cestu k souboru v nastaveních. Spravujte své úkoly pomocí ToDo. Je to soubor ve formátu todo.txt s výchozím umístění v >Notebook/todo. xt<, můžete nastavit vlastní cestu k souborům v nastavení. + Barva navigačního panelu Černá Bílá Zobrazení diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 126d968f9c..3d793e5d60 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -278,6 +278,7 @@ work. If not, see . Notebook er den mappe, som Markor indlæser i filbrowseren, når app\'en startes. Det er hjemmemappen for dine filer. QuickNote er den hurtigste mulighed for at skrive ned noter. Det er en fil i Markdown format med standard placering >Notebook / QuickNote. d<, kan du indstille en brugerdefineret filsti i indstillingerne. Administrer dine opgaver med ToDo. Det er en fil i todo.txt format med standard placering >Notebook / todo. xt<, du kan indstille en brugerdefineret filsti i indstillingerne. + Navigation bar farve Sort Hvid Vis diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7f38172ca2..cde15b48df 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -300,6 +300,7 @@ work. If not, see . Notizbuch ist der Ordner, den Markor beim Starten der App im Dateibrowser lädt. Es ist der Home-Ordner Ihrer Dateien. QuickNote ist die schnellste Option, um Notizen zu erstellen. Es ist eine Datei im Markdown-Format mit dem Standardpfad >Notizbuch/QuickNote.md<, du kannst den Pfad in den Einstellungen anpassen. Manage deine Aufgaben mit ToDo. Es ist eine Datei im todo.txt-Format mit dem Standardpfad >Notizbuch/todo.txt<, du kannst den Pfad in den Einstellungen anpassen. + Farbe der Navigationsleiste Schwarz Weiß Betrachten diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 4e009f04c2..4df06833f5 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -286,6 +286,7 @@ work. If not, see . Σημειωματάριο είναι ο φάκελος που το Markor φορτώνει στο πρόγραμμα περιήγησης αρχείων όταν ξεκινά η εφαρμογή. Είναι ο αρχικός φάκελος των αρχείων σας. Το QuickNote είναι η ταχύτερη επιλογή για εγγραφή σημειώσεων. Είναι ένα αρχείο σε μορφή Markdown με την προεπιλεγμένη τοποθεσία >Notebook/QuickNote. d<, μπορείτε να ορίσετε ένα προσαρμοσμένο αρχείο στις ρυθμίσεις. Διαχειριστείτε τις εργασίες σας με ToDo. Είναι ένα αρχείο σε μορφή todo.txt με την προεπιλεγμένη τοποθεσία >Notebook/todo. xt<, μπορείτε να ορίσετε μία διαδρομή στις ρυθμίσεις. + Χρώμα μπάρας πλοήγησης Μαύρο Λευκό Προβολή diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 6b2751f0a1..ab355ece62 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -298,6 +298,7 @@ work. If not, see . Notebook es la carpeta que Markor carga en el navegador de archivos cuando se inicia la aplicación. Es la carpeta de inicio de sus archivos. QuickNote es la opción más rápida para escribir notas. Es un archivo en formato Markdown con la ubicación predeterminada >Notebook/QuickNote.md<, puede establecer una ruta de archivo personalizada en la configuración. Administre sus tareas con ToDo. Es un archivo en formato todo.txt con la ubicación predeterminada >Notebook/todo.txt<, puede establecer una ruta de archivo personalizada en la configuración. + Color de la barra de navegación Negro Blanco Ver diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index f5e059a0f3..7d53268158 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -290,6 +290,7 @@ work. If not, see . Märkmik/Notebook on kaust, mille Markor rakenduse käivitamisel failihaldurisse laadib. See on teie failide kodukaust. QuickNote on kiireim võimalus märkmete kirjutamiseks. See on Markdown-vormingus fail, mille vaikeasukoht >Notebook/QuickNote.md<, seadistustes saate kohandada failitee. Halda oma ülesandeid TodDo abil. See on faili todo.txt vormingus vaikimisi asukohas >Notebook/todo.txt<, mille failiteed saad seadetes muuta. + Liikumisriba värv Must Valge Vaade diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 5a97045a9e..47d08a3cd1 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -284,6 +284,7 @@ work. If not, see . Notebook is the folder that Markor loads in the file browser when the app is started. It is the home folder of your files. QuickNote is the fastest option to write down notes. It is a file in Markdown format with default location >Notebook/QuickNote.md<, you can set a custom filepath in the settings. Manage your tasks with ToDo. It is a file in todo.txt format with default location >Notebook/todo.txt<, you can set a custom filepath in the settings. + رنگ نوار پیمایش سیاه سفید نمایش diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index a0b1cf0d4a..f5af2636a2 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -278,6 +278,7 @@ work. If not, see . Muistiinpanot on kansio, jonka Markor lataa tiedostoselaimeen, kun sovellus käynnistetään. Se on tiedostojesi kotikansio. QuickNote on nopein vaihtoehto muistiinpanojen kirjoittamiseen. Se on tiedosto Markdown-muodossa, jonka oletussijainti on >Notebook/QuickNote.md<, voit määrittää mukautetun tiedostopolun asetuksissa. Hallitse tehtäviäsi ToDo:lla. Se on tiedosto todo.txt-muodossa, jonka oletussijainti on >Notebook/todo.txt<, voit määrittää mukautetun tiedostopolun asetuksissa. + Navigointipalkin väri Musta Valkoinen Näytä diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml index 7716e6d770..e379cc4978 100644 --- a/app/src/main/res/values-fil/strings.xml +++ b/app/src/main/res/values-fil/strings.xml @@ -275,6 +275,7 @@ work. If not, see . Ang Notebook ay ang folder na nilo-load ng Markor sa file brower sa kada magbubukas ang app. Ito ang home folder ng iyong mga file. Ang Quicknote ay ang pinakamabilis na opsyon para magsulat ng mga tala. Ito ay isang file sa format na Markdown na default na nakalagay sa >Notebook/QuickNote.md<, maari kang magtakda ng custom na filepath sa mga pagsasaayos. Pamahalaan ang iyong mga gawain sa ToDo. Ito ay isang file sa format na todo.txt na default na nakalagay sa >Notebook/todo.txt<, maari kang magtakda ng custom ng filepath sa mga pagsasaayos. + Kulay ng navigation bar Itim Puti View diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index b93284a3eb..66db39d8b0 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -295,6 +295,7 @@ work. If not, see . Notebook est le dossier depuis lequel Markor charge les fichiers à son démarrage. C\'est le dossier principal de vos fichiers. QuickNote est l\'option la plus rapide pour prendre des notes. Il s\'agit d\'un fichier au format Markdown dont l\'emplacement par défaut est >Notebook/QuickNote.md<, vous pouvez définir un emplacement personnalisé dans les paramètres. Gérez vos tâches avec ToDo. Il s\'agit d\'un fichier au format todo.txt dont l\'emplacement par défaut est >NoteBook/todo.txt<, vous pouvez définir un emplacement personnalisé dans les paramètres. + Couleur de la barre de navigation Noir Blanc Vue diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index d877a11be4..1b39276fea 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -289,6 +289,7 @@ work. If not, see . फ़ोल्डर पहले इस पर चलें आंतरिक स्टोरेज + नेविगेशन पट्टी रंग काला सफ़ेद दृश्य diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 7b76627e96..15b7e0a99d 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -273,6 +273,7 @@ work. If not, see . A jegyzetfüzet az a mappa, amit Markor megnyit induláskor. A szövegfájlok helye. A QuickNote az ötletek gyors leírására szolgál Markdown formátumban. Alapértelmezetten a >Jegyzetfüzet/QuickNote.md< helyen található, de helye beállításokban testreszabható. A ToDo-val kezelheted a feladataidat \"todo.txt\" formátumban. Alapértelmezetten a >Jegyzetfüzet/todo.txt< helyen található, de helye beállításokban testreszabható. + Navigációs sáv színe Fekete Fehér Megtekintés diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index b34a667b85..0dedfde62d 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -284,6 +284,7 @@ work. If not, see . Notebook adalah folder yang dimuat Markor di browser file saat aplikasi dimulai. Ini adalah folder beranda dari file Anda. QuickNote adalah opsi tercepat untuk menuliskan catatan. Ini adalah file dalam format Markdown dengan lokasi default >Notebook/QuickNote.md<, Anda bisa mengatur jalur file kustom di pengaturan. Kelola tugas Anda dengan ToDo. Ini adalah file dalam format todo.txt dengan lokasi default >Notebook/todo.txt<, Anda dapat mengatur jalur file kustom di pengaturan. + Warna bilah navigasi Hitam Putih Lihat diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 706b126ad1..15a934f5f1 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -300,6 +300,7 @@ work. If not, see . Notebook è la cartella che Markor carica nel browser dei file quando l\'app è lanciata. È la cartella home per i tuoi file. QuickNote è l\'opzione più veloce per scrivere note. È un file in formato Markdown nella posizione predefinita >Notebook/QuickNote.md<, è possibile impostare un percorso file personalizzato nelle impostazioni. Gestisci le tue attività con ToDo. È un file in formato todo.txt nella posizione predefinita >Notebook/todo.txt<, è possibile impostare un file personalizzato nelle impostazioni. + Colore barra di navigazione Nero Bianco Vedi diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index ed42f5af03..e0df256672 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -294,6 +294,7 @@ work. If not, see . תיקיית המחברת הינו מה שMarkor טוען לתוך מעיין הקבצים בפתיחה האפלקיציה. זו תיקיית הבית עבור הקבצים שלכם. הפתק המהיר הינו הדרך המהירה ביותר לרשום דברים. זהו קובץ בפורמאט Markdown עם מיקום ברירת המחדל <Notebook/QuickNote.md>, הנכם יכולים להגדיר מיקום שונה בהגדרות. נהלו את משימותיכם באמצעות רשימת מטלות. זהו קובץ בפורמאט todo.txt עם מיקום ברירת המחדל <Notebook/todo.txt>, הנכם יכולים להגדיר מיקום שונה בהגדרות. + צבע שורת ניווט שחור לבן הצג diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c56ccdbc5d..d7c2d1d049 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -279,6 +279,7 @@ work. If not, see . Notebook は、アプリが起動する時に、Markor がファイルブラウザーで読み込むフォルダーです。あなたのファイルのホームフォルダーになります。 QuickNote は、メモを書くための最速のオプションです。デフォルトの場所は >Notebook/QuickNote.md< で Markdown 形式のファイルです。設定でカスタムのパスを設定できます。 ToDo とタスクを管理します。デフォルトの場所は >Notebook/todo.txt< で Todo.txt 形式のファイルです。設定でカスタムパスを設定できます。 + ナビゲーションバーの色 黒 白 表示 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 5d806fff29..90516e2b6f 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -300,6 +300,7 @@ work. If not, see . \'노트북\'은 앱이 시작될 때 Markor가 파일 탐색기에서 불러오는 폴더입니다. 노트북은 파일과 문서의 보금자리(최상위) 폴더입니다. \'퀵노트\'는 노트를 작성할 수 있는 가장 빠른 옵션입니다. 퀵노트는 마크다운 형식의 파일이며 >Notebook/QuickNote.md<가 기본 위치입니다. 설정에서 이 기본 위치를 임의로 변경할 수 있습니다. \'할 일\'을 활용해 일정을 관리해보세요. 할 일은 todo.txt 형식의 파일이며 >Notebook/todo.txt<가 기본 위치입니다. 설정에서 이 기본 위치를 임의로 변경할 수 있습니다. + 탐색 버튼 색상 검정색 흰색 보기 diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index a69c106cd9..11eded7def 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -297,6 +297,7 @@ work. If not, see . Notebook er mappen som Markor laster i filbrowseren når appen starter. Det er startmappen for filene. QuickNote er det raskeste alternativet for å skrive ned notater. Det er en fil i Markdown-format med standardplasseringen >Notebook/QuickNote.md<, du kan angi en egendefinert filbane i innstillingene. Administrer oppgavene med To-Do. Det er en fil i «todo.txt»-format med standardplasseringen >Notebook/todo.txt<, du kan angi en egendefinert filbane i innstillingene. + Navigasjonsbar farge Svart Hvit Vis diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index e33cd26e05..aa3ea59488 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -298,6 +298,7 @@ work. If not, see . Notebook is de map die Markor in de bestandsbrowser laadt wanneer de app is gestart. Het is de home map van uw bestanden. QuickNote is de snelste optie om notities op te schrijven. Het is een bestand in Markdown formaat met standaard locatie >Notebook/QuickNote.md<, u kunt een aangepast bestandspad instellen in de instellingen. Beheer uw taken met ToDo. Het is een bestand in todo.txt formaat met standaard locatie >Notebook/todo.txt<, u kunt een aangepast bestandspad instellen in de instellingen. + Kleur navigatiebalk Zwart Wit Bekijk diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 06c14651b8..2e9df3a965 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -288,6 +288,7 @@ work. If not, see . Notebook er mappen som Markor laster i filbrowseren når appen starter. Det er startmappen for filene. QuickNote er det raskeste alternativet for å skrive ned notater. Det er en fil i Markdown format med standard plassering >Notebook/QuickNote. d<, du kan angi en egendefinert filstien i innstillingene. Administrere oppgavene med ToDo. Det er en fil i todo.txt format med standardplassering >Notebook/todo. xt<, du kan angi en egendefinert filbane i innstillingene. + Navigasjonsbar farge Svart Hvit Vis diff --git a/app/src/main/res/values-or/strings.xml b/app/src/main/res/values-or/strings.xml index bfe7503c92..711bd59a83 100644 --- a/app/src/main/res/values-or/strings.xml +++ b/app/src/main/res/values-or/strings.xml @@ -190,6 +190,7 @@ work. If not, see . ପ୍ରଥମେ ଫୋଲ୍ଡର୍ ଅନ୍ତର୍ନିହିତ ଷ୍ଟୋରେଜ୍‌ ଆପଣ ତଳେଥିବା ମୁଖ୍ୟ ଦର୍ଶନ, ଫାଇଲ୍ ବ୍ରାଉଜର୍ କିମ୍ୱା ଉନ୍ମୋଚକ ରୁ ଡକ୍ୟୁମେଣ୍ଟ୍ ଖୋଲିପାରିବେ। Markorରେ ଅଂଶିଦାରୀ ପାଠ୍ୟ ଯୋଡ଼ିବାର ଏକ ବିକଳ୍ପ ମଧ୍ୟ ଅଛି। + ଦିଗଚଳନ ଦଣ୍ଡିକା ରଙ୍ଗ କଳା ଧଳା ଦର୍ଶନ diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index ab99904e70..ef137bf0b5 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -281,6 +281,7 @@ work. If not, see . Notatki to katalog, który Markor ładuje w przeglądarce plików po uruchomieniu aplikacji. To domyślny folder dla Twoich plików. QuickNote to najszybsza możliwość robienia notatek. Jest to plik w formacie Markdown z domyślną lokalizacją >Notatki/QuickNote.md<. Możesz wybrać własną lokalizację w ustawieniach. Zarządzaj zadaniami za pomocą ToDo. Jest to plik w formacie todo.txt z domyślną lokalizacją >Notebook/todo. xt<, możesz ustawić własną ścieżkę plików w ustawieniach. + Kolor paska nawigacji Czarny Biały Wyświetl diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index d59ca1bb32..adcb783e90 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -289,6 +289,7 @@ work. If not, see . Notebook é a pasta que o Markor abre através do gerenciador de arquivos quando o app é iniciado. É a pasta padrão dos seus arquivos. QuickNote é a opção mais rápida para suas anotações. Ele é um arquivo de formato Markdown e sua localização padrão é >Notebook/QuickNote.md<, e você pode customizar a localização nas configurações. Gerencie suas tarefas com ToDo. É um arquivo todo.txt com localização padrão >Notebook/todo.txt<, e que pode ter sua localização customizada nas configurações. + Cor da barra de navegação Preto Branco Ver diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 4c89a553ee..28dcd4e4b0 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -303,6 +303,7 @@ work. If not, see . Caderno é a pasta que a aplicação carrega no explorador de ficheiros ao iniciar. É a pasta que contém todos os seus ficheiros. QuickNote é a opção mais rápida para criar a sua nota. É um ficheiro com o formato Markdown, sendo colocado em >Caderno/QuickNote.md< mas pode ser definido um caminho personalizado nas definições. Pode gerir as suas tarefas em ToDo. É um ficheiro com o formato todo.txt, sendo colocado em >Caderno/todo.txt< mas pode ser definido um caminho personalizado nas definições. + Cor da barra de navegação Preto Branco Ver diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 00cf5ad1a5..302b43aab1 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -298,6 +298,7 @@ work. If not, see . Caietul este dosarul pe care Markor îl încarcă în browserul de fișiere la pornirea aplicației. Este dosarul principal al fișierelor tale. QuickNote este cea mai rapidă opțiune pentru a scrie notițe. Este un fișier în format Markdown cu locația implicită >Notebook/QuickNote.md<, puteți seta o cale personalizată în setări. Gestionați sarcinile cu ToDo. Este un fișier în format todo.txt cu locația implicită >Notebook/todo. xt<, puteţi seta o cale personalizată în setări. + Culoare bară de navigare Negru Alb Vizualizare diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 4638184abd..1a028cadfd 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -298,6 +298,7 @@ work. If not, see . Блокнот — это папка, которую Markor открывает в обозревателе файлов при запуске. Это папка по умолчанию для ваших файлов. QuickNote помогает быстро делать заметки. Это файл в формате Markdown, путь по умолчанию: >Notebook/QuickNote.md<. Вы можете изменить путь в настройках. Управляйте задачами с помощью ToDo. Это файл в формате todo.txt, путь по умолчанию: >Notebook/todo.txt<. Вы можете изменить путь в настройках. + Цвет панели навигации Чёрный Белый Просмотр diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml index 0f3f1b9bc4..b02239ff19 100644 --- a/app/src/main/res/values-sc/strings.xml +++ b/app/src/main/res/values-sc/strings.xml @@ -298,6 +298,7 @@ work. If not, see . \"Notas\" est sa cartella chi Markor carrigat in s\'esploradore de documentos cando s\'aplicatzione benit alluta. Est sa cartella de sos documentos tuos. QuickNote est s\'optzione prus lestra pro iscrìere notas. Est unu documentu in formadu Markdown, chi s\'agatat in >Notebook/QuickNote.md<. Podes impostare un\'àndala personalizada pro su documentu in sas impostatziones. Amministra sas fainas tuas cun ToDo. Est unu documentu in formadu todo.txt chi s\'agatat in >Notebook/todo.txt<. Podes impostare un\'àndala personalizada pro su documentu in sas impostatziones. + Colore de sa barra de navigatzione Nieddu Biancu Abbàida diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml index e798c7b583..77d928ab75 100644 --- a/app/src/main/res/values-si/strings.xml +++ b/app/src/main/res/values-si/strings.xml @@ -275,6 +275,7 @@ work. If not, see . Notebook යනු යෙදුම ආරම්භ කරන විට Markor ගොනු බ්‍රවුසරයේ පූරණය කරන ෆෝල්ඩරයයි. එය ඔබගේ ගොනු වල මුල් ෆෝල්ඩරය වේ. QuickNote යනු සටහන් ලිවීමට ඇති වේගවත්ම විකල්පයයි. එය පෙරනිමි ස්ථානය >Notebook/QuickNote.md<සමඟ Markdown ආකෘතියේ ගොනුවක් වේ, ඔබට සැකසීම් තුළ අභිරුචි ගොනු මාර්ගයක් සැකසිය හැක. ToDo සමඟින් ඔබගේ කාර්යයන් කළමනාකරණය කරන්න. එය todo.txt ආකෘතියේ ඇති ගොනුවකි, පෙරනිමි ස්ථානය >Notebook/todo.txt<, ඔබට සැකසීම් තුළ අභිරුචි ගොනු මාර්ගයක් සැකසිය හැක. + සංචාලන තීරුවේ වර්ණය කළු සුදු දැක්ම diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index d61e1dae5b..85eb2aaea7 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -300,6 +300,7 @@ work. If not, see . Beležka je mapa, ki jo Markor ob svojem zagonu naloži v brskalnik datotek. To je domača mapa vaših datotek. Hitra beležka je najhitrejša možnost zapisovanja zapiskov. To je datoteka v obliki Markdown s privzetim mestom >Notebook/QuickNote.md<, lahko pa tudi nastavite svoje mesto v nastavitvah. Upravljajte s svojimi opravili z Opravili. To je datoteka v obliki todo.txt s privzetim mestom >Notebook/todo.txt<, lahko pa tudi nastavite svoje mesto v nastavitvah. + Barva krmilne vrstice Črna Bela Pogled diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 359d413652..5c26707f52 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -296,6 +296,7 @@ work. If not, see . Anteckningsboken är katalogen Markor hämtar filhanteraren när programmet startas. Det är dina filers hemkatalaog. SnabbAnteckning är det snabbaste sättet att göra anteckningar. Det är en fil i Markdown-format som ligger i >Notebook/QuickNote.md<, du kan ändra vart filen sparas i inställningarna. Hantera dina uppgifter med ToDo. Det är en fil i todo.txt format med standardplats >Notebook/todo.txt< Du kan ställa in en anpassad sökväg i inställningarna. + Färg på navigeringsfältet Svart Vit Visa diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index a90f9fd2d3..6b025b8aec 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -272,6 +272,7 @@ work. If not, see . குறிப்புப்புத்தகம் என்பது ஒரு கோப்புறையாகும் Markor ஆவண உலாவியில் இருந்து செயலி தொடங்கும்போது இதை ஏற்றுகிறது. இதுவே உங்கள் ஆவணங்களின் முதன்மை கோப்புறையாகும். QuickNote என்பது விரைவாக குறிப்புகளை எழுதுவதற்கு ஒரு தேர்வாகும். இது Markdown முறையில் உள்ள ஒரு ஆவணமாகும் இதன் இயல்புநிலை இடமானது >Notebook/QuickNote.md<, நீங்கள் இந்த ஆவணத்திற்கு வேறு ஒரு கோப்பு பாதையை அமைப்புகளில் மாற்ற முடியும். உங்கள் செயல்களை நிர்வகிக்க ToDo வகை ஆவணத்தை பயன்படுத்தவும். அது todo.txt முறையில் உள்ள ஆவணமாகும் இதன் இயல்புநிலை இடமானது >Notebook/todo.txt<, நீங்கள் இந்த ஆவணத்திற்கு வேறு ஒரு கோப்பு பாதையை அமைப்புகளில் மாற்ற முடியும். + வழிநடத்தும் பட்டியின் நிறம் கருப்பு வெள்ளை பார்வை diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 54b2a67ca7..c7fa416c82 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -300,6 +300,7 @@ work. If not, see . Not Defteri, uygulama başlatıldığında Markor\'un dosya tarayıcısına yüklediği dizindir. Dosyalarınızın ana dizinidir. QuickNote not yazmak için en hızlı seçenektir. >NotDefteri/QuickNote.md < varsayılan konumunda bulunan Markdown biçiminde bir dosyadır, ayarlarda özel bir dosya yolu ayarlayabilirsiniz. Görevlerinizi ToDo ile yönetin. >NoteDefteri/todo.txt< varsayılan konumunda todo.txt biçiminde bir dosyadır, ayarlarda özel bir dosya yolu ayarlayabilirsiniz. + Gezinme çubuğu rengi Siyah Beyaz Görünüm diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 7998804ce3..e1e5839c91 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -296,6 +296,7 @@ work. If not, see . Notebook – директорія, яку Markor завантажує у переглядач файлів при запуску програми. Це домашня тека ваших файлів. QuickNote – найшвидший спосіб записувати нотатки. Це файл у форматі Markdown з типовим розташуванням >Notebook/QuickNote.md<, яке ви можете змінити у налаштуваннях. Керуйте своїми завданнями з ToDo. Це файл у форматі todo.txt, за умовчанням розташований у >Notebook/todo.txt<, ви можете встановити власний шлях у налаштуваннях. + Колір панелі навігації Чорний Білий Перегляд diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 65d9efdbd3..3fd6d76e9b 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -303,6 +303,7 @@ work. If not, see . 笔记本是程序启动时 Markor 在文件浏览器中加载的文件夹。它是你的文件的主文件夹。 QuickNote 是写下笔记最快选择。它是一个默认位置为 >Notebook/QuickNote.md< 的 Markdown 格式的文件，您可以在设置中设置一个自定义文件路径。 使用 ToDo 管理你的任务。它是 todo.txt 格式的文件，默认位置是 >Notebook/todo.txt<，你可以在设置中自定义文件路径。 + 导航栏颜色 黑色 白色 查看 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index f2d921e537..31baa16cab 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -297,6 +297,7 @@ work. If not, see . 「筆記本」是 Markor 啟動時在檔案管理器中的載入的資料夾，也是您檔案的主資料夾。 「QuickNote」是快速紀錄筆記的最佳選擇，以 Markdown 格式存放在預設位置 >Notebook/QuickNote.md<，您可以在設定裡自訂檔案路徑。 「ToDo」可以用來管理您的工作任務，以 todo.txt 格式存放在預設位置 >Notebook/todo.txt<，您可以在設定裡自訂檔案路徑。 + 導覽列顏色 黑色 白色 檢視 From 031276268b8a668c2d1e1531754b1afa853b86c0 Mon Sep 17 00:00:00 2001 From: Harshad Vedartham Date: Sun, 19 Apr 2026 18:39:42 -0700 Subject: [PATCH 5/8] Clean up appearance setting flow --- .../markor/activity/MainActivity.java | 34 +++++++------------ .../markor/activity/MarkorBaseActivity.java | 12 +++---- .../markor/activity/SettingsActivity.java | 2 +- .../filebrowser/MarkorFileBrowserFactory.java | 1 + .../gsantner/markor/model/AppSettings.java | 2 +- .../filebrowser/GsFileBrowserDialog.java | 2 +- .../filebrowser/GsFileBrowserFragment.java | 6 ++-- .../filebrowser/GsFileBrowserOptions.java | 2 ++ app/src/main/res/layout/main__activity.xml | 3 +- app/src/main/res/values/dimens.xml | 5 +-- 10 files changed, 33 insertions(+), 36 deletions(-) diff --git a/app/src/main/java/net/gsantner/markor/activity/MainActivity.java b/app/src/main/java/net/gsantner/markor/activity/MainActivity.java index 498df6b4f5..f52d58f674 100644 --- a/app/src/main/java/net/gsantner/markor/activity/MainActivity.java +++ b/app/src/main/java/net/gsantner/markor/activity/MainActivity.java @@ -21,7 +21,6 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; -import android.view.ViewGroup; import android.view.WindowManager; import androidx.annotation.NonNull; @@ -102,7 +101,8 @@ public void onPageSelected(int position) { }); setSupportActionBar(findViewById(R.id.toolbar)); - applyMainAppearancePreferences(); + applyActivityBarBackgroundColors(); + applyMainBottomTabBarAppearance(); optShowRate(); // Setup viewpager @@ -297,7 +297,7 @@ protected void onResume() { } _cu.setKeepScreenOn(this, _appSettings.isKeepScreenOn()); - applyMainAppearancePreferences(); + applyMainBottomTabBarAppearance(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && _appSettings.isMultiWindowEnabled()) { setTaskDescription(new ActivityManager.TaskDescription(getString(R.string.app_name))); } @@ -323,36 +323,28 @@ public void onPostResume() { super.onPostResume(); } - private void applyMainAppearancePreferences() { - applyConfiguredBarBackgroundColors(); - - if (_bottomNav == null || _viewPager == null || _fab == null) { + private void applyMainBottomTabBarAppearance() { + if (_bottomNav == null) { return; } final boolean showTabTitles = _appSettings.isMainBottomBarTabTitlesShown(); - final int barColor = _appSettings.getTopBottomBarColor(); + final int barColor = _appSettings.getConfiguredBarBackgroundColor(); _bottomNav.setBackgroundColor(barColor); _bottomNav.setItemBackground(new ColorDrawable(barColor)); _bottomNav.setLabelVisibilityMode(showTabTitles ? NavigationBarView.LABEL_VISIBILITY_LABELED : NavigationBarView.LABEL_VISIBILITY_UNLABELED); - applyBottomNavHeight(showTabTitles); + applyMainBottomTabBarMinHeight(showTabTitles); } - private void applyBottomNavHeight(final boolean showTabTitles) { - final ViewGroup.LayoutParams params = _bottomNav.getLayoutParams(); - if (params == null) { - return; - } - - final int height = getResources().getDimensionPixelSize(showTabTitles - ? R.dimen.main_bottom_bar_height - : R.dimen.main_bottom_bar_height_no_titles); - if (params.height != height) { - params.height = height; - _bottomNav.setLayoutParams(params); + private void applyMainBottomTabBarMinHeight(final boolean showTabTitles) { + final int minHeight = getResources().getDimensionPixelSize(showTabTitles + ? R.dimen.main_bottom_bar_min_height_labeled + : R.dimen.main_bottom_bar_min_height_unlabeled); + if (_bottomNav.getMinimumHeight() != minHeight) { + _bottomNav.setMinimumHeight(minHeight); } } diff --git a/app/src/main/java/net/gsantner/markor/activity/MarkorBaseActivity.java b/app/src/main/java/net/gsantner/markor/activity/MarkorBaseActivity.java index 9750e651a2..b5acea0892 100644 --- a/app/src/main/java/net/gsantner/markor/activity/MarkorBaseActivity.java +++ b/app/src/main/java/net/gsantner/markor/activity/MarkorBaseActivity.java @@ -36,7 +36,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { @Override protected void onResume() { super.onResume(); - applyConfiguredBarBackgroundColors(); + applyActivityBarBackgroundColors(); } protected boolean onReceiveKeyPress(GsFragmentBase fragment, int keyCode, KeyEvent event) { @@ -56,14 +56,14 @@ public Integer getNewActivityBackgroundColor() { return _appSettings.getAppThemeName().contains("black") ? Color.BLACK : null; } - public void applyConfiguredBarBackgroundColors() { + public void applyActivityBarBackgroundColors() { + final int backgroundColor = _appSettings.getConfiguredBarBackgroundColor(); + final Toolbar toolbar = findViewById(R.id.toolbar); - if (toolbar == null) { - return; + if (toolbar != null) { + toolbar.setBackgroundColor(backgroundColor); } - final int backgroundColor = _appSettings.getTopBottomBarColor(); - toolbar.setBackgroundColor(backgroundColor); _cu.setStatusbarColor(this, backgroundColor); } diff --git a/app/src/main/java/net/gsantner/markor/activity/SettingsActivity.java b/app/src/main/java/net/gsantner/markor/activity/SettingsActivity.java index 93bd09d5e0..a854a1ce7b 100644 --- a/app/src/main/java/net/gsantner/markor/activity/SettingsActivity.java +++ b/app/src/main/java/net/gsantner/markor/activity/SettingsActivity.java @@ -225,7 +225,7 @@ protected void onPreferenceChanged(final SharedPreferences prefs, final String k } else if (eq(key, R.string.pref_key__ui_flat_top_bottom_bars)) { final Activity activity = getActivity(); if (activity instanceof MarkorBaseActivity) { - ((MarkorBaseActivity) activity).applyConfiguredBarBackgroundColors(); + ((MarkorBaseActivity) activity).applyActivityBarBackgroundColors(); } } else if (eq(key, R.string.pref_key__file_browser_show_dividers)) { _appSettings.setRecreateMainRequired(true); diff --git a/app/src/main/java/net/gsantner/markor/frontend/filebrowser/MarkorFileBrowserFactory.java b/app/src/main/java/net/gsantner/markor/frontend/filebrowser/MarkorFileBrowserFactory.java index 2beb7bb064..db3993f331 100644 --- a/app/src/main/java/net/gsantner/markor/frontend/filebrowser/MarkorFileBrowserFactory.java +++ b/app/src/main/java/net/gsantner/markor/frontend/filebrowser/MarkorFileBrowserFactory.java @@ -87,6 +87,7 @@ public static void updateFsViewerOpts(final GsFileBrowserOptions.Options opts, f opts.descriptionFormat = appSettings.getString(R.string.pref_key__file_description_format, ""); opts.primaryColor = appSettings.isFlatTopBottomBarColorEnabled() ? R.color.background : R.color.primary; + opts.showDividers = appSettings.isFileBrowserDividerEnabled(); final File downloads = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS); opts.addVirtualFile("Download", downloads, R.drawable.baseline_download_24); diff --git a/app/src/main/java/net/gsantner/markor/model/AppSettings.java b/app/src/main/java/net/gsantner/markor/model/AppSettings.java index 8a790a4972..9452e4b60d 100644 --- a/app/src/main/java/net/gsantner/markor/model/AppSettings.java +++ b/app/src/main/java/net/gsantner/markor/model/AppSettings.java @@ -733,7 +733,7 @@ public boolean isFileBrowserDividerEnabled() { return rcolor(R.color.background); } - public @ColorInt int getTopBottomBarColor() { + public @ColorInt int getConfiguredBarBackgroundColor() { return isFlatTopBottomBarColorEnabled() ? getUiBackgroundColor() : rcolor(R.color.primary); } diff --git a/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserDialog.java b/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserDialog.java index 97a0ddef7e..6498c9a3cc 100644 --- a/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserDialog.java +++ b/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserDialog.java @@ -174,7 +174,7 @@ public void onViewCreated(final View root, final @Nullable Bundle savedInstanceS root.setBackgroundColor(rcolor(_dopt.backgroundColor)); - GsFileBrowserFragment.addDivider(activity, _recyclerList); + GsFileBrowserFragment.addDivider(activity, _recyclerList, _dopt.showDividers); _recyclerList.setItemViewCacheSize(20); diff --git a/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserFragment.java b/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserFragment.java index 2bd1ddc586..d4a4d12207 100644 --- a/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserFragment.java +++ b/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserFragment.java @@ -118,7 +118,7 @@ public void onViewCreated(@NonNull View root, @Nullable Bundle savedInstanceStat } setDialogOptions(((FilesystemFragmentOptionsListener) activity).getFilesystemFragmentOptions(_dopt)); - addDivider(activity, _recyclerList); + addDivider(activity, _recyclerList, _dopt.showDividers); _filesystemViewerAdapter = new GsFileBrowserListAdapter(_dopt, activity); _recyclerList.setAdapter(_filesystemViewerAdapter); @@ -636,12 +636,12 @@ public MarkorContextUtils createContextUtilsInstance(Context context) { return new MarkorContextUtils(context); } - public static void addDivider(final Activity activity, final RecyclerView recyclerView) { + public static void addDivider(final Activity activity, final RecyclerView recyclerView, final boolean showDividers) { if (recyclerView == null || activity == null) { return; } - if (!AppSettings.get(activity).isFileBrowserDividerEnabled()) { + if (!showDividers) { return; } diff --git a/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserOptions.java b/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserOptions.java index c74a85a9b4..f1eba3c2c6 100644 --- a/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserOptions.java +++ b/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserOptions.java @@ -131,6 +131,8 @@ public static class Options { @ColorRes public int folderColor = 0; + public boolean showDividers = true; + public final Map storageMaps = new LinkedHashMap<>(); public final Map iconMaps = new HashMap<>(); public Collection favouriteFiles, recentFiles, popularFiles = null; diff --git a/app/src/main/res/layout/main__activity.xml b/app/src/main/res/layout/main__activity.xml index 57c64cfbff..4ff1dc9a07 100644 --- a/app/src/main/res/layout/main__activity.xml +++ b/app/src/main/res/layout/main__activity.xml @@ -66,11 +66,12 @@ 32dp 8dp 46dp - 56dp - 48dp + 24dp + 56dp + 42dp 16dp From 8766cc7a7587ad75d7841851d8e23f1da2535d54 Mon Sep 17 00:00:00 2001 From: Harshad Vedartham Date: Sun, 19 Apr 2026 20:28:35 -0700 Subject: [PATCH 6/8] Match main system nav bar to tab bar --- .../main/java/net/gsantner/markor/activity/MainActivity.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/net/gsantner/markor/activity/MainActivity.java b/app/src/main/java/net/gsantner/markor/activity/MainActivity.java index f52d58f674..84ae4e51bd 100644 --- a/app/src/main/java/net/gsantner/markor/activity/MainActivity.java +++ b/app/src/main/java/net/gsantner/markor/activity/MainActivity.java @@ -24,7 +24,6 @@ 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; @@ -151,7 +150,7 @@ public void onActivityFirstTimeVisible() { @Override public Integer getNewNavigationBarColor() { - return ContextCompat.getColor(this, R.color.primary); + return _appSettings.getConfiguredBarBackgroundColor(); } @Override From 5605ddb1be2fa2aaf8cf32f9610804ddaabf3cb0 Mon Sep 17 00:00:00 2001 From: Harshad Vedartham Date: Sun, 19 Apr 2026 20:50:02 -0700 Subject: [PATCH 7/8] Tint settings icons immediately --- .../markor/activity/SettingsActivity.java | 3 --- .../base/GsPreferenceFragmentBase.java | 26 ++++++++++--------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/net/gsantner/markor/activity/SettingsActivity.java b/app/src/main/java/net/gsantner/markor/activity/SettingsActivity.java index a854a1ce7b..2354de251b 100644 --- a/app/src/main/java/net/gsantner/markor/activity/SettingsActivity.java +++ b/app/src/main/java/net/gsantner/markor/activity/SettingsActivity.java @@ -12,7 +12,6 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.graphics.Color; import android.os.Build; import android.os.Bundle; import android.text.TextUtils; @@ -57,7 +56,6 @@ public static class RESULT { } public static int activityRetVal = RESULT.NOCHANGE; - private static int iconColor = Color.WHITE; protected Toolbar toolbar; @@ -72,7 +70,6 @@ public void onCreate(Bundle b) { // Custom code GsFontPreferenceCompat.additionalyCheckedFolder = new File(_appSettings.getNotebookDirectory(), ".app/fonts"); - iconColor = _cu.rcolor(this, R.color.primary_text); toolbar.setTitle(R.string.settings); setSupportActionBar(findViewById(R.id.toolbar)); toolbar.setNavigationIcon(getResources().getDrawable(R.drawable.ic_arrow_back_white_24dp)); diff --git a/app/src/main/java/net/gsantner/opoc/frontend/base/GsPreferenceFragmentBase.java b/app/src/main/java/net/gsantner/opoc/frontend/base/GsPreferenceFragmentBase.java index 22f2db85fc..21ebc48250 100644 --- a/app/src/main/java/net/gsantner/opoc/frontend/base/GsPreferenceFragmentBase.java +++ b/app/src/main/java/net/gsantner/opoc/frontend/base/GsPreferenceFragmentBase.java @@ -91,7 +91,6 @@ @SuppressWarnings({"WeakerAccess", "unused", "UnusedReturnValue"}) public abstract class GsPreferenceFragmentBase extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener, PreferenceFragmentCompat.OnPreferenceStartScreenCallback { - private static final int DEFAULT_ICON_TINT_DELAY = 200; protected boolean _isDividerVisible = false; // @@ -167,23 +166,27 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { // on bottom afterOnCreate(savedInstanceState, activity); + tintPreferenceIcons(); } - public final GsCallback.a1 updatePreferenceIcons = (frag) -> { + private void tintPreferenceIcons() { try { - View view = frag.getView(); final Integer color = getIconTintColor(); - if (view != null && color != null) { - Runnable r = () -> tintAllPrefIcons(frag, color); - for (long delayFactor : new int[]{1, 10, 50, 100, 500}) { - view.postDelayed(r, delayFactor * DEFAULT_ICON_TINT_DELAY); - } + if (color == null) { + return; + } + + tintAllPrefIcons(color); + + final View view = getView(); + if (view != null) { + view.post(() -> tintAllPrefIcons(color)); } } catch (Exception ignored) { } - }; + } - public void tintAllPrefIcons(PreferenceFragmentCompat preferenceFragment, @ColorInt int iconColor) { + public void tintAllPrefIcons(@ColorInt int iconColor) { tintPrefIconsRecursive(getPreferenceScreen(), iconColor); } @@ -231,7 +234,6 @@ protected int keyToStringResId(String keyAsString) { @Override public void onViewCreated(@NonNull final View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - updatePreferenceIcons.callback(this); if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { view.postDelayed(() -> { @@ -343,7 +345,7 @@ public void onStop() { public boolean onPreferenceStartScreen(PreferenceFragmentCompat preferenceFragmentCompat, PreferenceScreen preferenceScreen) { _prefScreenBackstack.add(getPreferenceScreen()); preferenceFragmentCompat.setPreferenceScreen(preferenceScreen); - updatePreferenceIcons.callback(this); + tintPreferenceIcons(); onPreferenceScreenChangedPriv(preferenceFragmentCompat, preferenceScreen); return true; } From 2f8decd13e587cd1015677c5ee62d26b7d4f2fb4 Mon Sep 17 00:00:00 2001 From: Harshad Vedartham Date: Sun, 17 May 2026 17:45:57 -0700 Subject: [PATCH 8/8] Polish todo and attachment dialogs --- .../format/todotxt/TodoTxtActionButtons.java | 56 ++++++++++++++++++- .../frontend/AttachLinkOrFileDialog.java | 28 ++++++++++ ...chment_dialog_action_button_background.xml | 5 ++ .../main/res/layout/select_path_dialog.xml | 25 +++++++-- app/src/main/res/values-night/colors.xml | 1 + app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/styles.xml | 2 + 7 files changed, 110 insertions(+), 8 deletions(-) create mode 100644 app/src/main/res/drawable/attachment_dialog_action_button_background.xml diff --git a/app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtActionButtons.java b/app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtActionButtons.java index 4c51992032..098cc32aca 100644 --- a/app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtActionButtons.java +++ b/app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtActionButtons.java @@ -13,9 +13,14 @@ import android.content.DialogInterface; import android.os.Bundle; import android.text.Editable; +import android.view.View; +import android.view.Window; +import android.view.WindowManager; +import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.StringRes; +import androidx.core.content.ContextCompat; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentActivity; @@ -492,19 +497,64 @@ public DateFragment setCalendar(Calendar calendar) { public DatePickerDialog onCreateDialog(final Bundle savedInstanceState) { super.onCreateDialog(savedInstanceState); - final DatePickerDialog dialog = new DatePickerDialog(getContext(), _listener, _year, _month, _day); + final Context context = requireContext(); + final int backgroundColor = ContextCompat.getColor(context, R.color.background); + final int primaryTextColor = ContextCompat.getColor(context, R.color.primary_text); + final DatePickerDialog dialog = new DatePickerDialog( + context, + R.style.Theme_AppCompat_DayNight_Dialog_Rounded, + _listener, + _year, + _month, + _day + ); + styleDatePicker(dialog, backgroundColor, primaryTextColor); if (_message != null && !_message.isEmpty()) { - dialog.setMessage(_message); + dialog.setTitle(_message); } if (_extraListener != null && _extraLabel != null && !_extraLabel.isEmpty()) { dialog.setButton(DialogInterface.BUTTON_NEUTRAL, _extraLabel, _extraListener); } + dialog.setOnShowListener(dialogInterface -> { + styleDatePicker(dialog, backgroundColor, primaryTextColor); + final Window win = dialog.getWindow(); + if (win != null) { + win.setBackgroundDrawableResource(R.drawable.rounded_corner_background); + win.setLayout(WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT); + } + }); + return dialog; } + private static void styleDatePicker(final DatePickerDialog dialog, final int backgroundColor, final int primaryTextColor) { + dialog.getDatePicker().setBackgroundColor(backgroundColor); + + setPlatformDatePickerViewColor(dialog, "date_picker_header", backgroundColor, primaryTextColor); + setPlatformDatePickerViewColor(dialog, "date_picker_header_year", backgroundColor, primaryTextColor); + setPlatformDatePickerViewColor(dialog, "date_picker_header_date", backgroundColor, primaryTextColor); + setPlatformDatePickerViewColor(dialog, "date_picker_header_day", backgroundColor, primaryTextColor); + } + + private static void setPlatformDatePickerViewColor( + final DatePickerDialog dialog, + final String name, + final int backgroundColor, + final int primaryTextColor + ) { + final int id = dialog.getContext().getResources().getIdentifier(name, "id", "android"); + final View view = id != 0 ? dialog.findViewById(id) : null; + if (view != null) { + view.setBackgroundColor(backgroundColor); + if (view instanceof TextView) { + ((TextView) view).setTextColor(primaryTextColor); + } + } + } + @Override public void onCreate(final Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -514,4 +564,4 @@ public void onCreate(final Bundle savedInstanceState) { } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/net/gsantner/markor/frontend/AttachLinkOrFileDialog.java b/app/src/main/java/net/gsantner/markor/frontend/AttachLinkOrFileDialog.java index 47db1d3b48..ab2d233087 100644 --- a/app/src/main/java/net/gsantner/markor/frontend/AttachLinkOrFileDialog.java +++ b/app/src/main/java/net/gsantner/markor/frontend/AttachLinkOrFileDialog.java @@ -10,6 +10,7 @@ package net.gsantner.markor.frontend; import android.app.Activity; +import android.content.res.ColorStateList; import android.content.Context; import android.content.DialogInterface; import android.text.Editable; @@ -24,6 +25,8 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; +import androidx.core.content.ContextCompat; +import androidx.core.widget.TextViewCompat; import androidx.fragment.app.FragmentManager; import net.gsantner.markor.R; @@ -97,10 +100,12 @@ public static void showInsertImageOrLinkDialog( final EditText inputPathName = view.findViewById(R.id.ui__select_path_dialog__name); final EditText inputPathUrl = view.findViewById(R.id.ui__select_path_dialog__url); final Button buttonBrowseFilesystem = view.findViewById(R.id.ui__select_path_dialog__browse_filesystem); + final Button buttonRecordAudio = view.findViewById(R.id.ui__select_path_dialog__record_audio); final Button buttonSearch = view.findViewById(R.id.ui__select_path_dialog__search); final Button buttonPictureGallery = view.findViewById(R.id.ui__select_path_dialog__gallery_picture); final Button buttonPictureCamera = view.findViewById(R.id.ui__select_path_dialog__camera_picture); final Button buttonPictureEdit = view.findViewById(R.id.ui__select_path_dialog__edit_picture); + styleActionButtons(activity, buttonBrowseFilesystem, buttonRecordAudio, buttonSearch, buttonPictureCamera, buttonPictureGallery, buttonPictureEdit); builder.setCancelable(true); builder.setNegativeButton(android.R.string.cancel, (di, b) -> di.dismiss()); @@ -140,6 +145,7 @@ public static void showInsertImageOrLinkDialog( browseType = InsertType.IMAGE_BROWSE; okType = InsertType.IMAGE_DIALOG; } else if (action == AUDIO_ACTION) { + buttonRecordAudio.setVisibility(View.VISIBLE); dialog.setTitle(R.string.audio); browseType = InsertType.AUDIO_BROWSE; okType = InsertType.AUDIO_DIALOG; @@ -153,6 +159,7 @@ public static void showInsertImageOrLinkDialog( final String ok = activity.getString(android.R.string.ok); dialog.setButton(DialogInterface.BUTTON_POSITIVE, ok, (di, b) -> _insertItem.callback(okType)); buttonBrowseFilesystem.setOnClickListener(v -> _insertItem.callback(browseType)); + buttonRecordAudio.setOnClickListener(v -> _insertItem.callback(InsertType.AUDIO_RECORDING)); buttonSearch.setOnClickListener(v -> _insertItem.callback(InsertType.LINK_SEARCH)); buttonPictureCamera.setOnClickListener(b -> _insertItem.callback(InsertType.IMAGE_CAMERA)); buttonPictureGallery.setOnClickListener(v -> _insertItem.callback(InsertType.IMAGE_GALLERY)); @@ -167,6 +174,27 @@ public static void showInsertImageOrLinkDialog( } } + private static void styleActionButtons(final Context context, final Button... buttons) { + final int textColor = ContextCompat.getColor(context, R.color.primary_text); + final ColorStateList textColorList = ColorStateList.valueOf(textColor); + final int horizontalPadding = dpToPx(context, 16); + final int verticalPadding = dpToPx(context, 10); + + for (Button button : buttons) { + button.setAllCaps(false); + button.setMinHeight(dpToPx(context, 48)); + button.setTextColor(textColorList); + button.setCompoundDrawablePadding(dpToPx(context, 12)); + button.setBackgroundResource(R.drawable.attachment_dialog_action_button_background); + button.setPadding(horizontalPadding, verticalPadding, horizontalPadding, verticalPadding); + TextViewCompat.setCompoundDrawableTintList(button, textColorList); + } + } + + private static int dpToPx(final Context context, final int dp) { + return Math.round(dp * context.getResources().getDisplayMetrics().density); + } + private enum InsertType { IMAGE_CAMERA, IMAGE_GALLERY, diff --git a/app/src/main/res/drawable/attachment_dialog_action_button_background.xml b/app/src/main/res/drawable/attachment_dialog_action_button_background.xml new file mode 100644 index 0000000000..90270016af --- /dev/null +++ b/app/src/main/res/drawable/attachment_dialog_action_button_background.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/layout/select_path_dialog.xml b/app/src/main/res/layout/select_path_dialog.xml index fb86df4477..d481a3ac5a 100644 --- a/app/src/main/res/layout/select_path_dialog.xml +++ b/app/src/main/res/layout/select_path_dialog.xml @@ -41,45 +41,60 @@ android:inputType="textUri|textMultiLine" android:maxLines="3" /> -