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 @@ + + + + + + +