diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index b11b12f844..615f4114b0 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -358,6 +358,7 @@ dependencies {
compile project(path: ':OsmAnd-java', configuration: 'android')
compile project(':eclipse-compile:design')
compile project(':eclipse-compile:cardview')
+ compile project(':eclipse-compile:gridlayout')
// compile project(":eclipse-compile:recyclerview")
compile fileTree(include: ['*.jar'], exclude: ['QtAndroid-bundled.jar', 'QtAndroidAccessibility-bundled.jar', 'OsmAndCore_android.jar', 'OsmAndCore_wrapper.jar', 'android-support-multidex.jar'], dir: 'libs')
// compile "com.github.ksoichiro:android-observablescrollview:1.5.0"
diff --git a/OsmAnd/project.properties b/OsmAnd/project.properties
index 888b636da6..6129b595fa 100644
--- a/OsmAnd/project.properties
+++ b/OsmAnd/project.properties
@@ -15,3 +15,4 @@ dex.force.jumbo=true
android.library.reference.1=../eclipse-compile/appcompat
android.library.reference.2=../eclipse-compile/design
android.library.reference.3=../eclipse-compile/cardview
+android.library.reference.4=../eclipse-compile/gridlayout
diff --git a/OsmAnd/res/layout/fragment_reports.xml b/OsmAnd/res/layout/fragment_reports.xml
index 01107fce82..94dee37462 100644
--- a/OsmAnd/res/layout/fragment_reports.xml
+++ b/OsmAnd/res/layout/fragment_reports.xml
@@ -14,16 +14,16 @@
-
+ osmand:columnCount="2">
@@ -105,7 +105,7 @@
@@ -115,7 +115,7 @@
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="9dp"
- android:layout_columnSpan="2"
+ osmand:layout_columnSpan="2"
android:indeterminate="true"/>
@@ -153,7 +153,7 @@
+ android:src="@drawable/ic_map"/>
@@ -192,13 +192,13 @@
android:layout_width="56dp"
android:layout_height="60dp"
android:scaleType="center"
- android:src="@drawable/ic_action_message"/>
+ android:src="@drawable/ic_action_bitcoin"/>
@@ -220,7 +220,7 @@
@@ -254,7 +254,7 @@
android:textColor="?android:textColorPrimary"/>
-
+
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/ReportsFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/ReportsFragment.java
index b40a9f8bc1..95f1200550 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/ReportsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/ReportsFragment.java
@@ -136,7 +136,7 @@ public class ReportsFragment extends BaseOsmAndFragment implements CountrySelect
donationsIcon = (ImageView) view.findViewById(R.id.donationsIcon);
setThemedDrawable(numberOfContributorsIcon, R.drawable.ic_group);
setThemedDrawable(numberOfRecipientsIcon, R.drawable.ic_group);
- setThemedDrawable(donationsIcon, R.drawable.ic_action_message);
+ setThemedDrawable(donationsIcon, R.drawable.ic_action_bitcoin);
setThemedDrawable(numberOfEditsIcon, R.drawable.ic_map);
@@ -344,7 +344,7 @@ public class ReportsFragment extends BaseOsmAndFragment implements CountrySelect
numberOfContributorsIcon.setImageDrawable(getPaintedContentIcon(R.drawable.ic_group, inactiveColor));
numberOfEditsIcon.setImageDrawable(getPaintedContentIcon(R.drawable.ic_map, inactiveColor));
numberOfRecipientsIcon.setImageDrawable(getPaintedContentIcon(R.drawable.ic_group, inactiveColor));
- donationsIcon.setImageDrawable(getPaintedContentIcon(R.drawable.ic_action_message, inactiveColor));
+ donationsIcon.setImageDrawable(getPaintedContentIcon(R.drawable.ic_action_bitcoin, inactiveColor));
numberOfContributorsTitle.setTextColor(inactiveColor);
numberOfEditsTitle.setTextColor(inactiveColor);
@@ -364,7 +364,7 @@ public class ReportsFragment extends BaseOsmAndFragment implements CountrySelect
numberOfContributorsIcon.setImageDrawable(getContentIcon(R.drawable.ic_group));
numberOfEditsIcon.setImageDrawable(getContentIcon(R.drawable.ic_map));
numberOfRecipientsIcon.setImageDrawable(getContentIcon(R.drawable.ic_group));
- donationsIcon.setImageDrawable(getContentIcon(R.drawable.ic_action_message));
+ donationsIcon.setImageDrawable(getContentIcon(R.drawable.ic_action_bitcoin));
numberOfContributorsTitle.setTextColor(textColorSecondary);
numberOfEditsTitle.setTextColor(textColorSecondary);
diff --git a/eclipse-compile/gridlayout/.classpath b/eclipse-compile/gridlayout/.classpath
new file mode 100644
index 0000000000..a4763d1eec
--- /dev/null
+++ b/eclipse-compile/gridlayout/.classpath
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/eclipse-compile/gridlayout/.project b/eclipse-compile/gridlayout/.project
new file mode 100644
index 0000000000..1e67516d0d
--- /dev/null
+++ b/eclipse-compile/gridlayout/.project
@@ -0,0 +1,33 @@
+
+
+ android-support-v7-gridlayout
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/eclipse-compile/gridlayout/AndroidManifest.xml b/eclipse-compile/gridlayout/AndroidManifest.xml
new file mode 100644
index 0000000000..97f7be8d2c
--- /dev/null
+++ b/eclipse-compile/gridlayout/AndroidManifest.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
diff --git a/eclipse-compile/gridlayout/README.txt b/eclipse-compile/gridlayout/README.txt
new file mode 100644
index 0000000000..a67bf2a189
--- /dev/null
+++ b/eclipse-compile/gridlayout/README.txt
@@ -0,0 +1,66 @@
+Library Project including compatibility GridLayout.
+
+This can be used by an Android project to provide
+access to GridLayout on applications running on API 7+.
+
+There is technically no source, but the src folder is necessary
+to ensure that the build system works. The content is actually
+located in libs/android-support-v7-gridlayout.jar.
+The accompanying resources must also be included in the application.
+
+
+USAGE:
+
+Make sure you use in your
+layouts instead of .
+Same for instead of .
+
+Additionally, all of GridLayout's attributes should be put in the
+namespace of the app, as those attributes have been redefined in
+the library so that it can run on older platforms that don't offer
+those attributes in their namespace.
+
+To know which attributes need the application namespace, look at
+the two declare-styleable declared in res/values/attrs.xml
+
+
+
+For instance:
+
+
+ <===== notice how we're using app:columnCount here, not android:columnCount!
+
+
+
+
+
+
+
+
+
diff --git a/eclipse-compile/gridlayout/build.gradle b/eclipse-compile/gridlayout/build.gradle
new file mode 100644
index 0000000000..f0743d3ca0
--- /dev/null
+++ b/eclipse-compile/gridlayout/build.gradle
@@ -0,0 +1,26 @@
+apply plugin: 'com.android.library'
+dependencies {
+ compile files('libs/android-support-v7-gridlayout.jar')
+}
+
+android {
+ compileSdkVersion 23
+ buildToolsVersion "23.0.1"
+
+ defaultConfig {
+ minSdkVersion 9
+ targetSdkVersion 23
+ }
+ sourceSets {
+ main {
+ manifest.srcFile "AndroidManifest.xml"
+ aidl.srcDirs = ["src"]
+ java.srcDirs = ["src"]
+ resources.srcDirs = ["src"]
+ renderscript.srcDirs = ["src"]
+ res.srcDirs = ["res"]
+ assets.srcDirs = ["assets"]
+ }
+ }
+
+}
diff --git a/eclipse-compile/gridlayout/libs/android-support-v7-gridlayout.jar b/eclipse-compile/gridlayout/libs/android-support-v7-gridlayout.jar
new file mode 100644
index 0000000000..809bd0dbad
Binary files /dev/null and b/eclipse-compile/gridlayout/libs/android-support-v7-gridlayout.jar differ
diff --git a/eclipse-compile/gridlayout/project.properties b/eclipse-compile/gridlayout/project.properties
new file mode 100644
index 0000000000..8109e7b59e
--- /dev/null
+++ b/eclipse-compile/gridlayout/project.properties
@@ -0,0 +1,15 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-23
+android.library=true
\ No newline at end of file
diff --git a/eclipse-compile/gridlayout/res/values/attrs.xml b/eclipse-compile/gridlayout/res/values/attrs.xml
new file mode 100644
index 0000000000..8eea3d9994
--- /dev/null
+++ b/eclipse-compile/gridlayout/res/values/attrs.xml
@@ -0,0 +1,193 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/eclipse-compile/gridlayout/res/values/dimens.xml b/eclipse-compile/gridlayout/res/values/dimens.xml
new file mode 100644
index 0000000000..189f409b5c
--- /dev/null
+++ b/eclipse-compile/gridlayout/res/values/dimens.xml
@@ -0,0 +1,7 @@
+
+
+
+
+ 8dip
+
+
\ No newline at end of file
diff --git a/eclipse-compile/gridlayout/src/.readme b/eclipse-compile/gridlayout/src/.readme
new file mode 100644
index 0000000000..4bcebad80c
--- /dev/null
+++ b/eclipse-compile/gridlayout/src/.readme
@@ -0,0 +1,2 @@
+This hidden file is there to ensure there is an src folder.
+Once we support binary library this will go away.
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 1472966a6f..e6c2f9a135 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,5 @@
include ':OsmAnd-java'
+include ':eclipse-compile:gridlayout'
include ':eclipse-compile:cardview'
include ':eclipse-compile:design'
include ':eclipse-compile:appcompat'