From 916700ebc3ffe9295acc99423b7a2146a5f7d816 Mon Sep 17 00:00:00 2001 From: mdecorde Date: Mon, 10 Oct 2016 22:59:58 +0200 Subject: [PATCH 1/7] upgrade to gradle project add login, logout, favorites, song queue and message submit features --- LICENSE | 675 ++++++++++++++++++ ant.properties | 17 - app/app.iml | 113 +++ app/build.gradle | 23 + .../src/main/AndroidManifest.xml | 2 +- {assets => app/src/main/assets}/about.html | 0 {jni => app/src/main/cpp}/Android.mk | 0 {jni => app/src/main/cpp}/abort.c | 0 {jni => app/src/main/cpp}/abort.h | 0 {jni => app/src/main/cpp}/http.c | 0 .../src/main/cpp}/libmad-0.15.1b/CHANGES | 0 .../src/main/cpp}/libmad-0.15.1b/COPYING | 0 .../src/main/cpp}/libmad-0.15.1b/COPYRIGHT | 0 .../src/main/cpp}/libmad-0.15.1b/CREDITS | 0 .../src/main/cpp}/libmad-0.15.1b/D.dat | 0 .../src/main/cpp}/libmad-0.15.1b/INSTALL | 0 .../src/main/cpp}/libmad-0.15.1b/Makefile | 0 .../src/main/cpp}/libmad-0.15.1b/Makefile.am | 0 .../src/main/cpp}/libmad-0.15.1b/Makefile.in | 0 .../src/main/cpp}/libmad-0.15.1b/README | 0 {jni => app/src/main/cpp}/libmad-0.15.1b/TODO | 0 .../src/main/cpp}/libmad-0.15.1b/VERSION | 0 .../src/main/cpp}/libmad-0.15.1b/aclocal.m4 | 0 .../cpp}/libmad-0.15.1b/android-configure.sh | 0 .../src/main/cpp}/libmad-0.15.1b/bit.c | 0 .../src/main/cpp}/libmad-0.15.1b/bit.h | 0 .../src/main/cpp}/libmad-0.15.1b/config.guess | 0 .../src/main/cpp}/libmad-0.15.1b/config.h | 0 .../src/main/cpp}/libmad-0.15.1b/config.h.in | 0 .../src/main/cpp}/libmad-0.15.1b/config.log | 0 .../main/cpp}/libmad-0.15.1b/config.status | 0 .../src/main/cpp}/libmad-0.15.1b/config.sub | 0 .../src/main/cpp}/libmad-0.15.1b/configure | 0 .../src/main/cpp}/libmad-0.15.1b/configure.ac | 0 .../src/main/cpp}/libmad-0.15.1b/decoder.c | 0 .../src/main/cpp}/libmad-0.15.1b/decoder.h | 0 .../src/main/cpp}/libmad-0.15.1b/depcomp | 0 .../src/main/cpp}/libmad-0.15.1b/fixed.c | 0 .../src/main/cpp}/libmad-0.15.1b/fixed.h | 0 .../src/main/cpp}/libmad-0.15.1b/frame.c | 0 .../src/main/cpp}/libmad-0.15.1b/frame.h | 0 .../src/main/cpp}/libmad-0.15.1b/global.h | 0 .../src/main/cpp}/libmad-0.15.1b/huffman.c | 0 .../src/main/cpp}/libmad-0.15.1b/huffman.h | 0 .../main/cpp}/libmad-0.15.1b/imdct_l_arm.S | 0 .../src/main/cpp}/libmad-0.15.1b/imdct_s.dat | 0 .../src/main/cpp}/libmad-0.15.1b/install-sh | 0 .../src/main/cpp}/libmad-0.15.1b/layer12.c | 0 .../src/main/cpp}/libmad-0.15.1b/layer12.h | 0 .../src/main/cpp}/libmad-0.15.1b/layer3.c | 0 .../src/main/cpp}/libmad-0.15.1b/layer3.h | 0 .../src/main/cpp}/libmad-0.15.1b/libmad.list | 0 .../main/cpp}/libmad-0.15.1b/libmad.list.in | 0 .../src/main/cpp}/libmad-0.15.1b/libtool | 0 .../src/main/cpp}/libmad-0.15.1b/ltmain.sh | 0 .../src/main/cpp}/libmad-0.15.1b/mad.h | 0 .../src/main/cpp}/libmad-0.15.1b/mad.h.sed | 0 .../src/main/cpp}/libmad-0.15.1b/minimad.c | 0 .../src/main/cpp}/libmad-0.15.1b/missing | 0 .../main/cpp}/libmad-0.15.1b/mkinstalldirs | 0 .../main/cpp}/libmad-0.15.1b/msvc++/Makefile | 0 .../cpp}/libmad-0.15.1b/msvc++/Makefile.am | 0 .../cpp}/libmad-0.15.1b/msvc++/Makefile.in | 0 .../main/cpp}/libmad-0.15.1b/msvc++/config.h | 0 .../cpp}/libmad-0.15.1b/msvc++/libmad.dsp | 0 .../src/main/cpp}/libmad-0.15.1b/msvc++/mad.h | 0 .../src/main/cpp}/libmad-0.15.1b/qc_table.dat | 0 .../src/main/cpp}/libmad-0.15.1b/rq_table.dat | 0 .../src/main/cpp}/libmad-0.15.1b/sf_table.dat | 0 .../src/main/cpp}/libmad-0.15.1b/stamp-h1 | 0 .../src/main/cpp}/libmad-0.15.1b/stream.c | 0 .../src/main/cpp}/libmad-0.15.1b/stream.h | 0 .../src/main/cpp}/libmad-0.15.1b/synth.c | 0 .../src/main/cpp}/libmad-0.15.1b/synth.h | 0 .../src/main/cpp}/libmad-0.15.1b/timer.c | 0 .../src/main/cpp}/libmad-0.15.1b/timer.h | 0 .../src/main/cpp}/libmad-0.15.1b/version.c | 0 .../src/main/cpp}/libmad-0.15.1b/version.h | 0 {jni => app/src/main/cpp}/logmacros.h | 0 {jni => app/src/main/cpp}/read.c | 0 {jni => app/src/main/cpp}/read.h | 0 {jni => app/src/main/cpp}/ringbuffer.c | 0 {jni => app/src/main/cpp}/ringbuffer.h | 0 {jni => app/src/main/cpp}/ringbuffer_jni.c | 0 {jni => app/src/main/cpp}/ringbuffer_jni.h | 0 {jni => app/src/main/cpp}/streamer.c | 0 .../com/kvance/Nectroid/AboutActivity.java | 0 .../Nectroid/AutoRefreshDocManager.java | 0 .../kvance/Nectroid/BackgroundColorizer.java | 0 .../Nectroid/BackgroundTaskListener.java | 0 .../com/kvance/Nectroid/BaseDocManager.java | 0 .../main/java}/com/kvance/Nectroid/Cache.java | 24 +- .../com/kvance/Nectroid/CachedDocManager.java | 0 .../com/kvance/Nectroid/DbDataHelper.java | 0 .../com/kvance/Nectroid/DbOpenHelper.java | 0 .../java/com/kvance/Nectroid/Favorites.java | 133 ++++ .../kvance/Nectroid/FavoritesActivity.java | 256 +++++++ .../com/kvance/Nectroid/FavoritesAdapter.java | 112 +++ .../com/kvance/Nectroid/FavoritesManager.java | 139 ++++ .../java}/com/kvance/Nectroid/FetchUrl.java | 1 + .../kvance/Nectroid/ForegroundService.java | 5 +- .../com/kvance/Nectroid/MP3Streamer.java | 0 .../com/kvance/Nectroid/NectroidActivity.java | 507 +++++++++---- .../kvance/Nectroid/NectroidApplication.java | 35 +- .../java}/com/kvance/Nectroid/OneLiner.java | 0 .../com/kvance/Nectroid/OneLinerAdapter.java | 0 .../com/kvance/Nectroid/OneLinerManager.java | 0 .../com/kvance/Nectroid/PlayerManager.java | 0 .../com/kvance/Nectroid/PlayerService.java | 0 .../java}/com/kvance/Nectroid/Playlist.java | 0 .../com/kvance/Nectroid/PlaylistActivity.java | 0 .../com/kvance/Nectroid/PlaylistAdapter.java | 0 .../Nectroid/PlaylistHistoryAdapter.java | 0 .../com/kvance/Nectroid/PlaylistManager.java | 0 .../kvance/Nectroid/PlaylistQueueAdapter.java | 0 .../main/java}/com/kvance/Nectroid/Prefs.java | 13 +- .../java}/com/kvance/Nectroid/RingBuffer.java | 0 .../java}/com/kvance/Nectroid/Scrobbler.java | 0 .../com/kvance/Nectroid/SettingsActivity.java | 0 .../main/java}/com/kvance/Nectroid/Site.java | 0 .../com/kvance/Nectroid/SiteActivity.java | 0 .../com/kvance/Nectroid/SiteManager.java | 0 .../com/kvance/Nectroid/SitePreference.java | 0 .../java}/com/kvance/Nectroid/Stream.java | 0 .../com/kvance/Nectroid/StreamsActivity.java | 0 .../com/kvance/Nectroid/StreamsAdapter.java | 0 .../com/kvance/Nectroid/StreamsManager.java | 0 .../java}/com/kvance/Nectroid/Transition.java | 0 .../src/main/res}/anim/slide_in_left.xml | 0 .../src/main/res}/anim/slide_in_right.xml | 0 .../src/main/res}/anim/slide_out_left.xml | 0 .../src/main/res}/anim/slide_out_right.xml | 0 .../drawable-hdpi/ic_launcher_nectroid.png | Bin .../res}/drawable-hdpi/ic_menu_refresh.png | Bin .../main/res}/drawable-hdpi/orange_waffle.png | Bin .../src/main/res}/drawable-hdpi/play.png | Bin .../main/res}/drawable-hdpi/play_status.png | Bin .../src/main/res}/drawable-hdpi/stop.png | Bin .../drawable-ldpi/ic_launcher_nectroid.png | Bin .../res}/drawable-ldpi/ic_menu_refresh.png | Bin .../main/res}/drawable-ldpi/orange_waffle.png | Bin .../src/main/res}/drawable-ldpi/play.png | Bin .../main/res}/drawable-ldpi/play_status.png | Bin .../src/main/res}/drawable-ldpi/stop.png | Bin .../drawable-mdpi/ic_launcher_nectroid.png | Bin .../res}/drawable-mdpi/ic_menu_refresh.png | Bin .../main/res}/drawable-mdpi/orange_waffle.png | Bin .../src/main/res}/drawable-mdpi/play.png | Bin .../main/res}/drawable-mdpi/play_status.png | Bin .../src/main/res}/drawable-mdpi/stop.png | Bin .../src/main/res}/drawable/backrepeat.xml | 0 .../src/main/res}/drawable/bg_gradient.xml | 0 .../src/main/res}/drawable/text_button_bg.xml | 0 .../res}/drawable/text_button_pressed.xml | 0 .../res}/drawable/text_button_selected.xml | 0 .../src/main/res}/drawable/white_down_box.xml | 0 .../src/main/res}/drawable/white_up_box.xml | 0 .../src/main/res}/drawable/whitebox.xml | 0 {res => app/src/main/res}/layout/about.xml | 0 .../src/main/res}/layout/inset_list.xml | 2 +- {res => app/src/main/res}/layout/main.xml | 55 +- {res => app/src/main/res}/layout/site.xml | 0 .../src/main/res}/layout/stream_item.xml | 0 .../src/main/res}/menu/main_options.xml | 4 +- .../src/main/res}/menu/site_item_context.xml | 0 .../src/main/res}/menu/streams_options.xml | 0 {res => app/src/main/res}/values/arrays.xml | 12 +- {res => app/src/main/res}/values/colors.xml | 0 {res => app/src/main/res}/values/necta.xml | 0 {res => app/src/main/res}/values/strings.xml | 33 +- {res => app/src/main/res}/xml/settings.xml | 13 + build.gradle | 15 + build.properties | 17 - build.xml | 85 --- default.properties | 11 - gfx/icon_shadow.xcf | Bin 20038 -> 0 bytes gfx/nectarine.psd | Bin 53697 -> 0 bytes gfx/play.png | Bin 5064 -> 0 bytes gfx/play.svg | 417 ----------- gfx/play_status.png | Bin 5841 -> 0 bytes gfx/play_status.svg | 394 ---------- gfx/stop.png | Bin 3550 -> 0 bytes gfx/stop.svg | 419 ----------- local.properties | 7 + proguard.cfg | 40 -- project.properties | 11 - settings.gradle | 1 + tools/colorshifter.py | 179 ----- 188 files changed, 2031 insertions(+), 1739 deletions(-) create mode 100644 LICENSE delete mode 100644 ant.properties create mode 100644 app/app.iml create mode 100644 app/build.gradle rename AndroidManifest.xml => app/src/main/AndroidManifest.xml (97%) rename {assets => app/src/main/assets}/about.html (100%) rename {jni => app/src/main/cpp}/Android.mk (100%) rename {jni => app/src/main/cpp}/abort.c (100%) rename {jni => app/src/main/cpp}/abort.h (100%) rename {jni => app/src/main/cpp}/http.c (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/CHANGES (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/COPYING (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/COPYRIGHT (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/CREDITS (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/D.dat (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/INSTALL (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/Makefile (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/Makefile.am (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/Makefile.in (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/README (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/TODO (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/VERSION (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/aclocal.m4 (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/android-configure.sh (100%) mode change 100755 => 100644 rename {jni => app/src/main/cpp}/libmad-0.15.1b/bit.c (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/bit.h (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/config.guess (100%) mode change 100755 => 100644 rename {jni => app/src/main/cpp}/libmad-0.15.1b/config.h (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/config.h.in (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/config.log (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/config.status (100%) mode change 100755 => 100644 rename {jni => app/src/main/cpp}/libmad-0.15.1b/config.sub (100%) mode change 100755 => 100644 rename {jni => app/src/main/cpp}/libmad-0.15.1b/configure (100%) mode change 100755 => 100644 rename {jni => app/src/main/cpp}/libmad-0.15.1b/configure.ac (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/decoder.c (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/decoder.h (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/depcomp (100%) mode change 100755 => 100644 rename {jni => app/src/main/cpp}/libmad-0.15.1b/fixed.c (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/fixed.h (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/frame.c (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/frame.h (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/global.h (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/huffman.c (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/huffman.h (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/imdct_l_arm.S (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/imdct_s.dat (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/install-sh (100%) mode change 100755 => 100644 rename {jni => app/src/main/cpp}/libmad-0.15.1b/layer12.c (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/layer12.h (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/layer3.c (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/layer3.h (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/libmad.list (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/libmad.list.in (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/libtool (100%) mode change 100755 => 100644 rename {jni => app/src/main/cpp}/libmad-0.15.1b/ltmain.sh (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/mad.h (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/mad.h.sed (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/minimad.c (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/missing (100%) mode change 100755 => 100644 rename {jni => app/src/main/cpp}/libmad-0.15.1b/mkinstalldirs (100%) mode change 100755 => 100644 rename {jni => app/src/main/cpp}/libmad-0.15.1b/msvc++/Makefile (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/msvc++/Makefile.am (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/msvc++/Makefile.in (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/msvc++/config.h (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/msvc++/libmad.dsp (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/msvc++/mad.h (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/qc_table.dat (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/rq_table.dat (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/sf_table.dat (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/stamp-h1 (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/stream.c (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/stream.h (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/synth.c (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/synth.h (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/timer.c (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/timer.h (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/version.c (100%) rename {jni => app/src/main/cpp}/libmad-0.15.1b/version.h (100%) rename {jni => app/src/main/cpp}/logmacros.h (100%) rename {jni => app/src/main/cpp}/read.c (100%) rename {jni => app/src/main/cpp}/read.h (100%) rename {jni => app/src/main/cpp}/ringbuffer.c (100%) rename {jni => app/src/main/cpp}/ringbuffer.h (100%) rename {jni => app/src/main/cpp}/ringbuffer_jni.c (100%) rename {jni => app/src/main/cpp}/ringbuffer_jni.h (100%) rename {jni => app/src/main/cpp}/streamer.c (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/AboutActivity.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/AutoRefreshDocManager.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/BackgroundColorizer.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/BackgroundTaskListener.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/BaseDocManager.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/Cache.java (89%) rename {src => app/src/main/java}/com/kvance/Nectroid/CachedDocManager.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/DbDataHelper.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/DbOpenHelper.java (100%) create mode 100644 app/src/main/java/com/kvance/Nectroid/Favorites.java create mode 100644 app/src/main/java/com/kvance/Nectroid/FavoritesActivity.java create mode 100644 app/src/main/java/com/kvance/Nectroid/FavoritesAdapter.java create mode 100644 app/src/main/java/com/kvance/Nectroid/FavoritesManager.java rename {src => app/src/main/java}/com/kvance/Nectroid/FetchUrl.java (97%) rename {src => app/src/main/java}/com/kvance/Nectroid/ForegroundService.java (99%) rename {src => app/src/main/java}/com/kvance/Nectroid/MP3Streamer.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/NectroidActivity.java (51%) rename {src => app/src/main/java}/com/kvance/Nectroid/NectroidApplication.java (87%) rename {src => app/src/main/java}/com/kvance/Nectroid/OneLiner.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/OneLinerAdapter.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/OneLinerManager.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/PlayerManager.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/PlayerService.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/Playlist.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/PlaylistActivity.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/PlaylistAdapter.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/PlaylistHistoryAdapter.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/PlaylistManager.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/PlaylistQueueAdapter.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/Prefs.java (95%) rename {src => app/src/main/java}/com/kvance/Nectroid/RingBuffer.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/Scrobbler.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/SettingsActivity.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/Site.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/SiteActivity.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/SiteManager.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/SitePreference.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/Stream.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/StreamsActivity.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/StreamsAdapter.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/StreamsManager.java (100%) rename {src => app/src/main/java}/com/kvance/Nectroid/Transition.java (100%) rename {res => app/src/main/res}/anim/slide_in_left.xml (100%) rename {res => app/src/main/res}/anim/slide_in_right.xml (100%) rename {res => app/src/main/res}/anim/slide_out_left.xml (100%) rename {res => app/src/main/res}/anim/slide_out_right.xml (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_launcher_nectroid.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_menu_refresh.png (100%) rename {res => app/src/main/res}/drawable-hdpi/orange_waffle.png (100%) rename {res => app/src/main/res}/drawable-hdpi/play.png (100%) rename {res => app/src/main/res}/drawable-hdpi/play_status.png (100%) rename {res => app/src/main/res}/drawable-hdpi/stop.png (100%) rename {res => app/src/main/res}/drawable-ldpi/ic_launcher_nectroid.png (100%) rename {res => app/src/main/res}/drawable-ldpi/ic_menu_refresh.png (100%) rename {res => app/src/main/res}/drawable-ldpi/orange_waffle.png (100%) rename {res => app/src/main/res}/drawable-ldpi/play.png (100%) rename {res => app/src/main/res}/drawable-ldpi/play_status.png (100%) rename {res => app/src/main/res}/drawable-ldpi/stop.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ic_launcher_nectroid.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ic_menu_refresh.png (100%) rename {res => app/src/main/res}/drawable-mdpi/orange_waffle.png (100%) rename {res => app/src/main/res}/drawable-mdpi/play.png (100%) rename {res => app/src/main/res}/drawable-mdpi/play_status.png (100%) rename {res => app/src/main/res}/drawable-mdpi/stop.png (100%) rename {res => app/src/main/res}/drawable/backrepeat.xml (100%) rename {res => app/src/main/res}/drawable/bg_gradient.xml (100%) rename {res => app/src/main/res}/drawable/text_button_bg.xml (100%) rename {res => app/src/main/res}/drawable/text_button_pressed.xml (100%) rename {res => app/src/main/res}/drawable/text_button_selected.xml (100%) rename {res => app/src/main/res}/drawable/white_down_box.xml (100%) rename {res => app/src/main/res}/drawable/white_up_box.xml (100%) rename {res => app/src/main/res}/drawable/whitebox.xml (100%) rename {res => app/src/main/res}/layout/about.xml (100%) rename {res => app/src/main/res}/layout/inset_list.xml (91%) rename {res => app/src/main/res}/layout/main.xml (68%) rename {res => app/src/main/res}/layout/site.xml (100%) rename {res => app/src/main/res}/layout/stream_item.xml (100%) rename {res => app/src/main/res}/menu/main_options.xml (80%) rename {res => app/src/main/res}/menu/site_item_context.xml (100%) rename {res => app/src/main/res}/menu/streams_options.xml (100%) rename {res => app/src/main/res}/values/arrays.xml (84%) rename {res => app/src/main/res}/values/colors.xml (100%) rename {res => app/src/main/res}/values/necta.xml (100%) rename {res => app/src/main/res}/values/strings.xml (70%) rename {res => app/src/main/res}/xml/settings.xml (69%) create mode 100644 build.gradle delete mode 100644 build.properties delete mode 100644 build.xml delete mode 100644 default.properties delete mode 100644 gfx/icon_shadow.xcf delete mode 100644 gfx/nectarine.psd delete mode 100644 gfx/play.png delete mode 100644 gfx/play.svg delete mode 100644 gfx/play_status.png delete mode 100644 gfx/play_status.svg delete mode 100644 gfx/stop.png delete mode 100644 gfx/stop.svg create mode 100644 local.properties delete mode 100644 proguard.cfg delete mode 100644 project.properties create mode 100644 settings.gradle delete mode 100755 tools/colorshifter.py diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..733c072 --- /dev/null +++ b/LICENSE @@ -0,0 +1,675 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. + diff --git a/ant.properties b/ant.properties deleted file mode 100644 index ee52d86..0000000 --- a/ant.properties +++ /dev/null @@ -1,17 +0,0 @@ -# This file is used to override default values used by the Ant build system. -# -# This file must be checked in Version Control Systems, as it is -# integral to the build system of your project. - -# This file is only used by the Ant script. - -# You can use this to override default values such as -# 'source.dir' for the location of your java source folder and -# 'out.dir' for the location of your output folder. - -# You can also use it define how the release builds are signed by declaring -# the following properties: -# 'key.store' for the location of your keystore and -# 'key.alias' for the name of the key to use. -# The password will be asked during the build when you use the 'release' target. - diff --git a/app/app.iml b/app/app.iml new file mode 100644 index 0000000..62f840d --- /dev/null +++ b/app/app.iml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..9b441d7 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,23 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 21 + buildToolsVersion "23.0.3" + + defaultConfig { + applicationId "com.kvance.Nectroid" + minSdkVersion 3 + targetSdkVersion 4 + + ndk { + moduleName "libmad" + } + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + } +} diff --git a/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 97% rename from AndroidManifest.xml rename to app/src/main/AndroidManifest.xml index 3887244..d19a836 100644 --- a/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,7 +23,7 @@ - + . + +package com.kvance.Nectroid; + +import android.content.Context; +import android.sax.Element; +import android.sax.EndElementListener; +import android.sax.EndTextElementListener; +import android.sax.RootElement; +import android.sax.StartElementListener; +import android.sax.TextElementListener; +import android.util.Log; +import android.util.Xml; + +import org.xml.sax.Attributes; +import org.xml.sax.SAXException; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.List; + + +/** A playlist has a current song, a history, and an upcoming list. */ +class Favorites +{ + /** A single song in a playlist */ + public class Entry { + protected int mId = 0; + protected String mTitle = new String("UNKNOWN"); + protected Boolean mLocked = false; + + public int getId() { return mId; } + public String getTitle() { return mTitle; } + public boolean isLocked() { return mLocked; } + + @Override + public String toString() { + return String.format( + "", + mTitle, mId, mLocked.toString()); + } + } + + List mFavorites; + + private static final String TAG = "NectroidPlaylist"; + + + public Favorites() { + mFavorites = new ArrayList(); + } + + public Favorites(String xmlData) throws SAXException { + this(); + new Parser().parse(xmlData); + } + + /// + /// Getters + /// + + public List getFavorites() { return mFavorites; } + + /// + /// XML parser + /// + + private class Parser { + + /** Parse value into an int, or return -1. + * + * @param value the string to parse as an integer + * @param description a description of the string to print in an error message + */ + private int parseIntOrMinusOne(String value, String description) + { + // Same code in Stream XML parser + return Stream.Parser.parseIntOrMinusOne(value, description, TAG); + } + + private class SongTextListener implements TextElementListener + { + private int mId = -1; + private Boolean mLocked = false; + + public void start(Attributes attributes) { + + String idString = attributes.getValue("id"); + mId = parseIntOrMinusOne(idString, "song id"); + + String locked = attributes.getValue("locked"); + mLocked = "True".equals(locked); + } + + public void end(String body) { + Entry mNewEntry = new Entry(); + mNewEntry.mId = mId; + mNewEntry.mLocked = mLocked; + mNewEntry.mTitle = body; + if (!mNewEntry.mLocked) + mFavorites.add(mNewEntry); + } + } + + public void parse(String xmlData) throws SAXException + { + RootElement root = new RootElement("favorites"); + + Element song = root.getChild("song"); + SongTextListener songTextListener = new SongTextListener(); + song.setTextElementListener(songTextListener); + + Xml.parse(xmlData, root.getContentHandler()); + } + } +} diff --git a/app/src/main/java/com/kvance/Nectroid/FavoritesActivity.java b/app/src/main/java/com/kvance/Nectroid/FavoritesActivity.java new file mode 100644 index 0000000..b11d07a --- /dev/null +++ b/app/src/main/java/com/kvance/Nectroid/FavoritesActivity.java @@ -0,0 +1,256 @@ +// This file is part of Nectroid. +// +// Nectroid is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Nectroid is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Nectroid. If not, see . + +package com.kvance.Nectroid; + +import android.app.ListActivity; +import android.content.Intent; +import android.net.Uri; +import android.os.AsyncTask; +import android.os.Bundle; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.view.View; +import android.view.Window; +import android.widget.ListView; +import android.widget.TextView; +import android.widget.Toast; + +import org.apache.http.HttpResponse; +import org.apache.http.NameValuePair; +import org.apache.http.client.HttpClient; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.message.BasicNameValuePair; + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +public class FavoritesActivity extends ListActivity + implements BackgroundTaskListener +{ + + private FavoritesManager mFavoritesManager; + + private Favorites mFavorites; + private FavoritesAdapter mListAdapter; + + private static final String TAG = "Nectroid"; + + + /// + /// Activity event handlers + /// + + @Override + public void onCreate(Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); + setContentView(R.layout.inset_list); + + ((NectroidApplication)getApplication()).updateWindowBackground(getWindow()); + + // Check for a data URI + Uri dataUri = getIntent().getData(); + if(dataUri == null) { + throw new RuntimeException("Started FavoritesActivity with null data URI"); + } + if(!dataUri.getScheme().equals("nectroid")) { + throw new RuntimeException(String.format("Unknown URI scheme \"%s\" in %s", + dataUri.getScheme(), dataUri)); + } + + // Check which favorites we're supposed to display + String favoritesName = dataUri.getSchemeSpecificPart(); + if(!favoritesName.equals("//favorites")) { + throw new RuntimeException(String.format("Unknown favoritesName \"%s\" requested in %s", + favoritesName, dataUri)); + } + } + + @Override + public void onStart() + { + super.onStart(); + + // Subscribe to playlist events. + NectroidApplication app = (NectroidApplication)getApplication(); + mFavoritesManager = app.getFavoritesManager(); + mFavoritesManager.addTaskListener(this); + + // Set up the UI for whichever playlist was requested + mFavorites = mFavoritesManager.getFavorites(); + String appName = getString(R.string.app_name); + String listName = "Favorites"; + int emptyText = R.string.nofavs; + mListAdapter = new FavoritesAdapter(mFavorites, this); + setListAdapter(mListAdapter); + + setTitle(String.format("%s - %s", appName, listName)); + TextView emptyView = (TextView)findViewById(android.R.id.empty); + emptyView.setText(emptyText); + + // Update the throbber to the current state. (If we do this before we set the title, it + // seems to be ignored.) + setProgressBarIndeterminateVisibility(mFavoritesManager.isUpdating()); + } + + @Override + public void onStop() + { + // Unsubscribe from updates. + mFavoritesManager.removeTaskListener(this); + + super.onStop(); + } + + @Override + public void onResume() + { + super.onResume(); + mFavoritesManager.requestAutoRefresh(this); + } + + @Override + public void onPause() + { + super.onPause(); + mFavoritesManager.unrequestAutoRefresh(this); + } + + + @Override + protected void onListItemClick(ListView l, final View v, int position, long id) + { + // Find the base URL for the current site. + NectroidApplication app = (NectroidApplication)getApplication(); + String baseUrl = app.getSiteManager().getCurrentSite().getBaseUrl(); + + // Open the song link. + Favorites.Entry song = (Favorites.Entry)mListAdapter.getItem(position); + + // Req the song is not locked + if (song.isLocked()) { + Toast.makeText(this, "The song already locked :(", Toast.LENGTH_LONG).show(); + } else { + + try { + String url = baseUrl + FavoritesActivity.this.getString(R.string.url_song_queue); + HttpClient client = app.getHttpClient(); + + HttpPost post = new HttpPost(url); + System.out.println("SONG QUEUE URL="+url); + List nameValuePairs = new ArrayList(1); + nameValuePairs.add(new BasicNameValuePair(FavoritesActivity.this.getString(R.string.parameter_songid), Integer.toString(song.getId()))); + post.setEntity(new UrlEncodedFormEntity(nameValuePairs)); + + HttpResponse response = client.execute(post); + BufferedReader rd = new BufferedReader(new InputStreamReader(response.getEntity().getContent())); + rd.close(); // I don't need to read the output + + FetchUrl.Result data = FetchUrl.get(new URL(baseUrl+FavoritesActivity.this.getString(R.string.url_song)+ song.getId())); + String songinfo = data.getResponse(); + if (songinfo.contains("True")) { + song.mLocked = true; + + v.setEnabled(false); + Toast.makeText(FavoritesActivity.this, "Requesting song: " + song.getTitle(), Toast.LENGTH_LONG).show(); + } else { + Toast.makeText(FavoritesActivity.this, "Song already locked or too much songs queued :(", Toast.LENGTH_LONG).show(); + } + } catch (final Exception e) { + Toast.makeText(FavoritesActivity.this, "Requesting song failed with error=" + e, Toast.LENGTH_LONG).show(); + } + } + + } + + + /** Initialize the contents of the Activity's standard options menu. */ + @Override + public boolean onCreateOptionsMenu(Menu menu) { + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.main_options, menu); + return true; + } + + + /** Called whenever an item in the Activity's options menu is selected. */ + @Override + public boolean onOptionsItemSelected(MenuItem item) + { + switch(item.getItemId()) { + case R.id.settings_item: + // Show the settings activity. + Intent settingsActivity = new Intent(this, SettingsActivity.class); + startActivity(settingsActivity); + return true; + + case R.id.refresh_item: + // Refresh the playlist. + mFavoritesManager.cancelUpdate(); + mFavoritesManager.update(this, false); + return true; + + default: + return false; + } + } + + + // Override in API level 5+ + public void onBackPressed() + { + // Use a different transition depending on which playlist we're showing. + finish(); + Transition.set(this, R.anim.slide_in_left, R.anim.slide_out_right); + } + + + /// + /// Favorites event handlers + /// + + public void onTaskStarted(Object manager) + { + setProgressBarIndeterminateVisibility(true); + } + + public void onTaskFinished(Object manager, Object result) + { + //System.out.println("RESULT="+result); + Favorites favorites = (Favorites)result; + mFavorites = favorites; + mListAdapter.setFavorites(mFavorites); + setProgressBarIndeterminateVisibility(false); + } + + public void onTaskCancelled(Object manager) + { + setProgressBarIndeterminateVisibility(false); + } + + public void onTaskFailed(Object manager) + { + setProgressBarIndeterminateVisibility(false); + Toast errorToast = Toast.makeText(this, R.string.favorites_failed, Toast.LENGTH_SHORT); + errorToast.show(); + } +} diff --git a/app/src/main/java/com/kvance/Nectroid/FavoritesAdapter.java b/app/src/main/java/com/kvance/Nectroid/FavoritesAdapter.java new file mode 100644 index 0000000..5207834 --- /dev/null +++ b/app/src/main/java/com/kvance/Nectroid/FavoritesAdapter.java @@ -0,0 +1,112 @@ +// This file is part of Nectroid. +// +// Nectroid is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Nectroid is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Nectroid. If not, see . + +package com.kvance.Nectroid; + +import android.content.Context; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.TextView; + + +class FavoritesAdapter extends BaseAdapter +{ + protected Favorites mFavorites; + protected Context mContext; + + public FavoritesAdapter(Favorites favorites, Context context) + { + super(); + mFavorites = favorites; + mContext = context; + } + + /// + /// Adapter methods + /// + + @Override + public int getCount() + { + if(mFavorites == null) { + return 0; + } else { + return mFavorites.getFavorites().size(); + } + } + + + @Override + public Object getItem(int position) + { + return mFavorites.getFavorites().get(position); + } + + /** Set how many songs into the playlist we currently are. + * + * If mPlaylist.getCurrentEntry() is playling, offset = 0 + * If mPlaylist.getQueue().get(0) is playling, offset = 1 + * and so on. + */ + public void setQueueOffset(int newOffset) + { + notifyDataSetChanged(); + } + + + public void setFavorites(Favorites favorites) + { + mFavorites = favorites; + notifyDataSetChanged(); + } + + + /// + /// Adapter methods + /// + + @Override + public long getItemId(int position) + { + Favorites.Entry entry = (Favorites.Entry)getItem(position); + return entry.getId(); + } + + + @Override + public boolean hasStableIds() + { + return true; + } + + + @Override + public View getView(int position, View convertView, ViewGroup parent) + { + TextView view; + if(convertView == null) { + view = new TextView(mContext); + } else { + view = (TextView)convertView; + } + + Favorites.Entry entry = (Favorites.Entry)getItem(position); + view.setText(entry.getTitle()); + view.setEnabled(!entry.isLocked()); + + return view; + } +} diff --git a/app/src/main/java/com/kvance/Nectroid/FavoritesManager.java b/app/src/main/java/com/kvance/Nectroid/FavoritesManager.java new file mode 100644 index 0000000..00c6437 --- /dev/null +++ b/app/src/main/java/com/kvance/Nectroid/FavoritesManager.java @@ -0,0 +1,139 @@ +// This file is part of Nectroid. +// +// Nectroid is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Nectroid is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Nectroid. If not, see . + +package com.kvance.Nectroid; + +import android.content.Context; + +import org.xml.sax.SAXException; + +import java.util.Date; +import java.util.HashSet; + + +/** Manager responsible for updating a Favorites. + * + * Register for Favorites update events with addTaskListener(). + * Register for song update events with addSongListener(). + * + * If your activity or service wants the Favorites to be automatically refreshed before it gets + * stale, call requestAutoUpdate(). Once you no longer need them, make sure to unregister your + * request with unrequestAutoUpdate(). + */ +public class FavoritesManager extends AutoRefreshDocManager +{ + private Favorites mFavorites; + + // Milliseconds before we're considered "almost done" + private static final long ALMOST_DONE_TIME = 25000; + + // Minimum time between auto-refreshes (in ms) + private static final long MIN_AUTO_REFRESH_TIME = 30000; + + private static final String TAG = "Nectroid"; + + + public FavoritesManager(Context applicationContext) + { + super(applicationContext); + } + + /** Return the QUEUE DocId. */ + @Override + public Cache.DocId getDocId() + { + return Cache.DocId.FAVORITES; + } + + /** Parse an XML file into a Favorites object. */ + @Override + public Favorites parseDocument(String xmlData, Context context) + { + //System.out.println("PARSE DOCUMENT="+xmlData); + try { + mFavorites = new Favorites(xmlData); + //System.out.println("nb of favs: "+mFavorites.getFavorites().size()); + return mFavorites; + } catch(SAXException e) { + return null; + } + } + + + @Override + public void onParserSuccess(Favorites result, Context context) + { + super.onParserSuccess(result, context); + } + + + /// + /// Public interface + /// + + public void onLowMemory() + { + // We can release the Favorites if nothing's using it. + if(mUpdateTask == null) { + mFavorites = null; + } + } + + + /** Reset all data. */ + public void reset() { + cancelUpdate(); + } + + + /// + /// Getters + /// + + public Favorites getFavorites() { return mFavorites; } + + /// + /// Auto-refresh methods + /// + + @Override + protected void scheduleNextRefresh(Context context) + { + long delay = 1000L*60L; + + // Remove any old auto-update callbacks before posting this one. + mHandler.removeCallbacks(autoUpdateFavorites); + mHandler.postDelayed(autoUpdateFavorites, delay); + } + + @Override + protected void unscheduleNextRefresh(Context context) + { + mHandler.removeCallbacks(autoUpdateFavorites); + } + + private Runnable autoUpdateFavorites = new Runnable() { + public void run() { + update(mContext, false); + // The next update will be scheduled after our UpdateTask completes. + } + }; + + @Override + protected boolean hasDocument() + { + return (mFavorites != null); + } +} diff --git a/src/com/kvance/Nectroid/FetchUrl.java b/app/src/main/java/com/kvance/Nectroid/FetchUrl.java similarity index 97% rename from src/com/kvance/Nectroid/FetchUrl.java rename to app/src/main/java/com/kvance/Nectroid/FetchUrl.java index c6e6d3d..c49caa6 100644 --- a/src/com/kvance/Nectroid/FetchUrl.java +++ b/app/src/main/java/com/kvance/Nectroid/FetchUrl.java @@ -37,6 +37,7 @@ public static class Result public static Result get(URL url) { + System.out.println("FETCHING: "+url); Result result = new Result(); StringBuilder sb = new StringBuilder(); boolean failed; diff --git a/src/com/kvance/Nectroid/ForegroundService.java b/app/src/main/java/com/kvance/Nectroid/ForegroundService.java similarity index 99% rename from src/com/kvance/Nectroid/ForegroundService.java rename to app/src/main/java/com/kvance/Nectroid/ForegroundService.java index ef4cc30..f9ee505 100644 --- a/src/com/kvance/Nectroid/ForegroundService.java +++ b/app/src/main/java/com/kvance/Nectroid/ForegroundService.java @@ -82,7 +82,8 @@ void startForegroundCompat(int id, Notification notification) { } // Fall back on the old API. - setForeground(true); + //setForeground(true); + mNM.notify(id, notification); } @@ -109,7 +110,7 @@ void stopForegroundCompat(int id) { // Fall back on the old API. Note to cancel BEFORE changing the // foreground state, since we could be killed at that point. mNM.cancel(id); - setForeground(false); + //setForeground(false); } @Override diff --git a/src/com/kvance/Nectroid/MP3Streamer.java b/app/src/main/java/com/kvance/Nectroid/MP3Streamer.java similarity index 100% rename from src/com/kvance/Nectroid/MP3Streamer.java rename to app/src/main/java/com/kvance/Nectroid/MP3Streamer.java diff --git a/src/com/kvance/Nectroid/NectroidActivity.java b/app/src/main/java/com/kvance/Nectroid/NectroidActivity.java similarity index 51% rename from src/com/kvance/Nectroid/NectroidActivity.java rename to app/src/main/java/com/kvance/Nectroid/NectroidActivity.java index 3795d93..1a4313a 100644 --- a/src/com/kvance/Nectroid/NectroidActivity.java +++ b/app/src/main/java/com/kvance/Nectroid/NectroidActivity.java @@ -15,13 +15,24 @@ package com.kvance.Nectroid; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; +import java.net.URLConnection; +import java.util.ArrayList; import java.util.List; import android.app.Activity; import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; import android.database.sqlite.SQLiteDatabase; import android.net.Uri; import android.os.Bundle; @@ -31,21 +42,43 @@ import android.text.method.LinkMovementMethod; import android.text.method.MovementMethod; import android.util.Log; +import android.view.KeyEvent; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View.OnClickListener; import android.view.View; import android.view.Window; +import android.widget.EditText; import android.widget.ImageButton; +import android.widget.LinearLayout; import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; +import org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; +import org.apache.http.NameValuePair; +import org.apache.http.client.HttpClient; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.conn.scheme.Scheme; +import org.apache.http.conn.scheme.SchemeRegistry; +import org.apache.http.conn.ssl.SSLSocketFactory; +import org.apache.http.conn.ssl.X509HostnameVerifier; +import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.impl.conn.SingleClientConnManager; +import org.apache.http.message.BasicNameValuePair; +import org.apache.http.params.BasicHttpParams; +import org.apache.http.params.HttpParams; +import org.apache.http.util.EntityUtils; + +import javax.net.ssl.HostnameVerifier; + public class NectroidActivity extends Activity - implements BackgroundTaskListener, PlaylistManager.SongListener, PlayerManager.StateListener -{ + implements BackgroundTaskListener, PlaylistManager.SongListener, PlayerManager.StateListener { // Widgets private TextView mCurrentlyPlayingView; private TextView mRequestedByView; @@ -63,9 +96,20 @@ public class NectroidActivity extends Activity private boolean mPaused; private Handler mHandler; private int mTimeLeft; + private TextView loginButton; + private LinearLayout whatyousayLayout; + private TextView historyButton; + private TextView favoritesButton; + private TextView queueButton; + private TextView whatyousayButton; + private EditText whatyousayEditText; // When a new stream is selected, store the choice here until we verify it works. - private class StreamChoice { URL stream; int id; } + private class StreamChoice { + URL stream; + int id; + } + private StreamChoice mStreamChoice; @@ -73,22 +117,23 @@ private class StreamChoice { URL stream; int id; } private static final int PICK_STREAM_REQUEST = 0; private static final String TAG = "Nectroid"; - + /// /// Activity event handlers /// - /** Called when the Activity is first created. */ + /** + * Called when the Activity is first created. + */ @Override - public void onCreate(Bundle savedInstanceState) - { + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); setContentView(R.layout.main); mHandler = new Handler(); - + Window window = getWindow(); getNectroidApp().updateWindowBackground(window); @@ -100,10 +145,11 @@ public void onCreate(Bundle savedInstanceState) } - /** Called when the Activity is being displayed to the user. */ + /** + * Called when the Activity is being displayed to the user. + */ @Override - protected void onStart() - { + protected void onStart() { super.onStart(); NectroidApplication app = getNectroidApp(); @@ -129,7 +175,7 @@ protected void onStart() // Update the GUI with the current song. Playlist.EntryAndTimeLeft currentSong = mPlaylistManager.getCurrentSong(); - if(currentSong != null) { + if (currentSong != null) { updatePlaylistUI(currentSong); } else { clearPlaylistUI(); @@ -137,7 +183,7 @@ protected void onStart() // Update the GUI with the current oneliners. OneLiner.List oneLiners = mOneLinerManager.getOneLiners(); - if(oneLiners != null) { + if (oneLiners != null) { mOneLinerAdapter.setOneLiners(oneLiners); } else { clearOneLiners(); @@ -145,10 +191,11 @@ protected void onStart() } - /** Called when the Activity is no longer visible to the user. */ + /** + * Called when the Activity is no longer visible to the user. + */ @Override - protected void onStop() - { + protected void onStop() { // Unsubscribe from various events. mPlaylistManager.removeTaskListener(this); mPlaylistManager.removeSongListener(this); @@ -159,10 +206,11 @@ protected void onStop() } - /** Called when the Activity is going into the background. */ + /** + * Called when the Activity is going into the background. + */ @Override - protected void onPause() - { + protected void onPause() { super.onPause(); mPaused = true; @@ -172,10 +220,11 @@ protected void onPause() } - /** Called when the Activity is ready to start interacting with the user. */ + /** + * Called when the Activity is ready to start interacting with the user. + */ @Override - protected void onResume() - { + protected void onResume() { super.onResume(); mPaused = false; @@ -188,21 +237,23 @@ protected void onResume() } - /** Initialize the contents of the Activity's standard options menu. */ + /** + * Initialize the contents of the Activity's standard options menu. + */ @Override - public boolean onCreateOptionsMenu(Menu menu) - { + public boolean onCreateOptionsMenu(Menu menu) { MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.main_options, menu); return true; } - /** Called whenever an item in the Activity's options menu is selected. */ + /** + * Called whenever an item in the Activity's options menu is selected. + */ @Override - public boolean onOptionsItemSelected(MenuItem item) - { - switch(item.getItemId()) { + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { case R.id.settings_item: // Show the settings activity. Intent settingsActivity = new Intent(this, SettingsActivity.class); @@ -229,13 +280,14 @@ public boolean onOptionsItemSelected(MenuItem item) } - /** Called when an Activity that this Activity launched exits. */ + /** + * Called when an Activity that this Activity launched exits. + */ @Override - public void onActivityResult(int requestCode, int resultCode, Intent data) - { - switch(requestCode) { + public void onActivityResult(int requestCode, int resultCode, Intent data) { + switch (requestCode) { case PICK_STREAM_REQUEST: - if(resultCode == Activity.RESULT_OK) { + if (resultCode == Activity.RESULT_OK) { int id = data.getIntExtra(StreamsActivity.EXTRA_ID, -1); int bitrate = data.getIntExtra(StreamsActivity.EXTRA_BITRATE, 192); onStreamPicked(data.getData(), id, bitrate); @@ -254,21 +306,19 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) /// @Override - public void onTaskStarted(Object manager) - { + public void onTaskStarted(Object manager) { setProgressBarIndeterminateVisibility(true); } @Override - public void onTaskFinished(Object manager, Object result) - { + public void onTaskFinished(Object manager, Object result) { // Determine what task was finished, and call the appropriate event handler. Class managerClass = manager.getClass(); - if(managerClass == PlaylistManager.class) { + if (managerClass == PlaylistManager.class) { mHandler.post(onPlaylistUpdateTaskFinished); - } else if(managerClass == OneLinerManager.class) { - OneLiner.List oneLiners = (OneLiner.List)result; + } else if (managerClass == OneLinerManager.class) { + OneLiner.List oneLiners = (OneLiner.List) result; mHandler.post(new OnOneLinerUpdateTaskFinished(oneLiners)); } else { @@ -277,8 +327,7 @@ public void onTaskFinished(Object manager, Object result) } @Override - public void onTaskCancelled(Object manager) - { + public void onTaskCancelled(Object manager) { mHandler.post(new Runnable() { public void run() { setProgressBarIndeterminateVisibility(getNectroidApp().isLoadingAnything()); @@ -287,13 +336,14 @@ public void run() { } @Override - public void onTaskFailed(Object manager) - { + public void onTaskFailed(Object manager) { int stringId; Class managerClass = manager.getClass(); - if(managerClass == PlaylistManager.class) { + if (managerClass == PlaylistManager.class) { stringId = R.string.playlist_failed; - } else if(managerClass == OneLinerManager.class) { + } else if (managerClass == FavoritesManager.class) { + stringId = R.string.favorites_failed; + } else if (managerClass == OneLinerManager.class) { stringId = R.string.oneliner_failed; } else { throw new RuntimeException(String.format("Unknown task failed %s", managerClass)); @@ -335,8 +385,7 @@ public void run() { /// @Override - public void onSongChanged(Playlist.EntryAndTimeLeft newSong) - { + public void onSongChanged(Playlist.EntryAndTimeLeft newSong) { updatePlaylistUI(newSong); } @@ -345,17 +394,18 @@ public void onSongChanged(Playlist.EntryAndTimeLeft newSong) /// UI event handlers /// - /** The play button was clicked */ + /** + * The play button was clicked + */ private OnClickListener onPlayButtonClicked = new OnClickListener() { - public void onClick(View v) - { + public void onClick(View v) { // The play button can mean "play" or "stop" depending on the player state. - if(mPlayerManager.getPlayerState() != PlayerService.State.STOPPED) { + if (mPlayerManager.getPlayerState() != PlayerService.State.STOPPED) { stopStream(); } else { // Check if we have a URL to play. URL streamUrl = Prefs.getStreamUrl(NectroidActivity.this); - if(streamUrl != null) { + if (streamUrl != null) { int bitrate = getBitrateForStreamUrl(streamUrl); Log.d(TAG, String.format("Play stream \"%s\" (%d kbps)", streamUrl, bitrate)); playStream(streamUrl, bitrate); @@ -370,10 +420,11 @@ public void onClick(View v) }; - /** The "history" link was clicked */ + /** + * The "history" link was clicked + */ private OnClickListener onHistoryClicked = new OnClickListener() { - public void onClick(View widget) - { + public void onClick(View widget) { Activity us = NectroidActivity.this; Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("nectroid://history")); intent.setClass(us, PlaylistActivity.class); @@ -383,10 +434,11 @@ public void onClick(View widget) }; - /** The "queue" link was clicked */ + /** + * The "queue" link was clicked + */ private OnClickListener onQueueClicked = new OnClickListener() { - public void onClick(View widget) - { + public void onClick(View widget) { Activity us = NectroidActivity.this; Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("nectroid://queue")); intent.setClass(us, PlaylistActivity.class); @@ -395,35 +447,217 @@ public void onClick(View widget) } }; + /** + * The "favorites" link was clicked + */ + private OnClickListener onFavoritesClicked = new OnClickListener() { + public void onClick(View widget) { + + Activity us = NectroidActivity.this; + Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("nectroid://favorites")); + intent.setClass(us, FavoritesActivity.class); + startActivity(intent); + Transition.set(us, R.anim.slide_in_right, R.anim.slide_out_left); + + } + }; + + /** + * The "favorites" link was clicked + */ + private OnClickListener onWhatYouSayClicked = new OnClickListener() { + public void onClick(View widget) { + String text = whatyousayEditText.getText().toString(); + if (text.trim().length() == 0) return; + + try { +// Find the base URL for the current site. + NectroidApplication app = (NectroidApplication)getApplication(); + String baseUrl = app.getSiteManager().getCurrentSite().getBaseUrl(); + + HttpClient client = app.getHttpClient(); + + HttpPost post = new HttpPost(baseUrl+NectroidActivity.this.getString(R.string.url_whatyousay)); + System.out.println("WHATYOUSAY URL="+baseUrl+NectroidActivity.this.getString(R.string.url_whatyousay)); + List nameValuePairs = new ArrayList(1); + nameValuePairs.add(new BasicNameValuePair(NectroidActivity.this.getString(R.string.parameter_line), text)); + post.setEntity(new UrlEncodedFormEntity(nameValuePairs)); + + HttpResponse response = client.execute(post); + BufferedReader rd = new BufferedReader(new InputStreamReader(response.getEntity().getContent())); + String line = ""; + while ((line = rd.readLine()) != null) { + //System.out.println(line); + } + + Toast.makeText(NectroidActivity.this, "whatyousay=" + text, Toast.LENGTH_LONG).show(); + whatyousayEditText.getText().clear(); + mOneLinerManager.update(NectroidActivity.this, false); + } catch (Exception e) { + Toast.makeText(NectroidActivity.this, "Could not whatyousay error=" + e, Toast.LENGTH_LONG).show(); + } + } + }; - /** One second has elapsed */ + private static String readStream(InputStream in) { + BufferedReader reader = null; + StringBuffer response = new StringBuffer(); + try { + reader = new BufferedReader(new InputStreamReader(in)); + String line = ""; + while ((line = reader.readLine()) != null) { + response.append(line); + } + } catch (IOException e) { + e.printStackTrace(); + } finally { + if (reader != null) { + try { + reader.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return response.toString(); + } + + public static boolean findLineInStream(BufferedReader rd, String tofind, String stopIfFound) throws IOException { + + String line = ""; + while ((line = rd.readLine()) != null) { + if (tofind != null && line.trim().contains(tofind)) { + return true; + } else if (stopIfFound != null && line.trim().contains(stopIfFound)) { + return false; + } + } + rd.close(); + + return false; + } + + /** + * The "login" link was clicked + */ + private OnClickListener onLogInClicked = new OnClickListener() { + public void onClick(View widget) { + + String login = Prefs.getLogin(NectroidActivity.this); + String password = Prefs.getPassword(NectroidActivity.this); + + if (login == null || password == null) { + Toast.makeText(NectroidActivity.this, "Cannot login: your login is not set in preferences.", Toast.LENGTH_LONG).show(); + Intent settingsActivity = new Intent(NectroidActivity.this, SettingsActivity.class); + startActivity(settingsActivity); + return; + } + if (password == null) { + Toast.makeText(NectroidActivity.this, "Cannot login: your password is not set in preferences.", Toast.LENGTH_LONG).show(); + Intent settingsActivity = new Intent(NectroidActivity.this, SettingsActivity.class); + startActivity(settingsActivity); + return; + } + + NectroidApplication app = (NectroidApplication)getApplication(); + String baseUrl = app.getSiteManager().getCurrentSite().getBaseUrl(); + + if (whatyousayLayout.getVisibility() == LinearLayout.VISIBLE) { + // DefaultHttpClient client = null; + try { + + HttpPost post = new HttpPost(baseUrl+NectroidActivity.this.getString(R.string.url_logout)); + System.out.println("LOGOUT URL="+baseUrl+NectroidActivity.this.getString(R.string.url_logout)); + List nameValuePairs = new ArrayList(); + post.setEntity(new UrlEncodedFormEntity(nameValuePairs)); + + HttpClient client = app.getHttpClient(); + HttpResponse response = client.execute(post); + + BufferedReader rd = new BufferedReader(new InputStreamReader(response.getEntity().getContent())); + + if (findLineInStream(rd, "Welcome, " + login, "Welcome, Visitor!")) { + Toast.makeText(NectroidActivity.this, "Could not log out with login=" + login, Toast.LENGTH_LONG).show(); + } else { + Toast.makeText(NectroidActivity.this, "Logged out", Toast.LENGTH_LONG).show(); + whatyousayLayout.setVisibility(LinearLayout.INVISIBLE); + favoritesButton.setVisibility(LinearLayout.INVISIBLE); + loginButton.setText("Log in"); + + Cache.setUser(null); + } + } catch (Exception e) { + Toast.makeText(NectroidActivity.this, "Cannot login: with error " + e, Toast.LENGTH_LONG).show(); + return; + } finally { + + } + } else { + + // DefaultHttpClient client = null; + try { + HttpPost post = new HttpPost(baseUrl+NectroidActivity.this.getString(R.string.url_login)); + System.out.println("LOGIN_KEY URL="+baseUrl+NectroidActivity.this.getString(R.string.url_login)); + List nameValuePairs = new ArrayList(1); + nameValuePairs.add(new BasicNameValuePair(NectroidActivity.this.getString(R.string.parameter_username), login)); + nameValuePairs.add(new BasicNameValuePair(NectroidActivity.this.getString(R.string.parameter_password), password)); + post.setEntity(new UrlEncodedFormEntity(nameValuePairs)); + + HttpClient client = app.getHttpClient(); + HttpResponse response = client.execute(post); + BufferedReader rd = new BufferedReader(new InputStreamReader(response.getEntity().getContent())); + + if (findLineInStream(rd, "Welcome, " + login, "Welcome, Visitor!")) { + Toast.makeText(NectroidActivity.this, "Logged as " + login, Toast.LENGTH_LONG).show(); + whatyousayLayout.setVisibility(LinearLayout.VISIBLE); + favoritesButton.setVisibility(LinearLayout.VISIBLE); + loginButton.setText("Log out"); + Cache.setUser(login); + } else { + Toast.makeText(NectroidActivity.this, "Could not log (still visitor) in with login=" + login, Toast.LENGTH_LONG).show(); + } + } catch (Exception e) { + Toast.makeText(NectroidActivity.this, "Cannot login: with error " + e, Toast.LENGTH_LONG).show(); + return; + } finally { + + } + } + + } + }; + + /** + * One second has elapsed + */ final Runnable onTick = new Runnable() { public void run() { // Update the 1-second timer. - if(mTimeLeft > 0) { + if (mTimeLeft > 0) { mTimeLeft--; updateTimeLeft(); } // Schedule the next tick. - if(!mPaused) { + if (!mPaused) { mHandler.postDelayed(this, 1000); } } }; - /** The user selected a stream to play. */ - private void onStreamPicked(Uri streamUri, int id, int bitrate) - { + /** + * The user selected a stream to play. + */ + private void onStreamPicked(Uri streamUri, int id, int bitrate) { // Activities return URIs, but we need a URL. URL streamUrl = null; try { streamUrl = new URL(streamUri.toString()); - } catch(MalformedURLException e) { + } catch (MalformedURLException e) { Toast.makeText(this, R.string.invalid_stream, Toast.LENGTH_SHORT).show(); } - if(streamUrl != null) { + if (streamUrl != null) { // Remember the choice. Once we verify we can play the stream, save it to prefs. mStreamChoice = new StreamChoice(); mStreamChoice.stream = streamUrl; @@ -437,9 +671,8 @@ private void onStreamPicked(Uri streamUri, int id, int bitrate) /// Player event handlers /// - public void onStateChanged(PlayerService.State state) - { - switch(state) { + public void onStateChanged(PlayerService.State state) { + switch (state) { case STOPPED: mPlayButton.setImageResource(R.drawable.play); break; @@ -447,7 +680,7 @@ public void onStateChanged(PlayerService.State state) case PLAYING: // If we selected a new stream, we can now remember the choice since we verified // that it's playable. - if(mStreamChoice != null) { + if (mStreamChoice != null) { getNectroidApp().onUserPickedStream(mStreamChoice.stream, mStreamChoice.id); mStreamChoice = null; } @@ -465,18 +698,20 @@ public void onStateChanged(PlayerService.State state) /// Playlist commands /// - /** Update the playlist part of the UI with this song. */ - private void updatePlaylistUI(Playlist.EntryAndTimeLeft ent) - { + /** + * Update the playlist part of the UI with this song. + */ + private void updatePlaylistUI(Playlist.EntryAndTimeLeft ent) { mTimeLeft = ent.getTimeLeft(); updateTimeLeft(); updateCurrentlyPlaying(ent.getEntry()); updateRequestedBy(ent.getEntry()); } - /** Clear the playlist views. */ - private void clearPlaylistUI() - { + /** + * Clear the playlist views. + */ + private void clearPlaylistUI() { mTimeLeft = -1; mTimeLeftView.setText(""); mCurrentlyPlayingView.setText(""); @@ -488,15 +723,16 @@ private void clearPlaylistUI() /// Other commands /// - /** Create our widget references after the activity has been created. */ - private void createWidgets() - { + /** + * Create our widget references after the activity has been created. + */ + private void createWidgets() { // Get widget references - mCurrentlyPlayingView = (TextView)findViewById(R.id.currently_playing); - mRequestedByView = (TextView)findViewById(R.id.requested_by); - mTimeLeftView = (TextView)findViewById(R.id.time_left); - mOneLinerView = (ListView)findViewById(R.id.oneliner); - mPlayButton = (ImageButton)findViewById(R.id.play_button); + mCurrentlyPlayingView = (TextView) findViewById(R.id.currently_playing); + mRequestedByView = (TextView) findViewById(R.id.requested_by); + mTimeLeftView = (TextView) findViewById(R.id.time_left); + mOneLinerView = (ListView) findViewById(R.id.oneliner); + mPlayButton = (ImageButton) findViewById(R.id.play_button); // Make sure hypertext is clickable in textviews that have it. MovementMethod lmm = LinkMovementMethod.getInstance(); @@ -507,14 +743,47 @@ private void createWidgets() mPlayButton.setOnClickListener(onPlayButtonClicked); // Set up hypertext "buttons". - TextView historyButton = (TextView)findViewById(R.id.history_button); + historyButton = (TextView) findViewById(R.id.history_button); historyButton.setMovementMethod(lmm); historyButton.setOnClickListener(onHistoryClicked); - TextView queueButton = (TextView)findViewById(R.id.queue_button); + queueButton = (TextView) findViewById(R.id.queue_button); queueButton.setMovementMethod(lmm); queueButton.setOnClickListener(onQueueClicked); + //hide WHATYOUSAY LAYOUT + whatyousayLayout = (LinearLayout) findViewById(R.id.whatyousay_layout); + whatyousayLayout.setVisibility(LinearLayout.INVISIBLE); + + whatyousayButton = (TextView) findViewById(R.id.whatyousay_button); + whatyousayButton.setMovementMethod(lmm); + whatyousayButton.setOnClickListener(onWhatYouSayClicked); + + whatyousayEditText = (EditText) findViewById(R.id.whatyousay_edittext); + whatyousayEditText.setOnKeyListener(new View.OnKeyListener(){ + + @Override + public boolean onKey(View v, int keyCode, KeyEvent event) { + if ((event.getAction() == KeyEvent.ACTION_DOWN) && + (keyCode == KeyEvent.KEYCODE_ENTER)) { + + onWhatYouSayClicked.onClick(whatyousayButton); + + return true; + + } + return false; + } + }); + favoritesButton = (TextView) findViewById(R.id.favorites_button); + favoritesButton.setMovementMethod(lmm); + favoritesButton.setOnClickListener(onFavoritesClicked); + favoritesButton.setVisibility(LinearLayout.INVISIBLE); + + loginButton = (TextView) findViewById(R.id.login_button); + loginButton.setMovementMethod(lmm); + loginButton.setOnClickListener(onLogInClicked); + // Set up oneliner view. mOneLinerAdapter = new OneLinerAdapter(null, this); mOneLinerView.setAdapter(mOneLinerAdapter); @@ -522,18 +791,20 @@ private void createWidgets() } - /** Start the one-second timer. */ - private void startTimer() - { + /** + * Start the one-second timer. + */ + private void startTimer() { // Remove any existing timer first, just in case. mHandler.removeCallbacks(onTick); mHandler.postDelayed(onTick, 1000); } - /** Start the player service. */ - private void playStream(URL url, int bitrate) - { + /** + * Start the player service. + */ + private void playStream(URL url, int bitrate) { Intent intent = new Intent(this, PlayerService.class); intent.setAction(PlayerService.ACTION_PLAY); intent.setData(Uri.parse(url.toString())); @@ -541,18 +812,20 @@ private void playStream(URL url, int bitrate) startService(intent); } - /** Stop the player service. */ - private void stopStream() - { + /** + * Stop the player service. + */ + private void stopStream() { Intent intent = new Intent(this, PlayerService.class); boolean stopped = stopService(intent); Log.d(TAG, "stopService() returned " + String.valueOf(stopped)); } - /** Clear the OneLiners view. */ - private void clearOneLiners() - { + /** + * Clear the OneLiners view. + */ + private void clearOneLiners() { mOneLinerAdapter.setOneLiners(null); } @@ -560,8 +833,7 @@ private void clearOneLiners() /// Utilities /// - private void updateCurrentlyPlaying(Playlist.Entry entry) - { + private void updateCurrentlyPlaying(Playlist.Entry entry) { // Build the formatted string StringBuilder html = new StringBuilder(); String baseUrl = getNectroidApp().getSiteManager().getCurrentSite().getBaseUrl(); @@ -569,11 +841,11 @@ private void updateCurrentlyPlaying(Playlist.Entry entry) html.append(String.format("%s by ", songLink, entry.getTitle())); java.util.List artists = entry.getArtists(); int numArtists = artists.size(); - for(int i = 0; i < numArtists; i++) { + for (int i = 0; i < numArtists; i++) { Playlist.IdString artist = artists.get(i); String link = baseUrl + entry.artistLink(artist, this); html.append(String.format("%s", link, artist.getString())); - if(i < (numArtists - 1)) { + if (i < (numArtists - 1)) { html.append(", "); } } @@ -584,8 +856,7 @@ private void updateCurrentlyPlaying(Playlist.Entry entry) } - private void updateRequestedBy(Playlist.Entry entry) - { + private void updateRequestedBy(Playlist.Entry entry) { // Build the formatted string String baseUrl = getNectroidApp().getSiteManager().getCurrentSite().getBaseUrl(); String requesterLink = baseUrl + entry.requesterLink(this); @@ -598,23 +869,20 @@ private void updateRequestedBy(Playlist.Entry entry) } - private void updateTimeLeft() - { + private void updateTimeLeft() { int time = Math.max(0, mTimeLeft); mTimeLeftView.setText(String.format("%d:%02d", time / 60, time % 60)); } - private void updateTitle() - { + private void updateTitle() { String siteName = getNectroidApp().getSiteManager().getCurrentSite().getName(); String appName = this.getString(R.string.app_name); setTitle(appName + " - " + siteName); } - private int getBitrateForStreamUrl(URL streamUrl) - { + private int getBitrateForStreamUrl(URL streamUrl) { String urlString = streamUrl.toString(); int bitrate = 192; @@ -627,29 +895,28 @@ private int getBitrateForStreamUrl(URL streamUrl) db.close(); } - if(streams == null) { + if (streams == null) { Log.w(TAG, "Couldn't open streams database; using unknown bitrate"); } else { // Search the stream list for that URL. boolean found = false; - for(Stream stream : streams) { - if(stream.getUrl().toString().equals(urlString)) { + for (Stream stream : streams) { + if (stream.getUrl().toString().equals(urlString)) { bitrate = stream.getBitrate(); found = true; break; } } - if(!found) { + if (!found) { Log.w(TAG, String.format("Couldn't find bitrate for stream \"%s\"", urlString)); } } return bitrate; } - - private NectroidApplication getNectroidApp() - { - return (NectroidApplication)getApplication(); + + private NectroidApplication getNectroidApp() { + return (NectroidApplication) getApplication(); } } diff --git a/src/com/kvance/Nectroid/NectroidApplication.java b/app/src/main/java/com/kvance/Nectroid/NectroidApplication.java similarity index 87% rename from src/com/kvance/Nectroid/NectroidApplication.java rename to app/src/main/java/com/kvance/Nectroid/NectroidApplication.java index ab7c0ea..3e18715 100644 --- a/src/com/kvance/Nectroid/NectroidApplication.java +++ b/app/src/main/java/com/kvance/Nectroid/NectroidApplication.java @@ -28,6 +28,12 @@ import android.util.Log; import android.view.Window; +import org.apache.http.client.HttpClient; +import org.apache.http.conn.ClientConnectionManager; +import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; +import org.apache.http.params.HttpParams; + public class NectroidApplication extends Application implements OnSharedPreferenceChangeListener, SiteManager.SiteListener @@ -35,6 +41,7 @@ public class NectroidApplication extends Application private OneLinerManager mOneLinerManager; private PlayerManager mPlayerManager; private PlaylistManager mPlaylistManager; + private FavoritesManager mFavoritesManager; private Scrobbler mScrobbler; private SiteManager mSiteManager; private StreamsManager mStreamsManager; @@ -43,6 +50,7 @@ public class NectroidApplication extends Application private static final String TAG = "Nectroid"; + HttpClient client = new DefaultHttpClient(); @Override public void onCreate() @@ -60,6 +68,7 @@ public void onCreate() Cache.setSite(mSiteManager.getCurrentSite(), appContext); mPlaylistManager = new PlaylistManager(appContext); + mFavoritesManager = new FavoritesManager(appContext); mStreamsManager = new StreamsManager(); mPlayerManager = new PlayerManager(); @@ -88,6 +97,7 @@ public void onCreate() public void onLowMemory() { mPlaylistManager.onLowMemory(); + mFavoritesManager.onLowMemory(); mStreamsManager.onLowMemory(); mOneLinerManager.onLowMemory(); } @@ -131,6 +141,7 @@ public void onUserPickedStream(URL streamUrl, int streamId) /// Getters /// + public FavoritesManager getFavoritesManager() { return mFavoritesManager; } public PlaylistManager getPlaylistManager() { return mPlaylistManager; } public StreamsManager getStreamsManager() { return mStreamsManager; } public PlayerManager getPlayerManager() { return mPlayerManager; } @@ -145,10 +156,11 @@ public void onUserPickedStream(URL streamUrl, int streamId) /** Return true if any of our managers are loading something. */ public boolean isLoadingAnything() { - return mPlaylistManager.isUpdating() || - mStreamsManager.isUpdating() || - mOneLinerManager.isUpdating() || - mPlayerManager.getPlayerState() == PlayerService.State.LOADING; + return mFavoritesManager.isUpdating() || + mPlaylistManager.isUpdating() || + mStreamsManager.isUpdating() || + mOneLinerManager.isUpdating() || + mPlayerManager.getPlayerState() == PlayerService.State.LOADING; } /** Update this window's background to the current background color. */ @@ -190,6 +202,20 @@ public void onSharedPreferenceChanged(SharedPreferences prefs, String key) } } + public HttpClient getHttpClient() { + if (client != null) return client; + + DefaultHttpClient client = new DefaultHttpClient(); + ClientConnectionManager mgr = client.getConnectionManager(); + HttpParams params = client.getParams(); + + client = new DefaultHttpClient(new ThreadSafeClientConnManager(params, + mgr.getSchemeRegistry()), params); + + return client; + + } + /// /// Site updates @@ -210,6 +236,7 @@ public void onSiteChanged(Site newSite) // Reset all document managers. mPlaylistManager.reset(); + mFavoritesManager.reset(); mOneLinerManager.reset(); mStreamsManager.reset(); Prefs.clearOneLinerUpdateTime(appContext); diff --git a/src/com/kvance/Nectroid/OneLiner.java b/app/src/main/java/com/kvance/Nectroid/OneLiner.java similarity index 100% rename from src/com/kvance/Nectroid/OneLiner.java rename to app/src/main/java/com/kvance/Nectroid/OneLiner.java diff --git a/src/com/kvance/Nectroid/OneLinerAdapter.java b/app/src/main/java/com/kvance/Nectroid/OneLinerAdapter.java similarity index 100% rename from src/com/kvance/Nectroid/OneLinerAdapter.java rename to app/src/main/java/com/kvance/Nectroid/OneLinerAdapter.java diff --git a/src/com/kvance/Nectroid/OneLinerManager.java b/app/src/main/java/com/kvance/Nectroid/OneLinerManager.java similarity index 100% rename from src/com/kvance/Nectroid/OneLinerManager.java rename to app/src/main/java/com/kvance/Nectroid/OneLinerManager.java diff --git a/src/com/kvance/Nectroid/PlayerManager.java b/app/src/main/java/com/kvance/Nectroid/PlayerManager.java similarity index 100% rename from src/com/kvance/Nectroid/PlayerManager.java rename to app/src/main/java/com/kvance/Nectroid/PlayerManager.java diff --git a/src/com/kvance/Nectroid/PlayerService.java b/app/src/main/java/com/kvance/Nectroid/PlayerService.java similarity index 100% rename from src/com/kvance/Nectroid/PlayerService.java rename to app/src/main/java/com/kvance/Nectroid/PlayerService.java diff --git a/src/com/kvance/Nectroid/Playlist.java b/app/src/main/java/com/kvance/Nectroid/Playlist.java similarity index 100% rename from src/com/kvance/Nectroid/Playlist.java rename to app/src/main/java/com/kvance/Nectroid/Playlist.java diff --git a/src/com/kvance/Nectroid/PlaylistActivity.java b/app/src/main/java/com/kvance/Nectroid/PlaylistActivity.java similarity index 100% rename from src/com/kvance/Nectroid/PlaylistActivity.java rename to app/src/main/java/com/kvance/Nectroid/PlaylistActivity.java diff --git a/src/com/kvance/Nectroid/PlaylistAdapter.java b/app/src/main/java/com/kvance/Nectroid/PlaylistAdapter.java similarity index 100% rename from src/com/kvance/Nectroid/PlaylistAdapter.java rename to app/src/main/java/com/kvance/Nectroid/PlaylistAdapter.java diff --git a/src/com/kvance/Nectroid/PlaylistHistoryAdapter.java b/app/src/main/java/com/kvance/Nectroid/PlaylistHistoryAdapter.java similarity index 100% rename from src/com/kvance/Nectroid/PlaylistHistoryAdapter.java rename to app/src/main/java/com/kvance/Nectroid/PlaylistHistoryAdapter.java diff --git a/src/com/kvance/Nectroid/PlaylistManager.java b/app/src/main/java/com/kvance/Nectroid/PlaylistManager.java similarity index 100% rename from src/com/kvance/Nectroid/PlaylistManager.java rename to app/src/main/java/com/kvance/Nectroid/PlaylistManager.java diff --git a/src/com/kvance/Nectroid/PlaylistQueueAdapter.java b/app/src/main/java/com/kvance/Nectroid/PlaylistQueueAdapter.java similarity index 100% rename from src/com/kvance/Nectroid/PlaylistQueueAdapter.java rename to app/src/main/java/com/kvance/Nectroid/PlaylistQueueAdapter.java diff --git a/src/com/kvance/Nectroid/Prefs.java b/app/src/main/java/com/kvance/Nectroid/Prefs.java similarity index 95% rename from src/com/kvance/Nectroid/Prefs.java rename to app/src/main/java/com/kvance/Nectroid/Prefs.java index 6cc5002..685ecd9 100644 --- a/src/com/kvance/Nectroid/Prefs.java +++ b/app/src/main/java/com/kvance/Nectroid/Prefs.java @@ -41,7 +41,8 @@ class Prefs public static final String SITE_ID_KEY = "site_id"; public static final String CACHED_SITE_ID_KEY = "cached_site_id"; public static final String USE_SW_DECODER_KEY = "use_sw_decoder"; - + public static final String LOGIN_KEY = "login"; + public static final String PASSWORD_KEY = "password"; // Timestamp formatter private static final SimpleDateFormat timestampFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss"); @@ -99,6 +100,16 @@ public static boolean getUseSWDecoder(Context context) return sp(context).getBoolean(USE_SW_DECODER_KEY, DEFAULT_USE_SW_DECODER); } + public static String getLogin(Context context) + { + return sp(context).getString(LOGIN_KEY, null); + } + + public static String getPassword(Context context) + { + return sp(context).getString(PASSWORD_KEY, null); + } + public static URL getStreamUrl(Context context) { URL retval = null; diff --git a/src/com/kvance/Nectroid/RingBuffer.java b/app/src/main/java/com/kvance/Nectroid/RingBuffer.java similarity index 100% rename from src/com/kvance/Nectroid/RingBuffer.java rename to app/src/main/java/com/kvance/Nectroid/RingBuffer.java diff --git a/src/com/kvance/Nectroid/Scrobbler.java b/app/src/main/java/com/kvance/Nectroid/Scrobbler.java similarity index 100% rename from src/com/kvance/Nectroid/Scrobbler.java rename to app/src/main/java/com/kvance/Nectroid/Scrobbler.java diff --git a/src/com/kvance/Nectroid/SettingsActivity.java b/app/src/main/java/com/kvance/Nectroid/SettingsActivity.java similarity index 100% rename from src/com/kvance/Nectroid/SettingsActivity.java rename to app/src/main/java/com/kvance/Nectroid/SettingsActivity.java diff --git a/src/com/kvance/Nectroid/Site.java b/app/src/main/java/com/kvance/Nectroid/Site.java similarity index 100% rename from src/com/kvance/Nectroid/Site.java rename to app/src/main/java/com/kvance/Nectroid/Site.java diff --git a/src/com/kvance/Nectroid/SiteActivity.java b/app/src/main/java/com/kvance/Nectroid/SiteActivity.java similarity index 100% rename from src/com/kvance/Nectroid/SiteActivity.java rename to app/src/main/java/com/kvance/Nectroid/SiteActivity.java diff --git a/src/com/kvance/Nectroid/SiteManager.java b/app/src/main/java/com/kvance/Nectroid/SiteManager.java similarity index 100% rename from src/com/kvance/Nectroid/SiteManager.java rename to app/src/main/java/com/kvance/Nectroid/SiteManager.java diff --git a/src/com/kvance/Nectroid/SitePreference.java b/app/src/main/java/com/kvance/Nectroid/SitePreference.java similarity index 100% rename from src/com/kvance/Nectroid/SitePreference.java rename to app/src/main/java/com/kvance/Nectroid/SitePreference.java diff --git a/src/com/kvance/Nectroid/Stream.java b/app/src/main/java/com/kvance/Nectroid/Stream.java similarity index 100% rename from src/com/kvance/Nectroid/Stream.java rename to app/src/main/java/com/kvance/Nectroid/Stream.java diff --git a/src/com/kvance/Nectroid/StreamsActivity.java b/app/src/main/java/com/kvance/Nectroid/StreamsActivity.java similarity index 100% rename from src/com/kvance/Nectroid/StreamsActivity.java rename to app/src/main/java/com/kvance/Nectroid/StreamsActivity.java diff --git a/src/com/kvance/Nectroid/StreamsAdapter.java b/app/src/main/java/com/kvance/Nectroid/StreamsAdapter.java similarity index 100% rename from src/com/kvance/Nectroid/StreamsAdapter.java rename to app/src/main/java/com/kvance/Nectroid/StreamsAdapter.java diff --git a/src/com/kvance/Nectroid/StreamsManager.java b/app/src/main/java/com/kvance/Nectroid/StreamsManager.java similarity index 100% rename from src/com/kvance/Nectroid/StreamsManager.java rename to app/src/main/java/com/kvance/Nectroid/StreamsManager.java diff --git a/src/com/kvance/Nectroid/Transition.java b/app/src/main/java/com/kvance/Nectroid/Transition.java similarity index 100% rename from src/com/kvance/Nectroid/Transition.java rename to app/src/main/java/com/kvance/Nectroid/Transition.java diff --git a/res/anim/slide_in_left.xml b/app/src/main/res/anim/slide_in_left.xml similarity index 100% rename from res/anim/slide_in_left.xml rename to app/src/main/res/anim/slide_in_left.xml diff --git a/res/anim/slide_in_right.xml b/app/src/main/res/anim/slide_in_right.xml similarity index 100% rename from res/anim/slide_in_right.xml rename to app/src/main/res/anim/slide_in_right.xml diff --git a/res/anim/slide_out_left.xml b/app/src/main/res/anim/slide_out_left.xml similarity index 100% rename from res/anim/slide_out_left.xml rename to app/src/main/res/anim/slide_out_left.xml diff --git a/res/anim/slide_out_right.xml b/app/src/main/res/anim/slide_out_right.xml similarity index 100% rename from res/anim/slide_out_right.xml rename to app/src/main/res/anim/slide_out_right.xml diff --git a/res/drawable-hdpi/ic_launcher_nectroid.png b/app/src/main/res/drawable-hdpi/ic_launcher_nectroid.png similarity index 100% rename from res/drawable-hdpi/ic_launcher_nectroid.png rename to app/src/main/res/drawable-hdpi/ic_launcher_nectroid.png diff --git a/res/drawable-hdpi/ic_menu_refresh.png b/app/src/main/res/drawable-hdpi/ic_menu_refresh.png similarity index 100% rename from res/drawable-hdpi/ic_menu_refresh.png rename to app/src/main/res/drawable-hdpi/ic_menu_refresh.png diff --git a/res/drawable-hdpi/orange_waffle.png b/app/src/main/res/drawable-hdpi/orange_waffle.png similarity index 100% rename from res/drawable-hdpi/orange_waffle.png rename to app/src/main/res/drawable-hdpi/orange_waffle.png diff --git a/res/drawable-hdpi/play.png b/app/src/main/res/drawable-hdpi/play.png similarity index 100% rename from res/drawable-hdpi/play.png rename to app/src/main/res/drawable-hdpi/play.png diff --git a/res/drawable-hdpi/play_status.png b/app/src/main/res/drawable-hdpi/play_status.png similarity index 100% rename from res/drawable-hdpi/play_status.png rename to app/src/main/res/drawable-hdpi/play_status.png diff --git a/res/drawable-hdpi/stop.png b/app/src/main/res/drawable-hdpi/stop.png similarity index 100% rename from res/drawable-hdpi/stop.png rename to app/src/main/res/drawable-hdpi/stop.png diff --git a/res/drawable-ldpi/ic_launcher_nectroid.png b/app/src/main/res/drawable-ldpi/ic_launcher_nectroid.png similarity index 100% rename from res/drawable-ldpi/ic_launcher_nectroid.png rename to app/src/main/res/drawable-ldpi/ic_launcher_nectroid.png diff --git a/res/drawable-ldpi/ic_menu_refresh.png b/app/src/main/res/drawable-ldpi/ic_menu_refresh.png similarity index 100% rename from res/drawable-ldpi/ic_menu_refresh.png rename to app/src/main/res/drawable-ldpi/ic_menu_refresh.png diff --git a/res/drawable-ldpi/orange_waffle.png b/app/src/main/res/drawable-ldpi/orange_waffle.png similarity index 100% rename from res/drawable-ldpi/orange_waffle.png rename to app/src/main/res/drawable-ldpi/orange_waffle.png diff --git a/res/drawable-ldpi/play.png b/app/src/main/res/drawable-ldpi/play.png similarity index 100% rename from res/drawable-ldpi/play.png rename to app/src/main/res/drawable-ldpi/play.png diff --git a/res/drawable-ldpi/play_status.png b/app/src/main/res/drawable-ldpi/play_status.png similarity index 100% rename from res/drawable-ldpi/play_status.png rename to app/src/main/res/drawable-ldpi/play_status.png diff --git a/res/drawable-ldpi/stop.png b/app/src/main/res/drawable-ldpi/stop.png similarity index 100% rename from res/drawable-ldpi/stop.png rename to app/src/main/res/drawable-ldpi/stop.png diff --git a/res/drawable-mdpi/ic_launcher_nectroid.png b/app/src/main/res/drawable-mdpi/ic_launcher_nectroid.png similarity index 100% rename from res/drawable-mdpi/ic_launcher_nectroid.png rename to app/src/main/res/drawable-mdpi/ic_launcher_nectroid.png diff --git a/res/drawable-mdpi/ic_menu_refresh.png b/app/src/main/res/drawable-mdpi/ic_menu_refresh.png similarity index 100% rename from res/drawable-mdpi/ic_menu_refresh.png rename to app/src/main/res/drawable-mdpi/ic_menu_refresh.png diff --git a/res/drawable-mdpi/orange_waffle.png b/app/src/main/res/drawable-mdpi/orange_waffle.png similarity index 100% rename from res/drawable-mdpi/orange_waffle.png rename to app/src/main/res/drawable-mdpi/orange_waffle.png diff --git a/res/drawable-mdpi/play.png b/app/src/main/res/drawable-mdpi/play.png similarity index 100% rename from res/drawable-mdpi/play.png rename to app/src/main/res/drawable-mdpi/play.png diff --git a/res/drawable-mdpi/play_status.png b/app/src/main/res/drawable-mdpi/play_status.png similarity index 100% rename from res/drawable-mdpi/play_status.png rename to app/src/main/res/drawable-mdpi/play_status.png diff --git a/res/drawable-mdpi/stop.png b/app/src/main/res/drawable-mdpi/stop.png similarity index 100% rename from res/drawable-mdpi/stop.png rename to app/src/main/res/drawable-mdpi/stop.png diff --git a/res/drawable/backrepeat.xml b/app/src/main/res/drawable/backrepeat.xml similarity index 100% rename from res/drawable/backrepeat.xml rename to app/src/main/res/drawable/backrepeat.xml diff --git a/res/drawable/bg_gradient.xml b/app/src/main/res/drawable/bg_gradient.xml similarity index 100% rename from res/drawable/bg_gradient.xml rename to app/src/main/res/drawable/bg_gradient.xml diff --git a/res/drawable/text_button_bg.xml b/app/src/main/res/drawable/text_button_bg.xml similarity index 100% rename from res/drawable/text_button_bg.xml rename to app/src/main/res/drawable/text_button_bg.xml diff --git a/res/drawable/text_button_pressed.xml b/app/src/main/res/drawable/text_button_pressed.xml similarity index 100% rename from res/drawable/text_button_pressed.xml rename to app/src/main/res/drawable/text_button_pressed.xml diff --git a/res/drawable/text_button_selected.xml b/app/src/main/res/drawable/text_button_selected.xml similarity index 100% rename from res/drawable/text_button_selected.xml rename to app/src/main/res/drawable/text_button_selected.xml diff --git a/res/drawable/white_down_box.xml b/app/src/main/res/drawable/white_down_box.xml similarity index 100% rename from res/drawable/white_down_box.xml rename to app/src/main/res/drawable/white_down_box.xml diff --git a/res/drawable/white_up_box.xml b/app/src/main/res/drawable/white_up_box.xml similarity index 100% rename from res/drawable/white_up_box.xml rename to app/src/main/res/drawable/white_up_box.xml diff --git a/res/drawable/whitebox.xml b/app/src/main/res/drawable/whitebox.xml similarity index 100% rename from res/drawable/whitebox.xml rename to app/src/main/res/drawable/whitebox.xml diff --git a/res/layout/about.xml b/app/src/main/res/layout/about.xml similarity index 100% rename from res/layout/about.xml rename to app/src/main/res/layout/about.xml diff --git a/res/layout/inset_list.xml b/app/src/main/res/layout/inset_list.xml similarity index 91% rename from res/layout/inset_list.xml rename to app/src/main/res/layout/inset_list.xml index 7bdcdd8..5e5961b 100644 --- a/res/layout/inset_list.xml +++ b/app/src/main/res/layout/inset_list.xml @@ -16,7 +16,7 @@ android:background="@drawable/whitebox" android:gravity="center" android:visibility="gone" - android:textAppearance="?android:attr/textAppearanceMedium" + /> diff --git a/res/layout/main.xml b/app/src/main/res/layout/main.xml similarity index 68% rename from res/layout/main.xml rename to app/src/main/res/layout/main.xml index d260ae8..c16a132 100644 --- a/res/layout/main.xml +++ b/app/src/main/res/layout/main.xml @@ -1,6 +1,7 @@ @@ -68,7 +69,7 @@ - + +