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

[new downloader][android] fix: Rename dimension.

Browse source
This commit is contained in:
Alexander Marchuk 2016-02-05 18:41:19 +03:00 • committed by Sergey Yershov
parent 8d61f1afe0
commit 13317658ce
14 changed files with 26 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/AndroidManifest.xml
View file

@ -173,7 +173,7 @@
android:windowSoftInputMode="stateAlwaysHidden|adjustPan"/>
<activity
android:name="com.mapswithme.country.DownloadActivity"
android:name="com.mapswithme.maps.downloader.DownloaderActivity"
android:configChanges="orientation|screenLayout|screenSize"
android:label="@string/download_maps"
android:parentActivityName="com.mapswithme.maps.MwmActivity">

4
android/res/layout-land/layout_turn_instructions.xml
View file

@ -23,8 +23,8 @@
<ImageView
android:id="@+id/btn__close"
android:layout_width="@dimen/base_block_size"
android:layout_height="@dimen/base_block_size"
android:layout_width="@dimen/height_block_base"
android:layout_height="@dimen/height_block_base"
android:layout_centerVertical="true"
android:layout_marginBottom="@dimen/margin_base_plus"
android:layout_marginLeft="@dimen/margin_quarter"

4
android/res/layout-w840dp/layout_turn_instructions.xml
View file

@ -19,8 +19,8 @@
<ImageView
android:id="@+id/btn__close"
android:layout_width="@dimen/base_block_size"
android:layout_height="@dimen/base_block_size"
android:layout_width="@dimen/height_block_base"
android:layout_height="@dimen/height_block_base"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/margin_base"
android:layout_weight="0"

4
android/res/layout/fragment_editor.xml
View file

@ -43,7 +43,7 @@
<TextView
android:id="@+id/name_multilang"
android:layout_width="match_parent"
android:layout_height="@dimen/base_block_size"
android:layout_height="@dimen/height_block_base"
android:background="?clickableBackground"
android:drawableEnd="@drawable/ic_arrow_down"
android:drawableRight="@drawable/ic_arrow_down"
@ -175,7 +175,7 @@
style="@style/MwmWidget.Editor.FieldLayout"
android:background="?clickableBackground"
android:gravity="center_vertical"
android:minHeight="@dimen/base_block_size"
android:minHeight="@dimen/height_block_base"
android:text="@string/edit_opening_hours"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body1"

4
android/res/layout/fragment_osm_login.xml
View file

@ -34,7 +34,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_base"
android:minHeight="@dimen/base_block_size">
android:minHeight="@dimen/height_block_base">
<EditText
android:id="@+id/osm_username"
@ -48,7 +48,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_base"
android:minHeight="@dimen/base_block_size">
android:minHeight="@dimen/height_block_base">
<EditText
android:id="@+id/osm_password"

4
android/res/layout/fragment_timetable.xml
View file

@ -14,14 +14,14 @@
<View
android:layout_width="match_parent"
android:layout_height="@dimen/base_block_size"
android:layout_height="@dimen/height_block_base"
android:layout_alignParentBottom="true"
android:background="@android:color/white"/>
<TextView
android:id="@+id/tv__mode_switch"
android:layout_width="match_parent"
android:layout_height="@dimen/base_block_size"
android:layout_height="@dimen/height_block_base"
android:layout_alignParentBottom="true"
android:background="?clickableBackground"
android:gravity="center_vertical"

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

@ -51,7 +51,7 @@
<TextView
android:id="@+id/tv__examples_title"
android:layout_width="match_parent"
android:layout_height="@dimen/base_block_size"
android:layout_height="@dimen/height_block_base"
android:background="?clickableBackground"
android:drawableEnd="@drawable/ic_expand_more"
android:drawableLeft="@drawable/ic_type_text"

4
android/res/layout/fragment_timetable_picker.xml
View file

