diff --git a/assets/images/flags/are.png b/assets/images/flags/are.png deleted file mode 100644 index ae68c4ff2..000000000 Binary files a/assets/images/flags/are.png and /dev/null differ diff --git a/assets/images/flags/are.svg b/assets/images/flags/are.svg new file mode 100644 index 000000000..b7acdbdb3 --- /dev/null +++ b/assets/images/flags/are.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/images/flags/arg.png b/assets/images/flags/arg.png deleted file mode 100644 index c5bd233d2..000000000 Binary files a/assets/images/flags/arg.png and /dev/null differ diff --git a/assets/images/flags/arg.svg b/assets/images/flags/arg.svg new file mode 100644 index 000000000..364fca8ff --- /dev/null +++ b/assets/images/flags/arg.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/flags/aus.png b/assets/images/flags/aus.png deleted file mode 100644 index c8837731c..000000000 Binary files a/assets/images/flags/aus.png and /dev/null differ diff --git a/assets/images/flags/aus.svg b/assets/images/flags/aus.svg new file mode 100644 index 000000000..407fef43d --- /dev/null +++ b/assets/images/flags/aus.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/images/flags/bgd.png b/assets/images/flags/bgd.png deleted file mode 100644 index 0f8c5cfe5..000000000 Binary files a/assets/images/flags/bgd.png and /dev/null differ diff --git a/assets/images/flags/bgd.svg b/assets/images/flags/bgd.svg new file mode 100644 index 000000000..16b794deb --- /dev/null +++ b/assets/images/flags/bgd.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/flags/bgr.png b/assets/images/flags/bgr.png deleted file mode 100644 index a89509f1f..000000000 Binary files a/assets/images/flags/bgr.png and /dev/null differ diff --git a/assets/images/flags/bgr.svg b/assets/images/flags/bgr.svg new file mode 100644 index 000000000..b100dd0dc --- /dev/null +++ b/assets/images/flags/bgr.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/images/flags/bra.png b/assets/images/flags/bra.png deleted file mode 100644 index ecac6f5a3..000000000 Binary files a/assets/images/flags/bra.png and /dev/null differ diff --git a/assets/images/flags/bra.svg b/assets/images/flags/bra.svg new file mode 100644 index 000000000..354a7013f --- /dev/null +++ b/assets/images/flags/bra.svg @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/flags/ca.svg b/assets/images/flags/ca.svg new file mode 100644 index 000000000..f1b2c968a --- /dev/null +++ b/assets/images/flags/ca.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/flags/cad.png b/assets/images/flags/cad.png deleted file mode 100644 index 106cea5b9..000000000 Binary files a/assets/images/flags/cad.png and /dev/null differ diff --git a/assets/images/flags/cad.svg b/assets/images/flags/cad.svg new file mode 100644 index 000000000..f1b2c968a --- /dev/null +++ b/assets/images/flags/cad.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/flags/che.png b/assets/images/flags/che.png deleted file mode 100644 index 427db0fbc..000000000 Binary files a/assets/images/flags/che.png and /dev/null differ diff --git a/assets/images/flags/che.svg b/assets/images/flags/che.svg new file mode 100644 index 000000000..b42d6709c --- /dev/null +++ b/assets/images/flags/che.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/assets/images/flags/chl.png b/assets/images/flags/chl.png deleted file mode 100644 index 73a38f406..000000000 Binary files a/assets/images/flags/chl.png and /dev/null differ diff --git a/assets/images/flags/chl.svg b/assets/images/flags/chl.svg new file mode 100644 index 000000000..01766fefd --- /dev/null +++ b/assets/images/flags/chl.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/assets/images/flags/chn.png b/assets/images/flags/chn.png deleted file mode 100644 index 7a03dd26e..000000000 Binary files a/assets/images/flags/chn.png and /dev/null differ diff --git a/assets/images/flags/chn.svg b/assets/images/flags/chn.svg new file mode 100644 index 000000000..10d3489a0 --- /dev/null +++ b/assets/images/flags/chn.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/assets/images/flags/col.png b/assets/images/flags/col.png deleted file mode 100644 index 9a0fc6ac1..000000000 Binary files a/assets/images/flags/col.png and /dev/null differ diff --git a/assets/images/flags/col.svg b/assets/images/flags/col.svg new file mode 100644 index 000000000..ebd0a0fb2 --- /dev/null +++ b/assets/images/flags/col.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/images/flags/czk.png b/assets/images/flags/czk.png deleted file mode 100644 index a6c13a773..000000000 Binary files a/assets/images/flags/czk.png and /dev/null differ diff --git a/assets/images/flags/czk.svg b/assets/images/flags/czk.svg new file mode 100644 index 000000000..7913de389 --- /dev/null +++ b/assets/images/flags/czk.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/images/flags/deu.png b/assets/images/flags/deu.png deleted file mode 100644 index 95b88a0ea..000000000 Binary files a/assets/images/flags/deu.png and /dev/null differ diff --git a/assets/images/flags/deu.svg b/assets/images/flags/deu.svg new file mode 100644 index 000000000..b08334b62 --- /dev/null +++ b/assets/images/flags/deu.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/images/flags/dnk.png b/assets/images/flags/dnk.png deleted file mode 100644 index 69dd1b2b8..000000000 Binary files a/assets/images/flags/dnk.png and /dev/null differ diff --git a/assets/images/flags/dnk.svg b/assets/images/flags/dnk.svg new file mode 100644 index 000000000..563277f81 --- /dev/null +++ b/assets/images/flags/dnk.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/images/flags/egy.png b/assets/images/flags/egy.png deleted file mode 100644 index 062ee21cf..000000000 Binary files a/assets/images/flags/egy.png and /dev/null differ diff --git a/assets/images/flags/egy.svg b/assets/images/flags/egy.svg new file mode 100644 index 000000000..58c943c23 --- /dev/null +++ b/assets/images/flags/egy.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/flags/esp.png b/assets/images/flags/esp.png deleted file mode 100644 index 0193a6a44..000000000 Binary files a/assets/images/flags/esp.png and /dev/null differ diff --git a/assets/images/flags/esp.svg b/assets/images/flags/esp.svg new file mode 100644 index 000000000..815e0f846 --- /dev/null +++ b/assets/images/flags/esp.svg @@ -0,0 +1,544 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/flags/eur.png b/assets/images/flags/eur.png deleted file mode 100644 index 1312b0200..000000000 Binary files a/assets/images/flags/eur.png and /dev/null differ diff --git a/assets/images/flags/eur.svg b/assets/images/flags/eur.svg new file mode 100644 index 000000000..bbfefd6b4 --- /dev/null +++ b/assets/images/flags/eur.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/flags/fra.png b/assets/images/flags/fra.png deleted file mode 100644 index 91dce8ff2..000000000 Binary files a/assets/images/flags/fra.png and /dev/null differ diff --git a/assets/images/flags/fra.svg b/assets/images/flags/fra.svg new file mode 100644 index 000000000..79689fe94 --- /dev/null +++ b/assets/images/flags/fra.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/images/flags/gbr.png b/assets/images/flags/gbr.png deleted file mode 100644 index 151f06db5..000000000 Binary files a/assets/images/flags/gbr.png and /dev/null differ diff --git a/assets/images/flags/gbr.svg b/assets/images/flags/gbr.svg new file mode 100644 index 000000000..dbac25eae --- /dev/null +++ b/assets/images/flags/gbr.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/images/flags/gha.png b/assets/images/flags/gha.png deleted file mode 100644 index 8d6801e81..000000000 Binary files a/assets/images/flags/gha.png and /dev/null differ diff --git a/assets/images/flags/gha.svg b/assets/images/flags/gha.svg new file mode 100644 index 000000000..a6497de88 --- /dev/null +++ b/assets/images/flags/gha.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/images/flags/gtm.png b/assets/images/flags/gtm.png deleted file mode 100644 index 2083ad806..000000000 Binary files a/assets/images/flags/gtm.png and /dev/null differ diff --git a/assets/images/flags/gtm.svg b/assets/images/flags/gtm.svg new file mode 100644 index 000000000..9b3471244 --- /dev/null +++ b/assets/images/flags/gtm.svg @@ -0,0 +1,204 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/flags/hau.png b/assets/images/flags/hau.png deleted file mode 100644 index 7583b5daf..000000000 Binary files a/assets/images/flags/hau.png and /dev/null differ diff --git a/assets/images/flags/hau.svg b/assets/images/flags/hau.svg new file mode 100644 index 000000000..a9b2298a3 --- /dev/null +++ b/assets/images/flags/hau.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/images/flags/hkg.png b/assets/images/flags/hkg.png deleted file mode 100644 index 85925604e..000000000 Binary files a/assets/images/flags/hkg.png and /dev/null differ diff --git a/assets/images/flags/hkg.svg b/assets/images/flags/hkg.svg new file mode 100644 index 000000000..ec40b5fed --- /dev/null +++ b/assets/images/flags/hkg.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/images/flags/hrv.png b/assets/images/flags/hrv.png deleted file mode 100644 index 9c87c5d0e..000000000 Binary files a/assets/images/flags/hrv.png and /dev/null differ diff --git a/assets/images/flags/hrv.svg b/assets/images/flags/hrv.svg new file mode 100644 index 000000000..febbc2400 --- /dev/null +++ b/assets/images/flags/hrv.svg @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/flags/hun.png b/assets/images/flags/hun.png deleted file mode 100644 index 9722561a8..000000000 Binary files a/assets/images/flags/hun.png and /dev/null differ diff --git a/assets/images/flags/hun.svg b/assets/images/flags/hun.svg new file mode 100644 index 000000000..baddf7f5e --- /dev/null +++ b/assets/images/flags/hun.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/images/flags/idn.png b/assets/images/flags/idn.png deleted file mode 100644 index 52c965921..000000000 Binary files a/assets/images/flags/idn.png and /dev/null differ diff --git a/assets/images/flags/idn.svg b/assets/images/flags/idn.svg new file mode 100644 index 000000000..3b7c8fcfd --- /dev/null +++ b/assets/images/flags/idn.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/flags/ind.png b/assets/images/flags/ind.png deleted file mode 100644 index ef721a2aa..000000000 Binary files a/assets/images/flags/ind.png and /dev/null differ diff --git a/assets/images/flags/ind.svg b/assets/images/flags/ind.svg new file mode 100644 index 000000000..c634f68ac --- /dev/null +++ b/assets/images/flags/ind.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/flags/irn.png b/assets/images/flags/irn.png deleted file mode 100644 index 151a03919..000000000 Binary files a/assets/images/flags/irn.png and /dev/null differ diff --git a/assets/images/flags/irn.svg b/assets/images/flags/irn.svg new file mode 100644 index 000000000..5c9609eff --- /dev/null +++ b/assets/images/flags/irn.svg @@ -0,0 +1,219 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/flags/isl.png b/assets/images/flags/isl.png deleted file mode 100644 index ed545e905..000000000 Binary files a/assets/images/flags/isl.png and /dev/null differ diff --git a/assets/images/flags/isl.svg b/assets/images/flags/isl.svg new file mode 100644 index 000000000..56cc97787 --- /dev/null +++ b/assets/images/flags/isl.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/assets/images/flags/isr.png b/assets/images/flags/isr.png deleted file mode 100644 index 9f815dcbd..000000000 Binary files a/assets/images/flags/isr.png and /dev/null differ diff --git a/assets/images/flags/isr.svg b/assets/images/flags/isr.svg new file mode 100644 index 000000000..724cf8bf3 --- /dev/null +++ b/assets/images/flags/isr.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/assets/images/flags/ita.png b/assets/images/flags/ita.png deleted file mode 100644 index 768f5a181..000000000 Binary files a/assets/images/flags/ita.png and /dev/null differ diff --git a/assets/images/flags/ita.svg b/assets/images/flags/ita.svg new file mode 100644 index 000000000..20a8bfdcc --- /dev/null +++ b/assets/images/flags/ita.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/images/flags/jpn.png b/assets/images/flags/jpn.png deleted file mode 100644 index a13ef4178..000000000 Binary files a/assets/images/flags/jpn.png and /dev/null differ diff --git a/assets/images/flags/jpn.svg b/assets/images/flags/jpn.svg new file mode 100644 index 000000000..cd03a339d --- /dev/null +++ b/assets/images/flags/jpn.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/assets/images/flags/kor.png b/assets/images/flags/kor.png deleted file mode 100644 index 36e867ea8..000000000 Binary files a/assets/images/flags/kor.png and /dev/null differ diff --git a/assets/images/flags/kor.svg b/assets/images/flags/kor.svg new file mode 100644 index 000000000..44b51e251 --- /dev/null +++ b/assets/images/flags/kor.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/flags/mar.png b/assets/images/flags/mar.png deleted file mode 100644 index 65b31c892..000000000 Binary files a/assets/images/flags/mar.png and /dev/null differ diff --git a/assets/images/flags/mar.svg b/assets/images/flags/mar.svg new file mode 100644 index 000000000..7ce56eff7 --- /dev/null +++ b/assets/images/flags/mar.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/flags/mex.png b/assets/images/flags/mex.png deleted file mode 100644 index 9531a3ea2..000000000 Binary files a/assets/images/flags/mex.png and /dev/null differ diff --git a/assets/images/flags/mex.svg b/assets/images/flags/mex.svg new file mode 100644 index 000000000..bb305b8d1 --- /dev/null +++ b/assets/images/flags/mex.svg @@ -0,0 +1,382 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/flags/mmr.png b/assets/images/flags/mmr.png deleted file mode 100644 index 7fc6e1661..000000000 Binary files a/assets/images/flags/mmr.png and /dev/null differ diff --git a/assets/images/flags/mmr.svg b/assets/images/flags/mmr.svg new file mode 100644 index 000000000..8ed5e6ac2 --- /dev/null +++ b/assets/images/flags/mmr.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/assets/images/flags/mys.png b/assets/images/flags/mys.png deleted file mode 100644 index 022476291..000000000 Binary files a/assets/images/flags/mys.png and /dev/null differ diff --git a/assets/images/flags/mys.svg b/assets/images/flags/mys.svg new file mode 100644 index 000000000..264f48aef --- /dev/null +++ b/assets/images/flags/mys.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/flags/nga.png b/assets/images/flags/nga.png deleted file mode 100644 index ebfd82449..000000000 Binary files a/assets/images/flags/nga.png and /dev/null differ diff --git a/assets/images/flags/nga.svg b/assets/images/flags/nga.svg new file mode 100644 index 000000000..81eb35f78 --- /dev/null +++ b/assets/images/flags/nga.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/images/flags/nld.png b/assets/images/flags/nld.png deleted file mode 100644 index 62dbc2058..000000000 Binary files a/assets/images/flags/nld.png and /dev/null differ diff --git a/assets/images/flags/nld.svg b/assets/images/flags/nld.svg new file mode 100644 index 000000000..4faaf498e --- /dev/null +++ b/assets/images/flags/nld.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/images/flags/nor.png b/assets/images/flags/nor.png deleted file mode 100644 index bd226c0a6..000000000 Binary files a/assets/images/flags/nor.png and /dev/null differ diff --git a/assets/images/flags/nor.svg b/assets/images/flags/nor.svg new file mode 100644 index 000000000..a5f2a152a --- /dev/null +++ b/assets/images/flags/nor.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/images/flags/nzl.png b/assets/images/flags/nzl.png deleted file mode 100644 index 11c6ade9c..000000000 Binary files a/assets/images/flags/nzl.png and /dev/null differ diff --git a/assets/images/flags/nzl.svg b/assets/images/flags/nzl.svg new file mode 100644 index 000000000..a0028fb2f --- /dev/null +++ b/assets/images/flags/nzl.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/flags/pak.png b/assets/images/flags/pak.png deleted file mode 100644 index 1462650e4..000000000 Binary files a/assets/images/flags/pak.png and /dev/null differ diff --git a/assets/images/flags/pak.svg b/assets/images/flags/pak.svg new file mode 100644 index 000000000..fa02f6a8f --- /dev/null +++ b/assets/images/flags/pak.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/assets/images/flags/phl.png b/assets/images/flags/phl.png deleted file mode 100644 index b453f3933..000000000 Binary files a/assets/images/flags/phl.png and /dev/null differ diff --git a/assets/images/flags/phl.svg b/assets/images/flags/phl.svg new file mode 100644 index 000000000..65489e1cb --- /dev/null +++ b/assets/images/flags/phl.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/images/flags/pol.png b/assets/images/flags/pol.png deleted file mode 100644 index 30d5a9371..000000000 Binary files a/assets/images/flags/pol.png and /dev/null differ diff --git a/assets/images/flags/pol.svg b/assets/images/flags/pol.svg new file mode 100644 index 000000000..0fa514524 --- /dev/null +++ b/assets/images/flags/pol.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/images/flags/prt.png b/assets/images/flags/prt.png deleted file mode 100644 index ff5a25fa9..000000000 Binary files a/assets/images/flags/prt.png and /dev/null differ diff --git a/assets/images/flags/prt.svg b/assets/images/flags/prt.svg new file mode 100644 index 000000000..59793c040 --- /dev/null +++ b/assets/images/flags/prt.svg @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/flags/rou.png b/assets/images/flags/rou.png deleted file mode 100644 index 49b36b438..000000000 Binary files a/assets/images/flags/rou.png and /dev/null differ diff --git a/assets/images/flags/rou.svg b/assets/images/flags/rou.svg new file mode 100644 index 000000000..fa3bd927c --- /dev/null +++ b/assets/images/flags/rou.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/images/flags/rus.png b/assets/images/flags/rus.png deleted file mode 100644 index 2633dcbd0..000000000 Binary files a/assets/images/flags/rus.png and /dev/null differ diff --git a/assets/images/flags/rus.svg b/assets/images/flags/rus.svg new file mode 100644 index 000000000..f4d27efc9 --- /dev/null +++ b/assets/images/flags/rus.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/images/flags/saf.png b/assets/images/flags/saf.png deleted file mode 100644 index 3b9cbded8..000000000 Binary files a/assets/images/flags/saf.png and /dev/null differ diff --git a/assets/images/flags/saf.svg b/assets/images/flags/saf.svg new file mode 100644 index 000000000..aa54beb87 --- /dev/null +++ b/assets/images/flags/saf.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/assets/images/flags/sau.png b/assets/images/flags/sau.png deleted file mode 100644 index 97951983a..000000000 Binary files a/assets/images/flags/sau.png and /dev/null differ diff --git a/assets/images/flags/sau.svg b/assets/images/flags/sau.svg new file mode 100644 index 000000000..660396a70 --- /dev/null +++ b/assets/images/flags/sau.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/flags/sgp.png b/assets/images/flags/sgp.png deleted file mode 100644 index 5782ea144..000000000 Binary files a/assets/images/flags/sgp.png and /dev/null differ diff --git a/assets/images/flags/sgp.svg b/assets/images/flags/sgp.svg new file mode 100644 index 000000000..c4dd4ac9e --- /dev/null +++ b/assets/images/flags/sgp.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/assets/images/flags/swe.png b/assets/images/flags/swe.png deleted file mode 100644 index ef73086f6..000000000 Binary files a/assets/images/flags/swe.png and /dev/null differ diff --git a/assets/images/flags/swe.svg b/assets/images/flags/swe.svg new file mode 100644 index 000000000..0e41780ef --- /dev/null +++ b/assets/images/flags/swe.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/flags/tha.png b/assets/images/flags/tha.png deleted file mode 100644 index 1bdb04d00..000000000 Binary files a/assets/images/flags/tha.png and /dev/null differ diff --git a/assets/images/flags/tha.svg b/assets/images/flags/tha.svg new file mode 100644 index 000000000..1e93a61e9 --- /dev/null +++ b/assets/images/flags/tha.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/images/flags/tur.png b/assets/images/flags/tur.png deleted file mode 100644 index 166c6313a..000000000 Binary files a/assets/images/flags/tur.png and /dev/null differ diff --git a/assets/images/flags/tur.svg b/assets/images/flags/tur.svg new file mode 100644 index 000000000..a92804f88 --- /dev/null +++ b/assets/images/flags/tur.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/images/flags/twn.png b/assets/images/flags/twn.png deleted file mode 100644 index 4af8ba78d..000000000 Binary files a/assets/images/flags/twn.png and /dev/null differ diff --git a/assets/images/flags/twn.svg b/assets/images/flags/twn.svg new file mode 100644 index 000000000..57fd98b43 --- /dev/null +++ b/assets/images/flags/twn.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/flags/ukr.png b/assets/images/flags/ukr.png deleted file mode 100644 index 61071e338..000000000 Binary files a/assets/images/flags/ukr.png and /dev/null differ diff --git a/assets/images/flags/ukr.svg b/assets/images/flags/ukr.svg new file mode 100644 index 000000000..a339eb1b9 --- /dev/null +++ b/assets/images/flags/ukr.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/images/flags/usa.png b/assets/images/flags/usa.png deleted file mode 100644 index a8c44ce75..000000000 Binary files a/assets/images/flags/usa.png and /dev/null differ diff --git a/assets/images/flags/usa.svg b/assets/images/flags/usa.svg new file mode 100644 index 000000000..615946d4b --- /dev/null +++ b/assets/images/flags/usa.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/assets/images/flags/ven.png b/assets/images/flags/ven.png deleted file mode 100644 index fcc25ef2b..000000000 Binary files a/assets/images/flags/ven.png and /dev/null differ diff --git a/assets/images/flags/ven.svg b/assets/images/flags/ven.svg new file mode 100644 index 000000000..314e7f5f7 --- /dev/null +++ b/assets/images/flags/ven.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/flags/vnm.png b/assets/images/flags/vnm.png deleted file mode 100644 index 3cbbf878f..000000000 Binary files a/assets/images/flags/vnm.png and /dev/null differ diff --git a/assets/images/flags/vnm.svg b/assets/images/flags/vnm.svg new file mode 100644 index 000000000..24bedc503 --- /dev/null +++ b/assets/images/flags/vnm.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/lib/src/screens/settings/display_settings_page.dart b/lib/src/screens/settings/display_settings_page.dart index 3e7da522b..5f4cca21f 100644 --- a/lib/src/screens/settings/display_settings_page.dart +++ b/lib/src/screens/settings/display_settings_page.dart @@ -10,6 +10,7 @@ import 'package:cake_wallet/utils/responsive_layout_util.dart'; import 'package:cake_wallet/view_model/settings/display_settings_view_model.dart'; import 'package:flutter/material.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; +import 'package:flutter_svg/svg.dart'; class DisplaySettingsPage extends BasePage { DisplaySettingsPage(this._displaySettingsViewModel); @@ -50,7 +51,8 @@ class DisplaySettingsPage extends BasePage { onItemSelected: (FiatCurrency currency) => _displaySettingsViewModel.setFiatCurrency(currency), images: FiatCurrency.all - .map((e) => Image.asset("assets/images/flags/${e.countryCode}.png")) + .map((e) => SvgPicture.asset("assets/images/flags/${e.countryCode}.svg", + width: 42, height: 26, fit: BoxFit.contain)) .toList(), isGridView: true, matchingCriteria: (FiatCurrency currency, String searchText) { @@ -68,8 +70,9 @@ class DisplaySettingsPage extends BasePage { selectedItem: _displaySettingsViewModel.languageCode, onItemSelected: _displaySettingsViewModel.onLanguageSelected, images: LanguageService.list.keys - .map((e) => Image.asset( - "assets/images/flags/${LanguageService.localeCountryCode[e]}.png")) + .map((e) => SvgPicture.asset( + "assets/images/flags/${LanguageService.localeCountryCode[e]}.svg", + width: 42, height: 26, fit: BoxFit.contain)) .toList(), matchingCriteria: (String code, String searchText) { return LanguageService.list[code]?.toLowerCase().contains(searchText) ?? false; diff --git a/lib/src/screens/settings/widgets/settings_picker_cell.dart b/lib/src/screens/settings/widgets/settings_picker_cell.dart index 8e0492330..419d77fea 100644 --- a/lib/src/screens/settings/widgets/settings_picker_cell.dart +++ b/lib/src/screens/settings/widgets/settings_picker_cell.dart @@ -1,25 +1,34 @@ +import 'package:cake_wallet/src/widgets/picker.dart'; +import 'package:cake_wallet/src/widgets/standard_list.dart'; import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart'; import 'package:cake_wallet/utils/show_pop_up.dart'; import 'package:flutter/material.dart'; -import 'package:cake_wallet/src/widgets/picker.dart'; -import 'package:cake_wallet/src/widgets/standard_list.dart'; +import 'package:flutter_svg/flutter_svg.dart'; class SettingsPickerCell extends StandardListRow { - SettingsPickerCell( - {required String title, - required this.selectedItem, - required this.items, - this.displayItem, - this.images, - this.searchHintText, - this.isGridView = false, - this.matchingCriteria, - this.onItemSelected}) - : super( + SettingsPickerCell({ + required String title, + required this.selectedItem, + required this.items, + this.displayItem, + this.images, + this.searchHintText, + this.isGridView = false, + this.matchingCriteria, + this.onItemSelected, + }) : super( title: title, isSelected: false, onTap: (BuildContext context) async { final selectedAtIndex = items.indexOf(selectedItem); + List processedImages = []; + if (images != null) { + for (var image in images) { + if (image is Image || image is SvgPicture) { + processedImages.add(image as Widget); + } + } + } await showPopUp( context: context, @@ -29,7 +38,7 @@ class SettingsPickerCell extends StandardListRow { selectedAtIndex: selectedAtIndex, mainAxisAlignment: MainAxisAlignment.start, onItemSelected: (ItemType item) => onItemSelected?.call(item), - images: images ?? const [], + images: processedImages.isEmpty ? const [] : processedImages, isSeparated: false, hintText: searchHintText, isGridView: isGridView, @@ -43,7 +52,7 @@ class SettingsPickerCell extends StandardListRow { final List items; final void Function(ItemType item)? onItemSelected; final String Function(ItemType item)? displayItem; - final List? images; + final List? images; // Changed type to List final String? searchHintText; final bool isGridView; final bool Function(ItemType, String)? matchingCriteria; diff --git a/lib/src/widgets/picker.dart b/lib/src/widgets/picker.dart index 6b6543d2f..0d8811f13 100644 --- a/lib/src/widgets/picker.dart +++ b/lib/src/widgets/picker.dart @@ -11,27 +11,27 @@ import 'package:cake_wallet/themes/extensions/cake_text_theme.dart'; import 'package:cake_wallet/themes/extensions/cake_scrollbar_theme.dart'; import 'package:cake_wallet/themes/extensions/picker_theme.dart'; -class Picker extends StatefulWidget { +class Picker extends StatefulWidget { Picker({ required this.selectedAtIndex, required this.items, required this.onItemSelected, this.title, this.displayItem, - this.images = const [], + List? images, this.description, this.mainAxisAlignment = MainAxisAlignment.start, this.isGridView = false, this.isSeparated = true, this.hintText, this.matchingCriteria, - }) : assert(hintText == null || - matchingCriteria != - null); // make sure that if the search field is enabled then there is a searching criteria provided + }) : images = images ?? [], + assert(hintText == null || + matchingCriteria != null); // make sure that if the search field is enabled then there is a searching criteria provided final int selectedAtIndex; final List items; - final List images; + final List images; final String? title; final String? description; final Function(Item) onItemSelected; @@ -43,17 +43,17 @@ class Picker extends StatefulWidget { final bool Function(Item, String)? matchingCriteria; @override - _PickerState createState() => _PickerState(items, images, onItemSelected); + _PickerState createState() => _PickerState(items, images, onItemSelected); } -class _PickerState extends State> { +class _PickerState extends State> { _PickerState(this.items, this.images, this.onItemSelected); final Function(Item) onItemSelected; List items; - List images; + List images; List filteredItems = []; - List filteredImages = []; + List filteredImages = []; final TextEditingController searchController = TextEditingController(); diff --git a/pubspec_base.yaml b/pubspec_base.yaml index da79a5076..0b25f5e47 100644 --- a/pubspec_base.yaml +++ b/pubspec_base.yaml @@ -86,6 +86,7 @@ dependencies: git: url: https://github.com/cake-tech/bitcoin_flutter.git ref: cake-update-v3 + flutter_svg: ^2.0.7 dev_dependencies: flutter_test: