From: Jin Yoon Date: Mon, 10 Aug 2015 11:29:34 +0000 (+0900) Subject: Merge between chun and jin X-Git-Url: http://review.tizen.org/git/?p=apps%2Fnative%2Fsample%2Fadventure.git;a=commitdiff_plain;h=224250429252c346628cf23663b0a7abf7323614 Merge between chun and jin --- diff --git a/res/edje/images/searching_bar.png b/res/edje/images/searching_bar.png deleted file mode 100644 index 8eb1017..0000000 Binary files a/res/edje/images/searching_bar.png and /dev/null differ diff --git a/res/edje/images/world_map.png b/res/edje/images/world_map.png deleted file mode 100644 index 3f50872..0000000 Binary files a/res/edje/images/world_map.png and /dev/null differ diff --git a/res/edje/images/Aventure01.1.png b/res/images/Aventure01.1.png similarity index 100% rename from res/edje/images/Aventure01.1.png rename to res/images/Aventure01.1.png diff --git a/res/edje/images/Aventure01.png b/res/images/Aventure01.png similarity index 100% rename from res/edje/images/Aventure01.png rename to res/images/Aventure01.png diff --git a/res/edje/images/Aventure01_background.png b/res/images/Aventure01_background.png similarity index 100% rename from res/edje/images/Aventure01_background.png rename to res/images/Aventure01_background.png diff --git a/res/images/Day_nite_edit2.psd b/res/images/Day_nite_edit2.psd new file mode 100755 index 0000000..7dd4d5a Binary files /dev/null and b/res/images/Day_nite_edit2.psd differ diff --git a/res/images/Daynight layer.png b/res/images/Daynight layer.png new file mode 100755 index 0000000..394033c Binary files /dev/null and b/res/images/Daynight layer.png differ diff --git a/res/edje/images/Location.gif b/res/images/Location.gif similarity index 100% rename from res/edje/images/Location.gif rename to res/images/Location.gif diff --git a/res/images/Moments_EB.psd b/res/images/Moments_EB.psd new file mode 100755 index 0000000..69d1756 Binary files /dev/null and b/res/images/Moments_EB.psd differ diff --git a/res/edje/images/delete_button.png b/res/images/add.png old mode 100644 new mode 100755 similarity index 58% rename from res/edje/images/delete_button.png rename to res/images/add.png index d72b7d3..8a31f19 Binary files a/res/edje/images/delete_button.png and b/res/images/add.png differ diff --git a/res/images/add_btn.png b/res/images/add_btn.png new file mode 100644 index 0000000..8cbec44 Binary files /dev/null and b/res/images/add_btn.png differ diff --git a/res/edje/images/bg.jpg b/res/images/bg.jpg similarity index 100% rename from res/edje/images/bg.jpg rename to res/images/bg.jpg diff --git a/res/edje/images/btn.png b/res/images/btn.png similarity index 100% rename from res/edje/images/btn.png rename to res/images/btn.png diff --git a/res/edje/images/my_status_small.png b/res/images/city0.png similarity index 100% rename from res/edje/images/my_status_small.png rename to res/images/city0.png diff --git a/res/images/city01.png b/res/images/city01.png new file mode 100644 index 0000000..ee8bfa7 Binary files /dev/null and b/res/images/city01.png differ diff --git a/res/edje/images/other_location_blue_small.png b/res/images/city1.png similarity index 100% rename from res/edje/images/other_location_blue_small.png rename to res/images/city1.png diff --git a/res/images/city11.png b/res/images/city11.png new file mode 100644 index 0000000..025770a Binary files /dev/null and b/res/images/city11.png differ diff --git a/res/edje/images/other_location_mint_small.png b/res/images/city2.png similarity index 100% rename from res/edje/images/other_location_mint_small.png rename to res/images/city2.png diff --git a/res/images/city21.png b/res/images/city21.png new file mode 100644 index 0000000..025770a Binary files /dev/null and b/res/images/city21.png differ diff --git a/res/images/next.png b/res/images/next.png new file mode 100755 index 0000000..fcdba0c Binary files /dev/null and b/res/images/next.png differ diff --git a/res/images/next2.png b/res/images/next2.png new file mode 100755 index 0000000..4c8f687 Binary files /dev/null and b/res/images/next2.png differ diff --git a/res/images/next_btn.png b/res/images/next_btn.png new file mode 100644 index 0000000..4c8f687 Binary files /dev/null and b/res/images/next_btn.png differ diff --git a/res/edje/images/searching_X.png b/res/images/orange small.png old mode 100644 new mode 100755 similarity index 90% rename from res/edje/images/searching_X.png rename to res/images/orange small.png index 27228c7..241a680 Binary files a/res/edje/images/searching_X.png and b/res/images/orange small.png differ diff --git a/res/images/orange.png b/res/images/orange.png new file mode 100755 index 0000000..251b230 Binary files /dev/null and b/res/images/orange.png differ diff --git a/res/images/pink small.png b/res/images/pink small.png new file mode 100755 index 0000000..9ef57b2 Binary files /dev/null and b/res/images/pink small.png differ diff --git a/res/images/pink.png b/res/images/pink.png new file mode 100755 index 0000000..f0eb889 Binary files /dev/null and b/res/images/pink.png differ diff --git a/res/edje/images/other_location_blue.png b/res/images/searching list.png similarity index 75% rename from res/edje/images/other_location_blue.png rename to res/images/searching list.png index f5a2db5..bf751b8 100644 Binary files a/res/edje/images/other_location_blue.png and b/res/images/searching list.png differ diff --git a/res/images/searchlist.png b/res/images/searchlist.png new file mode 100644 index 0000000..bf751b8 Binary files /dev/null and b/res/images/searchlist.png differ diff --git a/res/edje/images/other_location_mint.png "b/res/images/\355\225\230\353\213\250 \353\262\204\355\212\274.png" old mode 100644 new mode 100755 similarity index 81% rename from res/edje/images/other_location_mint.png rename to "res/images/\355\225\230\353\213\250 \353\262\204\355\212\274.png" index 372eec3..51d8fa5 Binary files a/res/edje/images/other_location_mint.png and "b/res/images/\355\225\230\353\213\250 \353\262\204\355\212\274.png" differ