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

Styles corrections.

Browse source
This commit is contained in:
Dmitry Yunitsky 2014-12-11 01:52:35 +03:00 • committed by Alex Zolotarev
parent 371ea8bfc0
commit 49b6f23d6e
19 changed files with 57 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/res/drawable/separator_medium_padded.xml → android/res/drawable/divider_medium_padded.xml
View file

@ -1,5 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@android:color/white"/>
</shape>
</item>
<item
android:left="@dimen/margin_medium"
android:right="@dimen/margin_medium">

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

@ -12,13 +12,14 @@
android:layout_height="@dimen/search_box_height"
android:layout_marginBottom="@dimen/margin_small"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
app:theme="@style/MyActionBar">
app:theme="@style/MwmToolbar">
<TextView
android:id="@+id/tv__update_all"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical|right"
android:background="?attr/clickableBackground"
android:gravity="center_vertical"
android:paddingRight="@dimen/margin_small"
android:text="@string/downloader_update_all"
@ -30,11 +31,5 @@
<ListView
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:animationCache="false"
android:divider="@color/divider_standard"
android:dividerHeight="1px"
android:background="@android:color/white"
android:cacheColorHint="@android:color/transparent"
android:scrollingCache="false"/>
android:layout_height="match_parent"/>
</LinearLayout>

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

@ -15,11 +15,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_small"
android:animationCache="false"
android:background="@android:color/white"
android:divider="@color/divider_standard"
android:dividerHeight="1px"
android:scrollbarStyle="outsideOverlay"
android:scrollingCache="false"/>
android:scrollbarStyle="outsideOverlay"/>
</LinearLayout>

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

@ -12,13 +12,7 @@
android:layout_height="@dimen/search_box_height"
android:layout_marginBottom="@dimen/margin_small"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
app:theme="@style/MyActionBar"/>
<View
android:id="@+id/btn_buy_pro"
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_item_height"
android:visibility="gone"/>
app:theme="@style/MwmToolbar"/>
<RelativeLayout
android:layout_width="match_parent"
@ -81,6 +75,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_item_height"
android:minHeight="@dimen/search_item_height"
android:background="@android:color/white">
<ImageView

7
android/res/layout/download_item_country.xml
View file

@ -3,10 +3,11 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:wheel="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:addStatesFromChildren="true"
android:background="?attr/clickableBackground"
android:layout_height="match_parent"
android:minHeight="?android:attr/listPreferredItemHeight">
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingLeft="@dimen/margin_small">
<TextView
android:id="@+id/title"
@ -17,7 +18,7 @@
android:layout_marginLeft="@dimen/margin_small"
android:layout_toLeftOf="@+id/ll__info_slided"
android:maxLines="2"
android:textAppearance="@style/TextAppearance.AppCompat.Large"/>
android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
<com.mapswithme.maps.widget.WheelProgressView
android:id="@+id/download_progress"

6
android/res/layout/download_item_extended.xml
View file

@ -3,8 +3,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:addStatesFromChildren="true"
android:background="?attr/clickableBackground"
android:minHeight="?android:attr/listPreferredItemHeight">
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingLeft="@dimen/margin_small">
<TextView
android:id="@+id/title"
@ -14,7 +14,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/margin_small"
android:text="@string/downloader_downloaded"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="@android:color/black"/>
<TextView

5
android/res/layout/download_item_group.xml
View file

@ -4,7 +4,8 @@
android:layout_height="wrap_content"
android:addStatesFromChildren="true"
android:background="?attr/clickableBackground"
android:minHeight="?android:attr/listPreferredItemHeight">
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingLeft="@dimen/margin_small">
<TextView
android:id="@+id/title"
@ -13,7 +14,7 @@
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/margin_small"
android:textAppearance="@style/TextAppearance.AppCompat.Large"/>
android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
<ImageView
android:id="@+id/disclosure_image"

2
android/res/layout/download_item_header.xml
View file

