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

Merge pull request #599 from yunikkk/download-activity-fix

Browse source 
[android] Minor UI fixes.
This commit is contained in:
Alexander Marchuk 2015-11-19 18:00:27 +03:00
commit f399a6b838
2 changed files with 81 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
android/res/layout/activity_download_resources.xml
View file

@ -1,62 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:id="@+id/tv__download_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dip"
android:drawableLeft="@drawable/ic_launcher"
android:drawablePadding="@dimen/margin_base"
android:padding="@dimen/margin_half"
android:text="@string/download_resources"
android:textAppearance="@style/MwmTextAppearance.Body2"/>
android:id="@+id/tv__download_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_base_plus"
android:drawableLeft="@drawable/ic_launcher"
android:drawablePadding="@dimen/margin_base"
android:drawableStart="@drawable/ic_launcher"
android:padding="@dimen/margin_half"
android:textAppearance="@style/MwmTextAppearance.Body2"
tools:text="@string/download_resources"/>
<ProgressBar
android:id="@+id/pb__download_resources"
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_base_plus"
android:indeterminate="false"
android:minWidth="200dip"/>
android:id="@+id/pb__download_resources"
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_base_plus"
android:indeterminate="false"
android:minWidth="200dp"/>
<Button
android:id="@+id/btn__download_resources"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_base_plus"
android:textAppearance="@style/MwmTextAppearance.Body1"
tools:text="@string/download"/>
android:id="@+id/btn__download_resources"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_base_plus"
android:textAppearance="@style/MwmTextAppearance.Body1"
android:text="@string/download"/>
<TextView
android:id="@+id/tv__location"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_base_plus"
android:gravity="center_horizontal"
android:text="@string/getting_position"
android:textAppearance="@style/MwmTextAppearance.Body2"
android:visibility="gone"/>
android:id="@+id/tv__location"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_base_plus"
android:gravity="center_horizontal"
android:text="@string/getting_position"
android:textAppearance="@style/MwmTextAppearance.Body2"
android:visibility="gone"/>
<CheckBox
android:id="@+id/chb__download_country"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_base_plus"
android:text="@string/download_country_ask"
android:textAppearance="@style/MwmTextAppearance.Body2"
android:visibility="gone"/>
android:id="@+id/chb__download_country"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_base_plus"
android:text="@string/download_country_ask"
android:textAppearance="@style/MwmTextAppearance.Body2"
android:visibility="gone"/>
</LinearLayout>
</ScrollView>

67
android/res/layout/item_bookmark_category.xml
View file

@ -1,41 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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="?clickableBackground"
android:gravity="center_vertical"
android:minHeight="@dimen/height_item_oneline"
android:paddingLeft="0dp"
android:paddingRight="@dimen/margin_base">
<LinearLayout
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="?clickableBackground"
android:gravity="center_vertical"
android:minHeight="@dimen/height_item_oneline"
android:paddingEnd="@dimen/margin_base"
android:paddingLeft="0dp"
android:paddingRight="@dimen/margin_base"
android:paddingStart="0dp">
<ImageView
android:id="@+id/iv__set_visible"
android:layout_width="@dimen/height_item_oneline"
android:layout_height="@dimen/height_item_oneline"
android:layout_weight="0"
android:background="?clickableBackground"
android:scaleType="center"
tools:src="@drawable/ic_bookmark_show"/>
android:id="@+id/iv__set_visible"
android:layout_width="@dimen/height_item_oneline"
android:layout_height="@dimen/height_item_oneline"
android:layout_weight="0"
android:background="?clickableBackground"
android:scaleType="center"
tools:src="@drawable/ic_bookmark_show"/>
<TextView
android:id="@+id/tv__set_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_base"
android:layout_weight="1"
android:ellipsize="marquee"
android:singleLine="true"
android:textAppearance="@style/MwmTextAppearance.Body1"
tools:text="Bookmark name"/>
android:id="@+id/tv__set_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_base"
android:layout_marginStart="@dimen/margin_base"
android:layout_weight="1"
android:ellipsize="marquee"
android:singleLine="true"
android:textAppearance="@style/MwmTextAppearance.Body1"
tools:text="Bookmark name looooooooooooooooooongasdasdasd"/>
<TextView
android:id="@+id/tv__set_size"
android:layout_width="48dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="right"
android:textAppearance="@style/MwmTextAppearance.Body2"
tools:text="42"/>
android:id="@+id/tv__set_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:textAppearance="@style/MwmTextAppearance.Body2"
tools:text="42000000"/>
</LinearLayout>