mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-03-14 04:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgraded to Android Studio 3.0 Canary 6.

Browse Source
This commit is contained in:
casey langen 2017-07-11 22:12:39 -07:00
parent 3a0ed06a2b
commit f2e3d94a14
5 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/musikbox/app/window/TrackListView.cpp
View File

@ -240,9 +240,6 @@ bool TrackListView::KeyPress(const std::string& key) {
if (playback::Supplant(*this, this->playback)) {
ToastOverlay::Show(_TSTR("tracklist_supplant_success_toast"), 2000);
}
else {
ToastOverlay::Show(_TSTR("tracklist_supplant_fail_toast"), 2000);
}
}
handled = true;
}

1
src/musikbox/data/locales/en_US.json
View File

@ -127,7 +127,6 @@
"tracklist_unknown_album": "[unknown album]",
"tracklist_supplant_success_toast": "play queue swapped with current list",
"tracklist_supplant_fail_toast": "failed to swap play queue with current list",
"main_syncing_banner_start": "syncing metadata...",
"main_syncing_banner": "syncing metadata (%d tracks processed)",

6
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/playback/StreamingPlaybackService.kt
View File

@ -664,7 +664,7 @@ class StreamingPlaybackService(context: Context) : PlaybackService {
this.wss.sendObserve(query, this.wssClient)
.observeOn(AndroidSchedulers.mainThread())
.subscribeOn(AndroidSchedulers.mainThread())
.map { message -> extractTrackFromMessage(message) }
.map { message: SocketMessage -> extractTrackFromMessage(message)!! }
.subscribe(
{ track ->
if (originalParams === params && playContext.currentIndex == currentIndex) {
@ -704,8 +704,8 @@ class StreamingPlaybackService(context: Context) : PlaybackService {
.observeOn(AndroidSchedulers.mainThread())
.subscribeOn(AndroidSchedulers.mainThread())
.flatMap { response -> getQueueCount(playContext, response) }
.concatMap { count -> getCurrentAndNextTrackMessages(playContext, count ?: 0) }
.map { message -> extractTrackFromMessage(message) }
.concatMap { count -> getCurrentAndNextTrackMessages(playContext, count) }
.map { message -> extractTrackFromMessage(message)!! }
.subscribe(
{ track ->
if (playContext.currentMetadata == null) {

4
src/musikdroid/build.gradle
View File

@ -1,10 +1,10 @@
buildscript {
ext.kotlin_version = '1.1.2-5'
ext.kotlin_version = '1.1.3-2'
repositories {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
classpath 'com.android.tools.build:gradle:3.0.0-alpha6'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}

4
src/musikdroid/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Thu Jun 15 23:30:27 PDT 2017
#Tue Jul 11 22:05:46 PDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-rc-1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-milestone-1-all.zip