Attempting to style for mobile

This commit is contained in:
2026-08-09 11:57:13 -05:00
parent 5c5bca6b3a
commit 6f6a92257a
3 changed files with 189 additions and 4 deletions

View File

@@ -14,7 +14,8 @@
android:label="Critterfolio" android:label="Critterfolio"
android:configChanges="orientation|screenSize|keyboardHidden" android:configChanges="orientation|screenSize|keyboardHidden"
android:exported="true" android:exported="true"
android:screenOrientation="fullSensor"> android:screenOrientation="fullSensor"
android:theme="@android:style/Theme.Black.NoTitleBar">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

View File

@@ -380,3 +380,126 @@ textarea {
.btn-submit:hover { .btn-submit:hover {
background-color: var(--accent-bright-green); background-color: var(--accent-bright-green);
} }
/* ===================================
Small Screen Media Queries
=================================== */
@media (max-width: 600dp) {
body {
padding: 12px;
font-size: 12pt;
}
#header {
padding: 10px 14px;
margin-bottom: 14px;
}
#header h1 {
font-size: 1.6em;
}
.header-tag {
font-size: 10pt;
}
#new-critter-btn {
height: 40px;
width: 40px;
font-size: 20pt;
}
.critter-list {
gap: 8px;
}
.critter-card {
padding: 8px 10px;
}
.critter-card-body {
gap: 10px;
}
.critter-thumb {
width: 40px;
height: 40px;
}
.critter-name {
font-size: 14pt;
}
.critter-id {
font-size: 9pt;
}
.pill {
font-size: 10pt;
padding: 1px 6px;
}
.btn-delete {
padding: 3px 8px;
font-size: 9pt;
}
.modal-content {
width: 94vw;
}
.modal-content-small {
width: 88vw;
}
.modal-header h2 {
font-size: 16pt;
}
.modal-body {
padding: 14px 16px;
gap: 10px;
}
.form-row {
flex-direction: column;
gap: 10px;
}
.form-group.half {
width: 100%;
}
.modal-content label {
font-size: 12pt;
}
.modal-buttons {
padding: 12px 16px;
}
.modal-buttons button {
min-width: 90px;
height: 38px;
font-size: 13pt;
}
.dialog-text {
font-size: 14pt;
}
}
@media (max-width: 380dp) {
#header h1 {
font-size: 1.3em;
}
.critter-name {
font-size: 12pt;
}
.info-pills {
flex-direction: column;
gap: 4px;
}
}

View File

