From a4fde1ae3c09c39289de7cbe5e2cf8cc2757c82d Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Tue, 24 Jan 2023 23:52:34 +0200
Subject: [PATCH] Resolved #8158 - Fallback images for all major objects

---
 .../Images.PolicyIcons/PolicyIcons/Fallback.png  | Bin 0 -> 1391 bytes
 android/assets/PolicyIcons.atlas                 |   7 +++++++
 .../unciv/app/CustomFileLocationHelperAndroid.kt |   5 +++--
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 android/Images.PolicyIcons/PolicyIcons/Fallback.png

diff --git a/android/Images.PolicyIcons/PolicyIcons/Fallback.png b/android/Images.PolicyIcons/PolicyIcons/Fallback.png
new file mode 100644
index 0000000000000000000000000000000000000000..32107f0808e0ba69b190ba914b013de4f963acbd
GIT binary patch
literal 1391
zcmV-#1(5oQP)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf5&!@T5&_cPe*6Fc02y>eSaefwW^{L9
za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00iGjL_t(&L*1EMXjDfS$3q_TV(eSBq7Q{u
zj6ww;ygf=yUripG;*APH1QFB<`X<#@O54Os6SasSz7=ZILh#Ky-XD~DLBv+=#%xV?
zL-vwnZ~p%0d~V$A*^Q_<dyan?X6BpOng4&jZ)VOpTNgGI3WWyJ97_#m4n81TKRi6#
zl+9*$k}hX5nPF@W#>U2yxm@l(wr=YlJfzd<k0HK`^uTymh5alTfKLO&*RaZ$NI93H
zH}d(sl?nxZ^T>v%EfR^uhw$DDp@?y-2>K*R8LK*=zSf4S4U);^Oaye062_?_AR8wQ
zO!O4CKgjBBNPiKF#Twb5Kfx*K(y0vk4AA#Jp_DRH5wtyt$KxN^u>OI$>qkdNwFf2*
zA&8H$+80TW%~S%~M>(~Y*wFrgm75N!Q^unz=ywyry%J-lGH|N3+tB_2Lh~SZ*Em#!
z!iZHqLEpd4<OxEpi_G7B!Gt<eJ;UQwAfOk5oeCK<c>=K)$o#$05zsm`G_>8N;0=f;
z5%2?j&zZ>qg!81VRUJ^jqY$;>ryk5%54i(OESz>}l!LZgc%mIKeP${FWBg0HO8TF^
z{q$?HDW)De4w=+hT{i3x=}(8%1VHXEA~wE8D5daL5B+A@6jKjKH!*Q>KR`4Ffq$&(
zK*Z$*`t7GY{+v+-jN47-&*o;b1(18@PCX8616GuXzLAlUW`vwH)1<(2hsgX90YQ19
zOvI~z&^5%)r{6_0RR#UB2;M=_9}!G6ZL)Kp_P-#tl>CmFs)B_{A^Izu!XL2GKimAC
zpuGzb%UR)mGgXDckEh{<HoQMzUR`!^mqIBZB>YJGYVxWl(@W6z3Qxoz+3@~=N!y~)
z=sx360>wAaLK{e5BckNp!3*@y;kknp{k^eMsnim!GDOSn2yr65*OTuiO?tf2rymht
z*wFrgxf__=xf}3G$zuiL^ys~Yyky^COOu|G9@176N4-ZcS2nc2h(scDjfaRtt>}or
z6MEO^FjE<5OVj5!?vi8tc0H!ryx9qa!77)Q3xy9!;k0(5C%nK3w%LZNEd~b%XG6UB
zR7yF=URlQq>+-4y{RVtPv36dV2uS_z(sNdLlTIgW6*o2lp5v_+`+0Bx`CTFi`A&tD
zR@-6h0Yscf#3%OC-~eJ@LOjEU{S|_3+T_$@#=8h?&$S;Y1}BtWf=7qXAgIqWXE-(&
zsZ7$V=X4zch`dMs5Zib9=w?3)78D*3d<NMYT!_obqoiwyXtXZDhd!u5`nrS=E{n+@
zBP>$0%j`{{7)OL&HE~3086qxG*C{mLx`YG7{I`(L>vX~!N42@Jt+eKFfR%5Bcord@
zh}edAbewLr=5T=H^;1X>kj^5e**tMXp=Moz56J3;Nt^pAA*GKB{nW3>Ze79wR{j_B
zzzPIhmJsT}yPd0nRd3biW>4%u$U(|vA=})#7w~{Cx^sk-9zXJk*lo?>fHpA#PT>Ll
zL)1b(NL{b8;n~~*9#{=&J(h1lz-@#)q3Yk4?{@)v1o=-Pg*T2P0zEbOTkCBBas4r=
zQ|f!|3q)+Urtm-?#1NrR_r2u00K>O01iYZn`x5eqybobBtSMZ;3kk%e+><u*xtYTU
xgg74!5V6Nh;RGSo%4?~P-tg^<_YZY-F95jD)gEvm)~Wyi002ovPDHLkV1fo5jIjU!

literal 0
HcmV?d00001

diff --git a/android/assets/PolicyIcons.atlas b/android/assets/PolicyIcons.atlas
index 8737a6fce7..b98b2c643b 100644
--- a/android/assets/PolicyIcons.atlas
+++ b/android/assets/PolicyIcons.atlas
@@ -130,6 +130,13 @@ PolicyIcons/Constitution
   orig: 50, 50
   offset: 0, 0
   index: -1
+PolicyIcons/Fallback
+  rotate: false
+  xy: 236, 62
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
 PolicyIcons/Cultural Diplomacy
   rotate: false
   xy: 236, 4
diff --git a/android/src/com/unciv/app/CustomFileLocationHelperAndroid.kt b/android/src/com/unciv/app/CustomFileLocationHelperAndroid.kt
index b87b5fe940..dcd680e9fe 100644
--- a/android/src/com/unciv/app/CustomFileLocationHelperAndroid.kt
+++ b/android/src/com/unciv/app/CustomFileLocationHelperAndroid.kt
@@ -32,8 +32,9 @@ class CustomFileLocationHelperAndroid(private val activity: Activity) : CustomFi
                     } else ""
                 }
             }
-            catch(ex:Exception) {}
-            suggestedLocation.split("2F").last() // I have no idea why but the content path ends with this before the filename
+            catch(ex:Exception) {
+                suggestedLocation.split("2F").last() // I have no idea why but the content path ends with this before the filename
+            }
         } else {
             // if we didn't load, this is some file name entered by the user
             suggestedLocation