diff --git a/android/assets/themes/theme.list b/android/assets/themes/theme.list index d840edc..4c026ff 100644 --- a/android/assets/themes/theme.list +++ b/android/assets/themes/theme.list @@ -1,6 +1,7 @@ default dark darcula +winter solarized-light solarized-dark underwater diff --git a/android/assets/themes/winter.theme b/android/assets/themes/winter.theme new file mode 100644 index 0000000..8924a3f --- /dev/null +++ b/android/assets/themes/winter.theme @@ -0,0 +1,26 @@ +{ + "name": "Winter", + "price": 50, + "colors": { + "background": "81b9b7ff", + "foreground": "ffffffff", + "buttons": [ + "1e9dc8ff", + "00e0ffff", + "2fdbdbff", + "51a0e9ff" + ], + "empty_cell": "4085bfff", + "cells": [ + "d0defbff", "bddedcff", "d9ecf8ff", + "d9f7fcff", "cbe6f1ff", "dfeff2ff", "d9eaf0ff", + "c1dfeaff", "ccdeeaff" + ], + "current_score": "165456ff", + "high_score": "633ad2ff", + "bonus": "103caaff", + "band": "0c2e3cff", + "text": "ffffffff" + }, + "cell_texture": "snowflake.png" +} diff --git a/android/assets/ui/x0.75/cells/snowflake.png b/android/assets/ui/x0.75/cells/snowflake.png new file mode 100644 index 0000000..eb64149 Binary files /dev/null and b/android/assets/ui/x0.75/cells/snowflake.png differ diff --git a/android/assets/ui/x1.0/cells/snowflake.png b/android/assets/ui/x1.0/cells/snowflake.png new file mode 100644 index 0000000..a162b55 Binary files /dev/null and b/android/assets/ui/x1.0/cells/snowflake.png differ diff --git a/android/assets/ui/x1.25/cells/snowflake.png b/android/assets/ui/x1.25/cells/snowflake.png new file mode 100644 index 0000000..2019832 Binary files /dev/null and b/android/assets/ui/x1.25/cells/snowflake.png differ diff --git a/android/assets/ui/x1.5/cells/snowflake.png b/android/assets/ui/x1.5/cells/snowflake.png new file mode 100644 index 0000000..c76c5c9 Binary files /dev/null and b/android/assets/ui/x1.5/cells/snowflake.png differ diff --git a/android/assets/ui/x2.0/cells/snowflake.png b/android/assets/ui/x2.0/cells/snowflake.png new file mode 100644 index 0000000..7055273 Binary files /dev/null and b/android/assets/ui/x2.0/cells/snowflake.png differ diff --git a/android/assets/ui/x4.0/cells/snowflake.png b/android/assets/ui/x4.0/cells/snowflake.png new file mode 100644 index 0000000..cdeb76b Binary files /dev/null and b/android/assets/ui/x4.0/cells/snowflake.png differ diff --git a/original-resources/buttons.svg b/original-resources/buttons.svg index 3bb5be3..0111607 100644 --- a/original-resources/buttons.svg +++ b/original-resources/buttons.svg @@ -15,7 +15,7 @@ viewBox="0 0 500.00001 500.00001" id="svg2" version="1.1" - inkscape:version="0.92.1 r" + inkscape:version="0.92.2 5c3e80d, 2017-08-06" sodipodi:docname="buttons.svg"> @@ -152,9 +152,9 @@ borderopacity="1" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="0.5" - inkscape:cx="-85.026722" - inkscape:cy="8.3628693" + inkscape:zoom="0.70710678" + inkscape:cx="262.74365" + inkscape:cy="334.23276" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -1241,5 +1241,137 @@ inkscape:connector-curvature="0" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/original-resources/gen-ui-png.py b/original-resources/gen-ui-png.py index cd66144..8b64f41 100755 --- a/original-resources/gen-ui-png.py +++ b/original-resources/gen-ui-png.py @@ -43,7 +43,8 @@ cells = [ 'basic', 'bubble', 'ghost', - 'drop' + 'drop', + 'snowflake' ] inkscape_default_dpi = 90 @@ -54,7 +55,7 @@ gen_only = sys.argv[1:] for multiplier in multipliers: folder = os.path.join(root, f'x{multiplier}') os.makedirs(folder, exist_ok=True) - + dpi = int(inkscape_default_dpi * multiplier) print('Generating assets for', folder) for objectid in ids: @@ -68,7 +69,7 @@ for multiplier in multipliers: # -d to specify the DPI run(f'inkscape -z -i{objectid} -j -e{filename} -d{dpi} {svg}', shell=True, stdout=DEVNULL) - + folder = os.path.join(folder, 'cells') os.makedirs(folder, exist_ok=True) for cellid in cells: diff --git a/themes/create-theme.html b/themes/create-theme.html index 40e3e84..b700387 100644 --- a/themes/create-theme.html +++ b/themes/create-theme.html @@ -56,9 +56,10 @@ code {