@ -12,7 +12,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/margin_small"
android:textAppearance="@style/TextAppearance.AppCompat.Large"/>
android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
<ImageView
android:layout_width="wrap_content"

2
android/res/layout/download_item_updated.xml
View file

@ -5,6 +5,6 @@
android:layout_width="match_parent"
android:layout_height="40dp"
android:background="@color/downloader_gray_bg"
android:paddingLeft="@dimen/margin_small"
android:paddingLeft="@dimen/margin_medium"
android:paddingTop="@dimen/margin_small"
android:textAppearance="@style/TextAppearance.AppCompat"/>

10
android/res/layout/fragment_downloader.xml
View file

@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/search_box_height"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
app:theme="@style/MyActionBar">
app:theme="@style/MwmToolbar">
<TextView
android:id="@+id/tv__update_all"
@ -28,11 +28,5 @@
<ListView
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:animationCache="false"
android:background="@android:color/white"
android:divider="@color/divider_standard"
android:dividerHeight="1px"
android:cacheColorHint="@android:color/transparent"
android:scrollingCache="false"/>
android:layout_height="match_parent"/>
</LinearLayout>

6
android/res/layout/fragment_search.xml
View file

@ -15,10 +15,6 @@
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:animationCache="false"
android:divider="@color/divider_standard"
android:dividerHeight="1px"
android:scrollbarStyle="outsideOverlay"
android:scrollingCache="false"/>
android:scrollbarStyle="outsideOverlay"/>
</LinearLayout>

6
android/res/layout/map_bottom_vertical_toolbar.xml
View file

@ -6,12 +6,6 @@
android:background="@color/bg_bottom_toolbar"
android:orientation="vertical">
<View
android:id="@+id/btn_buy_pro"
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_item_height"
android:visibility="gone"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_item_height">

2
android/res/layout/search_item.xml
View file

@ -40,7 +40,7 @@
android:ellipsize="end"
android:fontFamily="@string/robotoRegular"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/text_search_item"
android:textColor="@color/text_search_item_subtitle"
android:textSize="13sp"/>
</LinearLayout>

2
android/res/layout/toolbar_with_search.xml
View file

@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/search_box_height"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
app:theme="@style/MyActionBar">
app:theme="@style/MwmToolbar">
<include
android:id="@+id/search_box"

1
android/res/values-sw600dp/dimens.xml
View file

@ -26,5 +26,6 @@
<dimen name="bottom_panel_height">70dp</dimen>
<dimen name="bottom_panel_width">58dp</dimen>
<dimen name="bottom_button_width">46dp</dimen>
<dimen name="bottom_item_height">56dp</dimen>
</resources>

3
android/res/values-v11/styles.xml
View file

@ -11,6 +11,8 @@
<item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
<item name="clickableBackground">?android:attr/selectableItemBackground</item>
<item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoRegular</item>
<item name="android:listViewStyle">@style/MwmList</item>
<item name="android:textViewStyle">@style/MwmText</item>
</style>
<style name="MwmSearch" parent="MwmBase">
@ -21,6 +23,5 @@
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowAnimationStyle">@android:style/Animation</item>
<item name="clickableBackground">?android:attr/selectableItemBackground</item>
<item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoRegular</item>
</style>
</resources>

3
android/res/values/colors.xml
View file

@ -28,12 +28,13 @@
<color name="text_menu">#1D1F29</color>
<color name="bg_bottom_toolbar">@android:color/white</color>
<color name="bg_bottom_toolbar_pressed">#15d081</color>
<color name="divider_standard">#E14A4B53</color>
<color name="divider_standard">#1E4A4B53</color>
<!-- search -->
<color name="text_search_box">@android:color/white</color>
<color name="text_hint_search_box">#bdffffff</color>
<color name="text_search_item">@android:color/black</color>
<color name="text_search_item_subtitle">#8A000000</color>
<color name="text_search_item_greyed">@android:color/darker_gray</color>
<color name="text_search_category">@android:color/black</color>
<color name="bg_search_green">#1F9F7E</color>

