Browse Source

Update icons, readme

master
Macoy Madson 1 year ago
parent
commit
5831b81a50
  1. BIN
      Android/app/src/main/res/mipmap-hdpi/ic_launcher.png
  2. BIN
      Android/app/src/main/res/mipmap-mdpi/ic_launcher.png
  3. BIN
      Android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
  4. BIN
      Android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
  5. BIN
      Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
  6. 7
      Build_Android.sh
  7. 12
      ReadMe.org
  8. 14
      UpdateIcon.sh
  9. BIN
      assets/Icon.png
  10. BIN
      assets/Icon.xcf
  11. BIN
      assets/Win.xcf
  12. 3
      src/Main.cake

BIN
Android/app/src/main/res/mipmap-hdpi/ic_launcher.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
Android/app/src/main/res/mipmap-mdpi/ic_launcher.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
Android/app/src/main/res/mipmap-xhdpi/ic_launcher.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
Android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 13 KiB

7
Build_Android.sh

@ -1,7 +1,10 @@
#!/bin/sh
echo "Building normally (important for copying files)"
sh ./Build.sh
sh ./Build.sh || exit $?
echo "Creating symlink to SDL in Android/app/jni"
ln -s $(pwd)/Dependencies/gamelib/Dependencies/SDL $(pwd)/Android/app/jni/SDL
ln -s $(pwd)/Dependencies/gamelib/Dependencies/SDL $(pwd)/Android/app/jni/SDL || exit $?
cd Android
./gradlew installDebug || exit $?

12
ReadMe.org

@ -112,3 +112,15 @@ An example board:
#+BEGIN_SRC C
60 IBBxooIooLDDJAALooJoKEEMFFKooMGGHHHM 2332
#+END_SRC
* Licensing and 3rd party
Kitty Gridlock is copyright (C) 2021 Macoy Madson. Licensed under ~GPL-3.0-or-later~. Art made by Macoy and V.
Kitty Gridlock uses the following 3rd-party code:
- [[http://libsdl.org/][SDL2]], [[https://www.libsdl.org/license.php][Zlib license]]
- [[https://github.com/HandmadeMath/Handmade-Math][Handmade Math]], public domain
During build time only:
- [[http://www.landley.net/code/][bunzip]] by Rob Landley, under LGPL v2
- [[https://www.michaelfogleman.com/rush/][Michael Fogleman's Rush Hour database]] is used to generate a list of puzzles. The code to generate the database is MIT Licensed, but the database itself is ambiguously licensed as far as I can tell (which I should reach out and get clarification on, but have yet to do so)
Kitty Gridlock is built atop my [[https://macoy.me/code/macoy/cakelisp/][Cakelisp]] and [[https://macoy.me/code/macoy/gamelib][GameLib]] tools, both ~GPL-3.0-or-later~.

14
UpdateIcon.sh

@ -1,12 +1,12 @@
#!/bin/sh
SRC_IMAGE=com.macoy.kitty-gridlock/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
# SRC_IMAGE=com.macoy.kitty-gridlock/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
SRC_IMAGE=assets/Icon.png
echo "Updating icons in com.macoy.kitty-gridlock/app/src/main/res/ based on $SRC_IMAGE"
convert $SRC_IMAGE -resize 72x72 com.macoy.kitty-gridlock/app/src/main/res/mipmap-hdpi/ic_launcher.png
convert $SRC_IMAGE -resize 48x48 com.macoy.kitty-gridlock/app/src/main/res/mipmap-mdpi/ic_launcher.png
convert $SRC_IMAGE -resize 96x96 com.macoy.kitty-gridlock/app/src/main/res/mipmap-xhdpi/ic_launcher.png
convert $SRC_IMAGE -resize 142x142 com.macoy.kitty-gridlock/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
# Don't need to convert base image (leaving this here in case base image changes)
# convert -resize 192x192 com.macoy.kitty-gridlock/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
convert $SRC_IMAGE -resize 72x72 Android/app/src/main/res/mipmap-hdpi/ic_launcher.png
convert $SRC_IMAGE -resize 48x48 Android/app/src/main/res/mipmap-mdpi/ic_launcher.png
convert $SRC_IMAGE -resize 96x96 Android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
convert $SRC_IMAGE -resize 142x142 Android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
convert $SRC_IMAGE -resize 192x192 Android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png

BIN
assets/Icon.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
assets/Icon.xcf

Binary file not shown.

BIN
assets/Win.xcf

Binary file not shown.

3
src/Main.cake

@ -1193,6 +1193,9 @@ Rush Hour database from Michael Fogleman.\n\n")
(return false))
(return true))
;; Because we have the list of modules from manager, we could actually generate the Android.mk file
;; in ../../Android/app/jni/src/ so that it automatically adds modules we import. For now I won't
;; do that, but a much bigger project would be well served by such a feature.
(defun-comptime copy-src-files-to-android (manager (& ModuleManager) module (* Module) &return bool)
(Log "copy-src-files-to-android: Copying files to SDL Android project\n")
(run-process-sequential-or

Loading…
Cancel
Save