Prefer extensions from URIs

.gitignore

@@ -1,31 +1,109 @@
+###Android###
 
+# built application files
+*.apk
+*.ap_
+
+# built NDK stuff
+libs/armeabi
+libs/armeabi-v7a
+obj/
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
 bin/
 gen/
+
+# capture hprofs
+captures
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Eclipse project files
+.classpath
+.project
+
+
+###Eclipse###
+
+*.pydevproject
 .project
 .metadata
+bin/**
 tmp/**
 tmp/**/*
 *.tmp
 *.bak
 *.swp
-*~
-lint.xml
-
+*~.nib
+local.properties
 .classpath
 .settings/
 .loadpath
 
+# External tool builders
+.externalToolBuilders/
+
 # Locally stored "Eclipse launch configurations"
 *.launch
 
-# built application files
-*.apk
-*.ap_
+# CDT-specific
+.cproject
 
+# PDT-specific
+.buildpath
 
-# Java class files
-*.class
 
-local.properties
-project.properties
-notes
+###Maven###
+
+target/
+
+
+###Gradle###
+
+.gradle/
+build/
+
+
+###IntelliJ###
+
+*.iml
+*.ipr
+*.iws
+.idea/
+
+
+###Actionscript###
+
+# Build and Release Folders
+bin/
+bin-debug/
+bin-release/
+
+# Project property files
+.actionScriptProperties
+.flexProperties
+.settings/
+.project
+
+###OSX###
+
+.DS_Store
+
+# Thumbnails
+._*
+
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+
+###Signing###
+signingconfig.gradle
+signing.properties
+*.keystore

.tx/config

