Fixed formatting and tiny bug fix.

This commit is contained in:
GaidamakUA 2016-02-26 12:18:05 +02:00
parent 3e406f15d2
commit 9ec141a44f

View file

@ -1,74 +1,74 @@
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:osmand="http://schemas.android.com/apk/res-auto" xmlns:osmand="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
tools:context="net.osmand.plus.liveupdates.ReportsFragment" > tools:context="net.osmand.plus.liveupdates.ReportsFragment">
<include layout="@layout/card_top_divider" /> <include layout="@layout/card_top_divider"/>
<GridLayout <GridLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/bg_color" android:background="?attr/bg_color"
android:columnCount="2" > android:columnCount="2">
<LinearLayout <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_columnSpan="2" android:layout_columnSpan="2"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:gravity="center_vertical"
android:minHeight="48dp" android:minHeight="48dp"
android:layout_width="match_parent" android:orientation="horizontal">
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_weight="1"
android:text="@string/select_month_and_country" android:text="@string/select_month_and_country"
android:textColor="?android:textColorPrimary" /> android:textColor="?android:textColorPrimary"/>
<net.osmand.plus.widgets.ButtonEx <net.osmand.plus.widgets.ButtonEx
android:id="@+id/show_all" android:id="@+id/show_all"
style="@style/DashboardGeneralButton" style="@style/DashboardGeneralButton"
android:text="@string/shared_string_all" android:text="@string/shared_string_all"
osmand:textAllCapsCompat="true" osmand:textAllCapsCompat="true"
osmand:typeface="@string/font_roboto_medium" /> osmand:typeface="@string/font_roboto_medium"/>
</LinearLayout> </LinearLayout>
<View <View
android:layout_height="1dp" android:layout_height="1dp"
android:layout_columnSpan="2" android:layout_columnSpan="2"
android:background="?attr/dashboard_divider" /> android:background="?attr/dashboard_divider"/>
<ImageView <ImageView
android:id="@+id/calendarImageView" android:id="@+id/calendarImageView"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:src="@drawable/ic_action_data" /> android:src="@drawable/ic_action_data"/>
<Spinner <Spinner
android:id="@+id/montReportsSpinner" android:id="@+id/montReportsSpinner"
android:layout_gravity="fill_horizontal|fill_vertical" android:layout_gravity="fill_horizontal|fill_vertical"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_marginRight="56dp" android:layout_marginRight="56dp"
android:gravity="center_vertical" /> android:gravity="center_vertical"/>
<View <View
android:layout_height="1dp" android:layout_height="1dp"
android:layout_column="1" android:layout_column="1"
android:background="?attr/dashboard_divider" /> android:background="?attr/dashboard_divider"/>
<ImageView <ImageView
android:id="@+id/regionIconImageView" android:id="@+id/regionIconImageView"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:src="@drawable/ic_world_globe_dark" /> android:src="@drawable/ic_world_globe_dark"/>
<LinearLayout <LinearLayout
android:id="@+id/reportsButton" android:id="@+id/reportsButton"
@ -78,14 +78,14 @@
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:background="?attr/expandable_list_item_background" android:background="?attr/expandable_list_item_background"
android:gravity="center" android:gravity="center"
android:orientation="vertical" > android:orientation="vertical">
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/reports_for" android:text="@string/reports_for"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_sub_text_size" /> android:textSize="@dimen/default_sub_text_size"/>
<TextView <TextView
android:id="@android:id/text1" android:id="@android:id/text1"
@ -93,26 +93,26 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="fill_horizontal" android:layout_gravity="fill_horizontal"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
tools:text="Worldwide" /> tools:text="Worldwide"/>
</LinearLayout> </LinearLayout>
<View <View
android:layout_height="1dp" android:layout_height="1dp"
android:layout_columnSpan="2" android:layout_columnSpan="2"
android:background="?attr/dashboard_divider" /> android:background="?attr/dashboard_divider"/>
<ProgressBar <ProgressBar
android:id="@+id/progress" android:id="@+id/progress"
style="?android:attr/progressBarStyleHorizontal" style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="8dp" android:layout_height="8dp"
android:layout_columnSpan="2" /> android:layout_columnSpan="2"/>
<ImageView <ImageView
android:id="@+id/numberOfContributorsIcon" android:id="@+id/numberOfContributorsIcon"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:src="@drawable/ic_group" /> android:src="@drawable/ic_group"/>
<LinearLayout <LinearLayout
android:id="@+id/numberOfContributorsLayout" android:id="@+id/numberOfContributorsLayout"
@ -122,7 +122,7 @@
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:background="?attr/expandable_list_item_background" android:background="?attr/expandable_list_item_background"
android:gravity="center" android:gravity="center"
android:orientation="vertical" > android:orientation="vertical">
<TextView <TextView
android:id="@+id/numberOfContributorsTitle" android:id="@+id/numberOfContributorsTitle"
@ -130,26 +130,26 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/number_of_contributors" android:text="@string/number_of_contributors"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_sub_text_size" /> android:textSize="@dimen/default_sub_text_size"/>
<TextView <TextView
android:id="@+id/contributorsTextView" android:id="@+id/contributorsTextView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="0" android:text="0"
android:textColor="?android:textColorPrimary" /> android:textColor="?android:textColorPrimary"/>
</LinearLayout> </LinearLayout>
<View <View
android:layout_height="1dp" android:layout_height="1dp"
android:layout_column="1" android:layout_column="1"
android:background="?attr/dashboard_divider" /> android:background="?attr/dashboard_divider"/>
<ImageView <ImageView
android:id="@+id/numberOfEditsIcon" android:id="@+id/numberOfEditsIcon"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:src="@drawable/ic_world_globe_dark" /> android:src="@drawable/ic_world_globe_dark"/>
<LinearLayout <LinearLayout
android:id="@+id/numberOfEditsLayout" android:id="@+id/numberOfEditsLayout"
@ -159,7 +159,7 @@
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:background="?attr/expandable_list_item_background" android:background="?attr/expandable_list_item_background"
android:gravity="center" android:gravity="center"
android:orientation="vertical" > android:orientation="vertical">
<TextView <TextView
android:id="@+id/numberOfEditsTitle" android:id="@+id/numberOfEditsTitle"
@ -167,21 +167,21 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/number_of_edits" android:text="@string/number_of_edits"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_sub_text_size" /> android:textSize="@dimen/default_sub_text_size"/>
<TextView <TextView
android:id="@+id/editsTextView" android:id="@+id/editsTextView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="0" android:text="0"
android:textColor="?android:textColorPrimary" /> android:textColor="?android:textColorPrimary"/>
</LinearLayout> </LinearLayout>
<ImageView <ImageView
android:id="@+id/donationsIcon" android:id="@+id/donationsIcon"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:src="@drawable/ic_action_message" /> android:src="@drawable/ic_action_message"/>
<LinearLayout <LinearLayout
android:id="@+id/donationsLayout" android:id="@+id/donationsLayout"
@ -190,34 +190,34 @@
android:layout_gravity="fill_vertical" android:layout_gravity="fill_vertical"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:gravity="center" android:gravity="center"
android:orientation="vertical" > android:orientation="vertical">
<TextView <TextView
android:id="@+id/donationsTitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:id="@+id/donationsTitle"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/donations" android:text="@string/donations"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_sub_text_size" /> android:textSize="@dimen/default_sub_text_size"/>
<TextView <TextView
android:id="@+id/donationsTextView" android:id="@+id/donationsTextView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="-" android:text="-"
android:textColor="?android:textColorPrimary" /> android:textColor="?android:textColorPrimary"/>
</LinearLayout> </LinearLayout>
<View <View
android:layout_height="1dp" android:layout_height="1dp"
android:layout_column="1" android:layout_column="1"
android:background="?attr/dashboard_divider" /> android:background="?attr/dashboard_divider"/>
<ImageView <ImageView
android:id="@+id/numberOfRecipientsIcon" android:id="@+id/numberOfRecipientsIcon"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:src="@drawable/ic_group" /> android:src="@drawable/ic_group"/>
<LinearLayout <LinearLayout
android:id="@+id/numberOfRecipientsLayout" android:id="@+id/numberOfRecipientsLayout"
@ -226,25 +226,26 @@
android:layout_gravity="fill_vertical" android:layout_gravity="fill_vertical"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:gravity="center" android:gravity="center"
android:orientation="vertical" > android:orientation="vertical">
<TextView <TextView
android:id="@+id/numberOfRecipientsTitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/numberOfRecipientsTitle"
android:text="@string/number_of_recipients" android:text="@string/number_of_recipients"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_sub_text_size" /> android:textSize="@dimen/default_sub_text_size"/>
<TextView <TextView
android:id="@+id/recipientsTextView" android:id="@+id/recipientsTextView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="-" android:text="-"
android:textColor="?android:textColorPrimary" /> android:textColor="?android:textColorPrimary"/>
</LinearLayout> </LinearLayout>
<include layout="@layout/card_bottom_divider" />
</GridLayout> </GridLayout>
<include layout="@layout/card_bottom_divider"/>
</LinearLayout> </LinearLayout>