mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-01-30 06:32:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated to android studio 3 beta 4, fixed a crash, fixed some warnings, suppressed some warnings.

Browse Source
This commit is contained in:
casey langen 2017-09-02 11:54:51 -07:00
parent 714fb62d17
commit 92db2d7006
7 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/musikdroid/app/build.gradle
View File

@ -88,9 +88,9 @@ dependencies {
implementation 'com.github.pluscubed:recycler-fast-scroll:0.3.2@aar'
implementation 'com.facebook.stetho:stetho:1.5.0'
implementation 'com.android.support:appcompat-v7:26.0.1'
implementation 'com.android.support:recyclerview-v7:26.0.1'
implementation 'com.android.support:design:26.0.1'
implementation 'com.android.support:appcompat-v7:26.0.2'
implementation 'com.android.support:recyclerview-v7:26.0.2'
implementation 'com.android.support:design:26.0.2'
implementation('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
transitive = true

5
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/activity/ConnectionsActivity.kt
View File

@ -60,19 +60,20 @@ class ConnectionsActivity : WebSocketActivityBase() {
override val playbackServiceEventListener: (() -> Unit)?
get() = null
@Suppress("UNCHECKED_CAST")
override fun onTaskCompleted(taskName: String, taskId: Long, task: Task<*, *>, result: Any) {
when (taskName) {
LoadTask.NAME,
DeleteTask.NAME,
RenameTask.NAME -> {
adapter.items = (result!! as List<Connection>)
adapter.items = (result as List<Connection>)
adapter.notifyDataSetChanged()
updateViewState()
}
}
}
fun updateViewState() {
private fun updateViewState() {
val count = adapter.itemCount
recycler.visibility = if (count == 0) View.GONE else View.VISIBLE
emptyText.visibility = if (count == 0) View.VISIBLE else View.GONE

44
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/activity/SettingsActivity.kt
View File

@ -173,17 +173,17 @@ class SettingsActivity : WebSocketActivityBase() {
}
private fun cacheViews() {
this.addressText = findViewById<EditText>(R.id.address)
this.portText = findViewById<EditText>(R.id.port)
this.httpPortText = findViewById<EditText>(R.id.http_port)
this.passwordText = findViewById<EditText>(R.id.password)
this.albumArtCheckbox = findViewById<CheckBox>(R.id.album_art_checkbox)
this.messageCompressionCheckbox = findViewById<CheckBox>(R.id.message_compression)
this.softwareVolume = findViewById<CheckBox>(R.id.software_volume)
this.bitrateSpinner = findViewById<Spinner>(R.id.transcoder_bitrate_spinner)
this.cacheSpinner = findViewById<Spinner>(R.id.streaming_disk_cache_spinner)
this.sslCheckbox = findViewById<CheckBox>(R.id.ssl_checkbox)
this.certCheckbox = findViewById<CheckBox>(R.id.cert_validation)
this.addressText = findViewById(R.id.address)
this.portText = findViewById(R.id.port)
this.httpPortText = findViewById(R.id.http_port)
this.passwordText = findViewById(R.id.password)
this.albumArtCheckbox = findViewById(R.id.album_art_checkbox)
this.messageCompressionCheckbox = findViewById(R.id.message_compression)
this.softwareVolume = findViewById(R.id.software_volume)
this.bitrateSpinner = findViewById(R.id.transcoder_bitrate_spinner)
this.cacheSpinner = findViewById(R.id.streaming_disk_cache_spinner)
this.sslCheckbox = findViewById(R.id.ssl_checkbox)
this.certCheckbox = findViewById(R.id.cert_validation)
}
private fun bindListeners() {
@ -274,9 +274,9 @@ class SettingsActivity : WebSocketActivityBase() {
override val playbackServiceEventListener: (() -> Unit)?
get() = null
override fun onTaskCompleted(name: String, id: Long, task: Task<*, *>, r: Any) {
if (SaveAsTask.match(name)) {
if ((r as SaveAsTask.Result) == SaveAsTask.Result.Exists) {
override fun onTaskCompleted(taskName: String, taskId: Long, task: Task<*, *>, result: Any) {
if (SaveAsTask.match(taskName)) {
if ((result as SaveAsTask.Result) == SaveAsTask.Result.Exists) {
val connection = (task as SaveAsTask).connection
if (!dialogVisible(ConfirmOverwiteDialog.TAG)) {
showDialog(
@ -453,23 +453,17 @@ class SettingsActivity : WebSocketActivityBase() {
}
}
private class SaveAsTask : Tasks.Blocking<SaveAsTask.Result, Exception> {
var connection: Connection
private class SaveAsTask(val connection: Connection,
val overwrite: Boolean = false)
: Tasks.Blocking<SaveAsTask.Result, Exception>()
{
enum class Result { Exists, Added }
val overwrite: Boolean
constructor(connection: Connection, overwrite: Boolean = false) {
this.connection = connection
this.overwrite = overwrite
}
override fun exec(context: Context?): Result {
val dao = Application.connectionsDb?.connectionsDao()!!
if (!overwrite) {
var existing: Connection? = dao.query(connection.name)
val existing: Connection? = dao.query(connection.name)
if (existing != null) {
return Result.Exists
}

2
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/activity/WebSocketActivityBase.kt
View File

@ -116,7 +116,7 @@ abstract class WebSocketActivityBase : AppCompatActivity(), Runner.TaskCallbacks
return super.onOptionsItemSelected(item)
}
override fun onTaskCompleted(s: String, l: Long, task: Task<*, *>, o: Any) {
override fun onTaskCompleted(taskName: String, taskId: Long, task: Task<*, *>, result: Any) {
}

4
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/view/MainMetadataView.kt
View File

@ -3,6 +3,7 @@ package io.casey.musikcube.remote.ui.view
import android.content.Context
import android.content.SharedPreferences
import android.graphics.Color
import android.os.Handler
import android.support.annotation.AttrRes
import android.text.SpannableStringBuilder
import android.text.TextPaint
@ -41,7 +42,6 @@ class MainMetadataView : FrameLayout {
private var prefs: SharedPreferences? = null
private var isPaused = true
private lateinit var title: TextView
private lateinit var artist: TextView
private lateinit var album: TextView
@ -363,7 +363,7 @@ class MainMetadataView : FrameLayout {
private var albumArtRetrieved: (AlbumArtModel, String?) -> Unit = {
model: AlbumArtModel, _: String? ->
handler.post {
handler?.post {
if (model === albumArtModel) {
if (Strings.empty(model.url)) {
setMetadataDisplayMode(DisplayMode.NoArtwork)

1
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/websocket/SocketMessage.kt
View File

@ -38,6 +38,7 @@ class SocketMessage private constructor(val name: String, val id: String, val ty
this.options = options ?: JSONObject()
}
@Suppress("UNCHECKED_CAST")
fun <T> getOption(key: String): T? {
if (options.has(key)) {
try {

7
src/musikdroid/build.gradle
View File

@ -1,10 +1,13 @@
buildscript {
ext.kotlin_version = '1.1.4-2'
ext.kotlin_version = '1.1.4-3'
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0-beta3'
classpath 'com.android.tools.build:gradle:3.0.0-beta4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}