From 989414d4dfc32063a914dded1f5c0a2dd076abfd Mon Sep 17 00:00:00 2001
From: sommermorgentraum <24917424+zxkmm@users.noreply.github.com>
Date: Sat, 7 Dec 2024 20:13:06 +0800
Subject: [PATCH] prevent show 1970 when focusing the paging item in fileman
 app (#2412)

* _

* fix map view button overlap
---
 firmware/application/apps/ui_fileman.cpp | 13 ++++++++++---
 firmware/application/ui/ui_geomap.hpp    |  2 +-
 2 files changed, 11 insertions(+), 4 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("");
+            }
         }
     };
 
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"};
 };