@@ -14,6 +14,7 @@
#include <iostream> #include <iostream>
#include <map> #include <map>
#include <vector> #include <vector>
static bool is_initalized = false; static bool is_initalized = false;
static bool is_running = false; static bool is_running = false;
static Rml::Context *ctx = nullptr; static Rml::Context *ctx = nullptr;
@@ -22,48 +23,85 @@ static std::vector<CritterEntry> critter_list;
static Rml::ElementDocument *doc; static Rml::ElementDocument *doc;
static AppData app_data; static AppData app_data;
static SDLFileInterface file_interface; static SDLFileInterface file_interface;
void shutdown() { void shutdown() {
Rml::Shutdown(); Rml::Shutdown();
Backend::Shutdown(); Backend::Shutdown();
SDL_Quit(); SDL_Quit();
} }
bool initialize() { bool initialize() {
if (!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS)) { if (!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS)) {
std::cout << "[ERROR] Failed to initialize SDL3: " << SDL_GetError() << "\n"; std::cout << "[ERROR] Failed to initialize SDL3: " << SDL_GetError() << "\n";
return false; return false;
} }
if (!Backend::Initialize("CritterFolio", 800, 600, true)) { if (!Backend::Initialize("CritterFolio", 800, 600, true)) {
std::cout << "[ERROR] Failed to initialize backend.\n"; std::cout << "[ERROR] Failed to initialize backend.\n";
return false; return false;
} }
std::cout << "[INFO] RmlUI Backend initialized.\n"; std::cout << "[INFO] RmlUI Backend initialized.\n";
Rml::SetSystemInterface(Backend::GetSystemInterface()); Rml::SetSystemInterface(Backend::GetSystemInterface());
Rml::SetRenderInterface(Backend::GetRenderInterface()); Rml::SetRenderInterface(Backend::GetRenderInterface());
Rml::SetFileInterface(&file_interface); Rml::SetFileInterface(&file_interface);
Rml::Initialise(); Rml::Initialise();
Rml::Lua::Initialise(); Rml::Lua::Initialise();
std::cout << "[INFO] Preparing local DB...\n"; std::cout << "[INFO] Preparing local DB...\n";
if (!ensure_db_copied()) { if (!ensure_db_copied()) {
std::cout << "[ERROR] Could not prepare local DB.\n"; std::cout << "[ERROR] Could not prepare local DB.\n";
return false; return false;
} }
std::cout << "[INFO] Loading local DB...\n"; std::cout << "[INFO] Loading local DB...\n";
if (!db_get_all_critters(critters)) { if (!db_get_all_critters(critters)) {
std::cout << "[ERROR] Local DB failed to initialize.\n"; std::cout << "[ERROR] Local DB failed to initialize.\n";
return false; return false;
} }
std::cout << "[INFO] Local DB initialized.\n"; std::cout << "[INFO] Local DB initialized.\n";
sync_map_to_list(critters, critter_list); sync_map_to_list(critters, critter_list);
ctx = Rml::CreateContext("main", Rml::Vector2i(800, 600));
int window_width = 800;
int window_height = 600;
{
int window_count = 0;
SDL_Window **windows = SDL_GetWindows(&window_count);
if (windows && window_count > 0) {
SDL_GetWindowSize(windows[0], &window_width, &window_height);
}
SDL_free(windows);
}
ctx = Rml::CreateContext("main", Rml::Vector2i(window_width, window_height));
std::cout << "[INFO] Context created at " << window_width << "x" << window_height << "\n";
{
int window_count = 0;
SDL_Window **windows = SDL_GetWindows(&window_count);
if (windows && window_count > 0) {
float display_scale = SDL_GetWindowDisplayScale(windows[0]);
ctx->SetDensityIndependentPixelRatio(display_scale);
SDL_Log("Display scale (dp ratio): %f", display_scale);
}
SDL_free(windows);
}
SDL_Log("Context created at %dx%d", window_width, window_height);
if (!ctx) { if (!ctx) {
std::cout << "[ERROR] Failed to create context.\n"; std::cout << "[ERROR] Failed to create context.\n";
return false; return false;
} }
std::cout << "[INFO] Main context initialized.\n"; std::cout << "[INFO] Main context initialized.\n";
Rml::LoadFontFace("./assets/fonts/Hubballi-Regular.ttf"); Rml::LoadFontFace("./assets/fonts/Hubballi-Regular.ttf");
Rml::Debugger::Initialise(ctx); Rml::Debugger::Initialise(ctx);
return true; return true;
} }
bool load_document() { bool load_document() {
doc = ctx->LoadDocument("./assets/main.rml"); doc = ctx->LoadDocument("./assets/main.rml");
if (!doc) { if (!doc) {
@@ -75,6 +113,7 @@ bool load_document() {
doc->Show(); doc->Show();
return true; return true;
} }
bool reload_doc() { bool reload_doc() {
if (doc) { if (doc) {
Rml::Factory::ClearStyleSheetCache(); Rml::Factory::ClearStyleSheetCache();
@@ -87,6 +126,7 @@ bool reload_doc() {
} }
return true; return true;
} }
bool f5_was_pressed = false; bool f5_was_pressed = false;
bool f8_was_pressed = false; bool f8_was_pressed = false;
void handle_input() { void handle_input() {
@@ -109,8 +149,10 @@ void handle_input() {
} }
} }
} }
int main(int arc, char *argv[]) { int main(int arc, char *argv[]) {
std::cout << "[INFO] Starting CritterFolio...\n"; std::cout << "[INFO] Starting CritterFolio...\n";
is_initalized = initialize(); is_initalized = initialize();
if (!is_initalized) { if (!is_initalized) {
std::cout << "[ERROR] Failed to initialize, shutting down.\n"; std::cout << "[ERROR] Failed to initialize, shutting down.\n";
@@ -118,25 +160,44 @@ int main(int arc, char *argv[]) {
return 1; return 1;
} }
is_running = true; is_running = true;
Rml::DataModelHandle app_data_handle; Rml::DataModelHandle app_data_handle;
if (!setup_data_binding(ctx, app_data_handle, app_data, critter_list, critters)) { if (!setup_data_binding(ctx, app_data_handle, app_data, critter_list, critters)) {
shutdown(); shutdown();
return 1; return 1;
} }
if (!load_document()) { if (!load_document()) {
shutdown(); shutdown();
return 1; return 1;
} }
std::cout << "[INFO] Main page loaded.\n"; std::cout << "[INFO] Main page loaded.\n";
while (is_running) { while (is_running) {
is_running = Backend::ProcessEvents(ctx); is_running = Backend::ProcessEvents(ctx);
{
int window_count = 0;
SDL_Window **windows = SDL_GetWindows(&window_count);
if (windows && window_count > 0) {
int current_width = 0, current_height = 0;
SDL_GetWindowSize(windows[0], &current_width, &current_height);
if (Rml::Vector2i(current_width, current_height) != ctx->GetDimensions()) {
ctx->SetDimensions(Rml::Vector2i(current_width, current_height));
}
}
SDL_free(windows);
}
handle_input(); handle_input();
ctx->Update(); ctx->Update();
Backend::BeginFrame(); Backend::BeginFrame();
ctx->Render(); ctx->Render();
Backend::PresentFrame(); Backend::PresentFrame();
} }
shutdown(); shutdown();
return 0; return 0;
} }