Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-03-10 11:04:04 +01:00
commit 8bd23ad3eb
2 changed files with 288 additions and 189 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

448
OsmAnd/res/layout/fragment_reports.xml
View file

@ -1,6 +1,6 @@
<ScrollView <ScrollView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:osmand="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" 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"
@ -11,268 +11,354 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout
<android.support.v7.widget.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"
app:columnCount="2"> android:orientation="vertical">
<LinearLayout
android:id="@+id/monthButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:gravity="center_vertical"
android:minHeight="60dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/calendarImageView"
android:layout_width="56dp"
android:layout_height="56dp"
android:scaleType="center"
android:src="@drawable/ic_action_data"/>
<Spinner
android:id="@+id/monthReportsSpinner"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="-8dp"
android:layout_marginRight="16dp"
android:layout_weight="1"
android:background="@null"
android:clickable="false"/>
<ImageView
android:id="@+id/monthDropDownIcon"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginRight="16dp"
android:src="@drawable/ic_action_arrow_drop_down"/>
</LinearLayout>
<View <View
android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
app:layout_columnSpan="2" android:layout_marginLeft="56dp"
android:background="?attr/dashboard_divider"/> android:background="?attr/dashboard_divider"/>
<ImageView
android:id="@+id/calendarImageView"
android:layout_width="56dp"
android:layout_height="60dp"
android:scaleType="center"
android:src="@drawable/ic_action_data"/>
<Spinner
android:id="@+id/monthReportsSpinner"
app:layout_gravity="fill_horizontal|fill_vertical"
android:layout_marginRight="56dp"
android:gravity="center_vertical"/>
<View
android:layout_height="1dp"
app:layout_column="1"
android:background="?attr/dashboard_divider"/>
<ImageView
android:id="@+id/regionIconImageView"
android:layout_width="56dp"
android:layout_height="60dp"
android:scaleType="center"
android:src="@drawable/ic_world_globe_dark"/>
<LinearLayout <LinearLayout
android:id="@+id/reportsButton" android:id="@+id/reportsButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_gravity="fill_vertical" android:background="?attr/selectableItemBackground"
android:gravity="center" android:clickable="true"
android:orientation="vertical"> android:gravity="center_vertical"
android:minHeight="60dp"
android:orientation="horizontal">
<TextView <ImageView
android:layout_width="match_parent" android:id="@+id/regionIconImageView"
android:layout_height="wrap_content" android:layout_width="56dp"
android:text="@string/reports_for" android:layout_height="56dp"
android:textColor="?android:textColorSecondary" android:scaleType="center"
android:textSize="@dimen/default_sub_text_size"/> android:src="@drawable/ic_world_globe_dark"/>
<TextView <LinearLayout
android:id="@android:id/text1" android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="fill_horizontal" android:layout_marginRight="16dp"
android:textColor="?android:textColorPrimary" android:layout_weight="1"
tools:text="Worldwide"/> android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/reports_for"
android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_sub_text_size"/>
<TextView
android:id="@android:id/text1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="fill_horizontal"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"
tools:text="Worldwide"/>
</LinearLayout>
<ImageView
android:id="@+id/countryDropDownIcon"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginRight="16dp"
android:src="@drawable/ic_action_arrow_drop_down"/>
</LinearLayout> </LinearLayout>
</LinearLayout>
</android.support.v7.widget.GridLayout>
<include layout="@layout/card_bottom_divider"/> <include layout="@layout/card_bottom_divider"/>
<include layout="@layout/card_top_divider"/> <include layout="@layout/card_top_divider"/>
<android.support.v7.widget.GridLayout <LinearLayout
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"
app:columnCount="2"> android:orientation="vertical">
<View <FrameLayout
android:id="@+id/divider_to_hide"
android:layout_height="8dp"
app:layout_columnSpan="2"/>
<ProgressBar
android:id="@+id/progress"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="8dp" android:layout_height="wrap_content">
app:layout_columnSpan="2"
android:indeterminate="true"/>
<ImageView <ProgressBar
android:id="@+id/numberOfContributorsIcon" android:id="@+id/progress"
android:layout_width="56dp" style="?android:attr/progressBarStyleHorizontal"
android:layout_height="52dp" android:layout_width="match_parent"
android:paddingBottom="8dp" android:layout_height="8dp"
android:scaleType="center" android:indeterminate="true"/>
android:src="@drawable/ic_action_group2"/>
<LinearLayout <LinearLayout
android:id="@+id/numberOfContributorsLayout" android:id="@+id/numberOfContributorsLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_gravity="fill_vertical"
android:gravity="center"
android:orientation="vertical"
android:paddingBottom="8dp">
<TextView
android:id="@+id/numberOfContributorsTitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/number_of_contributors" android:background="?attr/selectableItemBackground"
android:textColor="?android:textColorSecondary" android:clickable="true"
android:textSize="@dimen/default_sub_text_size"/> android:gravity="center_vertical"
android:minHeight="60dp"
android:orientation="horizontal">
<TextView <ImageView
android:id="@+id/contributorsTextView" android:id="@+id/numberOfContributorsIcon"
android:layout_width="match_parent" android:layout_width="56dp"
android:layout_height="wrap_content" android:layout_height="56dp"
android:text="0" android:scaleType="center"
android:textColor="?android:textColorPrimary"/> android:src="@drawable/ic_group"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="16dp"
android:orientation="vertical">
<TextView
android:id="@+id/numberOfContributorsTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/number_of_contributors"
android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_sub_text_size"/>
<TextView
android:id="@+id/contributorsTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="0"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"/>
</LinearLayout>
</LinearLayout>
</FrameLayout>
<View <View
android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
app:layout_column="1" android:layout_marginLeft="56dp"
android:background="?attr/dashboard_divider"/> android:background="?attr/dashboard_divider"/>
<ImageView
android:id="@+id/numberOfEditsIcon"
android:layout_width="56dp"
android:layout_height="60dp"
android:scaleType="center"
android:src="@drawable/ic_map"/>
<LinearLayout <LinearLayout
android:id="@+id/numberOfEditsLayout" android:id="@+id/numberOfEditsLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_gravity="fill_vertical" android:background="?attr/selectableItemBackground"
android:gravity="center" android:clickable="true"
android:orientation="vertical"> android:gravity="center_vertical"
android:minHeight="60dp"
android:orientation="horizontal">
<TextView <ImageView
android:id="@+id/numberOfEditsTitle" android:id="@+id/numberOfEditsIcon"
android:layout_width="56dp"
android:layout_height="56dp"
android:scaleType="center"
android:src="@drawable/ic_map"/>
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/number_of_edits" android:layout_marginRight="16dp"
android:textColor="?android:textColorSecondary" android:orientation="vertical">
android:textSize="@dimen/default_sub_text_size"/>
<TextView
android:id="@+id/numberOfEditsTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/number_of_edits"
android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_sub_text_size"/>
<TextView
android:id="@+id/editsTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="0"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"/>
</LinearLayout>
<TextView
android:id="@+id/editsTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="0"
android:textColor="?android:textColorPrimary"/>
</LinearLayout> </LinearLayout>
<View <View
android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
app:layout_column="1" android:layout_marginLeft="56dp"
android:background="?attr/dashboard_divider"/> android:background="?attr/dashboard_divider"/>
<ImageView
android:id="@+id/donationsIcon"
android:layout_width="56dp"
android:layout_height="60dp"
android:scaleType="center"
android:src="@drawable/ic_action_bitcoin"/>
<LinearLayout <LinearLayout
android:id="@+id/donationsLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_gravity="fill_vertical" android:gravity="center_vertical"
android:gravity="center" android:minHeight="60dp"
android:orientation="vertical"> android:orientation="horizontal">
<TextView <ImageView
android:id="@+id/donationsTitle" android:id="@+id/donationsIcon"
android:layout_width="56dp"
android:layout_height="56dp"
android:scaleType="center"
android:src="@drawable/ic_action_bitcoin"/>
<LinearLayout
android:id="@+id/donationsLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/donations" android:layout_marginRight="16dp"
android:textColor="?android:textColorSecondary" android:orientation="vertical">
android:textSize="@dimen/default_sub_text_size"/>
<TextView
android:id="@+id/donationsTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/donations"
android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_sub_text_size"/>
<TextView
android:id="@+id/donationsTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="-"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"/>
</LinearLayout>
<TextView
android:id="@+id/donationsTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="-"
android:textColor="?android:textColorPrimary"/>
</LinearLayout> </LinearLayout>
<View <View
android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
app:layout_column="1" android:layout_marginLeft="56dp"
android:background="?attr/dashboard_divider"/> android:background="?attr/dashboard_divider"/>
<ImageView
android:id="@+id/numberOfRecipientsIcon"
android:layout_width="56dp"
android:layout_height="60dp"
android:scaleType="center"
android:src="@drawable/ic_group"/>
<LinearLayout <LinearLayout
android:id="@+id/numberOfRecipientsLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_gravity="fill_vertical" android:gravity="center_vertical"
android:gravity="center" android:minHeight="60dp"
android:orientation="vertical"> android:orientation="horizontal">
<TextView <ImageView
android:id="@+id/numberOfRecipientsTitle" android:id="@+id/numberOfRecipientsIcon"
android:layout_width="56dp"
android:layout_height="60dp"
android:scaleType="center"
android:src="@drawable/ic_group"/>
<LinearLayout
android:id="@+id/numberOfRecipientsLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/number_of_recipients" android:layout_marginRight="16dp"
android:textColor="?android:textColorSecondary" android:orientation="vertical">
android:textSize="@dimen/default_sub_text_size"/>
<TextView
android:id="@+id/numberOfRecipientsTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/number_of_recipients"
android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_sub_text_size"/>
<TextView
android:id="@+id/recipientsTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="-"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"/>
</LinearLayout>
<TextView
android:id="@+id/recipientsTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="-"
android:textColor="?android:textColorPrimary"/>
</LinearLayout> </LinearLayout>
</android.support.v7.widget.GridLayout> </LinearLayout>
<include layout="@layout/card_bottom_divider"/> <include layout="@layout/card_bottom_divider"/>
<LinearLayout <android.support.v7.widget.CardView
android:id="@+id/show_all" android:id="@+id/card_view"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="8dp" android:layout_margin="8dp"
android:background="?attr/bg_card" card_view:cardBackgroundColor="?attr/bg_color"
android:gravity="center_vertical" card_view:cardCornerRadius="4dp">
android:minHeight="48dp"
android:orientation="vertical"
android:padding="16dp">
<TextView <LinearLayout
android:layout_width="wrap_content" android:id="@+id/show_all"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/full_report" android:background="?attr/selectableItemBackground"
android:textColor="?android:textColorSecondary" android:clickable="true"
android:textSize="@dimen/default_sub_text_size"/> android:gravity="center_vertical"
android:minHeight="48dp"
android:orientation="vertical"
android:padding="16dp">
<net.osmand.plus.widgets.TextViewEx <TextView
android:id="@+id/osm_live_url_label" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:text="@string/full_report"
android:layout_gravity="center_vertical" android:textColor="?android:textColorSecondary"
android:gravity="left|center_vertical" android:textSize="@dimen/default_sub_text_size"/>
android:textColor="?attr/dashboard_general_button_text_color"
android:textSize="@dimen/default_desc_text_size"
app:textAllCapsCompat="false"
app:typeface="@string/font_roboto_medium"
tools:text="http://osmand.net/osm_live"/>
</LinearLayout>
<net.osmand.plus.widgets.TextViewEx
android:id="@+id/osm_live_url_label"
style="@style/DashboardGeneralButton"
android:layout_height="wrap_content"
android:background="@null"
android:clickable="false"
android:gravity="left|center_vertical"
android:textSize="@dimen/default_desc_text_size"
osmand:textAllCapsCompat="false"
osmand:typeface="@string/font_roboto_medium"
tools:text="http://osmand.net/osm_live"/>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