26
android/res/values/styles.xml
View file

@ -6,6 +6,8 @@
<item name="colorPrimaryDark">@color/text_search_item_greyed</item>
<item name="colorAccent">@color/downloader_blue</item>
<item name="theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
<item name="android:listViewStyle">@style/MwmList</item>
<item name="android:textViewStyle">@style/MwmText</item>
</style>
<style name="MwmMain" parent="MwmBase">
@ -15,6 +17,8 @@
<style name="MwmMain.NoBar" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
<item name="clickableBackground">@drawable/default_selector</item>
<item name="android:listViewStyle">@style/MwmList</item>
<item name="android:textViewStyle">@style/MwmText</item>
</style>
<style name="MwmSearch" parent="MwmMain">
@ -24,7 +28,6 @@
<item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowAnimationStyle">@android:style/Animation</item>
<item name="clickableBackground">@drawable/default_selector</item>
</style>
<style name="MwmMain.Dialog.Light" parent="MwmMain">
@ -46,6 +49,8 @@
<style name="MwmMain.Dialog.DialogFragment" parent="Theme.AppCompat.Light">
<item name="android:windowBackground">@null</item>
<item name="android:windowIsFloating">true</item>
<item name="android:listViewStyle">@style/MwmList</item>
<item name="android:textViewStyle">@style/MwmText</item>
</style>
<style name="Widget.MapButtonZoom" parent="android:Widget.ImageButton">
@ -99,7 +104,7 @@
<style name="DrawerSeparatorMediumPadded" parent="DrawerSeparator">
<item name="android:layout_marginRight">0dp</item>
<item name="android:layout_marginLeft">0dp</item>
<item name="android:background">@drawable/separator_medium_padded</item>
<item name="android:background">@drawable/divider_medium_padded</item>
</style>
<style name="Widget.Button.Toggle" parent="android:Widget">
@ -117,8 +122,23 @@
<item name="android:background">?attr/clickableBackground</item>
</style>
<style name="MyActionBar" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
<style name="MwmToolbar" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="displayOptions">showHome|homeAsUp|showTitle</item>
<item name="android:background">@color/base_green</item>
</style>
<style name="MwmList" parent="android:Widget.Material.ListView">
<item name="android:fadingEdge">none</item>
<item name="android:divider">@drawable/divider_medium_padded</item>
<item name="android:dividerHeight">1px</item>
<item name="android:background">@android:color/white</item>
<item name="android:animationCache">false</item>
<item name="android:scrollingCache">false</item>
<item name="android:cacheColorHint">@android:color/transparent</item>
</style>
<style name="MwmText" parent="android:Widget.Material.TextView">
<item name="android:fontFamily">@string/robotoRegular</item>
</style>
</resources>

5
android/src/com/mapswithme/maps/MWMActivity.java
View file

@ -938,7 +938,6 @@ public class MWMActivity extends NvEventQueueActivity
{
mBottomToolbar = (ViewGroup) findViewById(R.id.map_bottom_toolbar);
mVerticalToolbar = (ViewGroup) findViewById(R.id.map_bottom_vertical_toolbar);
mVerticalToolbar.findViewById(R.id.btn_buy_pro).setOnClickListener(this);
mVerticalToolbar.findViewById(R.id.btn_download_maps).setOnClickListener(this);
mVerticalToolbar.findViewById(R.id.btn_share).setOnClickListener(this);
mVerticalToolbar.findViewById(R.id.btn_settings).setOnClickListener(this);
@ -1668,10 +1667,6 @@ public class MWMActivity extends NvEventQueueActivity
switch (v.getId())
{
case R.id.btn_buy_pro:
setVerticalToolbarVisible(false);
UiUtils.openAppInMarket(MWMActivity.this, BuildConfig.PRO_URL);
break;
case R.id.btn_share:
setVerticalToolbarVisible(false);
shareMyLocation();