diff --git a/.gitignore b/.gitignore index 5509140..bb88266 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.DS_Store +out/* diff --git a/source/itbl-sdk/ItblFonts/SourceSansPro-Bold.ttf b/source/itbl-sdk/ItblFonts/SourceSansPro-Bold.ttf deleted file mode 100644 index b8879af..0000000 Binary files a/source/itbl-sdk/ItblFonts/SourceSansPro-Bold.ttf and /dev/null differ diff --git a/source/itbl-sdk/ItblFonts/SourceSansPro-Regular.ttf b/source/itbl-sdk/ItblFonts/SourceSansPro-Regular.ttf deleted file mode 100644 index 98e8579..0000000 Binary files a/source/itbl-sdk/ItblFonts/SourceSansPro-Regular.ttf and /dev/null differ diff --git a/source/itbl-sdk/ItblImages/assets/poster_fhd.png b/source/itbl-sdk/ItblImages/assets/poster_fhd.png deleted file mode 100644 index 38ee3f7..0000000 Binary files a/source/itbl-sdk/ItblImages/assets/poster_fhd.png and /dev/null differ diff --git a/source/itbl-sdk/ItblImages/assets/poster_hd.png b/source/itbl-sdk/ItblImages/assets/poster_hd.png deleted file mode 100644 index 773b6ed..0000000 Binary files a/source/itbl-sdk/ItblImages/assets/poster_hd.png and /dev/null differ diff --git a/source/itbl-sdk/ItblImages/assets/poster_sd.png b/source/itbl-sdk/ItblImages/assets/poster_sd.png deleted file mode 100644 index c8da4a7..0000000 Binary files a/source/itbl-sdk/ItblImages/assets/poster_sd.png and /dev/null differ diff --git a/source/itbl-sdk/ItblImages/assets/splash_fhd.png b/source/itbl-sdk/ItblImages/assets/splash_fhd.png deleted file mode 100644 index 9b37572..0000000 Binary files a/source/itbl-sdk/ItblImages/assets/splash_fhd.png and /dev/null differ diff --git a/source/itbl-sdk/ItblImages/assets/splash_hd.png b/source/itbl-sdk/ItblImages/assets/splash_hd.png deleted file mode 100644 index c328ded..0000000 Binary files a/source/itbl-sdk/ItblImages/assets/splash_hd.png and /dev/null differ diff --git a/source/itbl-sdk/ItblImages/assets/splash_sd.png b/source/itbl-sdk/ItblImages/assets/splash_sd.png deleted file mode 100644 index a9fa7ce..0000000 Binary files a/source/itbl-sdk/ItblImages/assets/splash_sd.png and /dev/null differ diff --git a/source/itbl-sdk/ItblImages/brand/logo.png b/source/itbl-sdk/ItblImages/brand/logo.png deleted file mode 100644 index 5c7a680..0000000 Binary files a/source/itbl-sdk/ItblImages/brand/logo.png and /dev/null differ diff --git a/source/itbl-sdk/ItblImages/focus/loader.png b/source/itbl-sdk/ItblImages/focus/loader.png deleted file mode 100644 index 6e2ac8c..0000000 Binary files a/source/itbl-sdk/ItblImages/focus/loader.png and /dev/null differ diff --git a/source/itbl-sdk/ItblImages/overlay/Overlay.png b/source/itbl-sdk/ItblImages/overlay/Overlay.png deleted file mode 100644 index dc8c217..0000000 Binary files a/source/itbl-sdk/ItblImages/overlay/Overlay.png and /dev/null differ diff --git a/source/itbl-sdk/ItblImages/overlay/full_drop.png b/source/itbl-sdk/ItblImages/overlay/full_drop.png deleted file mode 100644 index 4da1170..0000000 Binary files a/source/itbl-sdk/ItblImages/overlay/full_drop.png and /dev/null differ diff --git a/source/itbl-sdk/components/ItblCustomDialog.brs b/source/itbl-sdk/components/ItblCustomDialog.brs index d52e718..aba8636 100644 --- a/source/itbl-sdk/components/ItblCustomDialog.brs +++ b/source/itbl-sdk/components/ItblCustomDialog.brs @@ -17,8 +17,8 @@ sub setLocals() m.focusedIndex = 0 m.defaultTheme = { "backgroundColor" : "#1C1C1C" - "defaultBoldFont" : "pkg:/ItblFonts/SourceSansPro-Bold.ttf" - "defaultRegularFont": "pkg:/ItblFonts/SourceSansPro-Regular.ttf", + "defaultBoldFont" : "font:MediumBoldSystemFont" + "defaultRegularFont": "font:MediumSystemFont" "buttonBorderColor": "0xFFFFFF" "buttonColorFocused": "0xB30041" "buttonTextColorFocused": "0xFFFFFF" @@ -142,10 +142,10 @@ function CreateLabel(labelText as string, fontSize as integer, labelFont as obje label.width = m.width if labelFont <> invalid and FileExists(labelFont) fontPath = labelFont + font = CreateFont(fontPath, fontSize) else - fontPath = defaultFont + font = defaultFont end if - font = CreateFont(fontPath, fontSize) label.font = font return label end function @@ -164,13 +164,12 @@ function CreateButton(id as string, item as object, fontSize as integer, dialogB if buttonColorUnFocused = invalid or buttonColorUnFocused = "" then buttonColorUnFocused = m.defaultTheme.buttonColorUnFocused if buttonTextColorFocused = invalid or buttonTextColorFocused = "" then buttonTextColorFocused = m.defaultTheme.buttonTextColorFocused if buttonTextColorUnFocused = invalid or buttonTextColorUnFocused = "" then buttonTextColorUnFocused = m.defaultTheme.buttonTextColorUnFocused - if dialogButtonFont <> invalid and FileExists(dialogButtonFont) fontPath = dialogButtonFont + font = CreateFont(fontPath, fontSize) else - fontPath = defaultFont + font = defaultFont end if - font = CreateFont(fontPath, fontSize) borderData = { "height" : m.buttonHeight, "width" : m.width, @@ -178,10 +177,11 @@ function CreateButton(id as string, item as object, fontSize as integer, dialogB "buttonBorderColor" : buttonBorderColor, "buttonColorFocused" : buttonColorFocused, "buttonColorUnFocused" : buttonColorUnFocused, - "buttonTextColorUnFocused" : buttonTextColorFocused, + "buttonTextColorFocused" : buttonTextColorFocused, "buttonTextColorUnFocused" : buttonTextColorUnFocused "font" : font } + print "borderData "borderData button = CreateObject("roSGNode", "ItblButton") button.id = id button.buttonText = item.buttonText diff --git a/source/itbl-sdk/manifest b/source/itbl-sdk/manifest index 90d198a..d6a4ec9 100644 --- a/source/itbl-sdk/manifest +++ b/source/itbl-sdk/manifest @@ -1,5 +1,4 @@ title=Itbl SDK -subtitle=Itbl SDK major_version=1 minor_version=1 build_version=0 diff --git a/test-app/source/itbl-sdk.zip b/test-app/source/itbl-sdk.zip index 4f943f2..860758b 100644 Binary files a/test-app/source/itbl-sdk.zip and b/test-app/source/itbl-sdk.zip differ