@@ -0,0 +1,9 @@
+[main]
+host = https://www.transifex.com
+lang_map = en_GB: en-rGB, af_ZA: af-rZA, am_ET: am-rET, ar_AA: ar-rAA, ar_AE: ar-rAE, ar_BH: ar-rBH, ar_DZ: ar-rDZ, ar_EG: ar-rEG, ar_IQ: ar-rIQ, ar_JO: ar-rJO, ar_KW: ar-rKW, ar_LB: ar-rLB, ar_LY: ar-rLY, ar_MA: ar-rMA, ar_OM: ar-rOM, ar_QA: ar-rQA, ar_SA: ar-rSA, ar_SY: sy-rIQ, ar_TN: ar-rTN, ar_YE: ar-rYE, arn_CL: arn-rCL, as_IN: as-rIN, ast_ES: ast-rES, az_AZ: az-rAZ, ba_RU: ba-rRU, be_BY: be-rBY, bg_BG: bg-rBG, bn_BD: bn-rBD, bn_IN: bn-rIN, bo_CN: bo-rCN, br_FR: br-rFR, bs_BA: bs-rBA, ca_ES: ca-rES, co_FR: co-rFR, cs_CZ: cs-rCZ, cy_GB: cy-rGB, da_DK: da-rDK, de_AT: de-rAT, de_CH: de-rCH, de_DE: de-rDE, de_LI: de-rLI, de_LU: de-rLU, dsb_DE: dsb-rDE, dv_MV: dv-rMV, el_GR: el-rGR, en_AU: en-rAU, en_BZ: en-rBZ, en_CA: en-rCA, en_IE: en-rIE, en_IN: en-rIN, en_JM: en-rJM, en_MY: en-rMY, en_NZ: en-rNZ, en_PH: en-rPH, en_SG: en-rSG, en_TT: en-rTT, en_US: en-rUS, en_ZA: en-rZA, en_ZW: en-rZW, eo: eo-rXX, es_AR: es-rAR, es_BO: es-rBO, es_CL: es-rCL, es_CO: es-rCO, es_CR: es-rCR, es_DO: es-rDO, es_EC: es-rEC, es_ES: es-rES, es_GT: es-rGT, es_HN: es-rHN, es_MX: es-rMX, es_NI: es-rNI, es_PA: es-rPA, es_PE: es-rPE, es_PR: es-rPR, es_PY: es-rPY, es_SV: es-rSV, es_419: es-rUS, es_UY: es-rUY, es_VE: es-rVE, et_EE: et-rEE, eu_ES: eu-rES, fa_IR: fa-rIR, fi_FI: fi-rFI, fil_PH: fil-rPH, fo_FO: fo-rFO, fr_BE: fr-rBE, fr_CA: fr-rCA, fr_CH: fr-rCH, fr_FR: fr-rFR, fr_LU: fr-rLU, fr_MC: fr-rMC, fy_NL: fy-rNL, ga_IE: ga-rIE, gd: gd-rGB, gl_ES: gl-rES, gsw_FR: gsw-rFR, gu_IN: gu-rIN, ha_NG: ha-rNG, he_IL: he-rIL, hi_IN: hi-rIN, hr_BA: hr-rBA, hr_HR: hr-rHR, hsb_DE: hsb-rDE, hu_HU: hu-rHU, hy_AM: hy-rAM, id_ID: id-rID, ig_NG: ig-rNG, ii_CN: ii-rCN, is_IS: is-rIS, it_CH: it-rCH, it_IT: it-rIT, iu_CA: iu-rCA, ja_JP: ja-rJP, ka_GE: ka-rGE, kk_KZ: kk-rKZ, kl_GL: kl-rGL, km_KH: km-rKH, kn_IN: kn-rIN, ko_KR: ko-rKR, ku_IQ: ckb-rIQ, kok_IN: kok-rIN, ky_KG: ky-rKG, lb_LU: lb-rLU, lo_LA: lo-rLA, lt_LT: lt-rLT, lv_LV: lv-rLV, mi_NZ: mi-rNZ, mk_MK: mk-rMK, ml_IN: ml-rIN, mn_CN: mn-rCN, mn_MN: mn-rMN, moh_CA: moh-rCA, mr_IN: mr-rIN, ms_BN: ms-rBN, ms_MY: ms-rMY, mt_MT: mt-rMT, my_MM : my-rMM, nb_NO: nb-rNO, ne_NP: ne-rNP, nl_BE: nl-rBE, nl_NL: nl-rNL, nn_NO: nn-rNO, nso_ZA: nso-rZA, oc_FR: oc-rFR, or_IN: or-rIN, pa_IN: pa-rIN, pl_PL: pl-rPL, prs_AF: prs-rAF, ps: ps-rAF, pt_BR: pt-rBR, pt_PT: pt-rPT, qut_GT: qut-rGT, quz_BO: quz-rBO, quz_EC: quz-rEC, quz_PE: quz-rPE, rm_CH: rm-rCH, ro_RO: ro-rRO, ru_RU: ru-rRU, rw_RW: rw-rRW, sa_IN: sa-rIN, sah_RU: sah-rRU, sd: sd-rPK, se_FI: se-rFI, se_NO: se-rNO, se_SE: se-rSE, si_LK: si-rLK, sk_SK: sk-rSK, sl_SI: sl-rSI, sma_NO: sma-rNO, sma_SE: sma-rSE, smj_NO: smj-rNO, smj_SE: smj-rSE, smn_FI: smn-rFI, sms_FI: sms-rFI, sq_AL: sq-rAL, sr@latin: sr-rYU, sr_BA: sr-rBA, sr_CS: sr-rCS, sr_ME: sr-rME, sr_RS: sr-rRS, sv_FI: sv-rFI, sv_SE: sv-rSE, sw_KE: sw-rKE, syr_SY: syr-rSY, ta_IN: ta-rIN, te_IN: te-rIN, tet: tet-rTL, tg_TJ: tg-rTJ, tl_PH: tl-rPH, th_TH: th-rTH, tk_TM: tk-rTM, tn_ZA: tn-rZA, tr_TR: tr-rTR, tt_RU: tt-rRU, tzm_DZ: tzm-rDZ, ug: ug-rCN, uk_UA: uk-rUA, ur_PK: ur-rPK, uz@Latn: uz-rUZ, uz@Cyrl: uzb-rUZ, vi_VN: vi-rVN, wo_SN: wo-rSN, xh_ZA: xh-rZA, yo_NG: yo-rNG, zh_CN: zh-rCN, zh_HK: zh-rHK, zh_MO: zh-rMO, zh_SG: zh-rSG, zh_TW: zh-rTW, zu_ZA: zu-rZA
+
+[tomahawk-android.stringsxml-72]
+file_filter = app/src/main/res/values-<lang>/strings.xml
+source_file = app/src/main/res/values/strings.xml
+source_lang = en
+type = ANDROID

README.md