25
OsmAnd/src/net/osmand/plus/liveupdates/ReportsFragment.java
View file

@ -75,7 +75,6 @@ public class ReportsFragment extends BaseOsmAndFragment implements CountrySelect
private TextView numberOfRecipientsTitle; private TextView numberOfRecipientsTitle;
private TextView donationsTitle; private TextView donationsTitle;
private ProgressBar progressBar; private ProgressBar progressBar;
private View dividerToHide;
private int inactiveColor; private int inactiveColor;
private int textColorPrimary; private int textColorPrimary;
@ -86,9 +85,25 @@ public class ReportsFragment extends BaseOsmAndFragment implements CountrySelect
Bundle savedInstanceState) { Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_reports, container, false); View view = inflater.inflate(R.layout.fragment_reports, container, false);
monthReportsSpinner = (Spinner) view.findViewById(R.id.monthReportsSpinner); monthReportsSpinner = (Spinner) view.findViewById(R.id.monthReportsSpinner);
final View monthButton = view.findViewById(R.id.monthButton);
monthReportsSpinner.setOnTouchListener(new View.OnTouchListener() {
@Override
public boolean onTouch(View v, MotionEvent event) {
event.offsetLocation(AndroidUtils.dpToPx(getActivity(), 48f), 0);
monthButton.onTouchEvent(event);
return true;
}
});
monthsForReportsAdapter = new MonthsForReportsAdapter(getActivity()); monthsForReportsAdapter = new MonthsForReportsAdapter(getActivity());
monthReportsSpinner.setAdapter(monthsForReportsAdapter); monthReportsSpinner.setAdapter(monthsForReportsAdapter);
monthButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
monthReportsSpinner.performClick();
}
});
view.findViewById(R.id.show_all).setOnClickListener(new OnClickListener() { view.findViewById(R.id.show_all).setOnClickListener(new OnClickListener() {
@Override @Override
@ -132,7 +147,9 @@ public class ReportsFragment extends BaseOsmAndFragment implements CountrySelect
countryNameTextView.setText(selectedCountryItem.getLocalName()); countryNameTextView.setText(selectedCountryItem.getLocalName());
setThemedDrawable(view, R.id.calendarImageView, R.drawable.ic_action_data); setThemedDrawable(view, R.id.calendarImageView, R.drawable.ic_action_data);
setThemedDrawable(view, R.id.monthDropDownIcon, R.drawable.ic_action_arrow_drop_down);
setThemedDrawable(view, R.id.regionIconImageView, R.drawable.ic_world_globe_dark); setThemedDrawable(view, R.id.regionIconImageView, R.drawable.ic_world_globe_dark);
setThemedDrawable(view, R.id.countryDropDownIcon, R.drawable.ic_action_arrow_drop_down);
numberOfContributorsIcon = (ImageView) view.findViewById(R.id.numberOfContributorsIcon); numberOfContributorsIcon = (ImageView) view.findViewById(R.id.numberOfContributorsIcon);
numberOfEditsIcon = (ImageView) view.findViewById(R.id.numberOfEditsIcon); numberOfEditsIcon = (ImageView) view.findViewById(R.id.numberOfEditsIcon);
@ -156,8 +173,6 @@ public class ReportsFragment extends BaseOsmAndFragment implements CountrySelect
donationsTextView = (TextView) view.findViewById(R.id.donationsTextView); donationsTextView = (TextView) view.findViewById(R.id.donationsTextView);
recipientsTextView = (TextView) view.findViewById(R.id.recipientsTextView); recipientsTextView = (TextView) view.findViewById(R.id.recipientsTextView);
dividerToHide = view.findViewById(R.id.divider_to_hide);
requestAndUpdateUi(); requestAndUpdateUi();
AdapterView.OnItemSelectedListener onItemSelectedListener = new AdapterView.OnItemSelectedListener() { AdapterView.OnItemSelectedListener onItemSelectedListener = new AdapterView.OnItemSelectedListener() {
@ -356,7 +371,6 @@ public class ReportsFragment extends BaseOsmAndFragment implements CountrySelect
donationsTitle.setTextColor(inactiveColor); donationsTitle.setTextColor(inactiveColor);
progressBar.setVisibility(View.VISIBLE); progressBar.setVisibility(View.VISIBLE);
dividerToHide.setVisibility(View.GONE);
contributorsTextView.setTextColor(inactiveColor); contributorsTextView.setTextColor(inactiveColor);
donationsTextView.setTextColor(inactiveColor); donationsTextView.setTextColor(inactiveColor);
@ -375,8 +389,7 @@ public class ReportsFragment extends BaseOsmAndFragment implements CountrySelect
numberOfRecipientsTitle.setTextColor(textColorSecondary); numberOfRecipientsTitle.setTextColor(textColorSecondary);
donationsTitle.setTextColor(textColorSecondary); donationsTitle.setTextColor(textColorSecondary);
progressBar.setVisibility(View.GONE); progressBar.setVisibility(View.INVISIBLE);
dividerToHide.setVisibility(View.VISIBLE);
contributorsTextView.setTextColor(textColorPrimary); contributorsTextView.setTextColor(textColorPrimary);
editsTextView.setTextColor(textColorPrimary); editsTextView.setTextColor(textColorPrimary);