AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Tablet UI corrections.

Browse source
This commit is contained in:
Dmitry Yunitsky 2014-12-25 21:59:38 +03:00 • committed by Alex Zolotarev
parent 9acf029f2f
commit f6576ce2aa
30 changed files with 92 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
android/res/drawable-hdpi-v11/ic_notification.png Executable file → Normal file
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 788 B

After

Width:  |  Height:  |  Size: 976 B

BIN
android/res/drawable-hdpi/ic_bg_dim.9.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 624 B

BIN
android/res/drawable-hdpi/ic_bg_light.9.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 604 B

BIN
android/res/drawable-hdpi/ic_bg_pp.9.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 830 B

BIN
android/res/drawable-hdpi/ic_bg_toolbar.9.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 639 B

BIN
android/res/drawable-hdpi/ic_notification.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 818 B

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
android/res/drawable-mdpi-v11/ic_notification.png Executable file → Normal file
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 505 B

After

Width:  |  Height:  |  Size: 655 B

BIN
android/res/drawable-mdpi/ic_bg_dim.9.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 423 B

BIN
android/res/drawable-mdpi/ic_bg_light.9.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 401 B

BIN
android/res/drawable-mdpi/ic_bg_pp.9.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 472 B

BIN
android/res/drawable-mdpi/ic_bg_toolbar.9.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 487 B

BIN
android/res/drawable-mdpi/ic_notification.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 492 B

After

Width:  |  Height:  |  Size: 731 B

BIN
android/res/drawable-xhdpi-v11/ic_notification.png Executable file → Normal file
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
android/res/drawable-xhdpi/ic_bg_dim.9.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 531 B

BIN
android/res/drawable-xhdpi/ic_bg_light.9.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 769 B

BIN
android/res/drawable-xhdpi/ic_bg_pp.9.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 666 B

BIN
android/res/drawable-xhdpi/ic_bg_toolbar.9.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 676 B

BIN
android/res/drawable-xhdpi/ic_notification.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
android/res/drawable-xxhdpi-v11/ic_notification.png Executable file → Normal file
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
android/res/drawable-xxhdpi/ic_bg_dim.9.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 583 B

BIN
android/res/drawable-xxhdpi/ic_bg_light.9.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 884 B

BIN
android/res/drawable-xxhdpi/ic_bg_pp.9.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
android/res/drawable-xxhdpi/ic_bg_toolbar.9.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
android/res/drawable-xxhdpi/ic_notification.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

4
android/res/layout-sw600dp/fragment_downloader.xml
View file

@ -10,7 +10,6 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_marginBottom="@dimen/margin_small"
android:gravity="center_vertical"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
app:theme="@style/MwmToolbar">
@ -32,5 +31,6 @@
<ListView
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent"
android:background="@drawable/ic_bg_light"/>
</LinearLayout>

2
android/res/layout-sw600dp/fragment_search.xml
View file

@ -14,7 +14,7 @@
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_small"
android:background="@drawable/ic_bg_light"
android:scrollbarStyle="outsideOverlay"/>
</LinearLayout>

138
android/res/layout-sw600dp/map_bottom_vertical_toolbar.xml
View file

