diff --git a/android/res/drawable-hdpi/ic_adress.png b/android/res/drawable-hdpi/ic_adress.png new file mode 100644 index 0000000000..3ce6e66940 Binary files /dev/null and b/android/res/drawable-hdpi/ic_adress.png differ diff --git a/android/res/drawable-hdpi/ic_bank.png b/android/res/drawable-hdpi/ic_bank.png new file mode 100644 index 0000000000..c8f62cda5f Binary files /dev/null and b/android/res/drawable-hdpi/ic_bank.png differ diff --git a/android/res/drawable-hdpi/ic_bank_operator.png b/android/res/drawable-hdpi/ic_bank_operator.png deleted file mode 100644 index 11398a5b4a..0000000000 Binary files a/android/res/drawable-hdpi/ic_bank_operator.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_coordinates.png b/android/res/drawable-hdpi/ic_coordinates.png new file mode 100644 index 0000000000..157ee14d54 Binary files /dev/null and b/android/res/drawable-hdpi/ic_coordinates.png differ diff --git a/android/res/drawable-hdpi/ic_cuisine.png b/android/res/drawable-hdpi/ic_cuisine.png index 5eed25e701..a4c27d5199 100644 Binary files a/android/res/drawable-hdpi/ic_cuisine.png and b/android/res/drawable-hdpi/ic_cuisine.png differ diff --git a/android/res/drawable-hdpi/ic_email.png b/android/res/drawable-hdpi/ic_email.png index c603eb795f..955f7310a8 100644 Binary files a/android/res/drawable-hdpi/ic_email.png and b/android/res/drawable-hdpi/ic_email.png differ diff --git a/android/res/drawable-hdpi/ic_entrance.png b/android/res/drawable-hdpi/ic_entrance.png new file mode 100644 index 0000000000..817ede8f97 Binary files /dev/null and b/android/res/drawable-hdpi/ic_entrance.png differ diff --git a/android/res/drawable-hdpi/ic_operating_hours.png b/android/res/drawable-hdpi/ic_operating_hours.png new file mode 100644 index 0000000000..69f2af7d61 Binary files /dev/null and b/android/res/drawable-hdpi/ic_operating_hours.png differ diff --git a/android/res/drawable-hdpi/ic_phone.png b/android/res/drawable-hdpi/ic_phone.png new file mode 100644 index 0000000000..60d72b5d3f Binary files /dev/null and b/android/res/drawable-hdpi/ic_phone.png differ diff --git a/android/res/drawable-hdpi/ic_text_adress.png b/android/res/drawable-hdpi/ic_text_adress.png deleted file mode 100644 index 0d9319bf1f..0000000000 Binary files a/android/res/drawable-hdpi/ic_text_adress.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_text_link.png b/android/res/drawable-hdpi/ic_text_link.png deleted file mode 100644 index 5c79b7d6d9..0000000000 Binary files a/android/res/drawable-hdpi/ic_text_link.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_text_phone.png b/android/res/drawable-hdpi/ic_text_phone.png deleted file mode 100644 index 172da26709..0000000000 Binary files a/android/res/drawable-hdpi/ic_text_phone.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_text_position.png b/android/res/drawable-hdpi/ic_text_position.png deleted file mode 100644 index 86efe4571d..0000000000 Binary files a/android/res/drawable-hdpi/ic_text_position.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_text_wifi.png b/android/res/drawable-hdpi/ic_text_wifi.png deleted file mode 100644 index ff7d2ddf08..0000000000 Binary files a/android/res/drawable-hdpi/ic_text_wifi.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_text_worktime.png b/android/res/drawable-hdpi/ic_text_worktime.png deleted file mode 100644 index 65a4f73f7a..0000000000 Binary files a/android/res/drawable-hdpi/ic_text_worktime.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_web.png b/android/res/drawable-hdpi/ic_web.png new file mode 100644 index 0000000000..e2a4f01f04 Binary files /dev/null and b/android/res/drawable-hdpi/ic_web.png differ diff --git a/android/res/drawable-hdpi/ic_wifi.png b/android/res/drawable-hdpi/ic_wifi.png new file mode 100644 index 0000000000..628fceca5b Binary files /dev/null and b/android/res/drawable-hdpi/ic_wifi.png differ diff --git a/android/res/drawable-hdpi/ic_wiki.png b/android/res/drawable-hdpi/ic_wiki.png new file mode 100644 index 0000000000..93b71d1fb2 Binary files /dev/null and b/android/res/drawable-hdpi/ic_wiki.png differ diff --git a/android/res/drawable-mdpi/ic_adress.png b/android/res/drawable-mdpi/ic_adress.png new file mode 100644 index 0000000000..d97a3224a1 Binary files /dev/null and b/android/res/drawable-mdpi/ic_adress.png differ diff --git a/android/res/drawable-mdpi/ic_bank.png b/android/res/drawable-mdpi/ic_bank.png new file mode 100644 index 0000000000..58c7842cdd Binary files /dev/null and b/android/res/drawable-mdpi/ic_bank.png differ diff --git a/android/res/drawable-mdpi/ic_bank_operator.png b/android/res/drawable-mdpi/ic_bank_operator.png deleted file mode 100644 index d5861589da..0000000000 Binary files a/android/res/drawable-mdpi/ic_bank_operator.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_coordinates.png b/android/res/drawable-mdpi/ic_coordinates.png new file mode 100644 index 0000000000..4c443e8dc8 Binary files /dev/null and b/android/res/drawable-mdpi/ic_coordinates.png differ diff --git a/android/res/drawable-mdpi/ic_cuisine.png b/android/res/drawable-mdpi/ic_cuisine.png index cd59421619..99cb9e81c6 100644 Binary files a/android/res/drawable-mdpi/ic_cuisine.png and b/android/res/drawable-mdpi/ic_cuisine.png differ diff --git a/android/res/drawable-mdpi/ic_email.png b/android/res/drawable-mdpi/ic_email.png index ff36d89264..5560961636 100644 Binary files a/android/res/drawable-mdpi/ic_email.png and b/android/res/drawable-mdpi/ic_email.png differ diff --git a/android/res/drawable-mdpi/ic_entrance.png b/android/res/drawable-mdpi/ic_entrance.png new file mode 100644 index 0000000000..5f0ec31bc6 Binary files /dev/null and b/android/res/drawable-mdpi/ic_entrance.png differ diff --git a/android/res/drawable-mdpi/ic_operating_hours.png b/android/res/drawable-mdpi/ic_operating_hours.png new file mode 100644 index 0000000000..babf02322b Binary files /dev/null and b/android/res/drawable-mdpi/ic_operating_hours.png differ diff --git a/android/res/drawable-mdpi/ic_phone.png b/android/res/drawable-mdpi/ic_phone.png new file mode 100644 index 0000000000..25fd74e16b Binary files /dev/null and b/android/res/drawable-mdpi/ic_phone.png differ diff --git a/android/res/drawable-mdpi/ic_text_adress.png b/android/res/drawable-mdpi/ic_text_adress.png deleted file mode 100644 index 44b0217e99..0000000000 Binary files a/android/res/drawable-mdpi/ic_text_adress.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_text_link.png b/android/res/drawable-mdpi/ic_text_link.png deleted file mode 100644 index fdc6f9f8ec..0000000000 Binary files a/android/res/drawable-mdpi/ic_text_link.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_text_phone.png b/android/res/drawable-mdpi/ic_text_phone.png deleted file mode 100644 index f362629a60..0000000000 Binary files a/android/res/drawable-mdpi/ic_text_phone.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_text_position.png b/android/res/drawable-mdpi/ic_text_position.png deleted file mode 100644 index b74b35ebda..0000000000 Binary files a/android/res/drawable-mdpi/ic_text_position.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_text_wifi.png b/android/res/drawable-mdpi/ic_text_wifi.png deleted file mode 100644 index 042ce336e8..0000000000 Binary files a/android/res/drawable-mdpi/ic_text_wifi.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_text_worktime.png b/android/res/drawable-mdpi/ic_text_worktime.png deleted file mode 100644 index 8479a01692..0000000000 Binary files a/android/res/drawable-mdpi/ic_text_worktime.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_web.png b/android/res/drawable-mdpi/ic_web.png new file mode 100644 index 0000000000..dd3afe5470 Binary files /dev/null and b/android/res/drawable-mdpi/ic_web.png differ diff --git a/android/res/drawable-mdpi/ic_wifi.png b/android/res/drawable-mdpi/ic_wifi.png new file mode 100644 index 0000000000..66f028223e Binary files /dev/null and b/android/res/drawable-mdpi/ic_wifi.png differ diff --git a/android/res/drawable-mdpi/ic_wiki.png b/android/res/drawable-mdpi/ic_wiki.png new file mode 100644 index 0000000000..00876ab767 Binary files /dev/null and b/android/res/drawable-mdpi/ic_wiki.png differ diff --git a/android/res/drawable-xhdpi/ic_adress.png b/android/res/drawable-xhdpi/ic_adress.png new file mode 100644 index 0000000000..552a70d44d Binary files /dev/null and b/android/res/drawable-xhdpi/ic_adress.png differ diff --git a/android/res/drawable-xhdpi/ic_bank.png b/android/res/drawable-xhdpi/ic_bank.png new file mode 100644 index 0000000000..23d4a65d82 Binary files /dev/null and b/android/res/drawable-xhdpi/ic_bank.png differ diff --git a/android/res/drawable-xhdpi/ic_bank_operator.png b/android/res/drawable-xhdpi/ic_bank_operator.png deleted file mode 100644 index 243704f73a..0000000000 Binary files a/android/res/drawable-xhdpi/ic_bank_operator.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_coordinates.png b/android/res/drawable-xhdpi/ic_coordinates.png new file mode 100644 index 0000000000..b23b12a284 Binary files /dev/null and b/android/res/drawable-xhdpi/ic_coordinates.png differ diff --git a/android/res/drawable-xhdpi/ic_cuisine.png b/android/res/drawable-xhdpi/ic_cuisine.png index 1cf9295f50..e548e10ca3 100644 Binary files a/android/res/drawable-xhdpi/ic_cuisine.png and b/android/res/drawable-xhdpi/ic_cuisine.png differ diff --git a/android/res/drawable-xhdpi/ic_email.png b/android/res/drawable-xhdpi/ic_email.png index 0fea8736f2..e8c823a026 100644 Binary files a/android/res/drawable-xhdpi/ic_email.png and b/android/res/drawable-xhdpi/ic_email.png differ diff --git a/android/res/drawable-xhdpi/ic_entrance.png b/android/res/drawable-xhdpi/ic_entrance.png new file mode 100644 index 0000000000..140dd22523 Binary files /dev/null and b/android/res/drawable-xhdpi/ic_entrance.png differ diff --git a/android/res/drawable-xhdpi/ic_operating_hours.png b/android/res/drawable-xhdpi/ic_operating_hours.png new file mode 100644 index 0000000000..b731d75ac9 Binary files /dev/null and b/android/res/drawable-xhdpi/ic_operating_hours.png differ diff --git a/android/res/drawable-xhdpi/ic_phone.png b/android/res/drawable-xhdpi/ic_phone.png new file mode 100644 index 0000000000..b9d6052877 Binary files /dev/null and b/android/res/drawable-xhdpi/ic_phone.png differ diff --git a/android/res/drawable-xhdpi/ic_text_adress.png b/android/res/drawable-xhdpi/ic_text_adress.png deleted file mode 100644 index 2706124b5a..0000000000 Binary files a/android/res/drawable-xhdpi/ic_text_adress.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_text_link.png b/android/res/drawable-xhdpi/ic_text_link.png deleted file mode 100644 index 39c1452524..0000000000 Binary files a/android/res/drawable-xhdpi/ic_text_link.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_text_phone.png b/android/res/drawable-xhdpi/ic_text_phone.png deleted file mode 100644 index b6f0539152..0000000000 Binary files a/android/res/drawable-xhdpi/ic_text_phone.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_text_position.png b/android/res/drawable-xhdpi/ic_text_position.png deleted file mode 100644 index 8a58c32a87..0000000000 Binary files a/android/res/drawable-xhdpi/ic_text_position.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_text_wifi.png b/android/res/drawable-xhdpi/ic_text_wifi.png deleted file mode 100644 index f07c04f652..0000000000 Binary files a/android/res/drawable-xhdpi/ic_text_wifi.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_text_worktime.png b/android/res/drawable-xhdpi/ic_text_worktime.png deleted file mode 100644 index 764210d32b..0000000000 Binary files a/android/res/drawable-xhdpi/ic_text_worktime.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_web.png b/android/res/drawable-xhdpi/ic_web.png new file mode 100644 index 0000000000..c9633ce486 Binary files /dev/null and b/android/res/drawable-xhdpi/ic_web.png differ diff --git a/android/res/drawable-xhdpi/ic_wifi.png b/android/res/drawable-xhdpi/ic_wifi.png new file mode 100644 index 0000000000..86203898d1 Binary files /dev/null and b/android/res/drawable-xhdpi/ic_wifi.png differ diff --git a/android/res/drawable-xhdpi/ic_wiki.png b/android/res/drawable-xhdpi/ic_wiki.png new file mode 100644 index 0000000000..f4a2208f2c Binary files /dev/null and b/android/res/drawable-xhdpi/ic_wiki.png differ diff --git a/android/res/drawable-xxhdpi/ic_adress.png b/android/res/drawable-xxhdpi/ic_adress.png new file mode 100644 index 0000000000..5b22430e33 Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_adress.png differ diff --git a/android/res/drawable-xxhdpi/ic_bank.png b/android/res/drawable-xxhdpi/ic_bank.png new file mode 100644 index 0000000000..b522486116 Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_bank.png differ diff --git a/android/res/drawable-xxhdpi/ic_bank_operator.png b/android/res/drawable-xxhdpi/ic_bank_operator.png deleted file mode 100644 index b12b632319..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_bank_operator.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_coordinates.png b/android/res/drawable-xxhdpi/ic_coordinates.png new file mode 100644 index 0000000000..f92d6024dc Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_coordinates.png differ diff --git a/android/res/drawable-xxhdpi/ic_cuisine.png b/android/res/drawable-xxhdpi/ic_cuisine.png index 3c03c2a230..b4f5d77cf4 100644 Binary files a/android/res/drawable-xxhdpi/ic_cuisine.png and b/android/res/drawable-xxhdpi/ic_cuisine.png differ diff --git a/android/res/drawable-xxhdpi/ic_email.png b/android/res/drawable-xxhdpi/ic_email.png index 53e7456835..96f72f161f 100644 Binary files a/android/res/drawable-xxhdpi/ic_email.png and b/android/res/drawable-xxhdpi/ic_email.png differ diff --git a/android/res/drawable-xxhdpi/ic_entrance.png b/android/res/drawable-xxhdpi/ic_entrance.png new file mode 100644 index 0000000000..3eee6b97ff Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_entrance.png differ diff --git a/android/res/drawable-xxhdpi/ic_operating_hours.png b/android/res/drawable-xxhdpi/ic_operating_hours.png new file mode 100644 index 0000000000..7784ea8a74 Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_operating_hours.png differ diff --git a/android/res/drawable-xxhdpi/ic_phone.png b/android/res/drawable-xxhdpi/ic_phone.png new file mode 100644 index 0000000000..c0f05acaf5 Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_phone.png differ diff --git a/android/res/drawable-xxhdpi/ic_text_adress.png b/android/res/drawable-xxhdpi/ic_text_adress.png deleted file mode 100644 index edf5b4844f..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_text_adress.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_text_link.png b/android/res/drawable-xxhdpi/ic_text_link.png deleted file mode 100644 index 7feedfade4..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_text_link.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_text_phone.png b/android/res/drawable-xxhdpi/ic_text_phone.png deleted file mode 100644 index a219ee3b31..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_text_phone.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_text_position.png b/android/res/drawable-xxhdpi/ic_text_position.png deleted file mode 100644 index 81b3891b41..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_text_position.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_text_wifi.png b/android/res/drawable-xxhdpi/ic_text_wifi.png deleted file mode 100644 index 5583dc6a5e..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_text_wifi.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_text_worktime.png b/android/res/drawable-xxhdpi/ic_text_worktime.png deleted file mode 100644 index 9daad3196f..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_text_worktime.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_web.png b/android/res/drawable-xxhdpi/ic_web.png new file mode 100644 index 0000000000..0bdd7dd045 Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_web.png differ diff --git a/android/res/drawable-xxhdpi/ic_wifi.png b/android/res/drawable-xxhdpi/ic_wifi.png new file mode 100644 index 0000000000..31306fe10f Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_wifi.png differ diff --git a/android/res/drawable-xxhdpi/ic_wiki.png b/android/res/drawable-xxhdpi/ic_wiki.png new file mode 100644 index 0000000000..326dac267d Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_wiki.png differ diff --git a/android/res/drawable-xxxhdpi/ic_adress.png b/android/res/drawable-xxxhdpi/ic_adress.png new file mode 100644 index 0000000000..b4f30a8f72 Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_adress.png differ diff --git a/android/res/drawable-xxxhdpi/ic_bank.png b/android/res/drawable-xxxhdpi/ic_bank.png new file mode 100644 index 0000000000..666782ae2d Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_bank.png differ diff --git a/android/res/drawable-xxxhdpi/ic_coordinates.png b/android/res/drawable-xxxhdpi/ic_coordinates.png new file mode 100644 index 0000000000..354b2d5779 Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_coordinates.png differ diff --git a/android/res/drawable-xxxhdpi/ic_cuisine.png b/android/res/drawable-xxxhdpi/ic_cuisine.png new file mode 100644 index 0000000000..4b81072156 Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_cuisine.png differ diff --git a/android/res/drawable-xxxhdpi/ic_email.png b/android/res/drawable-xxxhdpi/ic_email.png new file mode 100644 index 0000000000..0cf50082a9 Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_email.png differ diff --git a/android/res/drawable-xxxhdpi/ic_entrance.png b/android/res/drawable-xxxhdpi/ic_entrance.png new file mode 100644 index 0000000000..e860f9a0c3 Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_entrance.png differ diff --git a/android/res/drawable-xxxhdpi/ic_operating_hours.png b/android/res/drawable-xxxhdpi/ic_operating_hours.png new file mode 100644 index 0000000000..b95ef9e8f8 Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_operating_hours.png differ diff --git a/android/res/drawable-xxxhdpi/ic_phone.png b/android/res/drawable-xxxhdpi/ic_phone.png new file mode 100644 index 0000000000..29468dc3c7 Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_phone.png differ diff --git a/android/res/drawable-xxxhdpi/ic_web.png b/android/res/drawable-xxxhdpi/ic_web.png new file mode 100644 index 0000000000..08cd81b605 Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_web.png differ diff --git a/android/res/drawable-xxxhdpi/ic_wifi.png b/android/res/drawable-xxxhdpi/ic_wifi.png new file mode 100644 index 0000000000..4e4cea07b5 Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_wifi.png differ diff --git a/android/res/drawable-xxxhdpi/ic_wiki.png b/android/res/drawable-xxxhdpi/ic_wiki.png new file mode 100644 index 0000000000..0019bec907 Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_wiki.png differ diff --git a/android/res/layout-w600dp-port/place_page_details.xml b/android/res/layout-w600dp-port/place_page_details.xml index ea88fa7fc0..c1190c105d 100644 --- a/android/res/layout-w600dp-port/place_page_details.xml +++ b/android/res/layout-w600dp-port/place_page_details.xml @@ -48,11 +48,13 @@ + + - + @@ -63,14 +65,18 @@ android:layout_toRightOf="@id/anchor_center" android:orientation="vertical"> + + + + - - + + diff --git a/android/res/layout/place_page_cuisine.xml b/android/res/layout/place_page_cuisine.xml new file mode 100644 index 0000000000..37e1d2db5b --- /dev/null +++ b/android/res/layout/place_page_cuisine.xml @@ -0,0 +1,31 @@ + + + + + + + \ No newline at end of file diff --git a/android/res/layout/place_page_details.xml b/android/res/layout/place_page_details.xml index 61fe73d053..86899d022e 100644 --- a/android/res/layout/place_page_details.xml +++ b/android/res/layout/place_page_details.xml @@ -25,20 +25,26 @@ + + + + + + - - + + + + + + + + + \ No newline at end of file diff --git a/android/res/layout/place_page_latlon.xml b/android/res/layout/place_page_latlon.xml index ca9481f516..9910b41cb9 100644 --- a/android/res/layout/place_page_latlon.xml +++ b/android/res/layout/place_page_latlon.xml @@ -17,8 +17,8 @@ android:id="@+id/iv__place_latlon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/margin_double" - android:src="@drawable/ic_text_position"/> + android:layout_marginRight="@dimen/margin_base" + android:src="@drawable/ic_coordinates"/> + android:layout_marginRight="@dimen/margin_base" + android:src="@drawable/ic_bank"/> + android:layout_marginRight="@dimen/margin_base" + android:src="@drawable/ic_phone"/> - + + android:id="@+id/iv__place_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_marginRight="@dimen/margin_base" + android:src="@drawable/ic_adress"/> - \ No newline at end of file + android:id="@+id/tv__place_address" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/iv__place_name" + android:textColor="@color/text_place_page" + android:textSize="@dimen/text_size_body_1" + tools:text="Sample place"/> + + + \ No newline at end of file diff --git a/android/res/layout/place_page_preview_common.xml b/android/res/layout/place_page_preview_common.xml index 590d2fffdb..42f422bf64 100644 --- a/android/res/layout/place_page_preview_common.xml +++ b/android/res/layout/place_page_preview_common.xml @@ -2,79 +2,79 @@ + + + android:ellipsize="end" + android:maxLines="@integer/pp_title_lines" + android:textColor="@color/text_place_page" + android:textSize="@dimen/text_size_headline"/> + android:id="@+id/tv__subtitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/tv__title" + android:layout_marginRight="@dimen/margin_base" + android:textColor="@color/text_place_page_subtitle" + android:textSize="@dimen/text_size_body_1"/> - - + android:id="@+id/tv__opened_till" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/tv__subtitle" + android:gravity="center_vertical" + android:textColor="@color/text_place_page_subtitle" + android:textSize="@dimen/text_size_body_1" + android:visibility="gone"/> + android:id="@+id/rb__stars" + style="?android:attr/ratingBarStyleSmall" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignBottom="@id/tv__subtitle" + android:layout_marginBottom="@dimen/margin_eighth" + android:layout_toRightOf="@id/tv__subtitle" + android:numStars="5" + android:progressDrawable="@drawable/rating_bar_stars" + android:stepSize="1" + android:visibility="gone"/> + android:id="@+id/tv__peak_elevation" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignBottom="@id/tv__subtitle" + android:layout_toRightOf="@id/tv__subtitle" + android:drawableLeft="@drawable/ic_high_mountain" + android:textColor="@color/text_place_page_subtitle" + android:textSize="@dimen/text_size_body_1" + android:visibility="gone"/> + android:id="@+id/tv__straight_distance" + android:layout_width="72dp" + android:layout_height="wrap_content" + android:gravity="right" + android:textColor="@color/text_place_page" + android:textSize="@dimen/text_size_body_1"/> + android:id="@+id/av__direction" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginRight="-8dp" + android:clickable="true" + android:padding="@dimen/margin_half"/> diff --git a/android/res/layout/place_page_schedule.xml b/android/res/layout/place_page_schedule.xml index 829558ecc0..d71f99de78 100644 --- a/android/res/layout/place_page_schedule.xml +++ b/android/res/layout/place_page_schedule.xml @@ -1,28 +1,31 @@ + android:id="@+id/ll__place_schedule" + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?attr/clickableBackground" + android:gravity="center_vertical" + android:orientation="horizontal" + android:paddingBottom="@dimen/margin_half" + android:paddingTop="@dimen/margin_half" + android:tag="schedule" + android:visibility="gone" + tools:visibility="visible"> + android:id="@+id/iv__place_schedule" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginRight="@dimen/margin_base" + android:src="@drawable/ic_operating_hours"/> + android:id="@+id/tv__place_schedule" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="@color/text_place_page" + android:textSize="@dimen/text_size_body_1" + tools:text="Today 16:00-18.00"/> \ No newline at end of file diff --git a/android/res/layout/place_page_website.xml b/android/res/layout/place_page_website.xml index 9aa73edb1a..e0cc8933aa 100644 --- a/android/res/layout/place_page_website.xml +++ b/android/res/layout/place_page_website.xml @@ -19,8 +19,8 @@ android:id="@+id/iv__place_website" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/margin_double" - android:src="@drawable/ic_text_link"/> + android:layout_marginRight="@dimen/margin_base" + android:src="@drawable/ic_web"/> + tools:text="osm.org"/> diff --git a/android/res/layout/place_page_wifi.xml b/android/res/layout/place_page_wifi.xml index 7b456f4b53..6387d0296b 100644 --- a/android/res/layout/place_page_wifi.xml +++ b/android/res/layout/place_page_wifi.xml @@ -18,8 +18,8 @@ android:id="@+id/iv__place_wifi" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/margin_double" - android:src="@drawable/ic_text_wifi"/> + android:layout_marginRight="@dimen/margin_base" + android:src="@drawable/ic_wifi"/> + android:text="@string/WiFi_available"/> \ No newline at end of file diff --git a/android/res/layout/place_page_wiki.xml b/android/res/layout/place_page_wiki.xml new file mode 100644 index 0000000000..1e355175e4 --- /dev/null +++ b/android/res/layout/place_page_wiki.xml @@ -0,0 +1,32 @@ + + + + + + + diff --git a/android/src/com/mapswithme/maps/bookmarks/data/Metadata.java b/android/src/com/mapswithme/maps/bookmarks/data/Metadata.java index 081703b32f..6bbbf35b5d 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/Metadata.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/Metadata.java @@ -8,7 +8,7 @@ import java.util.Map; public class Metadata implements Parcelable { - // values MUST correspond to definitions from feature_meta.hpp + // Values must correspond to definitions from feature_meta.hpp. public enum MetadataType { FMD_CUISINE(1), @@ -24,7 +24,11 @@ public class Metadata implements Parcelable FMD_TURN_LANES(11), FMD_TURN_LANES_FORWARD(12), FMD_TURN_LANES_BACKWARD(13), - FMD_EMAIL(14); + FMD_EMAIL(14), + FMD_POSTCODE(15), + FMD_WIKIPEDIA(16), + FMD_MAXSPEED(17), + FMD_FLATS(18); private int mMetaType; @@ -48,8 +52,6 @@ public class Metadata implements Parcelable /** * Adds metadata with type code and value. Returns false if metaType is wrong or unknown * - * @param metaType - * @param metaValue * @return true, if metadata was added, false otherwise */ public boolean addMetadata(int metaType, String metaValue) @@ -65,8 +67,6 @@ public class Metadata implements Parcelable /** * Adds metadata with type and value. * - * @param type - * @param value * @return true, if metadata was added, false otherwise */ public boolean addMetadata(MetadataType type, String value) diff --git a/android/src/com/mapswithme/maps/settings/AboutFragment.java b/android/src/com/mapswithme/maps/settings/AboutFragment.java index fd76728140..0ba8d91157 100644 --- a/android/src/com/mapswithme/maps/settings/AboutFragment.java +++ b/android/src/com/mapswithme/maps/settings/AboutFragment.java @@ -16,7 +16,6 @@ import com.mapswithme.maps.widget.BaseShadowController; import com.mapswithme.maps.widget.ObservableScrollView; import com.mapswithme.maps.widget.ScrollViewShadowController; import com.mapswithme.util.Constants; -import com.mapswithme.util.UiUtils; import com.mapswithme.util.Utils; import com.mapswithme.util.sharing.ShareOption; import com.mapswithme.util.statistics.AlohaHelper; @@ -83,14 +82,14 @@ public class AboutFragment extends BaseSettingsFragment Statistics.INSTANCE.trackSimpleNamedEvent(Statistics.EventName.Settings.FACEBOOK); AlohaHelper.logClick(AlohaHelper.Settings.FACEBOOK); - UiUtils.showFacebookPage(getActivity()); + Utils.showFacebookPage(getActivity()); break; case R.id.twitter: Statistics.INSTANCE.trackSimpleNamedEvent(Statistics.EventName.Settings.TWITTER); AlohaHelper.logClick(AlohaHelper.Settings.TWITTER); - UiUtils.showTwitterPage(getActivity()); + Utils.showTwitterPage(getActivity()); break; case R.id.subscribe: @@ -107,7 +106,7 @@ public class AboutFragment extends BaseSettingsFragment Statistics.INSTANCE.trackSimpleNamedEvent(Statistics.EventName.Settings.RATE); AlohaHelper.logClick(AlohaHelper.Settings.RATE); - UiUtils.openAppInMarket(getActivity(), BuildConfig.REVIEW_URL); + Utils.openAppInMarket(getActivity(), BuildConfig.REVIEW_URL); break; case R.id.share: diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java index 1680bc6be5..ae8a3c1470 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java @@ -63,6 +63,8 @@ import com.mapswithme.util.sharing.ShareOption; import com.mapswithme.util.statistics.AlohaHelper; import com.mapswithme.util.statistics.Statistics; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; import java.util.ArrayList; import java.util.List; @@ -85,21 +87,27 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene private TextView mTvElevation; // Place page details private ScrollView mPpDetails; - private LinearLayout mLlAddress; + private RelativeLayout mAddress; private TextView mTvAddress; - private LinearLayout mLlPhone; + private LinearLayout mPhone; private TextView mTvPhone; - private LinearLayout mLlWebsite; + private LinearLayout mWebsite; private TextView mTvWebsite; - private LinearLayout mLlLatlon; + private LinearLayout mLatlon; private TextView mTvLatlon; - private LinearLayout mLlSchedule; + private LinearLayout mSchedule; private TextView mTvSchedule; - private LinearLayout mLlWifi; - private LinearLayout mLlEmail; + private LinearLayout mWifi; + private LinearLayout mEmail; private TextView mTvEmail; - private LinearLayout mLlOperator; + private LinearLayout mOperator; private TextView mTvOperator; + private LinearLayout mCuisine; + private TextView mTvCuisine; + private LinearLayout mWiki; + private TextView mTvWiki; + private LinearLayout mEntrance; + private TextView mTvEntrance; // Bookmark private ImageView mIvColor; private EditText mEtBookmarkName; @@ -110,7 +118,7 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene private TextView mTvBookmarkGroup; // Place page buttons private BaseShadowController mShadowController; - private LinearLayout mLlApiBack; + private LinearLayout mApiBack; private ImageView mIvBookmark; private View mRoutingButton; // Animations @@ -167,35 +175,45 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene mTvElevation = (TextView) ppPreview.findViewById(R.id.tv__peak_elevation); mPpDetails = (ScrollView) findViewById(R.id.pp__details); - mLlAddress = (LinearLayout) mPpDetails.findViewById(R.id.ll__place_name); + mAddress = (RelativeLayout) mPpDetails.findViewById(R.id.ll__place_name); mTvAddress = (TextView) mPpDetails.findViewById(R.id.tv__place_address); - mLlPhone = (LinearLayout) mPpDetails.findViewById(R.id.ll__place_phone); - mLlPhone.setOnClickListener(this); + mPhone = (LinearLayout) mPpDetails.findViewById(R.id.ll__place_phone); + mPhone.setOnClickListener(this); mTvPhone = (TextView) mPpDetails.findViewById(R.id.tv__place_phone); - mLlWebsite = (LinearLayout) mPpDetails.findViewById(R.id.ll__place_website); - mLlWebsite.setOnClickListener(this); + mWebsite = (LinearLayout) mPpDetails.findViewById(R.id.ll__place_website); + mWebsite.setOnClickListener(this); mTvWebsite = (TextView) mPpDetails.findViewById(R.id.tv__place_website); - mLlLatlon = (LinearLayout) mPpDetails.findViewById(R.id.ll__place_latlon); + mLatlon = (LinearLayout) mPpDetails.findViewById(R.id.ll__place_latlon); mTvLatlon = (TextView) mPpDetails.findViewById(R.id.tv__place_latlon); - mLlLatlon.setOnClickListener(this); - mLlSchedule = (LinearLayout) mPpDetails.findViewById(R.id.ll__place_schedule); + mLatlon.setOnClickListener(this); + mSchedule = (LinearLayout) mPpDetails.findViewById(R.id.ll__place_schedule); mTvSchedule = (TextView) mPpDetails.findViewById(R.id.tv__place_schedule); - mLlWifi = (LinearLayout) mPpDetails.findViewById(R.id.ll__place_wifi); + mWifi = (LinearLayout) mPpDetails.findViewById(R.id.ll__place_wifi); mIvColor = (ImageView) mPpDetails.findViewById(R.id.iv__bookmark_color); mIvColor.setOnClickListener(this); - mLlEmail = (LinearLayout) mPpDetails.findViewById(R.id.ll__place_email); - mLlEmail.setOnClickListener(this); - mTvEmail = (TextView) mLlEmail.findViewById(R.id.tv__place_email); - mLlOperator = (LinearLayout) mPpDetails.findViewById(R.id.ll__place_operator); - mLlOperator.setOnClickListener(this); - mTvOperator = (TextView) mPpDetails.findViewById(R.id.tv__place_operator); - mLlLatlon.setOnLongClickListener(this); - mLlAddress.setOnLongClickListener(this); - mLlPhone.setOnLongClickListener(this); - mLlWebsite.setOnLongClickListener(this); - mLlSchedule.setOnLongClickListener(this); - mLlEmail.setOnLongClickListener(this); - mLlOperator.setOnLongClickListener(this); + mEmail = (LinearLayout) mPpDetails.findViewById(R.id.ll__place_email); + mEmail.setOnClickListener(this); + mTvEmail = (TextView) mEmail.findViewById(R.id.tv__place_email); + mOperator = (LinearLayout) mPpDetails.findViewById(R.id.ll__place_operator); + mOperator.setOnClickListener(this); + mTvOperator = (TextView) mOperator.findViewById(R.id.tv__place_operator); + mCuisine = (LinearLayout) mPpDetails.findViewById(R.id.ll__place_cuisine); + mCuisine.setOnClickListener(this); + mTvCuisine = (TextView) mCuisine.findViewById(R.id.tv__place_cuisine); + mWiki = (LinearLayout) mPpDetails.findViewById(R.id.ll__place_wiki); + mWiki.setOnClickListener(this); + mTvWiki = (TextView) mWiki.findViewById(R.id.tv__place_wiki); + mEntrance = (LinearLayout) mPpDetails.findViewById(R.id.ll__place_entrance); + mEntrance.setOnClickListener(this); + mTvEntrance = (TextView) mEntrance.findViewById(R.id.tv__place_entrance); + mLatlon.setOnLongClickListener(this); + mAddress.setOnLongClickListener(this); + mPhone.setOnLongClickListener(this); + mWebsite.setOnLongClickListener(this); + mSchedule.setOnLongClickListener(this); + mEmail.setOnLongClickListener(this); + mOperator.setOnLongClickListener(this); + mWiki.setOnLongClickListener(this); mEtBookmarkName = (EditText) mPpDetails.findViewById(R.id.et__bookmark_name); mTvNotes = (TextView) mPpDetails.findViewById(R.id.tv__bookmark_notes); @@ -210,8 +228,8 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene mBtnEditHtmlDescription.setOnClickListener(this); ViewGroup ppButtons = (ViewGroup) findViewById(R.id.pp__buttons); - mLlApiBack = (LinearLayout) ppButtons.findViewById(R.id.ll__api_back); - mLlApiBack.setOnClickListener(this); + mApiBack = (LinearLayout) ppButtons.findViewById(R.id.ll__api_back); + mApiBack.setOnClickListener(this); final ViewGroup bookmarkGroup = (ViewGroup) ppButtons.findViewById(R.id.ll__bookmark); bookmarkGroup.setOnClickListener(this); mIvBookmark = (ImageView) bookmarkGroup.findViewById(R.id.iv__bookmark); @@ -219,8 +237,8 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene mRoutingButton = ppButtons.findViewById(R.id.ll__route); mShadowController = new ScrollViewShadowController((ObservableScrollView) mPpDetails) - .addBottomShadow() - .attach(); + .addBottomShadow() + .attach(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) setElevation(UiUtils.dimen(R.dimen.appbar_elevation)); @@ -274,7 +292,8 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene return mIsDocked; } - public boolean isFloating() { + public boolean isFloating() + { return mIsFloating; } @@ -382,51 +401,46 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene public String translateCuisine(String cuisine) { - if (!TextUtils.isEmpty(cuisine)) - { - // cuisines translations can contain unsupported symbols, and res ids - // replace them with supported "_"( so ', ' and ' ' are replaced with underlines) - final String[] cuisines = cuisine.split(";"); - String result = ""; - // search translations for each cuisine - for (String cuisineRaw : cuisines) - { - final String cuisineKey = cuisineRaw.replace(", ", "_").replace(' ', '_').toLowerCase(); - int resId = getResources().getIdentifier("cuisine_" + cuisineKey, "string", BuildConfig.APPLICATION_ID); - result += resId == 0 ? cuisineRaw : getResources().getString(resId); - } - return result; - } + if (TextUtils.isEmpty(cuisine)) + return cuisine; - return cuisine; + // cuisines translations can contain unsupported symbols, and res ids + // replace them with supported "_"( so ', ' and ' ' are replaced with underlines) + final String[] cuisines = cuisine.split(";"); + String result = ""; + // search translations for each cuisine + for (String cuisineRaw : cuisines) + { + final String cuisineKey = cuisineRaw.replace(", ", "_").replace(' ', '_').toLowerCase(); + int resId = getResources().getIdentifier("cuisine_" + cuisineKey, "string", BuildConfig.APPLICATION_ID); + result += resId == 0 ? cuisineRaw : getResources().getString(resId); + } + return result; } private void refreshDetails() { refreshLatLon(); final String website = mMapObject.getMetadata(Metadata.MetadataType.FMD_WEBSITE); - if (website != null) - refreshMetadataOrHide(website, mLlWebsite, mTvWebsite); - else - refreshMetadataOrHide(mMapObject.getMetadata(Metadata.MetadataType.FMD_URL), mLlWebsite, mTvWebsite); - refreshMetadataOrHide(mMapObject.getMetadata(Metadata.MetadataType.FMD_PHONE_NUMBER), mLlPhone, mTvPhone); - refreshMetadataOrHide(mMapObject.getMetadata(Metadata.MetadataType.FMD_EMAIL), mLlEmail, mTvEmail); - refreshMetadataOrHide(mMapObject.getMetadata(Metadata.MetadataType.FMD_OPERATOR), mLlOperator, mTvOperator); - + refreshMetadataOrHide(TextUtils.isEmpty(website) ? mMapObject.getMetadata(Metadata.MetadataType.FMD_URL) : website, mWebsite, mTvWebsite); + refreshMetadataOrHide(mMapObject.getMetadata(Metadata.MetadataType.FMD_PHONE_NUMBER), mPhone, mTvPhone); + refreshMetadataOrHide(mMapObject.getMetadata(Metadata.MetadataType.FMD_EMAIL), mEmail, mTvEmail); + refreshMetadataOrHide(mMapObject.getMetadata(Metadata.MetadataType.FMD_OPERATOR), mOperator, mTvOperator); + refreshMetadataOrHide(translateCuisine(mMapObject.getMetadata(Metadata.MetadataType.FMD_CUISINE)), mCuisine, mTvCuisine); + try + { + final String wikipedia = mMapObject.getMetadata(Metadata.MetadataType.FMD_WIKIPEDIA); + refreshMetadataOrHide(TextUtils.isEmpty(wikipedia) ? null : URLDecoder.decode(wikipedia, "UTF-8"), mWiki, mTvWiki); + } catch (UnsupportedEncodingException e) + { + } + refreshMetadataOrHide(mMapObject.getMetadata(Metadata.MetadataType.FMD_INTERNET), mWifi, null); + refreshMetadataOrHide(mMapObject.getMetadata(Metadata.MetadataType.FMD_FLATS), mEntrance, mTvEntrance); // TODO throw away parsing hack when data will be parsed correctly in core final String rawSchedule = mMapObject.getMetadata(Metadata.MetadataType.FMD_OPEN_HOURS); - if (!TextUtils.isEmpty(rawSchedule)) - refreshMetadataOrHide(rawSchedule.replace("; ", "\n").replace(';', '\n'), mLlSchedule, mTvSchedule); - else - refreshMetadataOrHide(null, mLlSchedule, mTvSchedule); - + refreshMetadataOrHide(TextUtils.isEmpty(rawSchedule) ? null : rawSchedule.replace("; ", "\n").replace(';', '\n'), mSchedule, mTvSchedule); refreshMetadataStars(mMapObject.getMetadata(Metadata.MetadataType.FMD_STARS)); - - final String elevation = mMapObject.getMetadata(Metadata.MetadataType.FMD_ELE); - if (TextUtils.isEmpty(elevation)) - UiUtils.hide(mTvElevation); - else - UiUtils.setTextAndShow(mTvElevation, elevation); + UiUtils.setTextAndHideIfEmpty(mTvElevation, mMapObject.getMetadata(Metadata.MetadataType.FMD_ELE)); } private void hideBookmarkDetails() @@ -459,7 +473,7 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene private void refreshButtons(boolean showBackButton, boolean showRoutingButton) { - UiUtils.showIf(showBackButton || ParsedMwmRequest.isPickPointMode(), mLlApiBack); + UiUtils.showIf(showBackButton || ParsedMwmRequest.isPickPointMode(), mApiBack); UiUtils.showIf(showRoutingButton, mRoutingButton); } @@ -681,12 +695,12 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene } break; case R.id.ll__place_website: - intent = new Intent(Intent.ACTION_VIEW); - String website = mTvWebsite.getText().toString(); - if (!website.startsWith("http://") && !website.startsWith("https://")) - website = "http://" + website; - intent.setData(Uri.parse(website)); - getContext().startActivity(intent); + followUrl(mTvWebsite.getText().toString()); + break; + case R.id.ll__place_wiki: + final String[] wikiParts = mTvWiki.getText().toString().split(":"); + if (wikiParts.length == 2) + followUrl("https://" + wikiParts[0] + ".wikipedia.org/wiki/" + wikiParts[1]); break; case R.id.tv__bookmark_group: saveBookmarkNameIfUpdated(null); @@ -732,6 +746,15 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene Statistics.INSTANCE.trackDescriptionChanged(); } + private void followUrl(String url) + { + final Intent intent = new Intent(Intent.ACTION_VIEW); + if (!url.startsWith("http://") && !url.startsWith("https://")) + url = "http://" + url; + intent.setData(Uri.parse(url)); + getContext().startActivity(intent); + } + private void toggleIsBookmark() { if (mMapObject == null) @@ -850,6 +873,9 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene case R.id.ll__place_operator: items.add(mTvOperator.getText().toString()); break; + case R.id.ll__place_wiki: + items.add(mTvWiki.getText().toString()); + break; } final String copyText = getResources().getString(android.R.string.copy); diff --git a/android/src/com/mapswithme/util/UiUtils.java b/android/src/com/mapswithme/util/UiUtils.java index c5df072656..6c87b39271 100644 --- a/android/src/com/mapswithme/util/UiUtils.java +++ b/android/src/com/mapswithme/util/UiUtils.java @@ -5,7 +5,6 @@ import android.app.Activity; import android.content.DialogInterface; import android.content.Intent; import android.content.res.Configuration; -import android.net.Uri; import android.os.Build; import android.provider.Settings; import android.support.annotation.DimenRes; @@ -22,6 +21,7 @@ import android.view.animation.Animation; import android.view.animation.Animation.AnimationListener; import android.view.animation.AnimationUtils; import android.widget.TextView; + import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; @@ -171,38 +171,6 @@ public final class UiUtils showIf(!TextUtils.isEmpty(text), tv); } - public static void openAppInMarket(Activity activity, String marketUrl) - { - try - { - activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(marketUrl))); - } catch (final Exception e) - { - e.printStackTrace(); - } - } - - public static void showFacebookPage(Activity activity) - { - try - { - // Exception is thrown if we don't have installed Facebook application. - activity.getPackageManager().getPackageInfo(Constants.Package.FB_PACKAGE, 0); - - activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.FB_MAPSME_COMMUNITY_NATIVE))); - } catch (final Exception e) - { - activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.FB_MAPSME_COMMUNITY_HTTP))); - } - } - - public static void showTwitterPage(Activity activity) - { - Intent intent; - intent = new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.TWITTER_MAPSME_HTTP)); - activity.startActivity(intent); - } - public static void checkConnectionAndShowAlert(final Activity activity, final String message) { if (!ConnectionState.isConnected()) diff --git a/android/src/com/mapswithme/util/Utils.java b/android/src/com/mapswithme/util/Utils.java index 0c09095616..92ece4d2cf 100644 --- a/android/src/com/mapswithme/util/Utils.java +++ b/android/src/com/mapswithme/util/Utils.java @@ -264,6 +264,24 @@ public class Utils } } + public static void showFacebookPage(Activity activity) + { + try + { + // Exception is thrown if we don't have installed Facebook application. + activity.getPackageManager().getPackageInfo(Constants.Package.FB_PACKAGE, 0); + activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.FB_MAPSME_COMMUNITY_NATIVE))); + } catch (final Exception e) + { + activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.FB_MAPSME_COMMUNITY_HTTP))); + } + } + + public static void showTwitterPage(Activity activity) + { + activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.TWITTER_MAPSME_HTTP))); + } + public static void sendSupportMail(Activity activity, String subject) { final Intent intent = new Intent(Intent.ACTION_SEND);