androidsoft-org · drzraf · Apr 16, 2017
diff --git a/src/main/java/org/androidsoft/games/memory/kids/ui/MainActivity.java b/src/main/java/org/androidsoft/games/memory/kids/ui/MainActivity.java
@@ -74,8 +74,18 @@ public class MainActivity extends AbstractMainActivity implements Memory.OnMemor
         R.drawable.tux_27, R.drawable.tux_28, R.drawable.tux_29, R.drawable.tux_30,
         R.drawable.tux_31, R.drawable.tux_32, R.drawable.tux_33
     };
+
+    private static final int[] tiles_animals =
+    {
+	R.drawable.animals_antelope, R.drawable.animals_bear,     R.drawable.animals_biene,       R.drawable.animals_butterfly,
+	R.drawable.animals_chicken,  R.drawable.animals_chipmunk, R.drawable.animals_cow,         R.drawable.animals_crab,
+	R.drawable.animals_crow,     R.drawable.animals_dolphin,  R.drawable.animals_dragonfly,   R.drawable.animals_elephant,
+	R.drawable.animals_fish,     R.drawable.animals_frog,     R.drawable.animals_grasshopper, R.drawable.animals_jaguar,
+	R.drawable.animals_kangaroo, R.drawable.animals_pferd,    R.drawable.animals_pigeon,      R.drawable.animals_schwein,
+	R.drawable.animals_seahorse, R.drawable.animals_snail,    R.drawable.animals_starfish,    R.drawable.animals_swallow,
+    };
 
