diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 65c32efbf9..c4c6e6db6e 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -#Tue Sep 13 11:46:29 MSK 2016 +#Sun Sep 11 01:49:03 MSK 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/android/res/drawable-hdpi/ic_spinner_pending_1.png b/android/res/drawable-hdpi/ic_spinner_pending_1.png deleted file mode 100644 index 9f961fdcf6..0000000000 Binary files a/android/res/drawable-hdpi/ic_spinner_pending_1.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_spinner_pending_10.png b/android/res/drawable-hdpi/ic_spinner_pending_10.png deleted file mode 100644 index 62ff77cbbb..0000000000 Binary files a/android/res/drawable-hdpi/ic_spinner_pending_10.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_spinner_pending_11.png b/android/res/drawable-hdpi/ic_spinner_pending_11.png deleted file mode 100644 index ef8dc8fed6..0000000000 Binary files a/android/res/drawable-hdpi/ic_spinner_pending_11.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_spinner_pending_12.png b/android/res/drawable-hdpi/ic_spinner_pending_12.png deleted file mode 100644 index eca73cad9f..0000000000 Binary files a/android/res/drawable-hdpi/ic_spinner_pending_12.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_spinner_pending_13.png b/android/res/drawable-hdpi/ic_spinner_pending_13.png deleted file mode 100644 index 3e65504a82..0000000000 Binary files a/android/res/drawable-hdpi/ic_spinner_pending_13.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_spinner_pending_14.png b/android/res/drawable-hdpi/ic_spinner_pending_14.png deleted file mode 100644 index 535499f56d..0000000000 Binary files a/android/res/drawable-hdpi/ic_spinner_pending_14.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_spinner_pending_15.png b/android/res/drawable-hdpi/ic_spinner_pending_15.png deleted file mode 100644 index 7da17a52b3..0000000000 Binary files a/android/res/drawable-hdpi/ic_spinner_pending_15.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_spinner_pending_16.png b/android/res/drawable-hdpi/ic_spinner_pending_16.png deleted file mode 100644 index 43d06bc434..0000000000 Binary files a/android/res/drawable-hdpi/ic_spinner_pending_16.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_spinner_pending_17.png b/android/res/drawable-hdpi/ic_spinner_pending_17.png deleted file mode 100644 index 0ae2dda40d..0000000000 Binary files a/android/res/drawable-hdpi/ic_spinner_pending_17.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_spinner_pending_18.png b/android/res/drawable-hdpi/ic_spinner_pending_18.png deleted file mode 100644 index ef92839545..0000000000 Binary files a/android/res/drawable-hdpi/ic_spinner_pending_18.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_spinner_pending_2.png b/android/res/drawable-hdpi/ic_spinner_pending_2.png deleted file mode 100644 index 9e8843bf40..0000000000 Binary files a/android/res/drawable-hdpi/ic_spinner_pending_2.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_spinner_pending_3.png b/android/res/drawable-hdpi/ic_spinner_pending_3.png deleted file mode 100644 index 083cea38d5..0000000000 Binary files a/android/res/drawable-hdpi/ic_spinner_pending_3.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_spinner_pending_4.png b/android/res/drawable-hdpi/ic_spinner_pending_4.png deleted file mode 100644 index 7e5bbaa664..0000000000 Binary files a/android/res/drawable-hdpi/ic_spinner_pending_4.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_spinner_pending_5.png b/android/res/drawable-hdpi/ic_spinner_pending_5.png deleted file mode 100644 index 51e00cec69..0000000000 Binary files a/android/res/drawable-hdpi/ic_spinner_pending_5.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_spinner_pending_6.png b/android/res/drawable-hdpi/ic_spinner_pending_6.png deleted file mode 100644 index abe817249f..0000000000 Binary files a/android/res/drawable-hdpi/ic_spinner_pending_6.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_spinner_pending_7.png b/android/res/drawable-hdpi/ic_spinner_pending_7.png deleted file mode 100644 index 3ff9e3c335..0000000000 Binary files a/android/res/drawable-hdpi/ic_spinner_pending_7.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_spinner_pending_8.png b/android/res/drawable-hdpi/ic_spinner_pending_8.png deleted file mode 100644 index 46576ef8c3..0000000000 Binary files a/android/res/drawable-hdpi/ic_spinner_pending_8.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_spinner_pending_9.png b/android/res/drawable-hdpi/ic_spinner_pending_9.png deleted file mode 100644 index c9278056d3..0000000000 Binary files a/android/res/drawable-hdpi/ic_spinner_pending_9.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_spinner_pending_1.png b/android/res/drawable-mdpi/ic_spinner_pending_1.png deleted file mode 100644 index 7512323b87..0000000000 Binary files a/android/res/drawable-mdpi/ic_spinner_pending_1.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_spinner_pending_10.png b/android/res/drawable-mdpi/ic_spinner_pending_10.png deleted file mode 100644 index 725c361eab..0000000000 Binary files a/android/res/drawable-mdpi/ic_spinner_pending_10.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_spinner_pending_11.png b/android/res/drawable-mdpi/ic_spinner_pending_11.png deleted file mode 100644 index aad16df9e4..0000000000 Binary files a/android/res/drawable-mdpi/ic_spinner_pending_11.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_spinner_pending_12.png b/android/res/drawable-mdpi/ic_spinner_pending_12.png deleted file mode 100644 index 5410ea97f1..0000000000 Binary files a/android/res/drawable-mdpi/ic_spinner_pending_12.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_spinner_pending_13.png b/android/res/drawable-mdpi/ic_spinner_pending_13.png deleted file mode 100644 index 53cc6ccf9a..0000000000 Binary files a/android/res/drawable-mdpi/ic_spinner_pending_13.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_spinner_pending_14.png b/android/res/drawable-mdpi/ic_spinner_pending_14.png deleted file mode 100644 index 477223b19e..0000000000 Binary files a/android/res/drawable-mdpi/ic_spinner_pending_14.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_spinner_pending_15.png b/android/res/drawable-mdpi/ic_spinner_pending_15.png deleted file mode 100644 index 4f392f90d3..0000000000 Binary files a/android/res/drawable-mdpi/ic_spinner_pending_15.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_spinner_pending_16.png b/android/res/drawable-mdpi/ic_spinner_pending_16.png deleted file mode 100644 index dc23f9fba9..0000000000 Binary files a/android/res/drawable-mdpi/ic_spinner_pending_16.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_spinner_pending_17.png b/android/res/drawable-mdpi/ic_spinner_pending_17.png deleted file mode 100644 index 884192a41e..0000000000 Binary files a/android/res/drawable-mdpi/ic_spinner_pending_17.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_spinner_pending_18.png b/android/res/drawable-mdpi/ic_spinner_pending_18.png deleted file mode 100644 index 5e05f2ae0a..0000000000 Binary files a/android/res/drawable-mdpi/ic_spinner_pending_18.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_spinner_pending_2.png b/android/res/drawable-mdpi/ic_spinner_pending_2.png deleted file mode 100644 index b980384551..0000000000 Binary files a/android/res/drawable-mdpi/ic_spinner_pending_2.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_spinner_pending_3.png b/android/res/drawable-mdpi/ic_spinner_pending_3.png deleted file mode 100644 index 41e871d1c7..0000000000 Binary files a/android/res/drawable-mdpi/ic_spinner_pending_3.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_spinner_pending_4.png b/android/res/drawable-mdpi/ic_spinner_pending_4.png deleted file mode 100644 index f5e42beb74..0000000000 Binary files a/android/res/drawable-mdpi/ic_spinner_pending_4.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_spinner_pending_5.png b/android/res/drawable-mdpi/ic_spinner_pending_5.png deleted file mode 100644 index 5201a795a1..0000000000 Binary files a/android/res/drawable-mdpi/ic_spinner_pending_5.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_spinner_pending_6.png b/android/res/drawable-mdpi/ic_spinner_pending_6.png deleted file mode 100644 index 6fb36c7a52..0000000000 Binary files a/android/res/drawable-mdpi/ic_spinner_pending_6.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_spinner_pending_7.png b/android/res/drawable-mdpi/ic_spinner_pending_7.png deleted file mode 100644 index 34ad771cf8..0000000000 Binary files a/android/res/drawable-mdpi/ic_spinner_pending_7.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_spinner_pending_8.png b/android/res/drawable-mdpi/ic_spinner_pending_8.png deleted file mode 100644 index 9c29e793b2..0000000000 Binary files a/android/res/drawable-mdpi/ic_spinner_pending_8.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_spinner_pending_9.png b/android/res/drawable-mdpi/ic_spinner_pending_9.png deleted file mode 100644 index f8159eb21d..0000000000 Binary files a/android/res/drawable-mdpi/ic_spinner_pending_9.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_1.png b/android/res/drawable-xhdpi/ic_spinner_pending_1.png deleted file mode 100644 index cd4419b3bf..0000000000 Binary files a/android/res/drawable-xhdpi/ic_spinner_pending_1.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_10.png b/android/res/drawable-xhdpi/ic_spinner_pending_10.png deleted file mode 100644 index 72fe49fc06..0000000000 Binary files a/android/res/drawable-xhdpi/ic_spinner_pending_10.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_11.png b/android/res/drawable-xhdpi/ic_spinner_pending_11.png deleted file mode 100644 index 4baa26638d..0000000000 Binary files a/android/res/drawable-xhdpi/ic_spinner_pending_11.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_12.png b/android/res/drawable-xhdpi/ic_spinner_pending_12.png deleted file mode 100644 index c9167e2a7e..0000000000 Binary files a/android/res/drawable-xhdpi/ic_spinner_pending_12.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_13.png b/android/res/drawable-xhdpi/ic_spinner_pending_13.png deleted file mode 100644 index edb9718b77..0000000000 Binary files a/android/res/drawable-xhdpi/ic_spinner_pending_13.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_14.png b/android/res/drawable-xhdpi/ic_spinner_pending_14.png deleted file mode 100644 index 076f106bb7..0000000000 Binary files a/android/res/drawable-xhdpi/ic_spinner_pending_14.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_15.png b/android/res/drawable-xhdpi/ic_spinner_pending_15.png deleted file mode 100644 index 3998f9af30..0000000000 Binary files a/android/res/drawable-xhdpi/ic_spinner_pending_15.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_16.png b/android/res/drawable-xhdpi/ic_spinner_pending_16.png deleted file mode 100644 index 98c6ac2d82..0000000000 Binary files a/android/res/drawable-xhdpi/ic_spinner_pending_16.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_17.png b/android/res/drawable-xhdpi/ic_spinner_pending_17.png deleted file mode 100644 index a32a8951bb..0000000000 Binary files a/android/res/drawable-xhdpi/ic_spinner_pending_17.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_18.png b/android/res/drawable-xhdpi/ic_spinner_pending_18.png deleted file mode 100644 index 0a9bbd4310..0000000000 Binary files a/android/res/drawable-xhdpi/ic_spinner_pending_18.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_2.png b/android/res/drawable-xhdpi/ic_spinner_pending_2.png deleted file mode 100644 index 22b7838f19..0000000000 Binary files a/android/res/drawable-xhdpi/ic_spinner_pending_2.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_3.png b/android/res/drawable-xhdpi/ic_spinner_pending_3.png deleted file mode 100644 index d825eefc4e..0000000000 Binary files a/android/res/drawable-xhdpi/ic_spinner_pending_3.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_4.png b/android/res/drawable-xhdpi/ic_spinner_pending_4.png deleted file mode 100644 index 402f0dac02..0000000000 Binary files a/android/res/drawable-xhdpi/ic_spinner_pending_4.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_5.png b/android/res/drawable-xhdpi/ic_spinner_pending_5.png deleted file mode 100644 index d9326baada..0000000000 Binary files a/android/res/drawable-xhdpi/ic_spinner_pending_5.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_6.png b/android/res/drawable-xhdpi/ic_spinner_pending_6.png deleted file mode 100644 index 151f3940ab..0000000000 Binary files a/android/res/drawable-xhdpi/ic_spinner_pending_6.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_7.png b/android/res/drawable-xhdpi/ic_spinner_pending_7.png deleted file mode 100644 index 557470b845..0000000000 Binary files a/android/res/drawable-xhdpi/ic_spinner_pending_7.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_8.png b/android/res/drawable-xhdpi/ic_spinner_pending_8.png deleted file mode 100644 index 3092b85fd6..0000000000 Binary files a/android/res/drawable-xhdpi/ic_spinner_pending_8.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_9.png b/android/res/drawable-xhdpi/ic_spinner_pending_9.png deleted file mode 100644 index a56a4eaffb..0000000000 Binary files a/android/res/drawable-xhdpi/ic_spinner_pending_9.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_1.png b/android/res/drawable-xxhdpi/ic_spinner_pending_1.png deleted file mode 100644 index bc7f968644..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_spinner_pending_1.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_10.png b/android/res/drawable-xxhdpi/ic_spinner_pending_10.png deleted file mode 100644 index d2626d1c8f..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_spinner_pending_10.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_11.png b/android/res/drawable-xxhdpi/ic_spinner_pending_11.png deleted file mode 100644 index 98bde38f94..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_spinner_pending_11.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_12.png b/android/res/drawable-xxhdpi/ic_spinner_pending_12.png deleted file mode 100644 index 1bc6d9ec76..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_spinner_pending_12.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_13.png b/android/res/drawable-xxhdpi/ic_spinner_pending_13.png deleted file mode 100644 index 37b7ee7401..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_spinner_pending_13.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_14.png b/android/res/drawable-xxhdpi/ic_spinner_pending_14.png deleted file mode 100644 index d98780d188..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_spinner_pending_14.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_15.png b/android/res/drawable-xxhdpi/ic_spinner_pending_15.png deleted file mode 100644 index 29cf8eca9a..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_spinner_pending_15.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_16.png b/android/res/drawable-xxhdpi/ic_spinner_pending_16.png deleted file mode 100644 index 95e47bb1da..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_spinner_pending_16.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_17.png b/android/res/drawable-xxhdpi/ic_spinner_pending_17.png deleted file mode 100644 index cc06183890..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_spinner_pending_17.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_18.png b/android/res/drawable-xxhdpi/ic_spinner_pending_18.png deleted file mode 100644 index 82678d1870..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_spinner_pending_18.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_2.png b/android/res/drawable-xxhdpi/ic_spinner_pending_2.png deleted file mode 100644 index 3fe2adadf5..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_spinner_pending_2.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_3.png b/android/res/drawable-xxhdpi/ic_spinner_pending_3.png deleted file mode 100644 index fe169d266f..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_spinner_pending_3.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_4.png b/android/res/drawable-xxhdpi/ic_spinner_pending_4.png deleted file mode 100644 index 2a5ea604ad..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_spinner_pending_4.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_5.png b/android/res/drawable-xxhdpi/ic_spinner_pending_5.png deleted file mode 100644 index d6e7e29dd4..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_spinner_pending_5.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_6.png b/android/res/drawable-xxhdpi/ic_spinner_pending_6.png deleted file mode 100644 index 997caa6b77..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_spinner_pending_6.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_7.png b/android/res/drawable-xxhdpi/ic_spinner_pending_7.png deleted file mode 100644 index 1bad19e858..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_spinner_pending_7.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_8.png b/android/res/drawable-xxhdpi/ic_spinner_pending_8.png deleted file mode 100644 index 32a719a923..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_spinner_pending_8.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_9.png b/android/res/drawable-xxhdpi/ic_spinner_pending_9.png deleted file mode 100644 index 306c51ea86..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_spinner_pending_9.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_1.png b/android/res/drawable-xxxhdpi/ic_spinner_pending_1.png deleted file mode 100644 index 4fec9c7e6c..0000000000 Binary files a/android/res/drawable-xxxhdpi/ic_spinner_pending_1.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_10.png b/android/res/drawable-xxxhdpi/ic_spinner_pending_10.png deleted file mode 100644 index caff63b3c5..0000000000 Binary files a/android/res/drawable-xxxhdpi/ic_spinner_pending_10.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_11.png b/android/res/drawable-xxxhdpi/ic_spinner_pending_11.png deleted file mode 100644 index 43e8e4b3b8..0000000000 Binary files a/android/res/drawable-xxxhdpi/ic_spinner_pending_11.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_12.png b/android/res/drawable-xxxhdpi/ic_spinner_pending_12.png deleted file mode 100644 index 1130bbc267..0000000000 Binary files a/android/res/drawable-xxxhdpi/ic_spinner_pending_12.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_13.png b/android/res/drawable-xxxhdpi/ic_spinner_pending_13.png deleted file mode 100644 index b90d98f7ee..0000000000 Binary files a/android/res/drawable-xxxhdpi/ic_spinner_pending_13.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_14.png b/android/res/drawable-xxxhdpi/ic_spinner_pending_14.png deleted file mode 100644 index dcef23b821..0000000000 Binary files a/android/res/drawable-xxxhdpi/ic_spinner_pending_14.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_15.png b/android/res/drawable-xxxhdpi/ic_spinner_pending_15.png deleted file mode 100644 index c052f58a67..0000000000 Binary files a/android/res/drawable-xxxhdpi/ic_spinner_pending_15.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_16.png b/android/res/drawable-xxxhdpi/ic_spinner_pending_16.png deleted file mode 100644 index d794fcbe4d..0000000000 Binary files a/android/res/drawable-xxxhdpi/ic_spinner_pending_16.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_17.png b/android/res/drawable-xxxhdpi/ic_spinner_pending_17.png deleted file mode 100644 index 3c3a5343cb..0000000000 Binary files a/android/res/drawable-xxxhdpi/ic_spinner_pending_17.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_18.png b/android/res/drawable-xxxhdpi/ic_spinner_pending_18.png deleted file mode 100644 index d74a4a1f69..0000000000 Binary files a/android/res/drawable-xxxhdpi/ic_spinner_pending_18.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_2.png b/android/res/drawable-xxxhdpi/ic_spinner_pending_2.png deleted file mode 100644 index fdd8a201c8..0000000000 Binary files a/android/res/drawable-xxxhdpi/ic_spinner_pending_2.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_3.png b/android/res/drawable-xxxhdpi/ic_spinner_pending_3.png deleted file mode 100644 index b6a35b1f3b..0000000000 Binary files a/android/res/drawable-xxxhdpi/ic_spinner_pending_3.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_4.png b/android/res/drawable-xxxhdpi/ic_spinner_pending_4.png deleted file mode 100644 index 301337cba6..0000000000 Binary files a/android/res/drawable-xxxhdpi/ic_spinner_pending_4.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_5.png b/android/res/drawable-xxxhdpi/ic_spinner_pending_5.png deleted file mode 100644 index bc3538c443..0000000000 Binary files a/android/res/drawable-xxxhdpi/ic_spinner_pending_5.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_6.png b/android/res/drawable-xxxhdpi/ic_spinner_pending_6.png deleted file mode 100644 index 35c0cf859f..0000000000 Binary files a/android/res/drawable-xxxhdpi/ic_spinner_pending_6.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_7.png b/android/res/drawable-xxxhdpi/ic_spinner_pending_7.png deleted file mode 100644 index 025e0eb494..0000000000 Binary files a/android/res/drawable-xxxhdpi/ic_spinner_pending_7.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_8.png b/android/res/drawable-xxxhdpi/ic_spinner_pending_8.png deleted file mode 100644 index bc6182d2dd..0000000000 Binary files a/android/res/drawable-xxxhdpi/ic_spinner_pending_8.png and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_9.png b/android/res/drawable-xxxhdpi/ic_spinner_pending_9.png deleted file mode 100644 index 87be2f3436..0000000000 Binary files a/android/res/drawable-xxxhdpi/ic_spinner_pending_9.png and /dev/null differ diff --git a/android/res/layout-w1020dp-land/routing_details.xml b/android/res/layout-w1020dp-land/routing_details.xml index 131a8af3a0..1acab6e410 100644 --- a/android/res/layout-w1020dp-land/routing_details.xml +++ b/android/res/layout-w1020dp-land/routing_details.xml @@ -10,7 +10,7 @@ android:id="@+id/time" style="@style/MwmWidget.TextView.PlanDetail.Number.Time" android:layout_marginBottom="4dp" - tools:text="33 min" /> + tools:text="33 min"/> + tools:ignore="HardcodedText"/> + tools:text="1024 km 324"/> - + + android:layout_marginBottom="8dp"/> \ No newline at end of file diff --git a/android/res/layout/fragment_routing.xml b/android/res/layout/fragment_routing.xml index 5206b083f3..e558728696 100644 --- a/android/res/layout/fragment_routing.xml +++ b/android/res/layout/fragment_routing.xml @@ -11,7 +11,7 @@ + android:layout_height="wrap_content"/> - + - + \ No newline at end of file diff --git a/android/res/layout/routing_details.xml b/android/res/layout/routing_details.xml index 1697ba5a25..ea7452bd03 100644 --- a/android/res/layout/routing_details.xml +++ b/android/res/layout/routing_details.xml @@ -5,12 +5,13 @@ android:layout_width="wrap_content" android:layout_height="@dimen/altitude_chart_time_distance_height" android:layout_marginBottom="@dimen/altitude_chart_time_distance_margin_bottom" + android:orientation="horizontal" tools:showIn="@layout/altitude_chart_panel"> + tools:text="33 min"/> + tools:ignore="HardcodedText"/> + tools:text="1024 km"/> \ No newline at end of file diff --git a/android/res/layout/routing_plan.xml b/android/res/layout/routing_plan.xml index 3d05eeec18..118b4e9d96 100644 --- a/android/res/layout/routing_plan.xml +++ b/android/res/layout/routing_plan.xml @@ -54,16 +54,16 @@ @@ -71,9 +71,9 @@ @@ -97,8 +97,8 @@ android:id="@+id/bicycle" android:layout_width="@dimen/routing_selector_size" android:layout_height="@dimen/routing_selector_size" - android:layout_marginRight="4dp" - android:layout_marginLeft="4dp" + android:layout_marginRight="@dimen/routing_selector_wheel_margin" + android:layout_marginLeft="@dimen/routing_selector_wheel_margin" tools:button="@drawable/ic_bicycle" tools:buttonTint="?iconTintLight" /> diff --git a/android/res/values-sw720dp/dimens.xml b/android/res/values-sw720dp/dimens.xml index 8754bdd6a7..04005accef 100644 --- a/android/res/values-sw720dp/dimens.xml +++ b/android/res/values-sw720dp/dimens.xml @@ -16,6 +16,7 @@ 250dp 16dp 16dp + 720dp \ No newline at end of file diff --git a/android/res/values-w400dp/dimens.xml b/android/res/values-w400dp/dimens.xml index 12c5adeba2..ff1e15bfeb 100644 --- a/android/res/values-w400dp/dimens.xml +++ b/android/res/values-w400dp/dimens.xml @@ -3,6 +3,7 @@ 56dp 12dp + 600dp diff --git a/android/res/values-w600dp/dimens.xml b/android/res/values-w600dp/dimens.xml deleted file mode 100644 index 00830a76c8..0000000000 --- a/android/res/values-w600dp/dimens.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - 600dp - \ No newline at end of file diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml index 44ab17144b..da1c4a3062 100644 --- a/android/res/values/colors.xml +++ b/android/res/values/colors.xml @@ -102,8 +102,8 @@ #FFF0F0F0 @color/bg_window_night #3D000000 - #80FFFFFF - #FFFFFFFF + #80FFFFFF + #FFFFFFFF @color/divider @color/divider_night diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml index 9713106a82..bee741fdc2 100644 --- a/android/res/values/dimens.xml +++ b/android/res/values/dimens.xml @@ -65,6 +65,7 @@ 48dp 48dp 40dp + 4dp 52dp 12dp 3dp @@ -139,6 +140,5 @@ 10dp 40dp 232dp - 96dp diff --git a/android/res/values/themes-base.xml b/android/res/values/themes-base.xml index c72c052335..7dc44d02df 100644 --- a/android/res/values/themes-base.xml +++ b/android/res/values/themes-base.xml @@ -73,8 +73,8 @@ @drawable/ic_fab_add - @color/routing_button_background - @color/routing_button_background_pressed + @color/routing_button_tint + @color/routing_button_pressed_tint @@ -149,5 +149,8 @@ @style/MwmTheme.Navigation.Night @drawable/ic_fab_add_night + + @color/routing_button_tint + @color/routing_button_pressed_tint \ No newline at end of file diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index c855914954..95239c61bf 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -1345,7 +1345,8 @@ public class MwmActivity extends BaseMwmFragmentActivity } @Override - public void onRouteBuilt(@Framework.RouterType int router) { + public void onRouteBuilt(@Framework.RouterType int router) + { if (mIsFragmentContainer) { RoutingPlanFragment fragment = (RoutingPlanFragment) getFragment(RoutingPlanFragment.class); diff --git a/android/src/com/mapswithme/maps/MwmApplication.java b/android/src/com/mapswithme/maps/MwmApplication.java index a79d147d24..d59f48c5b7 100644 --- a/android/src/com/mapswithme/maps/MwmApplication.java +++ b/android/src/com/mapswithme/maps/MwmApplication.java @@ -110,7 +110,7 @@ public class MwmApplication extends Application Statistics s = Statistics.INSTANCE; initHockeyApp(); -// initCrashlytics(); + initCrashlytics(); initPushWoosh(); String settingsPath = getSettingsPath(); @@ -123,7 +123,7 @@ public class MwmApplication extends Application mPrefs = getSharedPreferences(getString(R.string.pref_file_name), MODE_PRIVATE); mBackgroundTracker = new AppBackgroundTracker(); -// TrackRecorder.init(); + TrackRecorder.init(); Editor.init(); } diff --git a/android/src/com/mapswithme/maps/routing/RoutingPlanController.java b/android/src/com/mapswithme/maps/routing/RoutingPlanController.java index 2a05e60ae7..c8072f1b11 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingPlanController.java +++ b/android/src/com/mapswithme/maps/routing/RoutingPlanController.java @@ -111,14 +111,9 @@ public class RoutingPlanController extends ToolbarController mProgressBicycle = (WheelProgressView) progressFrame.findViewById(R.id.progress_bicycle); View altitudeChartFrame = mFrame.findViewById(R.id.altitude_chart_panel); - if (altitudeChartFrame == null) //We are in Phone mode, not tablet - { + if (altitudeChartFrame == null) altitudeChartFrame = mActivity.findViewById(R.id.altitude_chart_panel); - if (altitudeChartFrame == null) - { - throw new AssertionError("The altitude panel must be presented in Phone UI if it's absent in Table UI"); - } - } + mAltitudeChartFrame = altitudeChartFrame; mAltitudeChartFrame.setVisibility(View.GONE); @@ -185,12 +180,15 @@ public class RoutingPlanController extends ToolbarController TextView numbersDistance = (TextView) numbersFrame.findViewById(R.id.distance); TextView numbersArrival = (TextView) numbersFrame.findViewById(R.id.arrival); RoutingInfo rinfo = RoutingController.get().getCachedRoutingInfo(); - numbersTime.setText(RoutingController.formatRoutingTime(mFrame.getContext(), rinfo.totalTimeInSeconds, R.dimen.text_size_routing_number)); + numbersTime.setText(RoutingController.formatRoutingTime(mFrame.getContext(), rinfo.totalTimeInSeconds, + R.dimen.text_size_routing_number)); numbersDistance.setText(rinfo.distToTarget + " " + rinfo.targetUnits); if (numbersArrival != null) - numbersArrival.setText(MwmApplication.get().getString(R.string.routing_arrive, - RoutingController.formatArrivalTime(rinfo.totalTimeInSeconds))); + { + String arrivalTime = RoutingController.formatArrivalTime(rinfo.totalTimeInSeconds); + numbersArrival.setText(arrivalTime); + } UiUtils.show(mAltitudeChartFrame); mAltitudeChartShown = true; @@ -199,15 +197,14 @@ public class RoutingPlanController extends ToolbarController private void hideAltitudeChartAndRoutingDetails() { if (UiUtils.isHidden(mAltitudeChartFrame)) - { return; - } UiUtils.hide(mAltitudeChartFrame); mAltitudeChartShown = false; } - protected boolean isAltitudeChartShown() { + protected boolean isAltitudeChartShown() + { return mAltitudeChartShown; } @@ -315,20 +312,19 @@ public class RoutingPlanController extends ToolbarController protected void showRouteAltitudeChartInternal(boolean show, ImageView altitudeChart) { - if (show) + if (!show) { - int chartWidth = mActivity.getResources().getDimensionPixelSize(R.dimen.altitude_chart_image_width); - int chartHeight = mActivity.getResources().getDimensionPixelSize(R.dimen.altitude_chart_image_height); - Bitmap bm = Framework.GenerateRouteAltitudeChart(chartWidth, chartHeight); - if (bm != null) - { - altitudeChart.setImageBitmap(bm); - altitudeChart.setVisibility(View.VISIBLE); - } + UiUtils.hide(altitudeChart); + return; } - else + + int chartWidth = UiUtils.dimen(mActivity, R.dimen.altitude_chart_image_width); + int chartHeight = UiUtils.dimen(mActivity, R.dimen.altitude_chart_image_height); + Bitmap bm = Framework.GenerateRouteAltitudeChart(chartWidth, chartHeight); + if (bm != null) { - altitudeChart.setVisibility(View.GONE); + altitudeChart.setImageBitmap(bm); + UiUtils.show(altitudeChart); } } } diff --git a/android/src/com/mapswithme/maps/widget/menu/MainMenu.java b/android/src/com/mapswithme/maps/widget/menu/MainMenu.java index 33d46aec27..0d3ddbec2b 100644 --- a/android/src/com/mapswithme/maps/widget/menu/MainMenu.java +++ b/android/src/com/mapswithme/maps/widget/menu/MainMenu.java @@ -324,5 +324,4 @@ public class MainMenu extends BaseMenu { UiUtils.showIf(show, mLineFrame); } - }