Use universal themese scaled according to DPI_MUL

* Resolution-specific themes are still supported

Author: Tasssadar

Android.mk

@@ -17,6 +17,8 @@ LOCAL_SRC_FILES:= \
     pong.c \
     progressdots.c \
     multirom_ui_themes.c \
+    themes/multirom_ui_landscape.c \
+    themes/multirom_ui_portrait.c \
     fstab.c
 
 ifeq ($(ARCH_ARM_HAVE_NEON),true)
@@ -52,14 +54,17 @@ LOCAL_SRC_FILES += input_$(MR_INPUT_TYPE).c
 
 ifeq ($(DEVICE_RESOLUTION),)
     $(info DEVICE_RESOLUTION was not specified)
+else ifneq ($(wildcard $(multirom_local_path)/themes/multirom_ui_$(DEVICE_RESOLUTION).c),)
+    LOCAL_SRC_FILES += themes/multirom_ui_$(DEVICE_RESOLUTION).c
+    LOCAL_CFLAGS += -DMULTIROM_THEME_$(DEVICE_RESOLUTION)
 endif
-LOCAL_SRC_FILES += themes/multirom_ui_$(DEVICE_RESOLUTION).c
-LOCAL_CFLAGS += -DMULTIROM_THEME_$(DEVICE_RESOLUTION)
 
 ifneq ($(LANDSCAPE_RESOLUTION),)
+ifneq ($(wildcard $(multirom_local_path)/themes/multirom_ui_$(LANDSCAPE_RESOLUTION).c),)
     LOCAL_SRC_FILES += themes/multirom_ui_$(LANDSCAPE_RESOLUTION).c
     LOCAL_CFLAGS += -DMULTIROM_THEME_$(LANDSCAPE_RESOLUTION)
 endif
+endif
 ifneq ($(TW_DEFAULT_ROTATION),)
     MULTIROM_DEFAULT_ROTATION := $(TW_DEFAULT_ROTATION)
 endif

multirom_ui_themes.c

@@ -19,6 +19,7 @@
 #include "multirom_ui_themes.h"
 #include "multirom.h"
 #include "util.h"
+#include "log.h"
 
 multirom_themes_info *multirom_ui_init_themes(void)
 {
@@ -31,18 +32,9 @@ multirom_themes_info *multirom_ui_init_themes(void)
     extern struct multirom_theme theme_info_ ## RES; \
     list_add(&theme_info_ ## RES, &i->themes);
 
-#ifdef MULTIROM_THEME_800x1280
-    ADD_THEME(800x1280);
-#endif
-#ifdef MULTIROM_THEME_1280x800
-    ADD_THEME(1280x800);
-#endif
-#ifdef MULTIROM_THEME_1200x1920
-    ADD_THEME(1200x1920);
-#endif
-#ifdef MULTIROM_THEME_1920x1200
-    ADD_THEME(1920x1200);
-#endif
+    // universal themes which scale according to DPI_MUL
+    ADD_THEME(landscape);
+    ADD_THEME(portrait);
     return i;
 }
 
@@ -58,10 +50,21 @@ multirom_theme *multirom_ui_select_theme(multirom_themes_info *i, int w, int h)
     if(i->themes == NULL)
         return NULL;
 
+    multirom_theme *universal = NULL;
+    const int uni_type = (w > h) ? TH_LANDSCAPE : TH_PORTRAIT;
+
     multirom_theme **itr;
     for(itr = i->themes; *itr; ++itr)
+    {
         if((*itr)->width == w && (*itr)->height == h)
             return *itr;
 
-    return NULL;
+        if((*itr)->width == uni_type)
+            universal = *itr;
+    }
+
+    if(universal)
+        INFO("Using universal theme (%d)\n", uni_type);
+
+    return universal;
 }

multirom_ui_themes.h

@@ -23,6 +23,11 @@
 #include "progressdots.h"
 #include "listview.h"
 
+// universal themes has these as width and height,
+// instead of real resolution
+#define TH_PORTRAIT  (-1)
+#define TH_LANDSCAPE (-2)
+
 typedef struct 
 {
     listview *list;
@@ -52,8 +57,8 @@ typedef struct
 
 struct multirom_theme
 {
-    uint16_t width;
-    uint16_t height;
+    int16_t width;
+    int16_t height;
 
     void (*destroy)(multirom_theme_data *t);
     void (*init_header)(multirom_theme_data *t);