Merge branch 'develop'

Author: artem-zinnatullin

.travis.yml

@@ -16,20 +16,20 @@ before_install:
   # Install required components
   - echo yes | android update sdk --filter platform-tools --no-ui --force > /dev/null
   - echo yes | android update sdk --all --filter build-tools-20.0.0 --no-ui --force > /dev/null
-  - echo yes | android update sdk --filter android-20 --no-ui --force > /dev/null
-  - echo yes | android update sdk --filter android-19 --no-ui --force > /dev/null
+  - echo yes | android update sdk --filter android-21 --no-ui --force > /dev/null
   - echo yes | android update sdk --all --filter sys-img-armeabi-v7a-android-19 --no-ui --force > /dev/null
   - echo yes | android update sdk --filter extra-android-support --no-ui --force > /dev/null
   - echo yes | android update sdk --filter extra-android-m2repository --no-ui --force > /dev/null
 
 install:
   - ./gradlew assembleRelease --info
 
-before_script:
-  - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
-  - emulator -avd test -no-skin -no-audio -no-window &
-  - adb wait-for-device
-  - adb shell input keyevent 82 &
+# before_script:
+#   - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
+#   - emulator -avd test -no-skin -no-audio -no-window &
+#   - adb wait-for-device
+#   - adb shell input keyevent 82 &
 
-script:
-  - ./gradlew connectedAndroidTest --info
+# TODO: make tests work on Travis CI
+# script:
+#   - ./gradlew connectedAndroidTest --info

README.md

@@ -8,20 +8,25 @@
 
 *Main* ***develop*** branch build status [on Travis CI](https://travis-ci.org/artem-zinnatullin/android-wail-app): [![Build Status](https://travis-ci.org/artem-zinnatullin/android-wail-app.svg?branch=develop)](https://travis-ci.org/artem-zinnatullin/android-wail-app)
 
-***Also, here is tasks dashboard on Waffie.io*** -> [Tasks Dashboard](https://waffle.io/artem-zinnatullin/android-wail-app): [![Tasks ready to work on](https://badge.waffle.io/artem-zinnatullin/android-wail-app.png?label=ready&title=Ready)](https://waffle.io/artem-zinnatullin/android-wail-app)
-
 **How it looks:**
 
-<img src="screenshots/screenshot_1.png" alt="Main screen" height="500px"/>
-&nbsp;<img src="screenshots/screenshot_2.png" alt="Captured tracks list" height="500px"/>
+<img src="screenshots/dark_main.png" alt="Main screen" height="400px"/>
+&nbsp;<img src="screenshots/dark_tracks.png" alt="Captured tracks list" height="400px"/>
+&nbsp;<img src="screenshots/dark_settings.png" alt="Settings screen" height="400px"/>
 
-<img src="screenshots/screenshot_3.png" alt="Settings screen" height="500px"/>
-&nbsp;<img src="screenshots/screenshot_4.png" alt="Sound notifications" height="500px"/>
+<img src="screenshots/light_main.png" alt="Main screen" height="400px"/>
+&nbsp;<img src="screenshots/light_tracks.png" alt="Captured tracks list" height="400px"/>
+&nbsp;<img src="screenshots/light_settings.png" alt="Settings screen" height="400px"/>
 
 ##Main features:
 * Scrobbling tracks to the last.fm (even if you are offline, WAIL will send them later)
 * Updating #nowplaying
 * Sound notifications
+* Status bar notifications
+* "Love" track
+* Option to ignore any player
+* Light and dark theme
+* English, German and Russian languages
 
 -------------------
 ###BEFORE CONTRIBUTING TO THE WAIL APP!
@@ -31,6 +36,6 @@ Please read small wiki about commits style guides, git work flow and sources sty
 -------------------
 Questions and answers:
 
-* Why repo has small amount of commits? — Because original repo has my personal data, which I decided to remove before making WAIL Open Source. I decided to not use git filter-branch or bfg to delete these files, so I just created new repo with source code. Sorry guys, about ~250 commits losted...
+* Why repo has small amount of commits? — Because original repo has my personal data, which I decided to remove before making WAIL Open Source. I decided to not use git filter-branch or bfg to delete these files, so I just created new repo with source code. Sorry guys, about ~250 commits were lost...
 * Why you have last.fm secret api keys in Open Source project? — Just because it's very easy to decompile the apk and get them from it, so, please do not use them for evil purposes :)
 * Will WAIL be released to Google Play with your fixes? — YES, of course! This is the main purpose of making WAIL Open Source project, I have no time to work on it, so I hope you will help WAIL!

build.gradle

@@ -6,6 +6,6 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.0'
+        classpath 'com.android.tools.build:gradle:1.0.0'
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Jul 11 02:03:02 MSK 2014
+#Fri Dec 19 21:34:30 MSK 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip