From 98122f73f013a2d581b91599083f20288aeedb70 Mon Sep 17 00:00:00 2001 From: zxkmm Date: Sat, 7 Dec 2024 17:53:45 +0800 Subject: [PATCH 1/2] _ --- firmware/application/apps/ui_fileman.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/firmware/application/apps/ui_fileman.cpp b/firmware/application/apps/ui_fileman.cpp index e0ea09ecd..bcc80fd8d 100644 --- a/firmware/application/apps/ui_fileman.cpp +++ b/firmware/application/apps/ui_fileman.cpp @@ -751,10 +751,17 @@ FileManagerView::FileManagerView( text_date.set("Too many files!"); } else { text_date.set_style(Theme::getInstance()->fg_medium); - if (selected_is_valid()) - text_date.set((is_directory(get_selected_full_path()) ? "Created " : "Modified ") + to_string_FAT_timestamp(file_created_date(get_selected_full_path()))); - else + if (selected_is_valid()) { + if (get_selected_entry().path == str_back) { + text_date.set("Go page " + std::to_string(pagination + 1 - 1)); // for better explain, pagination start with 0 AKA real page - 1 + } else if (get_selected_entry().path == str_next) { + text_date.set("Go page " + std::to_string(pagination + 1 + 1)); // when show this, it should display current AKA (pagination + 1) + 1 AKA next page + } else { + text_date.set((is_directory(get_selected_full_path()) ? "Created " : "Modified ") + to_string_FAT_timestamp(file_created_date(get_selected_full_path()))); + } + } else { text_date.set(""); + } } }; From d296e48b40d510f3c098029cd95fde154f3ba91d Mon Sep 17 00:00:00 2001 From: zxkmm Date: Sat, 7 Dec 2024 19:51:51 +0800 Subject: [PATCH 2/2] fix map view button overlap --- firmware/application/ui/ui_geomap.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/application/ui/ui_geomap.hpp b/firmware/application/ui/ui_geomap.hpp index 8133d1156..772efedac 100644 --- a/firmware/application/ui/ui_geomap.hpp +++ b/firmware/application/ui/ui_geomap.hpp @@ -344,7 +344,7 @@ class GeoMapView : public View { {0, GeoMap::banner_height, GeoMap::geomap_rect_width, GeoMap::geomap_rect_height}}; Button button_ok{ - {20 * 8, 8, 8 * 8, 2 * 16}, + {screen_width - 15 * 8, 0, 15 * 8, 1 * 16}, "OK"}; };