@ -11,93 +11,99 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_gravity="center_vertical"
android:layout_marginBottom="@dimen/margin_small"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
app:theme="@style/MwmToolbar"/>
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_item_height"
android:background="@android:color/white">
android:layout_height="wrap_content"
android:background="@drawable/ic_bg_dim"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/margin_medium"
android:background="@drawable/ic_menu_download"
android:scaleType="center"/>
<TextView
android:id="@+id/btn_download_maps"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_item_height"
android:background="?attr/clickableBackground"
android:fontFamily="@string/robotoLight"
android:gravity="center_vertical"
android:paddingLeft="@dimen/margin_large_and_half"
android:text="@string/download_maps"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="@color/text_menu"/>
android:background="@android:color/white">
</RelativeLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/margin_medium"
android:background="@drawable/ic_menu_download"
android:scaleType="center"/>
<View
style="@style/DrawerSeparatorMediumPadded"/>
<TextView
android:id="@+id/btn_download_maps"
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_item_height"
android:background="?attr/clickableBackground"
android:fontFamily="@string/robotoLight"
android:gravity="center_vertical"
android:paddingLeft="@dimen/margin_large_and_half"
android:text="@string/download_maps"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="@color/text_menu"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_item_height"
android:background="@android:color/white">
</RelativeLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/margin_medium"
android:background="@drawable/ic_menu_settings"
android:scaleType="center"/>
<View
style="@style/DrawerSeparatorMediumPadded"/>
<TextView
android:id="@+id/btn_settings"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_item_height"
android:background="?attr/clickableBackground"
android:fontFamily="@string/robotoLight"
android:gravity="center_vertical"
android:paddingLeft="@dimen/margin_large_and_half"
android:text="@string/settings_and_more"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="@color/text_menu"/>
android:background="@android:color/white">
</RelativeLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/margin_medium"
android:background="@drawable/ic_menu_settings"
android:scaleType="center"/>
<View
style="@style/DrawerSeparatorMediumPadded"/>
<TextView
android:id="@+id/btn_settings"
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_item_height"
android:background="?attr/clickableBackground"
android:fontFamily="@string/robotoLight"
android:gravity="center_vertical"
android:paddingLeft="@dimen/margin_large_and_half"
android:text="@string/settings_and_more"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="@color/text_menu"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_item_height"
android:background="@android:color/white"
android:minHeight="@dimen/search_item_height">
</RelativeLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/margin_medium"
android:background="@drawable/ic_menu_send_my_location"
android:scaleType="center"/>
<View
style="@style/DrawerSeparatorMediumPadded"/>
<TextView
android:id="@+id/btn_share"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_item_height"
android:background="?attr/clickableBackground"
android:fontFamily="@string/robotoLight"
android:gravity="center_vertical"
android:paddingLeft="@dimen/margin_large_and_half"
android:text="@string/share_my_location"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="@color/text_menu"/>
android:background="@android:color/white"
android:minHeight="@dimen/search_item_height">
</RelativeLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/margin_medium"
android:background="@drawable/ic_menu_send_my_location"
android:scaleType="center"/>
<TextView
android:id="@+id/btn_share"
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_item_height"
android:background="?attr/clickableBackground"
android:fontFamily="@string/robotoLight"
android:gravity="center_vertical"
android:paddingLeft="@dimen/margin_large_and_half"
android:text="@string/share_my_location"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="@color/text_menu"/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>

29
android/res/layout/search_box.xml
View file

@ -8,27 +8,6 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ProgressBar
android:id="@+id/search_progress"
style="@style/Widget.AppCompat.ProgressBar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:padding="@dimen/margin_micro"/>
<ImageView
android:id="@+id/search_icon"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:contentDescription="@null"
android:src="@drawable/ic_search_hint_white"/>
</FrameLayout>
<EditText
android:id="@+id/search_text_query"
style="@style/TextAppearance.AppCompat.Large"
@ -46,6 +25,14 @@
android:textColor="@color/text_search_box"
android:textColorHint="@color/text_hint_search_box"/>
<ProgressBar
android:id="@+id/search_progress"
style="@style/Widget.AppCompat.ProgressBar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:padding="@dimen/margin_micro"/>
<FrameLayout
android:id="@+id/container_cancel_voice_input_search"
android:layout_width="wrap_content"

9
android/res/values-sw600dp/styles.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="MwmToolbar" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="displayOptions">showHome|homeAsUp|showTitle</item>
<item name="android:background">@drawable/ic_bg_toolbar</item>
</style>
</resources>

8
android/src/com/mapswithme/maps/search/SearchFragment.java
View file

@ -58,7 +58,6 @@ public class SearchFragment extends MWMListFragment implements View.OnClickListe
private ProgressBar mSearchProgress;
private View mClearQueryBtn;
private View mVoiceInput;
private View mSearchIcon;
// Current position.
private double mLat;
private double mLon;
@ -135,7 +134,6 @@ public class SearchFragment extends MWMListFragment implements View.OnClickListe
private void setUpView(ViewGroup root)
{
mVoiceInput = root.findViewById(R.id.search_voice_input);
mSearchIcon = root.findViewById(R.id.search_icon);
mSearchProgress = (ProgressBar) root.findViewById(R.id.search_progress);
mClearQueryBtn = root.findViewById(R.id.search_image_clear);
mClearQueryBtn.setOnClickListener(this);
@ -366,15 +364,9 @@ public class SearchFragment extends MWMListFragment implements View.OnClickListe
private void setSearchInProgress(boolean inProgress)
{
if (inProgress)
{
UiUtils.show(mSearchProgress);
UiUtils.invisible(mSearchIcon);
}
else // search is completed
{
UiUtils.invisible(mSearchProgress);
UiUtils.show(mSearchIcon);
}
}
@Override