-    private static final int[][] icons_set = { tiles_default , tiles_christmas, tiles_easter, tiles_tux };
+    private static final int[][] icons_set = { tiles_default , tiles_christmas, tiles_easter, tiles_tux, tiles_animals };
 
     private static final int[] sounds = {
       R.raw.blop, R.raw.chime, R.raw.chtoing, R.raw.tic, R.raw.toc, 
@@ -86,7 +96,7 @@ public class MainActivity extends AbstractMainActivity implements Memory.OnMemor
 
     private static final int[] not_found_tile_set =
     {
-        R.drawable.not_found_default, R.drawable.not_found_christmas, R.drawable.not_found_easter, R.drawable.not_found_tux
+        R.drawable.not_found_default, R.drawable.not_found_christmas, R.drawable.not_found_easter, R.drawable.not_found_tux, R.drawable.not_found_default
     };
     private Memory mMemory;
     private MemoryGridView mGridView;

diff --git a/src/main/res/iconset-animals/.gitignore b/src/main/res/iconset-animals/.gitignore
@@ -0,0 +1,2 @@
+png/
+svg/
diff --git a/src/main/res/iconset-animals/Makefile b/src/main/res/iconset-animals/Makefile
@@ -0,0 +1,72 @@
+PREFIX=animals_
+
+#URL_PREFIX=https://openclipart.org/download
+#EXT=svg
+
+# alternative example pattern for png 300px:
+URL_PREFIX=https://openclipart.org/image/300px/svg_to_png
+EXT=png
+
+DOWNLOAD=if test -e $(EXT)/$(PREFIX)$@; then return 0; fi; mkdir -p $(EXT); /usr/bin/wget -c -O $(EXT)/$(PREFIX)$@ 
+
+OBJS =  pferd schwein chicken biene dragonfly crab butterfly dolphin crow \
+	cow jaguar snail fish bear pigeon seahorse kangaroo elephant chipmunk \
+	frog antelope starfish swallow grasshopper
+
+.PHONY: png svg link
+
+png: $(addsuffix .png, $(OBJS))
+svg: $(addsuffix .svg, $(OBJS))
+
+# Only png can endup inside drawable-mdpi/
+link: png
+	ln -srf $(addprefix png/$(PREFIX),$(addsuffix .png, $(OBJS))) ../drawable-mdpi/
+
+pferd.$(EXT):
+	$(DOWNLOAD) "$(URL_PREFIX)/220784/Pferd-coloured.svg&disposition=attachment"
+schwein.$(EXT):
+	$(DOWNLOAD) "$(URL_PREFIX)/245556/Schwein-coloured.svg&disposition=attachment"
+chicken.$(EXT):
+	$(DOWNLOAD) "$(URL_PREFIX)/27980/davidone-Chicken.svg&disposition=attachment"
+biene.$(EXT):
+	$(DOWNLOAD) "$(URL_PREFIX)/172634/Biene.svg&disposition=attachment"
+dragonfly.$(EXT):
+	$(DOWNLOAD) "$(URL_PREFIX)/175833/55c89786.svg&disposition=attachment"
+crab.$(EXT):
+	$(DOWNLOAD) "$(URL_PREFIX)/229601/Crab.svg&disposition=attachment"
+butterfly.$(EXT):
+	$(DOWNLOAD) "$(URL_PREFIX)/22851/johnny-automatic-butterfly-3.svg&disposition=attachment"
+dolphin.$(EXT):
+	$(DOWNLOAD) "$(URL_PREFIX)/269678/Simple-Dolphin.svg&disposition=attachment"
+crow.$(EXT):
+	$(DOWNLOAD) "$(URL_PREFIX)/31303/Crow-1-.svg&disposition=attachment"
+cow.$(EXT):
+	$(DOWNLOAD) "$(URL_PREFIX)/105259/Holstein-Cow-.svg&disposition=attachment"
+jaguar.$(EXT):
+	$(DOWNLOAD) "$(URL_PREFIX)/167328/jaguar.svg&disposition=attachment"
+snail.$(EXT):
+	$(DOWNLOAD) "$(URL_PREFIX)/214781/Schnecke.svg&disposition=attachment"
+fish.$(EXT):
+	$(DOWNLOAD) "$(URL_PREFIX)/181437/Fish02.svg&disposition=attachment"
+bear.$(EXT):
+	$(DOWNLOAD) "$(URL_PREFIX)/24590/papapishu-Black-bear.svg&disposition=attachment"
+pigeon.$(EXT):
+	$(DOWNLOAD) "$(URL_PREFIX)/246804/PigeonHires.svg&disposition=attachment"
+seahorse.$(EXT):
+	$(DOWNLOAD) "$(URL_PREFIX)/277942/Seahorse3Colour.svg&disposition=attachment"
+kangaroo.$(EXT):
+	$(DOWNLOAD) "$(URL_PREFIX)/248625/Kangaroo4.svg&disposition=attachment"
+elephant.$(EXT):
+	$(DOWNLOAD) "$(URL_PREFIX)/249191/Elephant7.svg&disposition=attachment"
+chipmunk.$(EXT):
+	$(DOWNLOAD) "$(URL_PREFIX)/260451/Chipmunk.svg&disposition=attachment"
+frog.$(EXT):
+	$(DOWNLOAD) "$(URL_PREFIX)/262108/Frog4.svg&disposition=attachment"
+antelope.$(EXT):
+	$(DOWNLOAD) "$(URL_PREFIX)/262575/AntelopeClipped.svg&disposition=attachment"
+starfish.$(EXT):
+	$(DOWNLOAD) "$(URL_PREFIX)/264082/StarFish2.svg&disposition=attachment"
+swallow.$(EXT):
+	$(DOWNLOAD) "$(URL_PREFIX)/226292/Swallow.svg&disposition=attachment"
+grasshopper.$(EXT):
+	$(DOWNLOAD) "$(URL_PREFIX)/238809/CommonGreenGrasshopper2.svg&disposition=attachment"
diff --git a/src/main/res/iconset-animals/thanks.txt b/src/main/res/iconset-animals/thanks.txt
@@ -0,0 +1,32 @@
+https://openclipart.org/user-detail/papapishu
+papapishu-Black-bear.svg
+Crow-1-.svg
+Holstein-Cow-.svg
+
+https://openclipart.org/user-detail/frankes
+Schwein-coloured.svg
+Pferd-coloured.svg
+Biene.svg
+jaguar.svg
+Schnecke.svg
+
+https://openclipart.org/user-detail/Firkin:
+Crab.svg
+PigeonHires.svg
+Seahorse3Colour.svg
+barn-swallow-isolated
+Kangaroo4.svg
+Elephant7.svg
+Chipmunk.svg
+Frog4.svg
+AntelopeClipped.svg
+StarFish2.svg
+Swallow.svg
+CommonGreenGrasshopper2.svg
+
+
+davidone-Chicken.svg: https://openclipart.org/user-detail/davidone
+55c89786.svg: https://openclipart.org/user-detail/Dfly
+johnny-automatic-butterfly-3.svg: https://openclipart.org/user-detail/johnny_automatic
+Simple-Dolphin.svg: https://openclipart.org/user-detail/j4p4n
+Fish02.svg: https://openclipart.org/user-detail/vectorsme
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
@@ -45,6 +45,7 @@
         <item>Saison - Noël</item> 
         <item>Saison - Pâques</item> 
         <item>Fun - Tux</item> 
+        <item>Animaux</item>
     </string-array>
 
     <string name="title_support">Support</string>
@@ -53,4 +54,4 @@
 
     <string name="image_splash">Splash image</string>    
 
-</resources>
+</resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
@@ -46,6 +46,7 @@
         <item>Season - Christmas</item> 
         <item>Season - Easter</item> 
         <item>Fun - Tux</item> 
+        <item>Animals</item>
     </string-array>
 
     <string name="title_support">Support</string>
@@ -54,4 +55,4 @@
 
     <string name="image_splash">Splash image</string>    
 
-</resources>
+</resources>