Merge pull request #20 from hellcp/emery

Emery support

Author: hellcp

app/package.json

@@ -1,13 +1,13 @@
 {
   "name": "Bobby",
   "author": "Rebble",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "keywords": [
     "pebble-app"
   ],
   "private": true,
   "dependencies": {
-    "pebble-clay": "^1.0.4",
+    "@rebble/clay": "^1.0.6",
     "pebble-events": "^1.2.0"
   },
   "pebble": {
@@ -21,7 +21,8 @@
     ],
     "targetPlatforms": [
       "basalt",
-      "diorite"
+      "diorite",
+      "emery"
     ],
     "watchapp": {
       "watchface": false
@@ -332,7 +333,8 @@
           "name": "MENU_ICON_ABOUT",
           "type": "bitmap",
           "targetPlatforms": [
-            "basalt"
+            "basalt",
+            "emery"
           ]
         },
         {
@@ -349,7 +351,8 @@
           "name": "MENU_ICON_ALARMS",
           "type": "bitmap",
           "targetPlatforms": [
-            "basalt"
+            "basalt",
+            "emery"
           ]
         },
         {
@@ -366,7 +369,8 @@
           "name": "MENU_ICON_FEEDBACK",
           "type": "bitmap",
           "targetPlatforms": [
-            "basalt"
+            "basalt",
+            "emery"
           ]
         },
         {
@@ -383,7 +387,8 @@
           "name": "MENU_ICON_LEGAL",
           "type": "bitmap",
           "targetPlatforms": [
-            "basalt"
+            "basalt",
+            "emery"
           ]
         },
         {
@@ -400,7 +405,8 @@
           "name": "MENU_ICON_QUOTA",
           "type": "bitmap",
           "targetPlatforms": [
-            "basalt"
+            "basalt",
+            "emery"
           ]
         },
         {
@@ -417,7 +423,8 @@
           "name": "MENU_ICON_REMINDERS",
           "type": "bitmap",
           "targetPlatforms": [
-            "basalt"
+            "basalt",
+            "emery"
           ]
         },
         {
@@ -434,7 +441,8 @@
           "name": "MENU_ICON_TIMERS",
           "type": "bitmap",
           "targetPlatforms": [
-            "basalt"
+            "basalt",
+            "emery"
           ]
         },
         {
@@ -482,7 +490,8 @@
           "type": "bitmap",
           "memoryFormat": "2BitPalette",
           "targetPlatforms": [
-            "basalt"
+            "basalt",
+            "emery"
           ]
         },
         {
@@ -503,6 +512,22 @@
           "file": "text/changelog/1.4.txt",
           "name": "CHANGELOG_1_4",
           "type": "raw"
+        },
+        {
+          "file": "fonts/GOTHIC_36.pbf",
+          "name": "FONT_GOTHIC_36",
+          "type": "raw",
+          "targetPlatforms": [
+            "emery"
+          ]
+        },
+        {
+          "file": "fonts/GOTHIC_36_BOLD.pbf",
+          "name": "FONT_GOTHIC_36_BOLD",
+          "type": "raw",
+          "targetPlatforms": [
+            "emery"
+          ]
         }
       ]
     }

app/resources/button_indicator~emery.png

@@ -0,0 +1,95 @@
+Copyright (c) 2026, AmberW (amberw26237@gmail.com),
+with Reserved Font Name GOTHIC_36 and GOTHIC_36_BOLD.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+

app/resources/fonts/GOTHIC_36.pbf

@@ -0,0 +1,6 @@
+# New Features
+Bobby has been updated! We have some new features:
+## Support for Content Size
+Bobby will now follow the same scale setting as your system notifications! You can change the scale in Settings -> Notiications -> Text Size.
+## Native Core Time 2 resolution
+With new hardware comes new Bobby! The interface has been adapted to work with the new Core Time 2 hardware, to make it easier and more pleasant to use your favourite assistant on it. Huge thanks to AmberW who provided the fonts needed for the large text size option and the title screen!

app/resources/fonts/GOTHIC_36_BOLD.pbf

@@ -15,6 +15,7 @@
  */
 
 #include "alarm_window.h"
+#include "../util/fonts.h"
 #include "../util/style.h"
 #include "../util/vector_sequence_layer.h"
 #include "../util/result_window.h"
@@ -86,20 +87,21 @@ static void prv_window_load(Window *window) {
   AlarmWindowData* data = window_get_user_data(window);
   Layer* root_layer = window_get_root_layer(window);
   GRect rect = layer_get_bounds(root_layer);
+  const FontsConfig *fonts = fonts_get_config();
   data->title_layer = btext_layer_create(GRect(0, STATUS_BAR_LAYER_HEIGHT, rect.size.w - ACTION_BAR_WIDTH, 70));
   if (data->name) {
     text_layer_set_text(data->title_layer, data->name);
   } else {
     text_layer_set_text(data->title_layer, data->is_timer ? "Time's up!" : "Alarm!");
   }
-  text_layer_set_font(data->title_layer, fonts_get_system_font(FONT_KEY_GOTHIC_28_BOLD));
+  text_layer_set_font(data->title_layer, fonts->title_font);
   text_layer_set_text_alignment(data->title_layer, GTextAlignmentCenter);
   text_layer_set_background_color(data->title_layer, GColorClear);
   layer_add_child(root_layer, (Layer *)data->title_layer);
   GSize title_size = text_layer_get_content_size(data->title_layer);
   int16_t remaining_height = rect.size.h - STATUS_BAR_LAYER_HEIGHT - title_size.h - 49;
-  data->time_layer = btext_layer_create(GRect(0, STATUS_BAR_LAYER_HEIGHT + title_size.h + remaining_height / 2 - 22 / 2, rect.size.w - ACTION_BAR_WIDTH, 32));
-  text_layer_set_font(data->time_layer, fonts_get_system_font(FONT_KEY_LECO_32_BOLD_NUMBERS));
+  data->time_layer = btext_layer_create(GRect(0, STATUS_BAR_LAYER_HEIGHT + title_size.h + remaining_height / 2 - 22 / 2, rect.size.w - ACTION_BAR_WIDTH, fonts->content_font_cap * 2));
+  text_layer_set_font(data->time_layer, fonts->content_font);
   text_layer_set_text_alignment(data->time_layer, GTextAlignmentCenter);
   text_layer_set_background_color(data->time_layer, GColorClear);
   layer_add_child(root_layer, (Layer *)data->time_layer);
@@ -263,4 +265,4 @@ static SadVibeScore *prv_load_vibe_score(bool is_timer) {
   }
   uint32_t resource_id = prv_resource_id_for_setting(vibe_setting);
   return sad_vibe_score_create_with_resource(resource_id);
-}
+}