prevent show 1970 when focusing the paging item in fileman app (#2412)

* _ * fix map view button overlap
portapack-mayhem · Dec 7, 2024 · 989414d · 989414d
1 parent 509bda2
commit 989414d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git 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
@@ -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"};
 };