@ -10,9 +10,9 @@
<android.support.design.widget.TabLayout
android:id="@+id/tabs"
android:layout_width="match_parent"
android:layout_height="@dimen/base_block_size"
android:background="@android:color/white"
android:layout_height="@dimen/height_block_base"
android:elevation="@dimen/appbar_elevation"
android:background="@android:color/white"
app:tabGravity="fill"
app:tabIndicatorColor="?colorAccent"
app:tabMode="fixed"

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

@ -2,7 +2,7 @@
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="@dimen/base_block_size"
android:layout_height="@dimen/height_block_base"
android:background="?clickableBackground"
android:gravity="center_vertical|right"
android:paddingLeft="@dimen/margin_base"

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

@ -7,7 +7,7 @@
android:layout_height="wrap_content"
android:background="?attr/clickableBackground"
android:gravity="center_vertical"
android:minHeight="@dimen/base_block_size"
android:minHeight="@dimen/height_block_base"
android:paddingEnd="@dimen/margin_base"
android:paddingLeft="@dimen/margin_half"
android:paddingRight="@dimen/margin_base"

4
android/res/layout/item_timetable_closed_hours.xml
View file

@ -8,8 +8,8 @@
<ImageView
android:id="@+id/iv__remove_closed"
android:layout_width="@dimen/base_block_size"
android:layout_height="@dimen/base_block_size"
android:layout_width="@dimen/height_block_base"
android:layout_height="@dimen/height_block_base"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"

4
android/res/layout/layout_turn_instructions.xml
View file

@ -17,8 +17,8 @@
android:padding="@dimen/margin_quarter">
<ImageView
android:id="@+id/btn__close"
android:layout_width="@dimen/base_block_size"
android:layout_height="@dimen/base_block_size"
android:layout_width="@dimen/height_block_base"
android:layout_height="@dimen/height_block_base"
android:layout_weight="0"
android:background="?selectableItemBackgroundBorderless"
android:tint="?iconTint"

14
android/res/values/dimens.xml
View file

@ -25,11 +25,12 @@
<dimen name="neg_margin_base">-16dp</dimen>
<dimen name="neg_margin_double">-32dp</dimen>
<!-- margins -->
<dimen name="margin_navigation_buttons">@dimen/margin_quarter</dimen>
<dimen name="base_block_size">48dp</dimen>
<!-- base sizes -->
<dimen name="height_block_base">48dp</dimen>
<dimen name="height_item_oneline">56dp</dimen>
<dimen name="height_item_edit_bookmark">72dp</dimen>
<dimen name="dialog_max_height">320dp</dimen>
<dimen name="search_item_height">56dp</dimen>
@ -38,9 +39,7 @@
<dimen name="place_page_width">360dp</dimen>
<dimen name="place_page_buttons_height">56dp</dimen>
<dimen name="progress_wheel_width">48dp</dimen>
<dimen name="progress_wheel_height">40dp</dimen>
<dimen name="progress_wheel_width_neg">-48dp</dimen>
<dimen name="downloader_status_size">48dp</dimen>
<dimen name="search_progress_size">32dp</dimen>
<dimen name="panel_width">360dp</dimen>
@ -52,9 +51,6 @@
<dimen name="margin_direction_mid">24dp</dimen>
<dimen name="margin_direction_around_center">40dp</dimen>
<dimen name="height_item_oneline">56dp</dimen>
<dimen name="height_item_edit_bookmark">72dp</dimen>
<dimen name="zoom_buttons_top_required_space">266dp</dimen>
<dimen name="zoom_buttons_bottom_max_space">228dp</dimen>

2
android/res/values/styles-place_page.xml
View file

@ -67,7 +67,7 @@
<style name="PlacePageMetadata">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:minHeight">@dimen/base_block_size</item>
<item name="android:minHeight">@dimen/height_block_base</item>
<item name="android:background">?clickableBackground</item>
<item name="android:orientation">horizontal</item>
<item name="android:gravity">center_vertical</item>