@@ -1,55 +1,69 @@
-tomahawk-android
-================
-
-Tomahawk's Android Music Player
-
-setup
-================
-
-    - Open Eclipse and go to "File"->"Import"
-    - Under Android/ select "Existing Android Code into Workspace."
-    - Browse to your tomahawk-android checkout.
-    - Two projects will appear in the import dialog. Import them both.
-      One is the app and one is the unit tests.
-    - Right click on "tomahawk-android-test" and select "Properties". Now 
-      select "Java Build Path" and the tab "Projects". Click on "Add" and
-      choose "tomahawk-android". Finish by clicking "OK".
-    - tomahawk-android requires the third-party support library
-      "ActionBarSherlock". Download and extract the library:
-        - https://github.com/JakeWharton/ActionBarSherlock/zipball/4.1.0
-    - Now add it as an "Android Project" to your workspace: 
-      "File"-> "Import" -> "Android" -> "Existing Android Code into Workspace"
-    - Go into the folder you've extracted your downloaded zip-file to and
-      choose the "library" folder as your "Root Directory".
-    - Check "copy projects into workspace" and click "Finish".
-    - Since the 4.1.0 release of ActionBarSherlock does include an outdated copy
-      of the android support package v4, you'll need to update that manually by
-      doing the following:
-        - Copy "/android-sdk-linux/extras/android/support/v4/android-support-v4.jar"
-          into the just created ActionBarSherlock project's "lib" folder.
-          Confirm if asked to overwrite the existing "android-support-v4.jar".
-    - Now add the just created library project to tomahawk-android by
-      rightclicking your "tomahawk-android" project and selecting "Properties"
-    - Select "Android" and add the library by clicking "Add...".
-    - To finish the process, choose your ActionBarSherlock library project and
-      click "OK".
-
-    Notes:
-        - There is a known issue when importing. The primary app name
-          ends up being "org.tomahawk.tomahawk_android.TomahawkMainActivity".
-          Right click on the project and go to "Refactor"->"Rename". Rename
-          the project to "tomahawk-android" and this should fix any errors.
-        - If you have troubles building ActionBarSherlock, confirm that you have android-14 installed
-          in the sdk. This version is needed to build ActionBarSherlock, but you should use latest version
-          to build Tomahawk-Android.
-        - If you have other build problems, confirm that your Java Compiler is set to v1.6. 
-          ( in eclipse, go to tomahawk-android ( right click ) -> Properties -> Java Compiler -> 
-          Compiler compliance level -> 1.6 )
-        - Make sure that you dont tick the Is Library box in Properties->Android || Library.
-        - It is also good to add the sdk to your path. 
-
-required reading
-================
- - http://developer.android.com/reference/android/os/Handler.html
- - http://developer.android.com/guide/practices/screens_support.html
+## tomahawk-android
 
+*Music is everywhere, now you don’t have to be!*
+
+Tomahawk, the critically acclaimed multi-source music player, is now available on Android. Given the name of an artist, album or song Tomahawk will find the best available source and play it - whether that be from Spotify, Deezer, GMusic, Soundcloud, Tidal, Official.fm, Jamendo, Beets, Ampache, Subsonic or your phone’s local storage.
+Tomahawk for Android also syncs your history, your loved tracks, artists, albums and your playlists to/from the desktop version of Tomahawk via our new music community, Hatchet. On Hatchet you can hear your friends' favorite tracks and see what they're currently listening to.
+
+![Tomahawk Screenshot1](/screenshots/screenshot1.png) | ![Tomahawk Screenshot2](/screenshots/screenshot2.png) | ![Tomahawk Screenshot3](/screenshots/screenshot3.png)
+------ | -----  | -----
+
+## Beta and Nightly
+
+Get the Beta version on Google Play:
+https://play.google.com/store/apps/details?id=org.tomahawk.tomahawk_android
+
+Nightly builds are available here:
+http://download.tomahawk-player.org/nightly/android/?C=M;O=D
+
+## Development Setup
+
+First of all you have to properly setup your Android SDK/NDK:
+
+- Download and install the Android SDK http://developer.android.com/sdk/index.html
+    - Make sure you have updated and installed the following in your Android SDK Manager:
+        - "/Tools"
+        - the latest Android SDK Platform folder (e.g. "/Android 6.0 (API 23)")
+        - "/Extras/Android Support Repository" and "/Extras/Android Support Library"    
+        - "/Extras/Google Play Services" and "/Extras/Google Repository"
+
+Build it on the commandline with gradle:
+
+- Simply run "./gradlew assembleDebug" for the debug build or "./gradlew assembleRelease" for
+  the release build in your tomahawk-android checkout directory. The built apk will be put into
+  "tomahawk-android/build/outputs/apk"
+
+Setup using Android Studio and gradle (highly recommended):
+
+- Open Android Studio and go to "File"->"Import Project"
+- Browse to your tomahawk-android checkout and click "OK".
+- Make sure that the radio-button "Use default gradle wrapper (recommended)" is selected.
+- Click "next" and that's it :) tomahawk-android should compile right away
+
+Setup using other IDEs without gradle:
+
+- Import tomahawk-android into the IDE of your choice
+- tomahawk-android depends on several 3rd party libraries. You can look up a list of all dependencies in ./app/build.gradle under dependencies{...}
+- Make sure you setup the support libraries correctly (http://developer.android.com/tools/support-library/setup.html)
+- Add all dependencies to your tomahawk-android project
+- tomahawk-android should now compile successfully.
+
+If you have any further problems, feel free to join the #tomahawk.mobile irc channel on irc.freenode.org
+
+## Ready to contribute?
+
+Drop us an e-mail at [email protected] or join our IRC Channel #tomahawk.mobile on irc.freenode.org
+
+## Code Style Guidelines for Contributors
+
+In order to keep everything clean and cozy, please use the official Android code style format preset:
+- https://github.com/android/platform_development/tree/master/ide
+  (use the IntelliJ preset, if you're using Android Studio)
+
+For a larger overview you should read the official Android "Code Style Guidelines for Contributors":
+- http://source.android.com/source/code-style.html
+
+## Plugin Apps Source Code
+
+[Spotify Plugin App](https://github.com/tomahawk-player/tomahawk-android-spotify)     
+[Deezer Plugin App](https://github.com/tomahawk-player/tomahawk-android-deezer)