diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index af1a0b02e9..3a652ef716 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -188,7 +188,8 @@ android:name="com.mapswithme.maps.downloader.DownloaderActivity" android:configChanges="orientation|screenLayout|screenSize" android:label="@string/download_maps" - android:parentActivityName="com.mapswithme.maps.MwmActivity"> + android:parentActivityName="com.mapswithme.maps.MwmActivity" + android:windowSoftInputMode="adjustResize"> + android:windowSoftInputMode="stateVisible|adjustResize"> + android:parentActivityName="com.mapswithme.maps.MwmActivity" + android:windowSoftInputMode="adjustResize"> + android:parentActivityName="com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity" + android:windowSoftInputMode="adjustResize"> - + android:layout_above="@id/action" + android:paddingLeft="@dimen/margin_double_and_half" + android:paddingRight="@dimen/margin_double_and_half" + android:paddingTop="@dimen/placeholder_margin_top" + android:visibility="gone" + tools:visibility="visible"/> diff --git a/android/res/layout/fragment_search.xml b/android/res/layout/fragment_search.xml index fbbae56c08..ede639ea1f 100644 --- a/android/res/layout/fragment_search.xml +++ b/android/res/layout/fragment_search.xml @@ -57,7 +57,15 @@ android:background="?windowBackgroundForced"> - + diff --git a/android/res/layout/fragment_search_base.xml b/android/res/layout/fragment_search_base.xml new file mode 100644 index 0000000000..e6746a9ab4 --- /dev/null +++ b/android/res/layout/fragment_search_base.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/android/res/layout/fragment_search_recent.xml b/android/res/layout/fragment_search_recent.xml deleted file mode 100644 index 971f69d3c9..0000000000 --- a/android/res/layout/fragment_search_recent.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/android/res/layout/item_bookmark_hint.xml b/android/res/layout/item_bookmark_hint.xml index dc3c58d564..6bd587fbf0 100644 --- a/android/res/layout/item_bookmark_hint.xml +++ b/android/res/layout/item_bookmark_hint.xml @@ -9,5 +9,4 @@ android:paddingLeft="@dimen/margin_double_plus" android:paddingRight="@dimen/margin_double_plus" android:paddingTop="@dimen/margin_base" - android:text="@string/bookmarks_usage_hint" android:textAppearance="@style/MwmTextAppearance.Body2"/> diff --git a/android/res/layout/placeholder.xml b/android/res/layout/placeholder.xml index 6418eeb5ef..a4040473c2 100644 --- a/android/res/layout/placeholder.xml +++ b/android/res/layout/placeholder.xml @@ -1,36 +1,27 @@ - + xmlns:tools="http://schemas.android.com/tools"> @@ -38,8 +29,8 @@ android:id="@+id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="@style/MwmTextAppearance.Body2" + android:textAppearance="@style/MwmTextAppearance.Body3" android:gravity="center_horizontal" tools:text="Some placeholder text"/> - + diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml index b1480b7778..3366c797fc 100644 --- a/android/res/values/dimens.xml +++ b/android/res/values/dimens.xml @@ -45,6 +45,7 @@ 360dp 240dp 200dp + 160dp 300dp @@ -170,4 +171,8 @@ 96dp 14dp 10dp + + + 20dp + 80dp diff --git a/android/res/values/styles-text.xml b/android/res/values/styles-text.xml index 4786559b79..818deeb645 100644 --- a/android/res/values/styles-text.xml +++ b/android/res/values/styles-text.xml @@ -16,6 +16,11 @@ ?android:textColorPrimary + +