Browse Source

Fix storing of caption

pull/1/head
Malte Schmitz 8 years ago
parent
commit
f83b1a2b9c
1 changed files with 7 additions and 12 deletions
  1. +7
    -12
      app/src/main/java/de/mlte/soundboard/MainActivity.kt

+ 7
- 12
app/src/main/java/de/mlte/soundboard/MainActivity.kt View File

@@ -1,22 +1,18 @@
package de.mlte.soundboard package de.mlte.soundboard


import android.animation.ObjectAnimator import android.animation.ObjectAnimator
import android.app.Activity
import android.content.Context
import android.content.Intent
import android.media.MediaPlayer import android.media.MediaPlayer
import android.net.Uri
import android.os.Bundle import android.os.Bundle
import android.support.v7.app.AppCompatActivity import android.support.v7.app.AppCompatActivity
import android.view.animation.LinearInterpolator import android.view.animation.LinearInterpolator
import android.widget.ProgressBar import android.widget.ProgressBar
import android.widget.TextView import android.widget.TextView
import java.util.*
import kotlin.concurrent.timerTask
import android.content.Intent
import android.R.attr.data
import android.app.Activity
import android.content.Context
import android.net.Uri
import java.io.BufferedInputStream import java.io.BufferedInputStream
import java.io.BufferedOutputStream import java.io.BufferedOutputStream
import java.io.FileInputStream




class MainActivity : AppCompatActivity() { class MainActivity : AppCompatActivity() {
@@ -51,7 +47,7 @@ class MainActivity : AppCompatActivity() {
playing = false playing = false
progressBar.progress = 0 progressBar.progress = 0
} else { } else {
val file = getFileStreamPath("audio.mp3")
val file = getFileStreamPath("audio")
if (file.exists()) { if (file.exists()) {
val mp = MediaPlayer.create(this, Uri.fromFile(file)) val mp = MediaPlayer.create(this, Uri.fromFile(file))
mp.setOnCompletionListener { mp.setOnCompletionListener {
@@ -86,8 +82,6 @@ class MainActivity : AppCompatActivity() {
btn.setText(caption) btn.setText(caption)
} }


// var currentUri: Uri? = null

override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data) super.onActivityResult(requestCode, resultCode, data)


@@ -105,11 +99,12 @@ class MainActivity : AppCompatActivity() {
private fun savePreferences(caption: String, uri: Uri?) { private fun savePreferences(caption: String, uri: Uri?) {
val btn = findViewById<TextView>(R.id.text_view_button) val btn = findViewById<TextView>(R.id.text_view_button)
val editor = getPreferences(Context.MODE_PRIVATE).edit() val editor = getPreferences(Context.MODE_PRIVATE).edit()
editor.putString("caption", btn.text.toString())
editor.commit() editor.commit()


uri?.let { uri -> uri?.let { uri ->
grantUriPermission(getPackageName(), uri, Intent.FLAG_GRANT_READ_URI_PERMISSION) grantUriPermission(getPackageName(), uri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
val output = BufferedOutputStream(openFileOutput("audio.mp3", Context.MODE_PRIVATE))
val output = BufferedOutputStream(openFileOutput("audio", Context.MODE_PRIVATE))
val input = BufferedInputStream(getContentResolver().openInputStream(uri)) val input = BufferedInputStream(getContentResolver().openInputStream(uri))
try { try {
val buf = ByteArray(1024) val buf = ByteArray(1024)


Loading…
Cancel
Save